Skip to content

Commit 641d00d

Browse files
WillStrohlWillStrohl
authored
Merge pull request #1367 from DNNCommunity/dev
Synchronizing branches
2 parents d318791 + 8c9c1c2 commit 641d00d

File tree

81 files changed

+1236
-954
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+1236
-954
lines changed

‎Dnn.CommunityForums/App_LocalResources/LegacyTokenResources.resx

+3
Original file line numberDiff line numberDiff line change
@@ -417,4 +417,7 @@
417417
<data name="[LIKESx3].Text" xml:space="preserve">
418418
<value>&lt;i id="af-topicview-likes-[FORUMPOST:CONTENTID]" class="fa [FORUMPOST:ISLIKED|fa-thumbs-o-up|fa-thumbs-up] fa-3x" style="cursor: pointer" onclick="{0}"&gt; [FORUMPOST:LIKECOUNT]&lt;/i&gt;|&lt;i id="af-topicview-likes" class="fa [FORUMPOST:ISLIKED|fa-thumbs-o-up|fa-thumbs-up] fa-2x"&gt; [FORUMPOST:LIKECOUNT]&lt;/i&gt;</value>
419419
</data>
420+
<data name="[SUBJECTLINK].Text" xml:space="preserve">
421+
<value>&lt;a href="{0}" class="dcf-topic-link"&gt;[FORUMTOPIC:SUBJECT]&lt;/a&gt;</value>
422+
</data>
420423
</root>

‎Dnn.CommunityForums/App_LocalResources/SharedResources.de-DE.resx

+21-6
Original file line numberDiff line numberDiff line change
@@ -1457,13 +1457,13 @@ Von
14571457
<data name="DropDownSelect.Text" xml:space="preserve">
14581458
<value>&lt;GRUPPE ODER FORUM WÄHLEN&gt;</value>
14591459
</data>
1460-
<data name="drpSearchType.AllKeywords.Text" xml:space="preserve">
1460+
<data name="[RESX:SearchTypeAllKeywords].Text" xml:space="preserve">
14611461
<value>ALLE Schlüsselwörter</value>
14621462
</data>
1463-
<data name="drpSearchType.ANYKeywords.Text" xml:space="preserve">
1463+
<data name="[RESX:SearchTypeANYKeywords].Text" xml:space="preserve">
14641464
<value>JEDES Schlüsselwort</value>
14651465
</data>
1466-
<data name="drpSearchType.ExactMatch.Text" xml:space="preserve">
1466+
<data name="[RESX:SearchTypeExactMatch].Text" xml:space="preserve">
14671467
<value>Exakte Übereinstimmung</value>
14681468
</data>
14691469
<data name="EditProfile.Text" xml:space="preserve">
@@ -1565,13 +1565,13 @@ Von
15651565
<data name="SearchPostTime.Text" xml:space="preserve">
15661566
<value>{0} @ {1}</value>
15671567
</data>
1568-
<data name="SearchRangeAll.Text" xml:space="preserve">
1568+
<data name="[RESX:SearchRangeAll].Text" xml:space="preserve">
15691569
<value>Alle</value>
15701570
</data>
1571-
<data name="SearchRangeDays.Text" xml:space="preserve">
1571+
<data name="[RESX:SearchRangeDays].Text" xml:space="preserve">
15721572
<value>Letzte {0} Tage</value>
15731573
</data>
1574-
<data name="SearchRangeHours.Text" xml:space="preserve">
1574+
<data name="[RESX:SearchRangeHours].Text" xml:space="preserve">
15751575
<value>Letzte {0} Stunden</value>
15761576
</data>
15771577
<data name="SearchReplies.Text" xml:space="preserve">
@@ -1823,4 +1823,19 @@ Von
18231823
<value>&lt;p&gt;[FORUMPOST:AUTHORDISPLAYNAMELINK|&lt;i class="fa fa-user fa-fw fa-blue"&gt;&lt;/i&gt;nbsp;&lt;a href="{0}" class="af-profile-link" rel="nofollow"&gt;&lt;/a&gt;|[FORUMPOST:AUTHORDISPLAYNAME]] Inhalte veröffentlicht hat, die einer Moderation bedürfen.&lt;/p&gt;&lt;p&gt;&lt;strong&gt;Betreff:&lt;/strong&gt; [FORUMPOST:BETREFF]&lt;/p&gt;&lt;p&gt;Bitte überprüfen Sie den Inhalt und bestimmen Sie dessen Disposition.&lt;/p&gt;
18241824
&lt;p&gt;Sie können:&lt;ol&gt;&lt;li&gt;das Thema genehmigen,&lt;/li&gt;&lt;li&gt;Ablehnen (Senden an das Poster zur Überarbeitung),&lt;/li&gt;&lt;li&gt;Löschen Sie es oder&lt;/li&gt;&lt;li&gt;den Benutzer zu sperren, dieses und alle anderen Themen oder Antworten, die von diesem Benutzer gepostet wurden, zu löschen&lt;/li&gt;&lt;/ol&gt;&lt;/p&gt;&lt;p&gt;Wenn Sie nicht allein anhand des Themas feststellen können, ob dieser Inhalt geeignet ist, verwenden Sie &lt;a href="[FORUM:MODLINK]"&gt;diesen Link&lt;/a&gt; , um Themen zu überprüfen und zu moderieren.&lt;/p&gt;</value>
18251825
</data>
1826+
<data name="[RESX:SearchSubjectAndTopic].Text" xml:space="preserve">
1827+
<value>Thema &amp; Thema</value>
1828+
</data>
1829+
<data name="[RESX:SearchSubjectOnly].Text" xml:space="preserve">
1830+
<value>Nur Betreff</value>
1831+
</data>
1832+
<data name="[RESX:SearchTopicOnly].Text" xml:space="preserve">
1833+
<value>Nur Thema</value>
1834+
</data>
1835+
<data name="[RESX:SearchSortTypeRelevance].Text" xml:space="preserve">
1836+
<value>Relevanz</value>
1837+
</data>
1838+
<data name="[RESX:SearchSortTypePostDate].Text" xml:space="preserve">
1839+
<value>Datum der Veröffentlichung</value>
1840+
</data>
18261841
</root>

