Merge "Make restoreprefs crystal clear about the meaning of *all*"

diff --combined languages/messages/MessagesEn.php
index 9218651,f76eaa4..0ba7ccd
--- 1/languages/messages/MessagesEn.php
--- 2/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@@ -1350,7 -1350,7 +1350,7 @@@ You should do it if you accidentally sh
  'resettokens-legend'          => 'Reset tokens',
  'resettokens-tokens'          => 'Tokens:',
  'resettokens-token-label'     => '$1 (current value: $2)',
 -'resettokens-watchlist-token' => 'Watchlist web feed token',
 +'resettokens-watchlist-token' => 'Token for the web feed (Atom/RSS) of [[Special:Watchlist|changes to pages on your watchlist]]',
  'resettokens-done'            => 'Tokens reset.',
  'resettokens-resetbutton'     => 'Reset selected tokens',
  
@@@ -1925,7 -1925,7 +1925,7 @@@ Note that their indexes of {{SITENAME}
  'prefs-rendering'               => 'Appearance',
  'saveprefs'                     => 'Save',
  'resetprefs'                    => 'Clear unsaved changes',
- 'restoreprefs'                  => 'Restore all default settings',
+ 'restoreprefs'                  => 'Restore all default settings (in all sections)',
  'prefs-editing'                 => 'Editing',
  'rows'                          => 'Rows:',
  'columns'                       => 'Columns:',
@@@ -2195,8 -2195,6 +2195,8 @@@ Your email address is not revealed whe
  
  # Recent changes
  'nchanges'                          => '$1 {{PLURAL:$1|change|changes}}',
 +'enhancedrc-since-last-visit'       => '$1 {{PLURAL:$1|since last visit}}',
 +'enhancedrc-history'                => 'history',
  'recentchanges'                     => 'Recent changes',
  'recentchanges-url'                 => 'Special:RecentChanges', # do not translate or duplicate this message to other languages
  'recentchanges-legend'              => 'Recent changes options',
@@@ -2630,10 -2628,10 +2630,10 @@@ Remember to check for other links to th
  'randompage-url'     => 'Special:Random', # do not translate or duplicate this message to other languages
  
  # Random page in category
 -'randomincategory'                  => 'Random page in category',
 -'randomincategory-invalidcategory'  => '"$1" is not a valid category name.',
 -'randomincategory-nopages'          => 'There are no pages in [[:Category:$1]].',
 -'randomincategory-selectcategory'   => 'Get random page from category: $1 $2.',
 +'randomincategory'                       => 'Random page in category',
 +'randomincategory-invalidcategory'       => '"$1" is not a valid category name.',
 +'randomincategory-nopages'               => 'There are no pages in the [[:Category:$1|$1]] category.',
 +'randomincategory-selectcategory'        => 'Get random page from category: $1 $2.',
  'randomincategory-selectcategory-submit' => 'Go',
  
  # Random redirect
@@@ -2676,8 -2674,8 +2676,8 @@@ A page is treated as a disambiguation p
  'pageswithprop-text'              => 'This page lists pages that use a particular page property.',
  'pageswithprop-prop'              => 'Property name:',
  'pageswithprop-submit'            => 'Go',
 -'pageswithprop-prophidden-long'   => 'long text property value hidden ($1 kilobytes)',
 -'pageswithprop-prophidden-binary' => 'binary property value hidden ($1 kilobytes)',
 +'pageswithprop-prophidden-long'   => 'long text property value hidden ($1)',
 +'pageswithprop-prophidden-binary' => 'binary property value hidden ($1)',
  
  'doubleredirects'                   => 'Double redirects',
  'doubleredirects-summary'           => '', # do not translate or duplicate this message to other languages
@@@ -4003,7 -4001,7 +4003,7 @@@ By executing it, your system may be com
  # Human-readable timestamps
  'hours-ago'    => '$1 {{PLURAL:$1|hour|hours}} ago',
  'minutes-ago'  => '$1 {{PLURAL:$1|minute|minutes}} ago',
 -'seconds-ago'  => '$1 {{PLURAL:$1|seconds|seconds}} ago',
 +'seconds-ago'  => '$1 {{PLURAL:$1|second|seconds}} ago',
  'monday-at'    => 'Monday at $1',
  'tuesday-at'   => 'Tuesday at $1',
  'wednesday-at' => 'Wednesday at $1',
@@@ -5121,22 -5119,22 +5121,22 @@@ Otherwise, you can use the easy form be
  'rotate-comment' => 'Image rotated by $1 {{PLURAL:$1|degree|degrees}} clockwise',
  
  # Limit report
 -'limitreport-title' => 'Parser profiling data:',
 -'limitreport-cputime' => 'CPU time usage',
 -'limitreport-cputime-value' => '$1 {{PLURAL:$1|second|seconds}}',
 -'limitreport-walltime' => 'Real time usage',
 -'limitreport-walltime-value' => '$1 {{PLURAL:$1|second|seconds}}',
 -'limitreport-ppvisitednodes' => 'Preprocessor visited node count',
 -'limitreport-ppvisitednodes-value' => '$1/$2',
 -'limitreport-ppgeneratednodes' => 'Preprocessor generated node count',
 -'limitreport-ppgeneratednodes-value' => '$1/$2',
 -'limitreport-postexpandincludesize' => 'Post-expand include size',
 -'limitreport-postexpandincludesize-value' => '$1/$2 bytes',
 -'limitreport-templateargumentsize' => 'Template argument size',
 -'limitreport-templateargumentsize-value' => '$1/$2 bytes',
 -'limitreport-expansiondepth' => 'Highest expansion depth',
 -'limitreport-expansiondepth-value' => '$1/$2',
 -'limitreport-expensivefunctioncount' => 'Expensive parser function count',
 -'limitreport-expensivefunctioncount-value' => '$1/$2',
 +'limitreport-title'                        => 'Parser profiling data:',
 +'limitreport-cputime'                      => 'CPU time usage',
 +'limitreport-cputime-value'                => '$1 {{PLURAL:$1|second|seconds}}',
 +'limitreport-walltime'                     => 'Real time usage',
 +'limitreport-walltime-value'               => '$1 {{PLURAL:$1|second|seconds}}',
 +'limitreport-ppvisitednodes'               => 'Preprocessor visited node count',
 +'limitreport-ppvisitednodes-value'         => '$1/$2', # only translate this message to other languages if you have to change it
 +'limitreport-ppgeneratednodes'             => 'Preprocessor generated node count',
 +'limitreport-ppgeneratednodes-value'       => '$1/$2', # only translate this message to other languages if you have to change it
 +'limitreport-postexpandincludesize'        => 'Post-expand include size',
 +'limitreport-postexpandincludesize-value'  => '$1/$2 bytes',
 +'limitreport-templateargumentsize'         => 'Template argument size',
 +'limitreport-templateargumentsize-value'   => '$1/$2 bytes',
 +'limitreport-expansiondepth'               => 'Highest expansion depth',
 +'limitreport-expansiondepth-value'         => '$1/$2', # only translate this message to other languages if you have to change it
 +'limitreport-expensivefunctioncount'       => 'Expensive parser function count',
 +'limitreport-expensivefunctioncount-value' => '$1/$2', # only translate this message to other languages if you have to change it
  
  );