Improved phrases in search form

diff --git a/com.woltlab.wcf/templates/search.tpl b/com.woltlab.wcf/templates/search.tpl
index 0a2f4fa28377019b63f90e4735e14d5ca7b006e4..9cc6f03a4828c30933fe8f839223e28a85086900 100644 (file)
--- a/com.woltlab.wcf/templates/search.tpl
+++ b/com.woltlab.wcf/templates/search.tpl
@@ -12,7 +12,7 @@
                                        {/if}
                                {/foreach}
                        </select>
-                       <button class="searchButton button buttonPrimary">{lang}wcf.global.search{/lang}</button>
+                       <button class="searchButton button buttonPrimary">{lang}wcf.global.button.search{/lang}</button>
                </div>
 
                <details class="searchFiltersContainer"{if $extended} open{/if}>
@@ -75,7 +75,7 @@
                                {/if}
                        {/foreach}
 
-                       <button class="searchButton button buttonPrimary">{lang}wcf.global.search{/lang}</button>
+                       <button class="searchButton button buttonPrimary">{lang}wcf.global.button.search{/lang}</button>
                </details>
        </div>
 </form>

diff --git a/com.woltlab.wcf/templates/searchArticle.tpl b/com.woltlab.wcf/templates/searchArticle.tpl
index e7d16b56ac55a3ff7929a33d8fbf78dbc858c193..73de0e84f36083786fe89ebeafb5ab056625cc5a 100644 (file)
--- a/com.woltlab.wcf/templates/searchArticle.tpl
+++ b/com.woltlab.wcf/templates/searchArticle.tpl
@@ -1,5 +1,5 @@
 <dl>