‎Dnn.CommunityForums/App_LocalResources/SharedResources.es-ES.resx

+21-6
Original file line numberDiff line numberDiff line change
@@ -1459,13 +1459,13 @@ De
14591459
<data name="DropDownSelect.Text" xml:space="preserve">
14601460
<value>&lt; SELECCIONE GRUPO O FORO &gt;</value>
14611461
</data>
1462-
<data name="drpSearchType.AllKeywords.Text" xml:space="preserve">
1462+
<data name="[RESX:SearchTypeAllKeywords].Text" xml:space="preserve">
14631463
<value>TODAS las palabras clave</value>
14641464
</data>
1465-
<data name="drpSearchType.ANYKeywords.Text" xml:space="preserve">
1465+
<data name="[RESX:SearchTypeANYKeywords].Text" xml:space="preserve">
14661466
<value>CUALQUIER palabra clave</value>
14671467
</data>
1468-
<data name="drpSearchType.ExactMatch.Text" xml:space="preserve">
1468+
<data name="[RESX:SearchTypeExactMatch].Text" xml:space="preserve">
14691469
<value>Coincidencia exacta</value>
14701470
</data>
14711471
<data name="EditProfile.Text" xml:space="preserve">
@@ -1567,13 +1567,13 @@ De
15671567
<data name="SearchPostTime.Text" xml:space="preserve">
15681568
<value>{0} @ {1}</value>
15691569
</data>
1570-
<data name="SearchRangeAll.Text" xml:space="preserve">
1570+
<data name="[RESX:SearchRangeAll].Text" xml:space="preserve">
15711571
<value>Todo</value>
15721572
</data>
1573-
<data name="SearchRangeDays.Text" xml:space="preserve">
1573+
<data name="[RESX:SearchRangeDays].Text" xml:space="preserve">
15741574
<value>Últimos {0} días</value>
15751575
</data>
1576-
<data name="SearchRangeHours.Text" xml:space="preserve">
1576+
<data name="[RESX:SearchRangeHours].Text" xml:space="preserve">
15771577
<value>Últimas {0} horas</value>
15781578
</data>
15791579
<data name="SearchReplies.Text" xml:space="preserve">
@@ -1822,4 +1822,19 @@ De
18221822
<value>&lt;p&gt;[PUBLICACIÓN EN EL FORO:AUTHORDISPLAYNAMELINK|&lt;i class="fa fa-user fa-fw fa-blue"&gt;&lt;/i&gt;nbsp;&lt;a href="{0}" class="af-profile-link" rel="nofollow"&gt;&lt;/a&gt;|[FORO:AUTHORDISPLAYNAME]] ha publicado contenido que requiere moderación.&lt;/p&gt;&lt;p&gt;&lt;strong&gt;Asunto:&lt;/strong&gt; [FORO:ASUNTO]&lt;/p&gt;&lt;p&gt;Revise el contenido y determine su disposición.&lt;/p&gt;
18231823
&lt;p&gt;Puedes:&lt;ol&gt;&lt;li&gt;aprobar el tema,&lt;/li&gt;&lt;li&gt;rechazarlo (enviarlo al cartel para su revisión),&lt;/li&gt;&lt;li&gt;eliminarlo, o&lt;/li&gt;&lt;li&gt;Bloquear al usuario, eliminando este y cualquier otro tema o respuesta publicada por este usuario&lt;/li&gt;&lt;/ol&gt;&lt;/p&gt;&lt;p&gt;Si no puedes determinar si este contenido es adecuado solo en función del tema, usa &lt;a href="[FORUM:MODLINK]"&gt;este enlace&lt;/a&gt; para revisar y moderar los temas.&lt;/p&gt;</value>
18241824
</data>
1825+
<data name="[RESX:SearchSubjectAndTopic].Text" xml:space="preserve">
1826+
<value>Asunto y Tema</value>
1827+
</data>
1828+
<data name="[RESX:SearchSubjectOnly].Text" xml:space="preserve">
1829+
<value>Solo sujeto</value>
1830+
</data>
1831+
<data name="[RESX:SearchTopicOnly].Text" xml:space="preserve">
1832+
<value>Solo tema</value>
1833+
</data>
1834+
<data name="[RESX:SearchSortTypeRelevance].Text" xml:space="preserve">
1835+
<value>Pertinencia</value>
1836+
</data>
1837+
<data name="[RESX:SearchSortTypePostDate].Text" xml:space="preserve">
1838+
<value>Fecha de publicación</value>
1839+
</data>
18251840
</root>

