Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Shikhir Arora 2017-02-17 17:14:30 -05:00
commit 5bfdeb07a3
2 changed files with 2 additions and 2 deletions

View File

@ -2382,7 +2382,7 @@ namespace NadekoBot.Resources {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to qsearch .... /// Looks up a localized string similar to qsearch.
/// </summary> /// </summary>
public static string searchquote_cmd { public static string searchquote_cmd {
get { get {

View File

@ -1144,7 +1144,7 @@
<value>`{0}.. abc`</value> <value>`{0}.. abc`</value>
</data> </data>
<data name="searchquote_cmd" xml:space="preserve"> <data name="searchquote_cmd" xml:space="preserve">
<value>qsearch ...</value> <value>qsearch</value>
</data> </data>
<data name="searchquote_desc" xml:space="preserve"> <data name="searchquote_desc" xml:space="preserve">
<value>Searches a quote for a given keyword and any string portion of a quote matching that keyword.</value> <value>Searches a quote for a given keyword and any string portion of a quote matching that keyword.</value>