Merge "(bug 18062) new message when edit or create the local page of a shared file"

diff --combined languages/messages/MessagesEn.php
index f9a586a,e169e72..6186892
--- 1/languages/messages/MessagesEn.php
--- 2/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@@ -2404,6 -2404,10 +2404,10 @@@ A [[Special:WhatLinksHere/$2|full list]
  Please see the [$2 file description page] for further information.',
  'sharedupload-desc-here'            => 'This file is from $1 and may be used by other projects.
  The description on its [$2 file description page] there is shown below.',
+ 'sharedupload-desc-edit'            => 'This file is from $1 and may be used by other projects.
+ Maybe you want edit the description on its [$2 file description page] there.',
+ 'sharedupload-desc-create'          => 'This file is from $1 and may be used by other projects.
+ Maybe you want edit the description on its [$2 file description page] there.',
  'shareddescriptionfollows'          => '-', # do not translate or duplicate this message to other languages
  'filepage-nofile'                   => 'No file by this name exists.',
  'filepage-nofile-link'              => 'No file by this name exists, but you can [$1 upload it].',
@@@ -3069,7 -3073,6 +3073,7 @@@ The latest block log entry is provided 
  '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
 +'sp-contributions-footer-newbies'      => '-', # do not translate or duplicate this message to other languages
  
  # What links here
  'whatlinkshere'            => 'What links here',

diff --combined maintenance/language/messages.inc
index 33488c5,e9a7723..29c5c05
--- 1/maintenance/language/messages.inc
--- 2/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@@ -1494,6 -1494,8 +1494,8 @@@ $wgMessageStructure = array
                'sharedupload',
                'sharedupload-desc-there',
                'sharedupload-desc-here',
+               'sharedupload-desc-edit',
+               'sharedupload-desc-create',
                'shareddescriptionfollows',
                'filepage-nofile',
                'filepage-nofile-link',
@@@ -2081,7 -2083,6 +2083,7 @@@
                'sp-contributions-explain',
                'sp-contributions-footer',
                'sp-contributions-footer-anon',
 +              'sp-contributions-footer-newbies',
        ),
        'whatlinkshere' => array(
                'whatlinkshere',