‎Dnn.CommunityForums/App_LocalResources/SharedResources.fr-FR.resx

+21-6
Original file line numberDiff line numberDiff line change
@@ -1456,13 +1456,13 @@ De,
14561456
<data name="DropDownSelect.Text" xml:space="preserve">
14571457
<value>&lt; SÉLECTIONNEZ UN GROUPE OU FORUM &gt;</value>
14581458
</data>
1459-
<data name="drpSearchType.AllKeywords.Text" xml:space="preserve">
1459+
<data name="[RESX:SearchTypeAllKeywords].Text" xml:space="preserve">
14601460
<value>Tous les mots-clés</value>
14611461
</data>
1462-
<data name="drpSearchType.ANYKeywords.Text" xml:space="preserve">
1462+
<data name="[RESX:SearchTypeANYKeywords].Text" xml:space="preserve">
14631463
<value>N'importe quel mot-clé</value>
14641464
</data>
1465-
<data name="drpSearchType.ExactMatch.Text" xml:space="preserve">
1465+
<data name="[RESX:SearchTypeExactMatch].Text" xml:space="preserve">
14661466
<value>Concordance exacte</value>
14671467
</data>
14681468
<data name="EditProfile.Text" xml:space="preserve">
@@ -1564,13 +1564,13 @@ De,
15641564
<data name="SearchPostTime.Text" xml:space="preserve">
15651565
<value>{0} @ {1}</value>
15661566
</data>
1567-
<data name="SearchRangeAll.Text" xml:space="preserve">
1567+
<data name="[RESX:SearchRangeAll].Text" xml:space="preserve">
15681568
<value>Tous</value>
15691569
</data>
1570-
<data name="SearchRangeDays.Text" xml:space="preserve">
1570+
<data name="[RESX:SearchRangeDays].Text" xml:space="preserve">
15711571
<value>Les derniers {0} jours</value>
15721572
</data>
1573-
<data name="SearchRangeHours.Text" xml:space="preserve">
1573+
<data name="[RESX:SearchRangeHours].Text" xml:space="preserve">
15741574
<value>Les dernières {0} heures</value>
15751575
</data>
15761576
<data name="SearchReplies.Text" xml:space="preserve">
@@ -1819,4 +1819,19 @@ De,
18191819
<value>&lt;p&gt;[FORUMPOST :AUTHORDISPLAYNAMELINK|&lt;i class="fa fa-user fa-fw fa-blue"&gt;&lt;/i&gt;nbsp ;&lt;a href="{0}" class="af-profile-link" rel="nofollow"&gt;&lt;/a&gt;|[FORUMPOST :AUTHORDISPLAYNAME]] a publié du contenu nécessitant une modération.&lt;/p&gt;&lt;p&gt;&lt;strong&gt;Sujet :&lt;/strong&gt; [FORUMPOST :SUJET]&lt;/p&gt;&lt;p&gt;Veuillez examiner le contenu et déterminer son élimination.&lt;/p&gt;
18201820
&lt;p&gt;Vous pouvez:&lt;ol&gt;&lt;li&gt;approuver le sujet,&lt;/li&gt;&lt;li&gt;le rejeter (envoi à l’affiche pour révisions),&lt;/li&gt;&lt;li&gt;le supprimer, ou&lt;/li&gt;&lt;li&gt;bannir l’utilisateur, en supprimant ce sujet et tout autre sujet ou réponse posté par cet utilisateur&lt;/li&gt;&lt;/ol&gt;&lt;/p&gt;&lt;p&gt;Si vous ne parvenez pas à déterminer si ce contenu est approprié en vous basant uniquement sur le sujet, utilisez &lt;a href="[FORUM:MODLINK]"&gt;ce lien&lt;/a&gt; pour examiner et modérer les sujets.&lt;/p&gt;</value>
18211821
</data>
1822+
<data name="[RESX:SearchSubjectAndTopic].Text" xml:space="preserve">
1823+
<value>Sujet et sujet</value>
1824+
</data>
1825+
<data name="[RESX:SearchSubjectOnly].Text" xml:space="preserve">
1826+
<value>Sujet seulement</value>
1827+
</data>
1828+
<data name="[RESX:SearchTopicOnly].Text" xml:space="preserve">
1829+
<value>Sujet uniquement</value>
1830+
</data>
1831+
<data name="[RESX:SearchSortTypeRelevance].Text" xml:space="preserve">
1832+
<value>Pertinence</value>
1833+
</data>
1834+
<data name="[RESX:SearchSortTypePostDate].Text" xml:space="preserve">
1835+
<value>Date de publication</value>
1836+
</data>
18221837
</root>

