From 91a0ee31af034ed2ac74ed26c3d21fe4c2b0ad96 Mon Sep 17 00:00:00 2001
From: Shikhir Arora <shikhir@thesarogroup.com>
Date: Mon, 13 Feb 2017 22:30:16 -0500
Subject: [PATCH 01/22] Add quote search by keyword and text command

Quote search by keyword and text
---
 .../Modules/Utility/Commands/QuoteCommands.cs | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs b/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs
index 8add0707..b136b7aa 100644
--- a/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs
+++ b/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs
@@ -58,6 +58,27 @@ namespace NadekoBot.Modules.Utility
 
                 await Context.Channel.SendMessageAsync("📣 " + quote.Text.SanitizeMentions());
             }
+            
+            [NadekoCommand, Usage, Description, Aliases]
+  		    [RequireContext(ContextType.Guild)] 
+            public async Task SearchQuote(string keyword, [Remainder] string text)
+        	{
+		        if (string.IsNullOrWhiteSpace(keyword) || string.IsNullOrWhiteSpace(text))
+					return;
+
+                keyword = keyword.ToUpperInvariant();
+
+                Quote keywordquote;
+                using (var uow = DbHandler.UnitOfWork())
+               {
+                    keywordquote = await uow.Quotes.SearchQuoteKeywordTextAsync(Context.Guild.Id, keyword, text).ConfigureAwait(false);
+               }
+
+                if (keywordquote == null)
+                    return;
+
+                await Context.Channel.SendMessageAsync("💬 " + keyword + ":  " + keywordquote.Text.SanitizeMentions());
+            }
 
             [NadekoCommand, Usage, Description, Aliases]
             [RequireContext(ContextType.Guild)]
@@ -143,4 +164,4 @@ namespace NadekoBot.Modules.Utility
             }
         }
     }
-}
\ No newline at end of file
+}

From 283fc2c21663a00345f9e95981b67265789cceea Mon Sep 17 00:00:00 2001
From: Shikhir Arora <shikhir@thesarogroup.com>
Date: Mon, 13 Feb 2017 22:31:20 -0500
Subject: [PATCH 02/22] Update IQuoteRepository.cs

---
 src/NadekoBot/Services/Database/Repositories/IQuoteRepository.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/NadekoBot/Services/Database/Repositories/IQuoteRepository.cs b/src/NadekoBot/Services/Database/Repositories/IQuoteRepository.cs
index e3ca6ec1..080783ab 100644
--- a/src/NadekoBot/Services/Database/Repositories/IQuoteRepository.cs
+++ b/src/NadekoBot/Services/Database/Repositories/IQuoteRepository.cs
@@ -8,6 +8,7 @@ namespace NadekoBot.Services.Database.Repositories
     {
         IEnumerable<Quote> GetAllQuotesByKeyword(ulong guildId, string keyword);
         Task<Quote> GetRandomQuoteByKeywordAsync(ulong guildId, string keyword);
+        Task<Quote> SearchQuoteKeywordTextAsync(ulong guildId, string keyword, string text);
         IEnumerable<Quote> GetGroup(ulong guildId, int skip, int take);
     }
 }

From 921f3a6d6c9cbf76e43d0c77a5cf1ad8869fc561 Mon Sep 17 00:00:00 2001
From: Shikhir Arora <shikhir@thesarogroup.com>
Date: Mon, 13 Feb 2017 22:32:16 -0500
Subject: [PATCH 03/22] Update QuoteRepository.cs

Add quote search by keyword and text
---
 .../Services/Database/Repositories/Impl/QuoteRepository.cs  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs b/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs
index 22c6e5c9..d96a98c9 100644
--- a/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs
+++ b/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs
@@ -23,5 +23,11 @@ namespace NadekoBot.Services.Database.Repositories.Impl
             var rng = new NadekoRandom();
             return _set.Where(q => q.GuildId == guildId && q.Keyword == keyword).OrderBy(q => rng.Next()).FirstOrDefaultAsync();
         }
