Reverting messages from the reverted commits of Special:Search, and re-adding older...

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 1adffc5..cdce327 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1415,63 +1415,52 @@ Note that using the navigation links will reset this column.',
 'diff-strike'             => "'''strikethrough'''",
 
 # Search results
-'searchresults'                    => 'Search results',
-'searchresults-title'              => 'Search results for $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-exists'                => "*Page '''[[$1]]'''
-",
-'searchmenu-new'                   => "*Create page '''[[$1]]'''
-",
-'searchmenu'                       => '*[[Special:AllPages/$1|Index]]
-*[[{{ns:project}}:Searching|{{int:help}}]]
-',
-'searchprofile-articles'           => 'Pages',
-'searchprofile-project'            => 'Pages/Project',
-'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'''}}",
-'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.
+'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"]] | [[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:$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.
 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" />

diff --git a/languages/messages/MessagesHe.php b/languages/messages/MessagesHe.php
index 6f74194..650ee22 100644 (file)
--- a/languages/messages/MessagesHe.php
+++ b/languages/messages/MessagesHe.php
@@ -1153,56 +1153,46 @@ $2',
 'diff-strike'             => "'''קו חוצה'''",
 
 # Search results
-'searchresults'                    => 'תוצאות החיפוש',
-'searchresults-title'              => 'תוצאות החיפוש של $1',
-'toomanymatches'                   => 'יותר מדי תוצאות נמצאו, אנא נסו מילות חיפוש אחרות',
-'titlematches'                     => 'כותרות דפים תואמות',
-'notitlematches'                   => 'אין כותרות דפים תואמות',
-'textmatches'                      => 'דפים עם תוכן תואם',
-'notextmatches'                    => 'אין דפים עם תוכן תואם',
-'prevn'                            => '$1 הקודמים',
-'nextn'                            => '$1 הבאים',
-'viewprevnext'                     => 'צפו ב - ($1) ($2) ($3)',
-'searchmenu-exists'                => "*הדף '''[[$1]]'''",
-'searchmenu-new'                   => "*יצירת הדף '''[[$1]]'''",
-'searchmenu'                       => '* [[Special:AllPages/$1|אינדקס]]
-* [[{{MediaWiki:Searchhelp-url}}|{{int:help}}]]',
-'searchprofile-articles'           => 'דפים',
-'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'''}}",
-'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"]] | [[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:$4|תוצאה '''$1''' מתוך '''$3'''|תוצאות '''$1 - $2''' מתוך '''$3'''}}",
+'nonefound'                 => "'''הערה''': כברירת מחדל, החיפוש מבוצע במספר מרחבי שם בלבד. באפשרותכם לכתוב '''all:''' לפני מונח החיפוש כדי לחפש בכל הדפים (כולל דפי שיחה, תבניות, ועוד), או לכתוב לפני מונח החיפוש את מרחב השם שאתם מעוניינים בו.",
+'powersearch'               => 'חיפוש מתקדם',
+'powersearch-legend'        => 'חיפוש מתקדם',
+'powersearch-ns'            => 'חיפוש במרחבי השם:',
+'powersearch-redir'         => 'הצגת דפי הפניה',
+'powersearch-field'         => 'חיפוש',
+'search-external'           => 'חיפוש חיצוני',
+'searchdisabled'            => 'לצערנו, עקב עומס על המערכת, לא ניתן לחפש כעת בטקסט המלא של הדפים. באפשרותכם להשתמש בינתיים בגוגל, אך שימו לב שייתכן שהוא אינו מעודכן.',
 
 # Preferences page
 'preferences'              => 'העדפות',
@@ -1264,6 +1254,7 @@ $2',
 'allowemail'               => 'קבלת דוא"ל ממשתמשים אחרים',
 'prefs-searchoptions'      => 'אפשרויות חיפוש',
 'prefs-namespaces'         => 'מרחבי שם',
+'defaultns'                => 'מרחבי שם לחיפוש כברירת מחדל:',
 'default'                  => 'ברירת מחדל',
 'files'                    => 'קבצים',