‎Dnn.CommunityForums/App_LocalResources/SharedResources.it-IT.resx

+21-6
Original file line numberDiff line numberDiff line change
@@ -1456,13 +1456,13 @@ Da
14561456
<data name="DropDownSelect.Text" xml:space="preserve">
14571457
<value>&lt; SELEZIONA GRUPPO O FORUM &gt;</value>
14581458
</data>
1459-
<data name="drpSearchType.AllKeywords.Text" xml:space="preserve">
1459+
<data name="[RESX:SearchTypeAllKeywords].Text" xml:space="preserve">
14601460
<value>TUTTE le parole chiave</value>
14611461
</data>
1462-
<data name="drpSearchType.ANYKeywords.Text" xml:space="preserve">
1462+
<data name="[RESX:SearchTypeANYKeywords].Text" xml:space="preserve">
14631463
<value>Parola chiave ANY</value>
14641464
</data>
1465-
<data name="drpSearchType.ExactMatch.Text" xml:space="preserve">
1465+
<data name="[RESX:SearchTypeExactMatch].Text" xml:space="preserve">
14661466
<value>Corrispondenza esatta</value>
14671467
</data>
14681468
<data name="EditProfile.Text" xml:space="preserve">
@@ -1564,13 +1564,13 @@ Da
15641564
<data name="SearchPostTime.Text" xml:space="preserve">
15651565
<value>{0} @ {1}</value>
15661566
</data>
1567-
<data name="SearchRangeAll.Text" xml:space="preserve">
1567+
<data name="[RESX:SearchRangeAll].Text" xml:space="preserve">
15681568
<value>Tutto</value>
15691569
</data>
1570-
<data name="SearchRangeDays.Text" xml:space="preserve">
1570+
<data name="[RESX:SearchRangeDays].Text" xml:space="preserve">
15711571
<value>Ultimi {0} giorni</value>
15721572
</data>
1573-
<data name="SearchRangeHours.Text" xml:space="preserve">
1573+
<data name="[RESX:SearchRangeHours].Text" xml:space="preserve">
15741574
<value>Ultime {0} ore</value>
15751575
</data>
15761576
<data name="SearchReplies.Text" xml:space="preserve">
@@ -1822,4 +1822,19 @@ Da
18221822
<value>&lt;p&gt;[FORUMPOST:AUTHORDISPLAYNAMELINK|&lt;i class="fa fa-user fa-fw fa-blue"&gt;&lt;/i&gt;nbsp;&lt;a href="{0}" class="af-profile-link" rel="nofollow"&gt;&lt;/a&gt;|[FORUMPOST:NOMEDISPLAYAUTORE]] ha pubblicato contenuti che richiedono moderazione.&lt;/p&gt;&lt;p&gt;&lt;strong&gt;Oggetto:&lt;/strong&gt; [FORUMPOST:OGGETTO]&lt;/p&gt;&lt;p&gt;Si prega di rivedere il contenuto e determinarne la disposizione.&lt;/p&gt;
18231823
&lt;p&gt;Si può:&lt;ol&gt;&lt;li&gt;approvare l'argomento,&lt;/li&gt;&lt;li&gt;rifiutarlo (invio all'autore per le revisioni),&lt;/li&gt;&lt;li&gt;eliminarlo, oppure&lt;/li&gt;&lt;li&gt;bannare l'utente, cancellando questo e qualsiasi altro argomento o risposta postata da questo utente&lt;/li&gt;&lt;/ol&gt;&lt;/p&gt;&lt;p&gt;Se non riesci a determinare se questo contenuto è adatto solo in base all'argomento, utilizza &lt;a href="[FORUM:MODLINK]"&gt;questo link&lt;/a&gt; per rivedere e moderare gli argomenti.&lt;/p&gt;</value>
18241824
</data>
1825+
<data name="[RESX:SearchSubjectAndTopic].Text" xml:space="preserve">
1826+
<value>Soggetto e argomento</value>
1827+
</data>
1828+
<data name="[RESX:SearchSubjectOnly].Text" xml:space="preserve">
1829+
<value>Solo oggetto</value>
1830+
</data>
1831+
<data name="[RESX:SearchTopicOnly].Text" xml:space="preserve">
1832+
<value>Solo argomento</value>
1833+
</data>
1834+
<data name="[RESX:SearchSortTypeRelevance].Text" xml:space="preserve">
1835+
<value>Pertinenza</value>
1836+
</data>
1837+
<data name="[RESX:SearchSortTypePostDate].Text" xml:space="preserve">
1838+
<value>Data di pubblicazione</value>
1839+
</data>
18251840
</root>