-       <dt><label for="articleCategoryID">{lang}wcf.article.search.categories{/lang}</label></dt>
+       <dt><label for="articleCategoryID">{lang}wcf.search.searchInCategories{/lang}</label></dt>
        <dd>
                <select name="articleCategoryID" id="articleCategoryID">
                        <option value="">{lang}wcf.global.noSelection{/lang}</option>

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index b10c670b6174c1297ed26a6619e8c49393fda7d6..ab9691ab7b4cfc4d530eb4df7df4e8a88e453b93 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -3313,7 +3313,6 @@ freigeschaltet. {if LANGUAGE_USE_INFORMAL_VARIANT}Du kannst{else}Sie können{/if
                <item name="wcf.article.recentActivity.likedArticle"><![CDATA[Hat mit <span title="{$reactionType->getTitle()}" class="jsTooltip">{@$reactionType->renderIcon()}</span> auf den Artikel <a href="{$article->getLink()}">{$article->getTitle()}</a> reagiert.]]></item>
                <item name="wcf.article.recentActivity.articleComment"><![CDATA[Hat einen Kommentar zum Artikel <a href="{$article->getLink()}#comment{$commentID}">{$article->getTitle()}</a> geschrieben.]]></item>
                <item name="wcf.article.recentActivity.articleCommentResponse"><![CDATA[Hat auf einen Kommentar von <a href="{link controller='User' object=$commentAuthor}{/link}">{$commentAuthor->username}</a> zum Artikel <a href="{$article->getLink()}#comment{@$commentID}/response{@$responseID}">{$article->getTitle()}</a> geantwortet.]]></item>
-               <item name="wcf.article.search.categories"><![CDATA[Folgende Kategorien durchsuchen]]></item>
                <item name="wcf.article.articles"><![CDATA[Artikel]]></item>
                <item name="wcf.article.comment"><![CDATA[Artikel-Kommentar]]></item>
                <item name="wcf.article.commentResponse"><![CDATA[Antwort auf Artikel-Kommentar]]></item>
@@ -3914,7 +3913,7 @@ Dateianhänge:
                <item name="wcf.global.button.rss"><![CDATA[RSS-Feed]]></item>
                <item name="wcf.global.button.save"><![CDATA[Speichern]]></item>
                <item name="wcf.global.button.saveSorting"><![CDATA[Sortierung speichern]]></item>
-               <item name="wcf.global.button.search"><![CDATA[Suche]]></item>
+               <item name="wcf.global.button.search"><![CDATA[Suchen]]></item>
                <item name="wcf.global.button.submit"><![CDATA[Absenden]]></item>
                <item name="wcf.global.button.trash"><![CDATA[In den Papierkorb verschieben]]></item>
                <item name="wcf.global.button.upload"><![CDATA[Hochladen]]></item>
@@ -4526,6 +4525,7 @@ Dateianhänge:
                <item name="wcf.search.type.tags.popular"><![CDATA[Beliebte Tags]]></item>
                <item name="wcf.search.results.title"><![CDATA[{plural value=$count 0='Keine Ergebnisse' one='Ein Ergebnis' other='# Ergebnisse'}{if $query} für „{@$query}“{/if}]]></item>
                <item name="wcf.search.button.showMoreFilters"><![CDATA[Erweiterte Filter]]></item>
+               <item name="wcf.search.searchInCategories"><![CDATA[Folgende Kategorien durchsuchen]]></item>
        </category>
        <category name="wcf.style">
                <item name="wcf.style.changeStyle"><![CDATA[Stil ändern]]></item>
@@ -5621,5 +5621,6 @@ Benachrichtigungen auf <a href="{link isHtmlEmail=true}{/link}">{PAGE_TITLE|phra
        <item name="wcf.acp.option.enable_desktop_notifications.description"/>
        <item name="wcf.search.matchExactly" />
        <item name="wcf.search.subjectOnly" />
+       <item name="wcf.article.search.categories" />
 </delete>
 </language>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 03941122d963dc4ef5989474d37f21776bbadef5..09ef97636cfcc0eac4a6e26ca3772faa484167dd 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -3240,7 +3240,6 @@ Your account on the website: {@PAGE_TITLE|phrase} [URL:{link isEmail=true}{/link
                <item name="wcf.article.recentActivity.likedArticle"><![CDATA[Reacted with <span title="{$reactionType->getTitle()}" class="jsTooltip">{@$reactionType->renderIcon()}</span> to the article <a href="{$article->getLink()}">{$article->getTitle()}</a>.]]></item>
                <item name="wcf.article.recentActivity.articleComment"><![CDATA[Commented on article <a href="{$article->getLink()}#comment{$commentID}">{$article->getTitle()}</a>.]]></item>
                <item name="wcf.article.recentActivity.articleCommentResponse"><![CDATA[Replied to a comment by <a href="{link controller='User' object=$commentAuthor}{/link}">{$commentAuthor->username}</a> on article <a href="{$article->getLink()}#comment{@$commentID}/response{@$responseID}">{$article->getTitle()}</a>.]]></item>
-               <item name="wcf.article.search.categories"><![CDATA[Search in Categories]]></item>
                <item name="wcf.article.articles"><![CDATA[Articles]]></item>
                <item name="wcf.article.comment"><![CDATA[Article Comment]]></item>
                <item name="wcf.article.commentResponse"><![CDATA[Reply to Article Comment]]></item>
@@ -4518,6 +4517,7 @@ Attachments:
                <item name="wcf.search.searchIn"><![CDATA[Search In]]></item>
                <item name="wcf.search.searchIn.subjectAndMessage"><![CDATA[Subject and message]]></item>
                <item name="wcf.search.searchIn.subjectOnly"><![CDATA[Subject only]]></item>
+               <item name="wcf.search.searchInCategories"><![CDATA[Search in Categories]]></item>
                <item name="wcf.search.type"><![CDATA[Content Type]]></item>
                <item name="wcf.search.type.everywhere"><![CDATA[Everywhere]]></item>
                <item name="wcf.search.object.com.woltlab.wcf.article"><![CDATA[Article]]></item>
@@ -5623,5 +5623,6 @@ your notifications on <a href="{link isHtmlEmail=true}{/link}">{PAGE_TITLE|phras
        <item name="wcf.acp.option.enable_desktop_notifications.description"/>
        <item name="wcf.search.matchExactly" />
        <item name="wcf.search.subjectOnly" />
+       <item name="wcf.article.search.categories" />
 </delete>
 </language>