+        public Task<Quote> SearchQuoteKeywordTextAsync(ulong guildId, string keyword, string text)
+        {
+		      			
+          	var rngk = new NadekoRandom();
+            return _set.Where(q => q.Text.Contains(text) && q.GuildId == guildId && q.Keyword == keyword).OrderBy(q => rngk.Next()).FirstOrDefaultAsync();
+		}
     }
 }

From 7a03c277cf6cd60fae86fc049025b08d20e2a2a9 Mon Sep 17 00:00:00 2001
From: Shikhir Arora <shikhir@thesarogroup.com>
Date: Mon, 13 Feb 2017 22:32:39 -0500
Subject: [PATCH 04/22] Add quote search by keyword and text

Add quote search by keyword and text
---
 .../Services/Database/Repositories/Impl/QuoteRepository.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs b/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs
index d96a98c9..6f9cfc20 100644
--- a/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs
+++ b/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs
@@ -28,6 +28,6 @@ namespace NadekoBot.Services.Database.Repositories.Impl
 		      			
           	var rngk = new NadekoRandom();
             return _set.Where(q => q.Text.Contains(text) && q.GuildId == guildId && q.Keyword == keyword).OrderBy(q => rngk.Next()).FirstOrDefaultAsync();
-		}
+	}
     }
 }

From 9d84dfbe90e89be4609268906d2f5c62957284c4 Mon Sep 17 00:00:00 2001
From: Shikhir Arora <shikhir@thesarogroup.com>
Date: Mon, 13 Feb 2017 22:38:08 -0500
Subject: [PATCH 05/22] Update CommandStrings.Designer.cs

---
 .../Resources/CommandStrings.Designer.cs      | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/src/NadekoBot/Resources/CommandStrings.Designer.cs b/src/NadekoBot/Resources/CommandStrings.Designer.cs
index 11fa3692..73ea4744 100644
--- a/src/NadekoBot/Resources/CommandStrings.Designer.cs
+++ b/src/NadekoBot/Resources/CommandStrings.Designer.cs
@@ -2381,6 +2381,33 @@ namespace NadekoBot.Resources {
             }
         }
         