‎Dnn.CommunityForums/App_LocalResources/SharedResources.nl-NL.resx

+24-9
Original file line numberDiff line numberDiff line change
@@ -483,13 +483,13 @@
483483
<data name="SearchPosts.Text" xml:space="preserve">
484484
<value>Zoek berichten</value>
485485
</data>
486-
<data name="SearchRangeAll.Text" xml:space="preserve">
486+
<data name="[RESX:SearchRangeAll].Text" xml:space="preserve">
487487
<value>Alle</value>
488488
</data>
489-
<data name="SearchRangeDays.Text" xml:space="preserve">
489+
<data name="[RESX:SearchRangeDays].Text" xml:space="preserve">
490490
<value>Afgelopen {0} dagen</value>
491491
</data>
492-
<data name="SearchRangeHours.Text" xml:space="preserve">
492+
<data name="[RESX:SearchRangeHours].Text" xml:space="preserve">
493493
<value>Afgelopen {0} uren</value>
494494
</data>
495495
<data name="SearchUser.Text" xml:space="preserve">
@@ -501,13 +501,13 @@
501501
<data name="MoveText.Text" xml:space="preserve">
502502
<value>Verplaats bericht</value>
503503
</data>
504-
<data name="drpSearchType.AllKeywords.Text" xml:space="preserve">
504+
<data name="[RESX:SearchTypeAllKeywords].Text" xml:space="preserve">
505505
<value>ALLE sleutelwoorden</value>
506506
</data>
507-
<data name="drpSearchType.ANYKeywords.Text" xml:space="preserve">
507+
<data name="[RESX:SearchTypeANYKeywords].Text" xml:space="preserve">
508508
<value>ELK sleutelwoord</value>
509509
</data>
510-
<data name="drpSearchType.ExactMatch.Text" xml:space="preserve">
510+
<data name="[RESX:SearchTypeExactMatch].Text" xml:space="preserve">
511511
<value>Exacte match</value>
512512
</data>
513513
<data name="SearchType.Text" xml:space="preserve">
@@ -1465,9 +1465,6 @@ Van,
14651465
<data name="[RESX:SearchKeywords].Text" xml:space="preserve">
14661466
<value>Trefwoord (en):</value>
14671467
</data>
1468-
<data name="[RESX:Reset].Text" xml:space="preserve">
1469-
<value>Reset</value>
1470-
</data>
14711468
<data name="[RESX:SearchAllForums].Text" xml:space="preserve">
14721469
<value>Doorzoek forums</value>
14731470
</data>
@@ -1858,4 +1855,22 @@ Van,
18581855
<value>&lt;p&gt;[FORUMPOST:AUTEURDISPLAYNAAMLINK|&lt;i class="fa fa-user fa-fw fa-blue"&gt;&lt;/i&gt;nbsp;&lt;a href="{0}" class="af-profile-link" rel="nofollow"&gt;&lt;/a&gt;|[FORUMPOST:AUTHORDISPLAYNAME]] heeft inhoud geplaatst die moderatie vereist.&lt;/p&gt;&lt;p&gt;&lt;strong&gt;Onderwerp:&lt;/strong&gt; [FORUMPOST:SUBJECT]&lt;/p&gt;&lt;p&gt;Controleer de inhoud en bepaal de dispositie.&lt;/p&gt;
18591856
&lt;p&gt;U kunt:&lt;ol&gt;&lt;li&gt;keur het onderwerp goed,&lt;/li&gt;&lt;li&gt;Weiger het (stuur het naar de poster voor revisies),&lt;/li&gt;&lt;li&gt;te verwijderen, of&lt;/li&gt;&lt;li&gt;de gebruiker verbannen, dit en alle andere onderwerpen of antwoorden die door deze gebruiker zijn geplaatst, verwijderen&lt;/li&gt;&lt;/ol&gt;&lt;/p&gt;&lt;p&gt;Als u niet alleen op basis van het onderwerp kunt bepalen of deze inhoud geschikt is, gebruik &lt;a href="[FORUM:MODLINK]"&gt;dan deze link&lt;/a&gt; om onderwerpen te bekijken en te modereren.&lt;/p&gt;</value>
18601857
</data>
1858+
<data name="[RESX:Reset].Text" xml:space="preserve">
1859+
<value>Terugstellen</value>
1860+
</data>
1861+
<data name="[RESX:SearchSubjectAndTopic].Text" xml:space="preserve">
1862+
<value>Onderwerp en onderwerp</value>
1863+
</data>
1864+
<data name="[RESX:SearchSubjectOnly].Text" xml:space="preserve">
1865+
<value>Alleen onderwerp</value>
1866+
</data>
1867+
<data name="[RESX:SearchTopicOnly].Text" xml:space="preserve">
1868+
<value>Alleen onderwerp</value>
1869+
</data>
1870+
<data name="[RESX:SearchSortTypeRelevance].Text" xml:space="preserve">
1871+
<value>Relevantie</value>
1872+
</data>
1873+
<data name="[RESX:SearchSortTypePostDate].Text" xml:space="preserve">
1874+
<value>Publicatiedatum</value>
1875+
</data>
18611876
</root>

‎Dnn.CommunityForums/App_LocalResources/SharedResources.resx

+21-6
Original file line numberDiff line numberDiff line change
@@ -483,13 +483,13 @@
483483
<data name="SearchPosts.Text" xml:space="preserve">
484484
<value>Search Posts</value>
485485
</data>
486-
<data name="SearchRangeAll.Text" xml:space="preserve">
486+
<data name="[RESX:SearchRangeAll].Text" xml:space="preserve">
487487
<value>All</value>
488488
</data>
489-
<data name="SearchRangeDays.Text" xml:space="preserve">
489+
<data name="[RESX:SearchRangeDays].Text" xml:space="preserve">
490490
<value>Past {0} days</value>
491491
</data>
492-
<data name="SearchRangeHours.Text" xml:space="preserve">
492+
<data name="[RESX:SearchRangeHours].Text" xml:space="preserve">
493493
<value>Past {0} hours</value>
494494
</data>
495495
<data name="SearchUser.Text" xml:space="preserve">
@@ -501,13 +501,13 @@
501501
<data name="MoveText.Text" xml:space="preserve">
502502
<value>Move Topic</value>
503503
</data>
504-
<data name="drpSearchType.AllKeywords.Text" xml:space="preserve">
504+
<data name="[RESX:SearchTypeAllKeywords].Text" xml:space="preserve">
505505
<value>ALL Keywords</value>
506506
</data>
507-
<data name="drpSearchType.ANYKeywords.Text" xml:space="preserve">
507+
<data name="[RESX:SearchTypeANYKeywords].Text" xml:space="preserve">
508508
<value>ANY Keyword</value>
509509
</data>
510-
<data name="drpSearchType.ExactMatch.Text" xml:space="preserve">
510+
<data name="[RESX:SearchTypeExactMatch].Text" xml:space="preserve">
511511
<value>Exact Match</value>
512512
</data>
513513
<data name="SearchType.Text" xml:space="preserve">
@@ -1819,4 +1819,19 @@ From,
18191819
<data name="[RESX:EnableNotificationsForOwnContent].Help" xml:space="preserve">
18201820
<value>Select this option if you wish to receive notifications that new content has been posted even though you are the user who posted the content.</value>
18211821
</data>
1822+
<data name="[RESX:SearchSubjectAndTopic].Text" xml:space="preserve">
1823+
<value>Subject &amp; Topic</value>
1824+
</data>
1825+
<data name="[RESX:SearchSubjectOnly].Text" xml:space="preserve">
1826+
<value>Subject Only</value>
1827+
</data>
1828+
<data name="[RESX:SearchTopicOnly].Text" xml:space="preserve">
1829+
<value>Topic Only</value>
1830+
</data>
1831+
<data name="[RESX:SearchSortTypeRelevance].Text" xml:space="preserve">
1832+
<value>Relevance</value>
1833+
</data>
1834+
<data name="[RESX:SearchSortTypePostDate].Text" xml:space="preserve">
1835+
<value>Post Date</value>
1836+
</data>
18221837
</root>

0 commit comments

Comments
 (0)