+        /// <summary>
+        ///    Looks up a localized string similar to qsearch .....
+        /// </summary>
+        public static string searchquote_cmd {
+            get {
+                return ResourceManager.GetString("searchquote_cmd", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///    Looks up a localized string similar to Searches a quote for a given keyword and any string portion of a quote matching that keyword..
+        /// </summary>
+        public static string searchquote_desc {
+            get {
+                return ResourceManager.GetString("searchquote_desc", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///    Looks up a localized string similar to `{0}qsearch keyword text`.
+        /// </summary>
+        public static string searchquote_usage {
+            get {
+                return ResourceManager.GetString("searchquote_usage", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///    Looks up a localized string similar to delmsgoncmd.
         /// </summary>

From 599463e9123fa393eb37157559aa94813786f5d8 Mon Sep 17 00:00:00 2001
From: Shikhir Arora <shikhir@thesarogroup.com>
Date: Mon, 13 Feb 2017 22:39:39 -0500
Subject: [PATCH 06/22] Add searchquote command

Add searchquote command
---
 src/NadekoBot/Resources/CommandStrings.resx | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx
index cca4cf5c..97ffe02e 100644
--- a/src/NadekoBot/Resources/CommandStrings.resx
+++ b/src/NadekoBot/Resources/CommandStrings.resx
@@ -1143,6 +1143,15 @@
   <data name="showquote_usage" xml:space="preserve">
     <value>`{0}.. abc`</value>
   </data>
+  <data name="searchquote_cmd" xml:space="preserve">
+    <value>qsearch ....</value>
+  </data>
+  <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>
+  </data>
+  <data name="searchquote_usage" xml:space="preserve">
+    <value>`{0}qsearch keyword text`</value>
+ </data>
   <data name="deletequote_cmd" xml:space="preserve">
     <value>deletequote delq</value>
   </data>
@@ -3105,4 +3114,4 @@
   <data name="timezone_usage" xml:space="preserve">
     <value>`{0}timezone`</value>
   </data>
-</root>
\ No newline at end of file
+</root>

From 90d31fc266f0e459b7c17f504066ecfc0c9f8ad0 Mon Sep 17 00:00:00 2001
From: Shikhir Arora <shikhir@thesarogroup.com>
Date: Mon, 13 Feb 2017 22:42:10 -0500
Subject: [PATCH 07/22] Add quote search command by keyword and text

Add quote search command by keyword and text
---
 src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs b/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs
index b136b7aa..87285de0 100644
--- a/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs
+++ b/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs
@@ -60,7 +60,7 @@ namespace NadekoBot.Modules.Utility
             }
             
             [NadekoCommand, Usage, Description, Aliases]
-  		    [RequireContext(ContextType.Guild)] 
+  	    [RequireContext(ContextType.Guild)] 
             public async Task SearchQuote(string keyword, [Remainder] string text)
         	{
 		        if (string.IsNullOrWhiteSpace(keyword) || string.IsNullOrWhiteSpace(text))

From 9b773f4ea45d58ee4d33bb14d40ed6920e91d971 Mon Sep 17 00:00:00 2001
From: Shikhir Arora <shikhir@thesarogroup.com>
Date: Mon, 13 Feb 2017 22:51:57 -0500
Subject: [PATCH 08/22] Update CommandStrings.resx

---
 src/NadekoBot/Resources/CommandStrings.resx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx
index 97ffe02e..208ab0cc 100644
--- a/src/NadekoBot/Resources/CommandStrings.resx
+++ b/src/NadekoBot/Resources/CommandStrings.resx
@@ -1144,7 +1144,7 @@
     <value>`{0}.. abc`</value>
   </data>
   <data name="searchquote_cmd" xml:space="preserve">
-    <value>qsearch ....</value>
+    <value>qsearch ...</value>
   </data>
   <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>

From c4e228f2766d17369402f95ac8a6c055cea47d72 Mon Sep 17 00:00:00 2001
From: Shikhir Arora <shikhir@thesarogroup.com>
Date: Mon, 13 Feb 2017 23:43:35 -0500
Subject: [PATCH 09/22] Update QuoteCommands.cs

---
 src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs b/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs
index 87285de0..bf26a667 100644
--- a/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs
+++ b/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs
@@ -59,12 +59,12 @@ namespace NadekoBot.Modules.Utility
                 await Context.Channel.SendMessageAsync("📣 " + quote.Text.SanitizeMentions());
             }
             
-            [NadekoCommand, Usage, Description, Aliases]
+           [NadekoCommand, Usage, Description, Aliases]
   	    [RequireContext(ContextType.Guild)] 
             public async Task SearchQuote(string keyword, [Remainder] string text)
-        	{
-		        if (string.IsNullOrWhiteSpace(keyword) || string.IsNullOrWhiteSpace(text))
-					return;
+            {
+	        if (string.IsNullOrWhiteSpace(keyword) || string.IsNullOrWhiteSpace(text))
+		    return;
 
                 keyword = keyword.ToUpperInvariant();
 

From f0679854024f23b3460bb2c21ff418430a0f9545 Mon Sep 17 00:00:00 2001
From: Shikhir Arora <shikhir@thesarogroup.com>
Date: Mon, 13 Feb 2017 23:44:09 -0500
Subject: [PATCH 10/22] Update CommandStrings.Designer.cs

---
 src/NadekoBot/Resources/CommandStrings.Designer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/NadekoBot/Resources/CommandStrings.Designer.cs b/src/NadekoBot/Resources/CommandStrings.Designer.cs
index 73ea4744..8788c2e3 100644
--- a/src/NadekoBot/Resources/CommandStrings.Designer.cs
+++ b/src/NadekoBot/Resources/CommandStrings.Designer.cs
@@ -2382,7 +2382,7 @@ namespace NadekoBot.Resources {
         }
         
         /// <summary>
-        ///    Looks up a localized string similar to qsearch .....
+        ///    Looks up a localized string similar to qsearch ....
         /// </summary>
         public static string searchquote_cmd {
             get {

From 672bb565e8891d29ad1a213860e5f1c8f32a9ba7 Mon Sep 17 00:00:00 2001
From: Shikhir Arora <shikhir@thesarogroup.com>
Date: Mon, 13 Feb 2017 23:44:50 -0500
Subject: [PATCH 11/22] Update QuoteRepository.cs

---
 .../Services/Database/Repositories/Impl/QuoteRepository.cs   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs b/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs
index 6f9cfc20..898f0efd 100644
--- a/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs
+++ b/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs
@@ -24,9 +24,8 @@ namespace NadekoBot.Services.Database.Repositories.Impl
             return _set.Where(q => q.GuildId == guildId && q.Keyword == keyword).OrderBy(q => rng.Next()).FirstOrDefaultAsync();
         }
         public Task<Quote> SearchQuoteKeywordTextAsync(ulong guildId, string keyword, string text)
-        {
-		      			
-          	var rngk = new NadekoRandom();
+        {      			
+            var rngk = new NadekoRandom();
             return _set.Where(q => q.Text.Contains(text) && q.GuildId == guildId && q.Keyword == keyword).OrderBy(q => rngk.Next()).FirstOrDefaultAsync();
 	}
     }

From b5db72fa1a131f06cd8ae603933785b7421b6989 Mon Sep 17 00:00:00 2001
From: Shikhir Arora <shikhir@thesarogroup.com>
Date: Wed, 15 Feb 2017 06:18:58 -0500
Subject: [PATCH 12/22] matches latest dev

---
 src/NadekoBot/Resources/CommandStrings.resx | 28 +++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx
index 208ab0cc..951a745c 100644
--- a/src/NadekoBot/Resources/CommandStrings.resx
+++ b/src/NadekoBot/Resources/CommandStrings.resx
@@ -3114,4 +3114,32 @@
   <data name="timezone_usage" xml:space="preserve">
     <value>`{0}timezone`</value>
   </data>
+  <data name="languagesetdefault_cmd" xml:space="preserve">
+    <value>langsetdefault langsetd</value>
+  </data>
+  <data name="languagesetdefault_desc" xml:space="preserve">
+    <value>Sets the bot's default response language. All servers which use a default locale will use this one. Setting to `default` will use the host's current culture. Provide no arguments to see currently set language.</value>
+  </data>
+  <data name="languagesetdefault_usage" xml:space="preserve">
+    <value>`{0}langsetd en-US` or `{0}langsetd default`</value>
+  </data>
+  <data name="languageset_cmd" xml:space="preserve">
+    <value>languageset langset</value>
+  </data>
+  <data name="languageset_desc" xml:space="preserve">
+    <value>Sets this server's response language If bot's response strings have been translated to that language, bot will use that language in this server. Reset by using `default` as the locale name. Provide no arguments to see currently set language.</value>
+  </data>
+  <data name="languageset_usage" xml:space="preserve">
+    <value>`{0}langset de-DE ` or `{0}langset default`</value>
+  </data>
+  <data name="languageslist_cmd" xml:space="preserve">
+    <value>languageslist langli</value>
+  </data>
+  <data name="languageslist_desc" xml:space="preserve">
+    <value>List of languages for which translation (or part of it) exist atm.</value>
+  </data>
+  <data name="languageslist_usage" xml:space="preserve">
+    <value>`{0}langli`</value>
+  </data>
+</root>
 </root>

From 0ae08ec556d04b5c9229ee745babe0dbd5ad5d44 Mon Sep 17 00:00:00 2001
From: Shikhir Arora <shikhir@thesarogroup.com>
Date: Wed, 15 Feb 2017 06:20:19 -0500
Subject: [PATCH 13/22] Update

---
 src/NadekoBot/Resources/CommandStrings.resx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx
index 951a745c..27d7b10b 100644
--- a/src/NadekoBot/Resources/CommandStrings.resx
+++ b/src/NadekoBot/Resources/CommandStrings.resx
@@ -3142,4 +3142,3 @@
     <value>`{0}langli`</value>
   </data>
 </root>
-</root>

From 641f26242c62aa699d1fa646c726ae54ebbbbc83 Mon Sep 17 00:00:00 2001
From: Shikhir Arora <shikhir@thesarogroup.com>
Date: Wed, 15 Feb 2017 06:24:23 -0500
Subject: [PATCH 14/22] revert

---
 src/NadekoBot/Resources/CommandStrings.resx | 27 ---------------------
 1 file changed, 27 deletions(-)

diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx
index 27d7b10b..208ab0cc 100644
--- a/src/NadekoBot/Resources/CommandStrings.resx
+++ b/src/NadekoBot/Resources/CommandStrings.resx
@@ -3114,31 +3114,4 @@
   <data name="timezone_usage" xml:space="preserve">
     <value>`{0}timezone`</value>
   </data>
-  <data name="languagesetdefault_cmd" xml:space="preserve">
-    <value>langsetdefault langsetd</value>
-  </data>
-  <data name="languagesetdefault_desc" xml:space="preserve">
-    <value>Sets the bot's default response language. All servers which use a default locale will use this one. Setting to `default` will use the host's current culture. Provide no arguments to see currently set language.</value>
-  </data>
-  <data name="languagesetdefault_usage" xml:space="preserve">
-    <value>`{0}langsetd en-US` or `{0}langsetd default`</value>
-  </data>
-  <data name="languageset_cmd" xml:space="preserve">
-    <value>languageset langset</value>
-  </data>
-  <data name="languageset_desc" xml:space="preserve">
-    <value>Sets this server's response language If bot's response strings have been translated to that language, bot will use that language in this server. Reset by using `default` as the locale name. Provide no arguments to see currently set language.</value>
-  </data>
-  <data name="languageset_usage" xml:space="preserve">
-    <value>`{0}langset de-DE ` or `{0}langset default`</value>
-  </data>
-  <data name="languageslist_cmd" xml:space="preserve">
-    <value>languageslist langli</value>
-  </data>
-  <data name="languageslist_desc" xml:space="preserve">
-    <value>List of languages for which translation (or part of it) exist atm.</value>
-  </data>
-  <data name="languageslist_usage" xml:space="preserve">
-    <value>`{0}langli`</value>
-  </data>
 </root>

From 317edc2d9475f1875377840d1c7835b33cb6b53a Mon Sep 17 00:00:00 2001
From: Shikhir Arora <shikhir@thesarogroup.com>
Date: Wed, 15 Feb 2017 06:56:53 -0500
Subject: [PATCH 15/22] Revert "revert"

This reverts commit 641f26242c62aa699d1fa646c726ae54ebbbbc83.
---
 src/NadekoBot/Resources/CommandStrings.resx | 27 +++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx
index 208ab0cc..27d7b10b 100644
--- a/src/NadekoBot/Resources/CommandStrings.resx
+++ b/src/NadekoBot/Resources/CommandStrings.resx
@@ -3114,4 +3114,31 @@
   <data name="timezone_usage" xml:space="preserve">
     <value>`{0}timezone`</value>
   </data>
+  <data name="languagesetdefault_cmd" xml:space="preserve">
+    <value>langsetdefault langsetd</value>
+  </data>
+  <data name="languagesetdefault_desc" xml:space="preserve">
+    <value>Sets the bot's default response language. All servers which use a default locale will use this one. Setting to `default` will use the host's current culture. Provide no arguments to see currently set language.</value>
+  </data>
+  <data name="languagesetdefault_usage" xml:space="preserve">
+    <value>`{0}langsetd en-US` or `{0}langsetd default`</value>
+  </data>
+  <data name="languageset_cmd" xml:space="preserve">
+    <value>languageset langset</value>
+  </data>
+  <data name="languageset_desc" xml:space="preserve">
+    <value>Sets this server's response language If bot's response strings have been translated to that language, bot will use that language in this server. Reset by using `default` as the locale name. Provide no arguments to see currently set language.</value>
+  </data>
+  <data name="languageset_usage" xml:space="preserve">
+    <value>`{0}langset de-DE ` or `{0}langset default`</value>
+  </data>
+  <data name="languageslist_cmd" xml:space="preserve">
+    <value>languageslist langli</value>
+  </data>
+  <data name="languageslist_desc" xml:space="preserve">
+    <value>List of languages for which translation (or part of it) exist atm.</value>
+  </data>
+  <data name="languageslist_usage" xml:space="preserve">
+    <value>`{0}langli`</value>
+  </data>
 </root>

From 73ec3e43a1208d85e53403c462c165b828d981b2 Mon Sep 17 00:00:00 2001
From: Shikhir Arora <shikhir@thesarogroup.com>
Date: Wed, 15 Feb 2017 06:57:06 -0500
Subject: [PATCH 16/22] Revert "Update"

This reverts commit 0ae08ec556d04b5c9229ee745babe0dbd5ad5d44.
---
 src/NadekoBot/Resources/CommandStrings.resx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx
index 27d7b10b..951a745c 100644
--- a/src/NadekoBot/Resources/CommandStrings.resx
+++ b/src/NadekoBot/Resources/CommandStrings.resx
@@ -3142,3 +3142,4 @@
     <value>`{0}langli`</value>
   </data>
 </root>
+</root>

From 56a8914423f25f24a58453a0eaa26c42d9778445 Mon Sep 17 00:00:00 2001
From: Shikhir Arora <shikhir@thesarogroup.com>
Date: Wed, 15 Feb 2017 06:57:10 -0500
Subject: [PATCH 17/22] Revert "matches latest dev"

This reverts commit b5db72fa1a131f06cd8ae603933785b7421b6989.
---
 src/NadekoBot/Resources/CommandStrings.resx | 28 ---------------------
 1 file changed, 28 deletions(-)

diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx
index 951a745c..208ab0cc 100644
--- a/src/NadekoBot/Resources/CommandStrings.resx
+++ b/src/NadekoBot/Resources/CommandStrings.resx
@@ -3114,32 +3114,4 @@
   <data name="timezone_usage" xml:space="preserve">
     <value>`{0}timezone`</value>
   </data>
-  <data name="languagesetdefault_cmd" xml:space="preserve">
-    <value>langsetdefault langsetd</value>
-  </data>
-  <data name="languagesetdefault_desc" xml:space="preserve">
-    <value>Sets the bot's default response language. All servers which use a default locale will use this one. Setting to `default` will use the host's current culture. Provide no arguments to see currently set language.</value>
-  </data>
-  <data name="languagesetdefault_usage" xml:space="preserve">
-    <value>`{0}langsetd en-US` or `{0}langsetd default`</value>
-  </data>
-  <data name="languageset_cmd" xml:space="preserve">
-    <value>languageset langset</value>
-  </data>
-  <data name="languageset_desc" xml:space="preserve">
-    <value>Sets this server's response language If bot's response strings have been translated to that language, bot will use that language in this server. Reset by using `default` as the locale name. Provide no arguments to see currently set language.</value>
-  </data>
-  <data name="languageset_usage" xml:space="preserve">
-    <value>`{0}langset de-DE ` or `{0}langset default`</value>
-  </data>
-  <data name="languageslist_cmd" xml:space="preserve">
-    <value>languageslist langli</value>
-  </data>
-  <data name="languageslist_desc" xml:space="preserve">
-    <value>List of languages for which translation (or part of it) exist atm.</value>
-  </data>
-  <data name="languageslist_usage" xml:space="preserve">
-    <value>`{0}langli`</value>
-  </data>
-</root>
 </root>

From 2a3eaa316a1efc90b1d8c10577385907bcf7115d Mon Sep 17 00:00:00 2001
From: Shikhir Arora <shikhir@thesarogroup.com>
Date: Wed, 15 Feb 2017 06:57:16 -0500
Subject: [PATCH 18/22] Revert "revert"

This reverts commit 641f26242c62aa699d1fa646c726ae54ebbbbc83.
---
 src/NadekoBot/Resources/CommandStrings.resx | 27 +++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx
index 208ab0cc..27d7b10b 100644
--- a/src/NadekoBot/Resources/CommandStrings.resx
+++ b/src/NadekoBot/Resources/CommandStrings.resx
@@ -3114,4 +3114,31 @@
   <data name="timezone_usage" xml:space="preserve">
     <value>`{0}timezone`</value>
   </data>
+  <data name="languagesetdefault_cmd" xml:space="preserve">
+    <value>langsetdefault langsetd</value>
+  </data>
+  <data name="languagesetdefault_desc" xml:space="preserve">
+    <value>Sets the bot's default response language. All servers which use a default locale will use this one. Setting to `default` will use the host's current culture. Provide no arguments to see currently set language.</value>
+  </data>
+  <data name="languagesetdefault_usage" xml:space="preserve">
+    <value>`{0}langsetd en-US` or `{0}langsetd default`</value>
+  </data>
+  <data name="languageset_cmd" xml:space="preserve">
+    <value>languageset langset</value>
+  </data>
+  <data name="languageset_desc" xml:space="preserve">
+    <value>Sets this server's response language If bot's response strings have been translated to that language, bot will use that language in this server. Reset by using `default` as the locale name. Provide no arguments to see currently set language.</value>
+  </data>
+  <data name="languageset_usage" xml:space="preserve">
+    <value>`{0}langset de-DE ` or `{0}langset default`</value>
+  </data>
+  <data name="languageslist_cmd" xml:space="preserve">
+    <value>languageslist langli</value>
+  </data>
+  <data name="languageslist_desc" xml:space="preserve">
+    <value>List of languages for which translation (or part of it) exist atm.</value>
+  </data>
+  <data name="languageslist_usage" xml:space="preserve">
+    <value>`{0}langli`</value>
+  </data>
 </root>

From d704e77124a9539377a5b7b784c603bf6ddb5be3 Mon Sep 17 00:00:00 2001
From: Shikhir Arora <shikhir@thesarogroup.com>
Date: Wed, 15 Feb 2017 07:04:26 -0500
Subject: [PATCH 19/22] Update CommandStrings.resx

---
 src/NadekoBot/Resources/CommandStrings.resx | 27 ---------------------
 1 file changed, 27 deletions(-)

diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx
index 27d7b10b..208ab0cc 100644
--- a/src/NadekoBot/Resources/CommandStrings.resx
+++ b/src/NadekoBot/Resources/CommandStrings.resx
@@ -3114,31 +3114,4 @@
   <data name="timezone_usage" xml:space="preserve">
     <value>`{0}timezone`</value>
   </data>
-  <data name="languagesetdefault_cmd" xml:space="preserve">
-    <value>langsetdefault langsetd</value>
-  </data>
-  <data name="languagesetdefault_desc" xml:space="preserve">
-    <value>Sets the bot's default response language. All servers which use a default locale will use this one. Setting to `default` will use the host's current culture. Provide no arguments to see currently set language.</value>
-  </data>
-  <data name="languagesetdefault_usage" xml:space="preserve">
-    <value>`{0}langsetd en-US` or `{0}langsetd default`</value>
-  </data>
-  <data name="languageset_cmd" xml:space="preserve">
-    <value>languageset langset</value>
-  </data>
-  <data name="languageset_desc" xml:space="preserve">
-    <value>Sets this server's response language If bot's response strings have been translated to that language, bot will use that language in this server. Reset by using `default` as the locale name. Provide no arguments to see currently set language.</value>
-  </data>
-  <data name="languageset_usage" xml:space="preserve">
-    <value>`{0}langset de-DE ` or `{0}langset default`</value>
-  </data>
-  <data name="languageslist_cmd" xml:space="preserve">
-    <value>languageslist langli</value>
-  </data>
-  <data name="languageslist_desc" xml:space="preserve">
-    <value>List of languages for which translation (or part of it) exist atm.</value>
-  </data>
-  <data name="languageslist_usage" xml:space="preserve">
-    <value>`{0}langli`</value>
-  </data>
 </root>

From 77f0a3b4ee17caa276b4723f73fdc5c71181f5a6 Mon Sep 17 00:00:00 2001
From: Shikhir Arora <shikhir@thesarogroup.com>
Date: Wed, 15 Feb 2017 07:16:23 -0500
Subject: [PATCH 20/22] Update CommandStrings.resx

---
 src/NadekoBot/Resources/CommandStrings.resx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx
index 6b03349f..69aa41c4 100644
--- a/src/NadekoBot/Resources/CommandStrings.resx
+++ b/src/NadekoBot/Resources/CommandStrings.resx
@@ -3114,9 +3114,6 @@
   <data name="timezone_usage" xml:space="preserve">
     <value>`{0}timezone`</value>
   </data>
-<<<<<<< HEAD
-</root>
-=======
   <data name="languagesetdefault_cmd" xml:space="preserve">
     <value>langsetdefault langsetd</value>
   </data>
@@ -3145,4 +3142,3 @@
     <value>`{0}langli`</value>
   </data>
 </root>
->>>>>>> Kwoth/dev

From 244e05bd8920388de5aae12ca7fe875908450919 Mon Sep 17 00:00:00 2001
From: Shikhir Arora <shikhir@thesarogroup.com>
Date: Fri, 17 Feb 2017 17:13:06 -0500
Subject: [PATCH 21/22] Update CommandStrings.Designer.cs

remove alias ...
---
 src/NadekoBot/Resources/CommandStrings.Designer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/NadekoBot/Resources/CommandStrings.Designer.cs b/src/NadekoBot/Resources/CommandStrings.Designer.cs
index b5b4a1cc..7fb45cfe 100644
--- a/src/NadekoBot/Resources/CommandStrings.Designer.cs
+++ b/src/NadekoBot/Resources/CommandStrings.Designer.cs
@@ -2382,7 +2382,7 @@ namespace NadekoBot.Resources {
         }
         
         /// <summary>
-        ///    Looks up a localized string similar to qsearch ....
+        ///    Looks up a localized string similar to qsearch.
         /// </summary>
         public static string searchquote_cmd {
             get {

From a878aa8fa3157cc5aaa86a37b36bb6dbd521b0ee Mon Sep 17 00:00:00 2001
From: Shikhir Arora <shikhir@thesarogroup.com>
Date: Fri, 17 Feb 2017 17:13:43 -0500
Subject: [PATCH 22/22] remove alias ...

---
 src/NadekoBot/Resources/CommandStrings.resx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx
index 69aa41c4..8f010f11 100644
--- a/src/NadekoBot/Resources/CommandStrings.resx
+++ b/src/NadekoBot/Resources/CommandStrings.resx
@@ -1144,7 +1144,7 @@
     <value>`{0}.. abc`</value>
   </data>
   <data name="searchquote_cmd" xml:space="preserve">
-    <value>qsearch ...</value>
+    <value>qsearch</value>
   </data>
   <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>