From 91a0ee31af034ed2ac74ed26c3d21fe4c2b0ad96 Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Mon, 13 Feb 2017 22:30:16 -0500 Subject: [PATCH 001/496] 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 Date: Mon, 13 Feb 2017 22:31:20 -0500 Subject: [PATCH 002/496] 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 GetAllQuotesByKeyword(ulong guildId, string keyword); Task GetRandomQuoteByKeywordAsync(ulong guildId, string keyword); + Task SearchQuoteKeywordTextAsync(ulong guildId, string keyword, string text); IEnumerable GetGroup(ulong guildId, int skip, int take); } } From 921f3a6d6c9cbf76e43d0c77a5cf1ad8869fc561 Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Mon, 13 Feb 2017 22:32:16 -0500 Subject: [PATCH 003/496] 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 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 Date: Mon, 13 Feb 2017 22:32:39 -0500 Subject: [PATCH 004/496] 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 Date: Mon, 13 Feb 2017 22:38:08 -0500 Subject: [PATCH 005/496] 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 { } } + /// + /// Looks up a localized string similar to qsearch ..... + /// + public static string searchquote_cmd { + get { + return ResourceManager.GetString("searchquote_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Searches a quote for a given keyword and any string portion of a quote matching that keyword.. + /// + public static string searchquote_desc { + get { + return ResourceManager.GetString("searchquote_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}qsearch keyword text`. + /// + public static string searchquote_usage { + get { + return ResourceManager.GetString("searchquote_usage", resourceCulture); + } + } + /// /// Looks up a localized string similar to delmsgoncmd. /// From 599463e9123fa393eb37157559aa94813786f5d8 Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Mon, 13 Feb 2017 22:39:39 -0500 Subject: [PATCH 006/496] 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 @@ `{0}.. abc` + + qsearch .... + + + Searches a quote for a given keyword and any string portion of a quote matching that keyword. + + + `{0}qsearch keyword text` + deletequote delq @@ -3105,4 +3114,4 @@ `{0}timezone` - \ No newline at end of file + From 90d31fc266f0e459b7c17f504066ecfc0c9f8ad0 Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Mon, 13 Feb 2017 22:42:10 -0500 Subject: [PATCH 007/496] 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 Date: Mon, 13 Feb 2017 22:51:57 -0500 Subject: [PATCH 008/496] 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 @@ `{0}.. abc` - qsearch .... + qsearch ... Searches a quote for a given keyword and any string portion of a quote matching that keyword. From c4e228f2766d17369402f95ac8a6c055cea47d72 Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Mon, 13 Feb 2017 23:43:35 -0500 Subject: [PATCH 009/496] 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 Date: Mon, 13 Feb 2017 23:44:09 -0500 Subject: [PATCH 010/496] 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 { } /// - /// Looks up a localized string similar to qsearch ..... + /// Looks up a localized string similar to qsearch .... /// public static string searchquote_cmd { get { From 672bb565e8891d29ad1a213860e5f1c8f32a9ba7 Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Mon, 13 Feb 2017 23:44:50 -0500 Subject: [PATCH 011/496] 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 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 Date: Wed, 15 Feb 2017 06:18:58 -0500 Subject: [PATCH 012/496] 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 @@ `{0}timezone` + + langsetdefault langsetd + + + 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. + + + `{0}langsetd en-US` or `{0}langsetd default` + + + languageset langset + + + 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. + + + `{0}langset de-DE ` or `{0}langset default` + + + languageslist langli + + + List of languages for which translation (or part of it) exist atm. + + + `{0}langli` + + From 0ae08ec556d04b5c9229ee745babe0dbd5ad5d44 Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Wed, 15 Feb 2017 06:20:19 -0500 Subject: [PATCH 013/496] 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 @@ `{0}langli` - From 641f26242c62aa699d1fa646c726ae54ebbbbc83 Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Wed, 15 Feb 2017 06:24:23 -0500 Subject: [PATCH 014/496] 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 @@ `{0}timezone` - - langsetdefault langsetd - - - 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. - - - `{0}langsetd en-US` or `{0}langsetd default` - - - languageset langset - - - 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. - - - `{0}langset de-DE ` or `{0}langset default` - - - languageslist langli - - - List of languages for which translation (or part of it) exist atm. - - - `{0}langli` - From 317edc2d9475f1875377840d1c7835b33cb6b53a Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Wed, 15 Feb 2017 06:56:53 -0500 Subject: [PATCH 015/496] 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 @@ `{0}timezone` + + langsetdefault langsetd + + + 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. + + + `{0}langsetd en-US` or `{0}langsetd default` + + + languageset langset + + + 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. + + + `{0}langset de-DE ` or `{0}langset default` + + + languageslist langli + + + List of languages for which translation (or part of it) exist atm. + + + `{0}langli` + From 73ec3e43a1208d85e53403c462c165b828d981b2 Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Wed, 15 Feb 2017 06:57:06 -0500 Subject: [PATCH 016/496] 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 @@ `{0}langli` + From 56a8914423f25f24a58453a0eaa26c42d9778445 Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Wed, 15 Feb 2017 06:57:10 -0500 Subject: [PATCH 017/496] 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 @@ `{0}timezone` - - langsetdefault langsetd - - - 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. - - - `{0}langsetd en-US` or `{0}langsetd default` - - - languageset langset - - - 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. - - - `{0}langset de-DE ` or `{0}langset default` - - - languageslist langli - - - List of languages for which translation (or part of it) exist atm. - - - `{0}langli` - - From 2a3eaa316a1efc90b1d8c10577385907bcf7115d Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Wed, 15 Feb 2017 06:57:16 -0500 Subject: [PATCH 018/496] 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 @@ `{0}timezone` + + langsetdefault langsetd + + + 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. + + + `{0}langsetd en-US` or `{0}langsetd default` + + + languageset langset + + + 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. + + + `{0}langset de-DE ` or `{0}langset default` + + + languageslist langli + + + List of languages for which translation (or part of it) exist atm. + + + `{0}langli` + From d704e77124a9539377a5b7b784c603bf6ddb5be3 Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Wed, 15 Feb 2017 07:04:26 -0500 Subject: [PATCH 019/496] 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 @@ `{0}timezone` - - langsetdefault langsetd - - - 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. - - - `{0}langsetd en-US` or `{0}langsetd default` - - - languageset langset - - - 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. - - - `{0}langset de-DE ` or `{0}langset default` - - - languageslist langli - - - List of languages for which translation (or part of it) exist atm. - - - `{0}langli` - From 77f0a3b4ee17caa276b4723f73fdc5c71181f5a6 Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Wed, 15 Feb 2017 07:16:23 -0500 Subject: [PATCH 020/496] 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 @@ `{0}timezone` -<<<<<<< HEAD - -======= langsetdefault langsetd @@ -3145,4 +3142,3 @@ `{0}langli` ->>>>>>> Kwoth/dev From 9f9548b33ba2ce9920200a7bfd1a28873afe6e67 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Thu, 16 Feb 2017 21:49:30 +0100 Subject: [PATCH 021/496] stats should work properly now --- src/NadekoBot/Services/IStatsService.cs | 1 - src/NadekoBot/Services/Impl/StatsService.cs | 117 ++++++++++++-------- 2 files changed, 72 insertions(+), 46 deletions(-) diff --git a/src/NadekoBot/Services/IStatsService.cs b/src/NadekoBot/Services/IStatsService.cs index b1cb948f..5634790d 100644 --- a/src/NadekoBot/Services/IStatsService.cs +++ b/src/NadekoBot/Services/IStatsService.cs @@ -5,6 +5,5 @@ namespace NadekoBot.Services public interface IStatsService { Task Print(); - Task Reset(); } } diff --git a/src/NadekoBot/Services/Impl/StatsService.cs b/src/NadekoBot/Services/Impl/StatsService.cs index 40823b1b..f7f39985 100644 --- a/src/NadekoBot/Services/Impl/StatsService.cs +++ b/src/NadekoBot/Services/Impl/StatsService.cs @@ -3,6 +3,7 @@ using Discord.WebSocket; using NadekoBot.Extensions; using System; using System.Collections.Generic; +using System.Globalization; using System.Linq; using System.Net.Http; using System.Threading; @@ -12,75 +13,108 @@ namespace NadekoBot.Services.Impl { public class StatsService : IStatsService { - private DiscordShardedClient client; - private DateTime started; + private readonly DiscordShardedClient _client; + private DateTime _started; public const string BotVersion = "1.1.8-alpha"; public string Author => "Kwoth#2560"; public string Library => "Discord.Net"; - public int MessageCounter { get; private set; } = 0; - public int CommandsRan { get; private set; } = 0; public string Heap => - Math.Round((double)GC.GetTotalMemory(false) / 1.MiB(), 2).ToString(); + Math.Round((double)GC.GetTotalMemory(false) / 1.MiB(), 2).ToString(CultureInfo.InvariantCulture); public double MessagesPerSecond => MessageCounter / GetUptime().TotalSeconds; - private int _textChannels = 0; - public int TextChannels => _textChannels; - private int _voiceChannels = 0; - public int VoiceChannels => _voiceChannels; - Timer carbonitexTimer { get; } + private long _textChannels; + public long TextChannels => Interlocked.Read(ref _textChannels); + private long _voiceChannels; + public long VoiceChannels => Interlocked.Read(ref _voiceChannels); + private long _messageCounter; + public long MessageCounter => Interlocked.Read(ref _messageCounter); + private long _commandsRan; + public long CommandsRan => Interlocked.Read(ref _commandsRan); + + private Timer carbonitexTimer { get; } public StatsService(DiscordShardedClient client, CommandHandler cmdHandler) { - this.client = client; + _client = client; - Reset(); - this.client.MessageReceived += _ => Task.FromResult(MessageCounter++); - cmdHandler.CommandExecuted += (_, e) => Task.FromResult(CommandsRan++); + _started = DateTime.Now; + _client.MessageReceived += _ => Task.FromResult(Interlocked.Increment(ref _messageCounter)); + cmdHandler.CommandExecuted += (_, e) => Task.FromResult(Interlocked.Increment(ref _commandsRan)); - this.client.ChannelCreated += (c) => + _client.ChannelCreated += (c) => { if (c is ITextChannel) - ++_textChannels; + Interlocked.Increment(ref _textChannels); else if (c is IVoiceChannel) - ++_voiceChannels; + Interlocked.Increment(ref _voiceChannels); return Task.CompletedTask; }; - this.client.ChannelDestroyed += (c) => + _client.ChannelDestroyed += (c) => { if (c is ITextChannel) - --_textChannels; + Interlocked.Decrement(ref _textChannels); else if (c is IVoiceChannel) - --_voiceChannels; + Interlocked.Decrement(ref _voiceChannels); return Task.CompletedTask; }; - this.client.JoinedGuild += (g) => + _client.GuildAvailable += (g) => { - var tc = g.Channels.Where(cx => cx is ITextChannel).Count(); - var vc = g.Channels.Count - tc; - _textChannels += tc; - _voiceChannels += vc; - + var _ = Task.Run(() => + { + var tc = g.Channels.Count(cx => cx is ITextChannel); + var vc = g.Channels.Count - tc; + Interlocked.Add(ref _textChannels, tc); + Interlocked.Add(ref _voiceChannels, vc); + }); return Task.CompletedTask; }; - this.client.LeftGuild += (g) => + _client.JoinedGuild += (g) => { - var tc = g.Channels.Where(cx => cx is ITextChannel).Count(); - var vc = g.Channels.Count - tc; - _textChannels -= tc; - _voiceChannels -= vc; + var _ = Task.Run(() => + { + var tc = g.Channels.Count(cx => cx is ITextChannel); + var vc = g.Channels.Count - tc; + Interlocked.Add(ref _textChannels, tc); + Interlocked.Add(ref _voiceChannels, vc); + }); + return Task.CompletedTask; + }; + + _client.GuildUnavailable += (g) => + { + var _ = Task.Run(() => + { + var tc = g.Channels.Count(cx => cx is ITextChannel); + var vc = g.Channels.Count - tc; + Interlocked.Add(ref _textChannels, -tc); + Interlocked.Add(ref _voiceChannels, -vc); + }); return Task.CompletedTask; }; - this.carbonitexTimer = new Timer(async (state) => + _client.LeftGuild += (g) => + { + var _ = Task.Run(() => + { + var tc = g.Channels.Count(cx => cx is ITextChannel); + var vc = g.Channels.Count - tc; + Interlocked.Add(ref _textChannels, -tc); + Interlocked.Add(ref _voiceChannels, -vc); + }); + + return Task.CompletedTask; + }; + + carbonitexTimer = new Timer(async (state) => { if (string.IsNullOrWhiteSpace(NadekoBot.Credentials.CarbonKey)) return; @@ -90,7 +124,7 @@ namespace NadekoBot.Services.Impl { using (var content = new FormUrlEncodedContent( new Dictionary { - { "servercount", this.client.GetGuildCount().ToString() }, + { "servercount", _client.GetGuildCount().ToString() }, { "key", NadekoBot.Credentials.CarbonKey }})) { content.Headers.Clear(); @@ -98,7 +132,7 @@ namespace NadekoBot.Services.Impl await http.PostAsync("https://www.carbonitex.net/discord/data/botdata.php", content).ConfigureAwait(false); } - }; + } } catch { @@ -109,34 +143,27 @@ namespace NadekoBot.Services.Impl public void Initialize() { - var guilds = this.client.GetGuilds().ToArray(); + var guilds = _client.GetGuilds().ToArray(); _textChannels = guilds.Sum(g => g.Channels.Count(cx => cx is ITextChannel)); _voiceChannels = guilds.Sum(g => g.Channels.Count) - _textChannels; } public Task Print() { - var curUser = client.CurrentUser; + var curUser = _client.CurrentUser; return Task.FromResult($@" Author: [{Author}] | Library: [{Library}] Bot Version: [{BotVersion}] Bot ID: {curUser.Id} Owner ID(s): {string.Join(", ", NadekoBot.Credentials.OwnerIds)} Uptime: {GetUptimeString()} -Servers: {client.GetGuildCount()} | TextChannels: {TextChannels} | VoiceChannels: {VoiceChannels} +Servers: {_client.GetGuildCount()} | TextChannels: {TextChannels} | VoiceChannels: {VoiceChannels} Commands Ran this session: {CommandsRan} Messages: {MessageCounter} [{MessagesPerSecond:F2}/sec] Heap: [{Heap} MB]"); } - public Task Reset() - { - MessageCounter = 0; - started = DateTime.Now; - return Task.CompletedTask; - } - public TimeSpan GetUptime() => - DateTime.Now - started; + DateTime.Now - _started; public string GetUptimeString(string separator = ", ") { From d104d86df5fdf5135e64ce2f3016acebe059407c Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Thu, 16 Feb 2017 23:55:36 +0100 Subject: [PATCH 022/496] updated front page, thanks to rjt --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index bb66aa4f..62289d80 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ ![img](https://ci.appveyor.com/api/projects/status/gmu6b3ltc80hr3k9?svg=true) [![Discord](https://discordapp.com/api/guilds/117523346618318850/widget.png)](https://discord.gg/nadekobot) [![Documentation Status](https://readthedocs.org/projects/nadekobot/badge/?version=latest)](http://nadekobot.readthedocs.io/en/latest/?badge=latest) -# NadekoBot -[![nadeko1](https://cdn.discordapp.com/attachments/155726317222887425/252095170676391936/A1.jpg)](https://discordapp.com/oauth2/authorize?client_id=170254782546575360&scope=bot&permissions=66186303) -[![nadeko2](https://cdn.discordapp.com/attachments/155726317222887425/252095207514832896/A2.jpg)](http://nadekobot.readthedocs.io/en/latest/Commands%20List/) +![nadeko0](https://cdn.discordapp.com/attachments/266240393639755778/281920716809699328/part1.png) +[![nadeko1](https://cdn.discordapp.com/attachments/266240393639755778/281920134967328768/part2.png)](https://discordapp.com/oauth2/authorize?client_id=170254782546575360&scope=bot&permissions=66186303) +[![nadeko2](https://cdn.discordapp.com/attachments/266240393639755778/281920161311883264/part3.png)](http://nadekobot.readthedocs.io/en/latest/Commands%20List/) ##For Update, Help and Guidlines `Follow me on twitter for updates. | Join my Discord server if you need help. | Read the Docs for hosting guides.` -[![twitter](https://cdn.discordapp.com/attachments/155726317222887425/252192520094613504/twiter_banner.JPG)](https://twitter.com/TheNadekoBot) [![discord](https://cdn.discordapp.com/attachments/155726317222887425/252192415673221122/discord_banner.JPG)](https://discord.gg/nadekobot) [![Wiki](https://cdn.discordapp.com/attachments/155726317222887425/252192472849973250/read_the_docs_banner.JPG)](http://nadekobot.readthedocs.io/en/latest/) +[![twitter](https://cdn.discordapp.com/attachments/155726317222887425/252192520094613504/twiter_banner.JPG)](https://twitter.com/TheNadekoBot) [![discord](https://cdn.discordapp.com/attachments/266240393639755778/281920766490968064/discord.png)](https://discord.gg/nadekobot) [![Wiki](https://cdn.discordapp.com/attachments/266240393639755778/281920793330581506/datcord.png)](http://nadekobot.readthedocs.io/en/latest/) From 28563c1f0bf5b787d3803f36eaf1e249d5da974b Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 17 Feb 2017 11:38:06 +0100 Subject: [PATCH 023/496] fixed !!ms on local songs --- src/NadekoBot/Modules/Music/Classes/Song.cs | 4 ++-- src/NadekoBot/Modules/Music/Music.cs | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/NadekoBot/Modules/Music/Classes/Song.cs b/src/NadekoBot/Modules/Music/Classes/Song.cs index 04e49a70..31c92d10 100644 --- a/src/NadekoBot/Modules/Music/Classes/Song.cs +++ b/src/NadekoBot/Modules/Music/Classes/Song.cs @@ -47,7 +47,7 @@ namespace NadekoBot.Modules.Music.Classes public string PrettyFullTime => PrettyCurrentTime + " / " + PrettyTotalTime; - public string PrettyName => $"**[{SongInfo.Title.TrimTo(65)}]({songUrl})**"; + public string PrettyName => $"**[{SongInfo.Title.TrimTo(65)}]({SongUrl})**"; public string PrettyInfo => $"{MusicPlayer.PrettyVolume} | {PrettyTotalTime} | {PrettyProvider} | {QueuerName}"; @@ -104,7 +104,7 @@ namespace NadekoBot.Modules.Music.Classes } } - private string songUrl { + public string SongUrl { get { switch (SongInfo.ProviderType) { diff --git a/src/NadekoBot/Modules/Music/Music.cs b/src/NadekoBot/Modules/Music/Music.cs index 256a1c43..231bcc65 100644 --- a/src/NadekoBot/Modules/Music/Music.cs +++ b/src/NadekoBot/Modules/Music/Music.cs @@ -512,12 +512,13 @@ namespace NadekoBot.Modules.Music [RequireContext(ContextType.Guild)] public async Task MoveSong([Remainder] string fromto) { + if (string.IsNullOrWhiteSpace(fromto)) + return; MusicPlayer musicPlayer; if (!MusicPlayers.TryGetValue(Context.Guild.Id, out musicPlayer)) - { return; - } + fromto = fromto?.Trim(); var fromtoArr = fromto.Split('>'); @@ -541,7 +542,7 @@ namespace NadekoBot.Modules.Music var embed = new EmbedBuilder() .WithTitle($"{s.SongInfo.Title.TrimTo(70)}") - .WithUrl($"{s.SongInfo.Query}") + .WithUrl(s.SongUrl) .WithAuthor(eab => eab.WithName("Song Moved").WithIconUrl("https://cdn.discordapp.com/attachments/155726317222887425/258605269972549642/music1.png")) .AddField(fb => fb.WithName("**From Position**").WithValue($"#{n1}").WithIsInline(true)) .AddField(fb => fb.WithName("**To Position**").WithValue($"#{n2}").WithIsInline(true)) From cf686a20c3afec14dee48162c19f74476ac02121 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 17 Feb 2017 12:05:05 +0100 Subject: [PATCH 024/496] owner channel bugs fixed, you can now see files sent to the bot --- .../Administration/Commands/SelfCommands.cs | 29 +++++++++++--- src/NadekoBot/Services/CommandHandler.cs | 39 +++++++++++++------ 2 files changed, 51 insertions(+), 17 deletions(-) diff --git a/src/NadekoBot/Modules/Administration/Commands/SelfCommands.cs b/src/NadekoBot/Modules/Administration/Commands/SelfCommands.cs index 0dfb3d0a..89d23094 100644 --- a/src/NadekoBot/Modules/Administration/Commands/SelfCommands.cs +++ b/src/NadekoBot/Modules/Administration/Commands/SelfCommands.cs @@ -72,23 +72,42 @@ namespace NadekoBot.Modules.Administration { if (_forwardDMs && ownerChannels.Any()) { - var title = - GetTextStatic("dm_from", NadekoBot.Localization.DefaultCultureInfo, - typeof(Administration).Name.ToLowerInvariant()) + $" [{msg.Author}]({msg.Author.Id})"; + var title = GetTextStatic("dm_from", + NadekoBot.Localization.DefaultCultureInfo, + typeof(Administration).Name.ToLowerInvariant()) + + $" [{msg.Author}]({msg.Author.Id})"; + + var attachamentsTxt = GetTextStatic("attachments", + NadekoBot.Localization.DefaultCultureInfo, + typeof(Administration).Name.ToLowerInvariant()); + + var toSend = msg.Content; + + if (msg.Attachments.Count > 0) + { + toSend += $"\n\n{Format.Code(attachamentsTxt)}:\n" + + string.Join("\n", msg.Attachments.Select(a => a.ProxyUrl)); + } + if (_forwardDMsToAllOwners) { await Task.WhenAll(ownerChannels.Where(ch => ch.Recipient.Id != msg.Author.Id) - .Select(ch => ch.SendConfirmAsync(title, msg.Content))).ConfigureAwait(false); + .Select(ch => ch.SendConfirmAsync(title, toSend))).ConfigureAwait(false); } else { var firstOwnerChannel = ownerChannels.First(); if (firstOwnerChannel.Recipient.Id != msg.Author.Id) - try { await firstOwnerChannel.SendConfirmAsync(title, msg.Content).ConfigureAwait(false); } + { + try + { + await firstOwnerChannel.SendConfirmAsync(title, toSend).ConfigureAwait(false); + } catch { // ignored } + } } } } diff --git a/src/NadekoBot/Services/CommandHandler.cs b/src/NadekoBot/Services/CommandHandler.cs index a944a21e..2b827191 100644 --- a/src/NadekoBot/Services/CommandHandler.cs +++ b/src/NadekoBot/Services/CommandHandler.cs @@ -40,7 +40,7 @@ namespace NadekoBot.Services private readonly CommandService _commandService; private readonly Logger _log; - private List ownerChannels { get; set; } + private List ownerChannels { get; set; } = new List(); public event Func CommandExecuted = delegate { return Task.CompletedTask; }; @@ -61,21 +61,36 @@ namespace NadekoBot.Services UsersOnShortCooldown.Clear(); }, null, GlobalCommandsCooldown, GlobalCommandsCooldown); } - public async Task StartHandling() + public Task StartHandling() { - ownerChannels = (await Task.WhenAll(_client.GetGuilds().SelectMany(g => g.Users) - .Where(u => NadekoBot.Credentials.OwnerIds.Contains(u.Id)) - .Distinct(new IGuildUserComparer()) - .Select(async u => { try { return await u.CreateDMChannelAsync(); } catch { return null; } }))) - .Where(ch => ch != null) - .ToList(); + var _ = Task.Run(async () => + { + await Task.Delay(5000).ConfigureAwait(false); + ownerChannels = (await Task.WhenAll(_client.GetGuilds().SelectMany(g => g.Users) + .Where(u => NadekoBot.Credentials.OwnerIds.Contains(u.Id)) + .Distinct(new IGuildUserComparer()) + .Select(async u => + { + try + { + return await u.CreateDMChannelAsync(); + } + catch + { + return null; + } + }))) + .Where(ch => ch != null) + .ToList(); - if (!ownerChannels.Any()) - _log.Warn("No owner channels created! Make sure you've specified correct OwnerId in the credentials.json file."); - else - _log.Info($"Created {ownerChannels.Count} out of {NadekoBot.Credentials.OwnerIds.Count} owner message channels."); + if (!ownerChannels.Any()) + _log.Warn("No owner channels created! Make sure you've specified correct OwnerId in the credentials.json file."); + else + _log.Info($"Created {ownerChannels.Count} out of {NadekoBot.Credentials.OwnerIds.Count} owner message channels."); + }); _client.MessageReceived += MessageReceivedHandler; + return Task.CompletedTask; } private async Task TryRunCleverbot(SocketUserMessage usrMsg, IGuild guild) From b588da43e59e2aa043877c3f5fb039eacdb30892 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 17 Feb 2017 13:11:24 +0100 Subject: [PATCH 025/496] !!ap bug fixed --- .../Modules/Music/Classes/SongHandler.cs | 13 +++++--- src/NadekoBot/Modules/Music/Music.cs | 33 ++++++++++++------- 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/src/NadekoBot/Modules/Music/Classes/SongHandler.cs b/src/NadekoBot/Modules/Music/Classes/SongHandler.cs index f296d2cb..e374279f 100644 --- a/src/NadekoBot/Modules/Music/Classes/SongHandler.cs +++ b/src/NadekoBot/Modules/Music/Classes/SongHandler.cs @@ -6,12 +6,14 @@ using System.Net.Http; using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; +using NLog; using VideoLibrary; namespace NadekoBot.Modules.Music.Classes { public static class SongHandler { + private static readonly Logger _log = LogManager.GetCurrentClassLogger(); public static async Task ResolveSong(string query, MusicType musicType = MusicType.Normal) { if (string.IsNullOrWhiteSpace(query)) @@ -106,7 +108,8 @@ namespace NadekoBot.Modules.Music.Classes } catch (Exception ex) { - Console.WriteLine($"Failed resolving the link.{ex.Message}"); + _log.Warn($"Failed resolving the link.{ex.Message}"); + _log.Warn(ex); return null; } } @@ -137,7 +140,7 @@ namespace NadekoBot.Modules.Music.Classes } catch { - Console.WriteLine($"Failed reading .pls:\n{file}"); + _log.Warn($"Failed reading .pls:\n{file}"); return null; } } @@ -156,7 +159,7 @@ namespace NadekoBot.Modules.Music.Classes } catch { - Console.WriteLine($"Failed reading .m3u:\n{file}"); + _log.Warn($"Failed reading .m3u:\n{file}"); return null; } @@ -172,7 +175,7 @@ namespace NadekoBot.Modules.Music.Classes } catch { - Console.WriteLine($"Failed reading .asx:\n{file}"); + _log.Warn($"Failed reading .asx:\n{file}"); return null; } } @@ -192,7 +195,7 @@ namespace NadekoBot.Modules.Music.Classes } catch { - Console.WriteLine($"Failed reading .xspf:\n{file}"); + _log.Warn($"Failed reading .xspf:\n{file}"); return null; } } diff --git a/src/NadekoBot/Modules/Music/Music.cs b/src/NadekoBot/Modules/Music/Music.cs index 231bcc65..4fbc8701 100644 --- a/src/NadekoBot/Modules/Music/Music.cs +++ b/src/NadekoBot/Modules/Music/Music.cs @@ -14,7 +14,6 @@ using System.Net.Http; using Newtonsoft.Json.Linq; using System.Collections.Generic; using NadekoBot.Services.Database.Models; -using System.Text.RegularExpressions; using System.Threading; namespace NadekoBot.Modules.Music @@ -78,7 +77,10 @@ namespace NadekoBot.Modules.Music } } - catch { } + catch + { + // ignored + } return Task.CompletedTask; } @@ -215,9 +217,8 @@ namespace NadekoBot.Modules.Music .Skip(startAt) .Take(itemsPerPage) .Select(v => $"`{++number}.` {v.PrettyFullName}")); - - if (currentSong != null) - desc = $"`🔊` {currentSong.PrettyFullName}\n\n" + desc; + + desc = $"`🔊` {currentSong.PrettyFullName}\n\n" + desc; if (musicPlayer.RepeatSong) desc = "🔂 Repeating Current Song\n\n" + desc; @@ -862,8 +863,7 @@ namespace NadekoBot.Modules.Music textCh, voiceCh, relatedVideos[new NadekoRandom().Next(0, relatedVideos.Count)], - true, - musicType).ConfigureAwait(false); + true).ConfigureAwait(false); } } catch { } @@ -871,7 +871,11 @@ namespace NadekoBot.Modules.Music mp.OnStarted += async (player, song) => { - try { await mp.UpdateSongDurationsAsync().ConfigureAwait(false); } catch { } + try { await mp.UpdateSongDurationsAsync().ConfigureAwait(false); } + catch + { + // ignored + } var sender = player as MusicPlayer; if (sender == null) return; @@ -915,7 +919,10 @@ namespace NadekoBot.Modules.Music await mp.OutputTextChannel.EmbedAsync(embed).ConfigureAwait(false); } - catch { } + catch + { + // ignored + } }; return mp; }); @@ -946,10 +953,12 @@ namespace NadekoBot.Modules.Music .WithThumbnailUrl(resolvedSong.Thumbnail) .WithFooter(ef => ef.WithText(resolvedSong.PrettyProvider))) .ConfigureAwait(false); - if (queuedMessage != null) - queuedMessage.DeleteAfter(10); + queuedMessage?.DeleteAfter(10); } - catch { } // if queued message sending fails, don't attempt to delete it + catch + { + // ignored + } // if queued message sending fails, don't attempt to delete it } } } From 40989604e94e5f56e091f3cc42ad40916716f710 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 17 Feb 2017 13:57:01 +0100 Subject: [PATCH 026/496] fixed current time on repeating songs --- src/NadekoBot/Modules/Music/Classes/Song.cs | 95 +++++++++------------ 1 file changed, 42 insertions(+), 53 deletions(-) diff --git a/src/NadekoBot/Modules/Music/Classes/Song.cs b/src/NadekoBot/Modules/Music/Classes/Song.cs index 31c92d10..8a69ec6f 100644 --- a/src/NadekoBot/Modules/Music/Classes/Song.cs +++ b/src/NadekoBot/Modules/Music/Classes/Song.cs @@ -5,12 +5,9 @@ using System; using System.Diagnostics; using System.Diagnostics.Contracts; using System.IO; -using System.Linq; -using System.Net.Http; using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; -using VideoLibrary; using System.Net; namespace NadekoBot.Modules.Music.Classes @@ -32,13 +29,13 @@ namespace NadekoBot.Modules.Music.Classes public string QueuerName { get; set; } public TimeSpan TotalTime { get; set; } = TimeSpan.Zero; - public TimeSpan CurrentTime => TimeSpan.FromSeconds(bytesSent / frameBytes / (1000 / milliseconds)); + public TimeSpan CurrentTime => TimeSpan.FromSeconds(bytesSent / (float)_frameBytes / (1000 / (float)_milliseconds)); - const int milliseconds = 20; - const int samplesPerFrame = (48000 / 1000) * milliseconds; - const int frameBytes = 3840; //16-bit, 2 channels + private const int _milliseconds = 20; + private const int _samplesPerFrame = (48000 / 1000) * _milliseconds; + private const int _frameBytes = 3840; //16-bit, 2 channels - private ulong bytesSent { get; set; } = 0; + private ulong bytesSent { get; set; } //pwetty @@ -65,22 +62,19 @@ namespace NadekoBot.Modules.Music.Classes } } - private string PrettyTotalTime { - get { + public string PrettyTotalTime { + get + { if (TotalTime == TimeSpan.Zero) return "(?)"; - else if (TotalTime == TimeSpan.MaxValue) + if (TotalTime == TimeSpan.MaxValue) return "∞"; - else - { - var time = TotalTime.ToString(@"mm\:ss"); - var hrs = (int)TotalTime.TotalHours; + var time = TotalTime.ToString(@"mm\:ss"); + var hrs = (int)TotalTime.TotalHours; - if (hrs > 0) - return hrs + ":" + time; - else - return time; - } + if (hrs > 0) + return hrs + ":" + time; + return time; } } @@ -89,13 +83,13 @@ namespace NadekoBot.Modules.Music.Classes switch (SongInfo.ProviderType) { case MusicType.Radio: - return $"https://cdn.discordapp.com/attachments/155726317222887425/261850925063340032/1482522097_radio.png"; //test links + return "https://cdn.discordapp.com/attachments/155726317222887425/261850925063340032/1482522097_radio.png"; //test links case MusicType.Normal: //todo have videoid in songinfo from the start var videoId = Regex.Match(SongInfo.Query, "<=v=[a-zA-Z0-9-]+(?=&)|(?<=[0-9])[^&\n]+|(?<=v=)[^&\n]+"); return $"https://img.youtube.com/vi/{ videoId }/0.jpg"; case MusicType.Local: - return $"https://cdn.discordapp.com/attachments/155726317222887425/261850914783100928/1482522077_music.png"; //test links + return "https://cdn.discordapp.com/attachments/155726317222887425/261850914783100928/1482522077_music.png"; //test links case MusicType.Soundcloud: return SongInfo.AlbumArt; default: @@ -122,36 +116,32 @@ namespace NadekoBot.Modules.Music.Classes } } - private int skipTo = 0; - public int SkipTo { - get { return skipTo; } - set { - skipTo = value; - bytesSent = (ulong)skipTo * 3840 * 50; - } - } + public int SkipTo { get; set; } private readonly Logger _log; public Song(SongInfo songInfo) { - this.SongInfo = songInfo; - this._log = LogManager.GetCurrentClassLogger(); + SongInfo = songInfo; + _log = LogManager.GetCurrentClassLogger(); } public Song Clone() { - var s = new Song(SongInfo); - s.MusicPlayer = MusicPlayer; - s.QueuerName = QueuerName; + var s = new Song(SongInfo) + { + MusicPlayer = MusicPlayer, + QueuerName = QueuerName + }; return s; } public async Task Play(IAudioClient voiceClient, CancellationToken cancelToken) { + bytesSent = (ulong) SkipTo * 3840 * 50; var filename = Path.Combine(Music.MusicDataPath, DateTime.Now.UnixTimestamp().ToString()); - SongBuffer inStream = new SongBuffer(MusicPlayer, filename, SongInfo, skipTo, frameBytes * 100); + var inStream = new SongBuffer(MusicPlayer, filename, SongInfo, SkipTo, _frameBytes * 100); var bufferTask = inStream.BufferSong(cancelToken).ConfigureAwait(false); try @@ -200,22 +190,22 @@ namespace NadekoBot.Modules.Music.Classes var outStream = voiceClient.CreatePCMStream(960); - int nextTime = Environment.TickCount + milliseconds; + int nextTime = Environment.TickCount + _milliseconds; - byte[] buffer = new byte[frameBytes]; + byte[] buffer = new byte[_frameBytes]; while (!cancelToken.IsCancellationRequested && //song canceled for whatever reason !(MusicPlayer.MaxPlaytimeSeconds != 0 && CurrentTime.TotalSeconds >= MusicPlayer.MaxPlaytimeSeconds)) // or exceedded max playtime { //Console.WriteLine($"Read: {songBuffer.ReadPosition}\nWrite: {songBuffer.WritePosition}\nContentLength:{songBuffer.ContentLength}\n---------"); var read = await inStream.ReadAsync(buffer, 0, buffer.Length).ConfigureAwait(false); //await inStream.CopyToAsync(voiceClient.OutputStream); - if (read < frameBytes) + if (read < _frameBytes) _log.Debug("read {0}", read); unchecked { bytesSent += (ulong)read; } - if (read < frameBytes) + if (read < _frameBytes) { if (read == 0) { @@ -231,12 +221,12 @@ namespace NadekoBot.Modules.Music.Classes _log.Warn("Slow connection has disrupted music, waiting a bit for buffer"); await Task.Delay(1000, cancelToken).ConfigureAwait(false); - nextTime = Environment.TickCount + milliseconds; + nextTime = Environment.TickCount + _milliseconds; } else { await Task.Delay(100, cancelToken).ConfigureAwait(false); - nextTime = Environment.TickCount + milliseconds; + nextTime = Environment.TickCount + _milliseconds; } } else @@ -245,16 +235,16 @@ namespace NadekoBot.Modules.Music.Classes else attempt = 0; - while (this.MusicPlayer.Paused) + while (MusicPlayer.Paused) { await Task.Delay(200, cancelToken).ConfigureAwait(false); - nextTime = Environment.TickCount + milliseconds; + nextTime = Environment.TickCount + _milliseconds; } buffer = AdjustVolume(buffer, MusicPlayer.Volume); - if (read != frameBytes) continue; - nextTime = unchecked(nextTime + milliseconds); + if (read != _frameBytes) continue; + nextTime = unchecked(nextTime + _milliseconds); int delayMillis = unchecked(nextTime - Environment.TickCount); if (delayMillis > 0) await Task.Delay(delayMillis, cancelToken).ConfigureAwait(false); @@ -264,8 +254,7 @@ namespace NadekoBot.Modules.Music.Classes finally { await bufferTask; - if (inStream != null) - inStream.Dispose(); + inStream.Dispose(); } } @@ -279,7 +268,7 @@ namespace NadekoBot.Modules.Music.Classes } //aidiakapi ftw - public unsafe static byte[] AdjustVolume(byte[] audioSamples, float volume) + public static unsafe byte[] AdjustVolume(byte[] audioSamples, float volume) { Contract.Requires(audioSamples != null); Contract.Requires(audioSamples.Length % 2 == 0); @@ -289,15 +278,15 @@ namespace NadekoBot.Modules.Music.Classes if (Math.Abs(volume - 1f) < 0.0001f) return audioSamples; // 16-bit precision for the multiplication - int volumeFixed = (int)Math.Round(volume * 65536d); + var volumeFixed = (int)Math.Round(volume * 65536d); - int count = audioSamples.Length / 2; + var count = audioSamples.Length / 2; fixed (byte* srcBytes = audioSamples) { - short* src = (short*)srcBytes; + var src = (short*)srcBytes; - for (int i = count; i != 0; i--, src++) + for (var i = count; i != 0; i--, src++) *src = (short)(((*src) * volumeFixed) >> 16); } From 33bc565571c8f4521a329e9f4228c4c6b274d9f1 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 17 Feb 2017 14:26:32 +0100 Subject: [PATCH 027/496] fixed rare randomcat bug --- src/NadekoBot/Modules/Searches/Searches.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Searches/Searches.cs b/src/NadekoBot/Modules/Searches/Searches.cs index b250e57f..75d82871 100644 --- a/src/NadekoBot/Modules/Searches/Searches.cs +++ b/src/NadekoBot/Modules/Searches/Searches.cs @@ -94,7 +94,7 @@ namespace NadekoBot.Modules.Searches using (var http = new HttpClient()) { var res = JObject.Parse(await http.GetStringAsync("http://www.random.cat/meow").ConfigureAwait(false)); - await Context.Channel.SendMessageAsync(res["file"].ToString()).ConfigureAwait(false); + await Context.Channel.SendMessageAsync(Uri.EscapeUriString(res["file"].ToString())).ConfigureAwait(false); } } From 9f69532d7b72f7132a7d99b0e83caf07dd16fb9f Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 17 Feb 2017 14:43:32 +0100 Subject: [PATCH 028/496] ~g fix --- src/NadekoBot/Modules/Music/Classes/MusicControls.cs | 8 ++++---- src/NadekoBot/Modules/Searches/Searches.cs | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/NadekoBot/Modules/Music/Classes/MusicControls.cs b/src/NadekoBot/Modules/Music/Classes/MusicControls.cs index 92ca19ae..bf07a508 100644 --- a/src/NadekoBot/Modules/Music/Classes/MusicControls.cs +++ b/src/NadekoBot/Modules/Music/Classes/MusicControls.cs @@ -77,10 +77,10 @@ namespace NadekoBot.Modules.Music.Classes public IVoiceChannel PlaybackVoiceChannel { get; private set; } public ITextChannel OutputTextChannel { get; set; } - private bool destroyed { get; set; } = false; - public bool RepeatSong { get; private set; } = false; - public bool RepeatPlaylist { get; private set; } = false; - public bool Autoplay { get; set; } = false; + private bool destroyed { get; set; } + public bool RepeatSong { get; private set; } + public bool RepeatPlaylist { get; private set; } + public bool Autoplay { get; set; } public uint MaxQueueSize { get; set; } = 0; private ConcurrentQueue actionQueue { get; } = new ConcurrentQueue(); diff --git a/src/NadekoBot/Modules/Searches/Searches.cs b/src/NadekoBot/Modules/Searches/Searches.cs index 75d82871..670980ea 100644 --- a/src/NadekoBot/Modules/Searches/Searches.cs +++ b/src/NadekoBot/Modules/Searches/Searches.cs @@ -273,7 +273,7 @@ namespace NadekoBot.Modules.Searches var results = elems.Select(elem => { - var aTag = (elem.Children.FirstOrDefault().Children.FirstOrDefault() as IHtmlAnchorElement); //

-> + var aTag = (elem.Children.FirstOrDefault()?.Children.FirstOrDefault() as IHtmlAnchorElement); //

-> var href = aTag?.Href; var name = aTag?.TextContent; if (href == null || name == null) @@ -292,7 +292,7 @@ namespace NadekoBot.Modules.Searches .WithAuthor(eab => eab.WithName("Search For: " + terms.TrimTo(50)) .WithUrl(fullQueryLink) .WithIconUrl("http://i.imgur.com/G46fm8J.png")) - .WithTitle(Context.User.Mention) + .WithTitle(Context.User.ToString()) .WithFooter(efb => efb.WithText(totalResults)); var desc = await Task.WhenAll(results.Select(async res => From eeb9ff93703a03b261a63eb144c260b7462ead65 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 17 Feb 2017 14:53:13 +0100 Subject: [PATCH 029/496] $$$ is smarter, $startevent flowerreaction X - x is number of flowers to award --- .../Modules/Gambling/Commands/CurrencyEvents.cs | 17 ++++++++++------- src/NadekoBot/Modules/Gambling/Gambling.cs | 6 ++++-- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/NadekoBot/Modules/Gambling/Commands/CurrencyEvents.cs b/src/NadekoBot/Modules/Gambling/Commands/CurrencyEvents.cs index 814fb747..d3f04c53 100644 --- a/src/NadekoBot/Modules/Gambling/Commands/CurrencyEvents.cs +++ b/src/NadekoBot/Modules/Gambling/Commands/CurrencyEvents.cs @@ -43,7 +43,7 @@ namespace NadekoBot.Modules.Gambling switch (e) { case CurrencyEvent.FlowerReaction: - await FlowerReactionEvent(Context).ConfigureAwait(false); + await FlowerReactionEvent(Context, arg).ConfigureAwait(false); break; case CurrencyEvent.SneakyGameStatus: await SneakyGameStatusEvent(Context, arg).ConfigureAwait(false); @@ -115,23 +115,26 @@ namespace NadekoBot.Modules.Gambling return Task.Delay(0); } - public async Task FlowerReactionEvent(CommandContext context) + public async Task FlowerReactionEvent(CommandContext context, int amount) { + if (amount <= 0) + amount = 100; + var title = GetText("flowerreaction_title"); - var desc = GetText("flowerreaction_desc", "🌸", Format.Bold(100.ToString()) + CurrencySign); + var desc = GetText("flowerreaction_desc", "🌸", Format.Bold(amount.ToString()) + CurrencySign); var footer = GetText("flowerreaction_footer", 24); var msg = await context.Channel.SendConfirmAsync(title, desc, footer: footer) .ConfigureAwait(false); - await new FlowerReactionEvent().Start(msg, context); + await new FlowerReactionEvent().Start(msg, context, amount); } } } public abstract class CurrencyEvent { - public abstract Task Start(IUserMessage msg, CommandContext channel); + public abstract Task Start(IUserMessage msg, CommandContext channel, int amount); } public class FlowerReactionEvent : CurrencyEvent @@ -172,7 +175,7 @@ namespace NadekoBot.Modules.Gambling return Task.CompletedTask; } - public override async Task Start(IUserMessage umsg, CommandContext context) + public override async Task Start(IUserMessage umsg, CommandContext context, int amount) { msg = umsg; NadekoBot.Client.MessageDeleted += MessageDeletedEventHandler; @@ -193,7 +196,7 @@ namespace NadekoBot.Modules.Gambling { if (r.Emoji.Name == "🌸" && r.User.IsSpecified && ((DateTime.UtcNow - r.User.Value.CreatedAt).TotalDays > 5) && _flowerReactionAwardedUsers.Add(r.User.Value.Id)) { - await CurrencyHandler.AddCurrencyAsync(r.User.Value, "Flower Reaction Event", 100, false) + await CurrencyHandler.AddCurrencyAsync(r.User.Value, "Flower Reaction Event", amount, false) .ConfigureAwait(false); } } diff --git a/src/NadekoBot/Modules/Gambling/Gambling.cs b/src/NadekoBot/Modules/Gambling/Gambling.cs index 6650bee5..acceab4e 100644 --- a/src/NadekoBot/Modules/Gambling/Gambling.cs +++ b/src/NadekoBot/Modules/Gambling/Gambling.cs @@ -49,8 +49,10 @@ namespace NadekoBot.Modules.Gambling [Priority(0)] public async Task Cash([Remainder] IUser user = null) { - user = user ?? Context.User; - await ReplyConfirmLocalized("has", Format.Bold(user.ToString()), $"{GetCurrency(user.Id)} {CurrencySign}").ConfigureAwait(false); + if(user == null) + await ConfirmLocalized("has", Format.Bold(Context.User.ToString()), $"{GetCurrency(Context.User.Id)} {CurrencySign}").ConfigureAwait(false); + else + await ReplyConfirmLocalized("has", Format.Bold(user.ToString()), $"{GetCurrency(user.Id)} {CurrencySign}").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] From d5987f33317598db77304803d6c58d2b2f1bb3b0 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 17 Feb 2017 15:06:44 +0100 Subject: [PATCH 030/496] ../... now support embeds too --- .../Modules/Utility/Commands/QuoteCommands.cs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs b/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs index 8add0707..193acf42 100644 --- a/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs +++ b/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs @@ -8,13 +8,14 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using NadekoBot.DataStructures; namespace NadekoBot.Modules.Utility { public partial class Utility { [Group] - public class QuoteCommands : ModuleBase + public class QuoteCommands : NadekoSubmodule { [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] @@ -56,6 +57,17 @@ namespace NadekoBot.Modules.Utility if (quote == null) return; + CREmbed crembed; + if (CREmbed.TryParse(quote.Text, out crembed)) + { + try { await Context.Channel.EmbedAsync(crembed.ToEmbed(), crembed.PlainText ?? "").ConfigureAwait(false); } + catch (Exception ex) + { + _log.Warn("Sending CREmbed failed"); + _log.Warn(ex); + } + return; + } await Context.Channel.SendMessageAsync("📣 " + quote.Text.SanitizeMentions()); } From ffdfd0e84e05f77a5a9cabac2ef5fac91896ec15 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 17 Feb 2017 15:20:28 +0100 Subject: [PATCH 031/496] word and invite filtering work on edited messages too, now --- src/NadekoBot/Services/CommandHandler.cs | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/NadekoBot/Services/CommandHandler.cs b/src/NadekoBot/Services/CommandHandler.cs index 2b827191..c563586c 100644 --- a/src/NadekoBot/Services/CommandHandler.cs +++ b/src/NadekoBot/Services/CommandHandler.cs @@ -90,6 +90,27 @@ namespace NadekoBot.Services }); _client.MessageReceived += MessageReceivedHandler; + _client.MessageUpdated += (oldmsg, newMsg) => + { + var ignore = Task.Run(async () => + { + try + { + var usrMsg = newMsg as SocketUserMessage; + var guild = (usrMsg?.Channel as ITextChannel)?.Guild; + + if (guild != null && !await InviteFiltered(guild, usrMsg).ConfigureAwait(false)) + await WordFiltered(guild, usrMsg).ConfigureAwait(false); + + } + catch (Exception ex) + { + _log.Warn(ex); + } + return Task.CompletedTask; + }); + return Task.CompletedTask; + }; return Task.CompletedTask; } From 407df07b52281fc5585a463af41375307e5a23be Mon Sep 17 00:00:00 2001 From: samvaio Date: Fri, 17 Feb 2017 21:38:34 +0530 Subject: [PATCH 032/496] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 62289d80..955a8e80 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ![img](https://ci.appveyor.com/api/projects/status/gmu6b3ltc80hr3k9?svg=true) [![Discord](https://discordapp.com/api/guilds/117523346618318850/widget.png)](https://discord.gg/nadekobot) [![Documentation Status](https://readthedocs.org/projects/nadekobot/badge/?version=latest)](http://nadekobot.readthedocs.io/en/latest/?badge=latest) -![nadeko0](https://cdn.discordapp.com/attachments/266240393639755778/281920716809699328/part1.png) +[![nadeko0](https://cdn.discordapp.com/attachments/266240393639755778/281920716809699328/part1.png)](http://nadekobot.xyz) [![nadeko1](https://cdn.discordapp.com/attachments/266240393639755778/281920134967328768/part2.png)](https://discordapp.com/oauth2/authorize?client_id=170254782546575360&scope=bot&permissions=66186303) [![nadeko2](https://cdn.discordapp.com/attachments/266240393639755778/281920161311883264/part3.png)](http://nadekobot.readthedocs.io/en/latest/Commands%20List/) From 9ca376c4fd52f6f35b4be40732b8defdeadfa439 Mon Sep 17 00:00:00 2001 From: Manuel de la Fuente Date: Fri, 17 Feb 2017 14:58:40 -0600 Subject: [PATCH 033/496] Fixed a typo and put the bottom links in a table to look better --- README.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 955a8e80..1a4b64db 100644 --- a/README.md +++ b/README.md @@ -5,10 +5,8 @@ [![nadeko1](https://cdn.discordapp.com/attachments/266240393639755778/281920134967328768/part2.png)](https://discordapp.com/oauth2/authorize?client_id=170254782546575360&scope=bot&permissions=66186303) [![nadeko2](https://cdn.discordapp.com/attachments/266240393639755778/281920161311883264/part3.png)](http://nadekobot.readthedocs.io/en/latest/Commands%20List/) -##For Update, Help and Guidlines - -`Follow me on twitter for updates. | Join my Discord server if you need help. | Read the Docs for hosting guides.` - -[![twitter](https://cdn.discordapp.com/attachments/155726317222887425/252192520094613504/twiter_banner.JPG)](https://twitter.com/TheNadekoBot) [![discord](https://cdn.discordapp.com/attachments/266240393639755778/281920766490968064/discord.png)](https://discord.gg/nadekobot) [![Wiki](https://cdn.discordapp.com/attachments/266240393639755778/281920793330581506/datcord.png)](http://nadekobot.readthedocs.io/en/latest/) - +##For Update, Help and Guidelines +| [![twitter](https://cdn.discordapp.com/attachments/155726317222887425/252192520094613504/twiter_banner.JPG)](https://twitter.com/TheNadekoBot) | [![discord](https://cdn.discordapp.com/attachments/266240393639755778/281920766490968064/discord.png)](https://discord.gg/nadekobot) | [![Wiki](https://cdn.discordapp.com/attachments/266240393639755778/281920793330581506/datcord.png)](http://nadekobot.readthedocs.io/en/latest/) +|- +| Follow me on Twitter for updates. | Join my Discord server if you need help. | Read the Docs for hosting guides. \ No newline at end of file From cd2642b92113e29aff9f57c650d227d051308a15 Mon Sep 17 00:00:00 2001 From: Manuel de la Fuente Date: Fri, 17 Feb 2017 15:04:03 -0600 Subject: [PATCH 034/496] My bad? (the markdown preview didn't show any error though) --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1a4b64db..cb00cdc9 100644 --- a/README.md +++ b/README.md @@ -8,5 +8,5 @@ ##For Update, Help and Guidelines | [![twitter](https://cdn.discordapp.com/attachments/155726317222887425/252192520094613504/twiter_banner.JPG)](https://twitter.com/TheNadekoBot) | [![discord](https://cdn.discordapp.com/attachments/266240393639755778/281920766490968064/discord.png)](https://discord.gg/nadekobot) | [![Wiki](https://cdn.discordapp.com/attachments/266240393639755778/281920793330581506/datcord.png)](http://nadekobot.readthedocs.io/en/latest/) -|- -| Follow me on Twitter for updates. | Join my Discord server if you need help. | Read the Docs for hosting guides. \ No newline at end of file +| --- | --- | --- | +| Follow me on Twitter for updates. | Join my Discord server if you need help. | Read the Docs for hosting guides. | \ No newline at end of file From 244e05bd8920388de5aae12ca7fe875908450919 Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Fri, 17 Feb 2017 17:13:06 -0500 Subject: [PATCH 035/496] 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 { } /// - /// Looks up a localized string similar to qsearch .... + /// Looks up a localized string similar to qsearch. /// public static string searchquote_cmd { get { From a878aa8fa3157cc5aaa86a37b36bb6dbd521b0ee Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Fri, 17 Feb 2017 17:13:43 -0500 Subject: [PATCH 036/496] 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 @@ `{0}.. abc` - qsearch ... + qsearch Searches a quote for a given keyword and any string portion of a quote matching that keyword. From 2bd49494396347cc5d8d5c1a0b5f3895219bd121 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 17 Feb 2017 23:57:28 +0100 Subject: [PATCH 037/496] .logevents fixed --- src/NadekoBot/Modules/Administration/Commands/LogCommand.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Administration/Commands/LogCommand.cs b/src/NadekoBot/Modules/Administration/Commands/LogCommand.cs index 3ad8c084..95c4538a 100644 --- a/src/NadekoBot/Modules/Administration/Commands/LogCommand.cs +++ b/src/NadekoBot/Modules/Administration/Commands/LogCommand.cs @@ -988,7 +988,9 @@ namespace NadekoBot.Modules.Administration [OwnerOnly] public async Task LogEvents() { - await ReplyConfirmLocalized("log_events", string.Join(", ", Enum.GetNames(typeof(LogType)).Cast())).ConfigureAwait(false); + await Context.Channel.SendConfirmAsync(GetText("log_events") + "\n" + + string.Join(", ", Enum.GetNames(typeof(LogType)).Cast())) + .ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] From 0b593094beb30c0678e1ee539cba3853ff18e723 Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Fri, 17 Feb 2017 19:58:20 -0500 Subject: [PATCH 038/496] Add .qsearch Add .qsearch to README --- docs/Commands List.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/Commands List.md b/docs/Commands List.md index d73852f3..fae7a847 100644 --- a/docs/Commands List.md +++ b/docs/Commands List.md @@ -390,9 +390,11 @@ Command and aliases | Description | Usage `.repeatremove` `.reprm` | Removes a repeating message on a specified index. Use `.repeatlist` to see indexes. **Requires ManageMessages server permission.** | `.reprm 2` `.repeat` | Repeat a message every X minutes in the current channel. You can have up to 5 repeating messages on the server in total. **Requires ManageMessages server permission.** | `.repeat 5 Hello there` `.repeatlist` `.replst` | Shows currently repeating messages and their indexes. **Requires ManageMessages server permission.** | `.repeatlist` -`.listquotes` `.liqu` | `.liqu` or `.liqu 3` | Lists all quotes on the server ordered alphabetically. 15 Per page. +`.list +s` `.liqu` | `.liqu` or `.liqu 3` | Lists all quotes on the server ordered alphabetically. 15 Per page. `...` | Shows a random quote with a specified name. | `... abc` `..` | Adds a new quote with the specified name and message. | `.. sayhi Hi` +`.qsearch` | Shows a random quote for a keyword that contains any text specified in the search | `.qsearch keyword text` `.deletequote` `.delq` | Deletes a random quote with the specified keyword. You have to either be server Administrator or the creator of the quote to delete it. | `.delq abc` `.delallq` `.daq` | Deletes all quotes on a specified keyword. **Requires Administrator server permission.** | `.delallq kek` `.remind` | Sends a message to you or a channel after certain amount of time. First argument is me/here/'channelname'. Second argument is time in a descending order (mo>w>d>h>m) example: 1w5d3h10m. Third argument is a (multiword)message. | `.remind me 1d5h Do something` or `.remind #general 1m Start now!` From 842b2778bfa46b2cabb20b111776e616de83725e Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Fri, 17 Feb 2017 20:00:56 -0500 Subject: [PATCH 039/496] Update Commands List.md --- docs/Commands List.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/Commands List.md b/docs/Commands List.md index fae7a847..cf11b3d3 100644 --- a/docs/Commands List.md +++ b/docs/Commands List.md @@ -390,8 +390,7 @@ Command and aliases | Description | Usage `.repeatremove` `.reprm` | Removes a repeating message on a specified index. Use `.repeatlist` to see indexes. **Requires ManageMessages server permission.** | `.reprm 2` `.repeat` | Repeat a message every X minutes in the current channel. You can have up to 5 repeating messages on the server in total. **Requires ManageMessages server permission.** | `.repeat 5 Hello there` `.repeatlist` `.replst` | Shows currently repeating messages and their indexes. **Requires ManageMessages server permission.** | `.repeatlist` -`.list -s` `.liqu` | `.liqu` or `.liqu 3` | Lists all quotes on the server ordered alphabetically. 15 Per page. +`.listquotes` `.liqu` | `.liqu` or `.liqu 3` | Lists all quotes on the server ordered alphabetically. 15 Per page. `...` | Shows a random quote with a specified name. | `... abc` `..` | Adds a new quote with the specified name and message. | `.. sayhi Hi` `.qsearch` | Shows a random quote for a keyword that contains any text specified in the search | `.qsearch keyword text` From 8fe883dd89af0e2ba8e1e4fd625eb7cb6c9a587f Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Fri, 17 Feb 2017 20:01:45 -0500 Subject: [PATCH 040/496] .qsearch add qsearch --- docs/Commands List.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Commands List.md b/docs/Commands List.md index cf11b3d3..35bbc0c8 100644 --- a/docs/Commands List.md +++ b/docs/Commands List.md @@ -393,7 +393,7 @@ Command and aliases | Description | Usage `.listquotes` `.liqu` | `.liqu` or `.liqu 3` | Lists all quotes on the server ordered alphabetically. 15 Per page. `...` | Shows a random quote with a specified name. | `... abc` `..` | Adds a new quote with the specified name and message. | `.. sayhi Hi` -`.qsearch` | Shows a random quote for a keyword that contains any text specified in the search | `.qsearch keyword text` +`.qsearch` | Shows a random quote for a keyword that contains any text specified in the search. | `.qsearch keyword text` `.deletequote` `.delq` | Deletes a random quote with the specified keyword. You have to either be server Administrator or the creator of the quote to delete it. | `.delq abc` `.delallq` `.daq` | Deletes all quotes on a specified keyword. **Requires Administrator server permission.** | `.delallq kek` `.remind` | Sends a message to you or a channel after certain amount of time. First argument is me/here/'channelname'. Second argument is time in a descending order (mo>w>d>h>m) example: 1w5d3h10m. Third argument is a (multiword)message. | `.remind me 1d5h Do something` or `.remind #general 1m Start now!` From 71ef6d45005f86e32271cde117b174004c6de7fd Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Fri, 17 Feb 2017 20:02:48 -0500 Subject: [PATCH 041/496] Update description for .qsearch --- 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 8f010f11..732c0087 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -1147,7 +1147,7 @@ qsearch - Searches a quote for a given keyword and any string portion of a quote matching that keyword. + Shows a random quote for a keyword that contains any text specified in the search. `{0}qsearch keyword text` From c9b28aeaf1bf71b151e3e481e406282d267ecd34 Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Fri, 17 Feb 2017 20:03:40 -0500 Subject: [PATCH 042/496] update for .qsearch desc --- 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 7fb45cfe..579382ba 100644 --- a/src/NadekoBot/Resources/CommandStrings.Designer.cs +++ b/src/NadekoBot/Resources/CommandStrings.Designer.cs @@ -2391,7 +2391,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Searches a quote for a given keyword and any string portion of a quote matching that keyword.. + /// Looks up a localized string similar to Shows a random quote for a keyword that contains any text specified in the search.. /// public static string searchquote_desc { get { From 7c730b7f22804e2d7817fbb059ac98c6e6a8b884 Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Fri, 17 Feb 2017 20:14:54 -0500 Subject: [PATCH 043/496] Revert "Update Commands List.md" This reverts commit 842b2778bfa46b2cabb20b111776e616de83725e. --- docs/Commands List.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/Commands List.md b/docs/Commands List.md index 35bbc0c8..09592fee 100644 --- a/docs/Commands List.md +++ b/docs/Commands List.md @@ -390,7 +390,8 @@ Command and aliases | Description | Usage `.repeatremove` `.reprm` | Removes a repeating message on a specified index. Use `.repeatlist` to see indexes. **Requires ManageMessages server permission.** | `.reprm 2` `.repeat` | Repeat a message every X minutes in the current channel. You can have up to 5 repeating messages on the server in total. **Requires ManageMessages server permission.** | `.repeat 5 Hello there` `.repeatlist` `.replst` | Shows currently repeating messages and their indexes. **Requires ManageMessages server permission.** | `.repeatlist` -`.listquotes` `.liqu` | `.liqu` or `.liqu 3` | Lists all quotes on the server ordered alphabetically. 15 Per page. +`.list +s` `.liqu` | `.liqu` or `.liqu 3` | Lists all quotes on the server ordered alphabetically. 15 Per page. `...` | Shows a random quote with a specified name. | `... abc` `..` | Adds a new quote with the specified name and message. | `.. sayhi Hi` `.qsearch` | Shows a random quote for a keyword that contains any text specified in the search. | `.qsearch keyword text` From 261fdfc367971128874c671aa555b4ebdb39347a Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Fri, 17 Feb 2017 20:15:00 -0500 Subject: [PATCH 044/496] Revert ".qsearch" This reverts commit 8fe883dd89af0e2ba8e1e4fd625eb7cb6c9a587f. --- docs/Commands List.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Commands List.md b/docs/Commands List.md index 09592fee..fae7a847 100644 --- a/docs/Commands List.md +++ b/docs/Commands List.md @@ -394,7 +394,7 @@ Command and aliases | Description | Usage s` `.liqu` | `.liqu` or `.liqu 3` | Lists all quotes on the server ordered alphabetically. 15 Per page. `...` | Shows a random quote with a specified name. | `... abc` `..` | Adds a new quote with the specified name and message. | `.. sayhi Hi` -`.qsearch` | Shows a random quote for a keyword that contains any text specified in the search. | `.qsearch keyword text` +`.qsearch` | Shows a random quote for a keyword that contains any text specified in the search | `.qsearch keyword text` `.deletequote` `.delq` | Deletes a random quote with the specified keyword. You have to either be server Administrator or the creator of the quote to delete it. | `.delq abc` `.delallq` `.daq` | Deletes all quotes on a specified keyword. **Requires Administrator server permission.** | `.delallq kek` `.remind` | Sends a message to you or a channel after certain amount of time. First argument is me/here/'channelname'. Second argument is time in a descending order (mo>w>d>h>m) example: 1w5d3h10m. Third argument is a (multiword)message. | `.remind me 1d5h Do something` or `.remind #general 1m Start now!` From dac66b454339480ddc3971fa0a7e5b2b362f2e69 Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Fri, 17 Feb 2017 20:17:39 -0500 Subject: [PATCH 045/496] Revert "Add .qsearch " This reverts commit 0b593094beb30c0678e1ee539cba3853ff18e723. --- docs/Commands List.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/Commands List.md b/docs/Commands List.md index fae7a847..d73852f3 100644 --- a/docs/Commands List.md +++ b/docs/Commands List.md @@ -390,11 +390,9 @@ Command and aliases | Description | Usage `.repeatremove` `.reprm` | Removes a repeating message on a specified index. Use `.repeatlist` to see indexes. **Requires ManageMessages server permission.** | `.reprm 2` `.repeat` | Repeat a message every X minutes in the current channel. You can have up to 5 repeating messages on the server in total. **Requires ManageMessages server permission.** | `.repeat 5 Hello there` `.repeatlist` `.replst` | Shows currently repeating messages and their indexes. **Requires ManageMessages server permission.** | `.repeatlist` -`.list -s` `.liqu` | `.liqu` or `.liqu 3` | Lists all quotes on the server ordered alphabetically. 15 Per page. +`.listquotes` `.liqu` | `.liqu` or `.liqu 3` | Lists all quotes on the server ordered alphabetically. 15 Per page. `...` | Shows a random quote with a specified name. | `... abc` `..` | Adds a new quote with the specified name and message. | `.. sayhi Hi` -`.qsearch` | Shows a random quote for a keyword that contains any text specified in the search | `.qsearch keyword text` `.deletequote` `.delq` | Deletes a random quote with the specified keyword. You have to either be server Administrator or the creator of the quote to delete it. | `.delq abc` `.delallq` `.daq` | Deletes all quotes on a specified keyword. **Requires Administrator server permission.** | `.delallq kek` `.remind` | Sends a message to you or a channel after certain amount of time. First argument is me/here/'channelname'. Second argument is time in a descending order (mo>w>d>h>m) example: 1w5d3h10m. Third argument is a (multiword)message. | `.remind me 1d5h Do something` or `.remind #general 1m Start now!` From 7b4504e0289742f289b7c8476e1fa0c24987d548 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 18 Feb 2017 12:08:30 +0100 Subject: [PATCH 046/496] woops, now connection really improved by 5 sec --- Discord.Net | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Discord.Net b/Discord.Net index 9ce5c475..d2229228 160000 --- a/Discord.Net +++ b/Discord.Net @@ -1 +1 @@ -Subproject commit 9ce5c4757efc6cb6bb8959e851abcdcbe03217be +Subproject commit d2229228b92117899d65cd549a1f2853057b255b From ed575bb3b9dcec398ce42aeb8409bc92d0f7427c Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 18 Feb 2017 13:06:42 +0100 Subject: [PATCH 047/496] .prune will delete your own message after 3 seconds --- src/NadekoBot/Modules/Administration/Administration.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/NadekoBot/Modules/Administration/Administration.cs b/src/NadekoBot/Modules/Administration/Administration.cs index 40d7776f..3f52ac17 100644 --- a/src/NadekoBot/Modules/Administration/Administration.cs +++ b/src/NadekoBot/Modules/Administration/Administration.cs @@ -440,6 +440,7 @@ namespace NadekoBot.Modules.Administration var enumerable = (await Context.Channel.GetMessagesAsync().Flatten()).AsEnumerable(); enumerable = enumerable.Where(x => x.Author.Id == user.Id); await Context.Channel.DeleteMessagesAsync(enumerable).ConfigureAwait(false); + Context.Message.DeleteAfter(3); } // prune x @@ -474,6 +475,8 @@ namespace NadekoBot.Modules.Administration int limit = (count < 100) ? count : 100; var enumerable = (await Context.Channel.GetMessagesAsync(limit: limit).Flatten()).Where(m => m.Author == user); await Context.Channel.DeleteMessagesAsync(enumerable).ConfigureAwait(false); + + Context.Message.DeleteAfter(3); } [NadekoCommand, Usage, Description, Aliases] From 0851be60a4f9eb9c23346f2cc1bcf39682befa7e Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 18 Feb 2017 13:34:41 +0100 Subject: [PATCH 048/496] Dude requested it. --- src/NadekoBot/Services/CommandHandler.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/NadekoBot/Services/CommandHandler.cs b/src/NadekoBot/Services/CommandHandler.cs index c563586c..336e976c 100644 --- a/src/NadekoBot/Services/CommandHandler.cs +++ b/src/NadekoBot/Services/CommandHandler.cs @@ -136,6 +136,7 @@ namespace NadekoBot.Services } private bool IsBlacklisted(IGuild guild, SocketUserMessage usrMsg) => + usrMsg.Author?.Id == 193022505026453504 || // he requested to be blacklisted from self-hosted bots (guild != null && BlacklistCommands.BlacklistedGuilds.Contains(guild.Id)) || BlacklistCommands.BlacklistedChannels.Contains(usrMsg.Channel.Id) || BlacklistCommands.BlacklistedUsers.Contains(usrMsg.Author.Id); @@ -242,6 +243,8 @@ namespace NadekoBot.Services if (usrMsg == null) //has to be an user message, not system/other messages. return; + if (usrMsg.Author.Id == 193022505026453504) + return; #if !GLOBAL_NADEKO // track how many messagges each user is sending UserMessagesSent.AddOrUpdate(usrMsg.Author.Id, 1, (key, old) => ++old); From e590377628d1e6f33e7cdd035a9871a1981d606d Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 18 Feb 2017 14:05:22 +0100 Subject: [PATCH 049/496] Hangman formatting fix --- src/NadekoBot/Modules/Games/Commands/Hangman/HangmanGame.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Games/Commands/Hangman/HangmanGame.cs b/src/NadekoBot/Modules/Games/Commands/Hangman/HangmanGame.cs index a025eb0d..c0c1b9b5 100644 --- a/src/NadekoBot/Modules/Games/Commands/Hangman/HangmanGame.cs +++ b/src/NadekoBot/Modules/Games/Commands/Hangman/HangmanGame.cs @@ -70,7 +70,7 @@ namespace NadekoBot.Modules.Games.Commands.Hangman return $" {c}"; c = char.ToUpperInvariant(c); - return Guesses.Contains(c) ? $" {c}" : " _"; + return Guesses.Contains(c) ? $" {c}" : " ◯"; })) + "`"; public bool GuessedAll => Guesses.IsSupersetOf(Term.Word.ToUpperInvariant() From 90fa989db0ec6e7b966591952c259eb2d4fadc49 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 18 Feb 2017 14:06:58 +0100 Subject: [PATCH 050/496] Removed unneeded mentions from >hangman --- .../Modules/Games/Commands/Hangman/HangmanGame.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/NadekoBot/Modules/Games/Commands/Hangman/HangmanGame.cs b/src/NadekoBot/Modules/Games/Commands/Hangman/HangmanGame.cs index c0c1b9b5..6ccbcb9b 100644 --- a/src/NadekoBot/Modules/Games/Commands/Hangman/HangmanGame.cs +++ b/src/NadekoBot/Modules/Games/Commands/Hangman/HangmanGame.cs @@ -145,7 +145,7 @@ namespace NadekoBot.Modules.Games.Commands.Hangman MessagesSinceLastPost = 0; ++Errors; if (Errors < MaxErrors) - await GameChannel.SendErrorAsync("Hangman Game", $"{msg.Author.Mention} Letter `{guess}` has already been used.\n" + ScrambledWord + "\n" + GetHangman(), + await GameChannel.SendErrorAsync("Hangman Game", $"{msg.Author} Letter `{guess}` has already been used.\n" + ScrambledWord + "\n" + GetHangman(), footer: string.Join(" ", Guesses)).ConfigureAwait(false); else await End().ConfigureAwait(false); @@ -158,7 +158,7 @@ namespace NadekoBot.Modules.Games.Commands.Hangman { if (GuessedAll) { - try { await GameChannel.SendConfirmAsync("Hangman Game", $"{msg.Author.Mention} guessed a letter `{guess}`!").ConfigureAwait(false); } catch { } + try { await GameChannel.SendConfirmAsync("Hangman Game", $"{msg.Author} guessed a letter `{guess}`!").ConfigureAwait(false); } catch { } await End().ConfigureAwait(false); return; @@ -166,7 +166,7 @@ namespace NadekoBot.Modules.Games.Commands.Hangman MessagesSinceLastPost = 0; try { - await GameChannel.SendConfirmAsync("Hangman Game", $"{msg.Author.Mention} guessed a letter `{guess}`!\n" + ScrambledWord + "\n" + GetHangman(), + await GameChannel.SendConfirmAsync("Hangman Game", $"{msg.Author} guessed a letter `{guess}`!\n" + ScrambledWord + "\n" + GetHangman(), footer: string.Join(" ", Guesses)).ConfigureAwait(false); } catch { } @@ -177,7 +177,7 @@ namespace NadekoBot.Modules.Games.Commands.Hangman MessagesSinceLastPost = 0; ++Errors; if (Errors < MaxErrors) - await GameChannel.SendErrorAsync("Hangman Game", $"{msg.Author.Mention} Letter `{guess}` does not exist.\n" + ScrambledWord + "\n" + GetHangman(), + await GameChannel.SendErrorAsync("Hangman Game", $"{msg.Author} Letter `{guess}` does not exist.\n" + ScrambledWord + "\n" + GetHangman(), footer: string.Join(" ", Guesses)).ConfigureAwait(false); else await End().ConfigureAwait(false); From bf7d070684698a2e2ca06a69457ba7d3eb04782e Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 18 Feb 2017 14:13:05 +0100 Subject: [PATCH 051/496] >acro can now be ran with time between 10 and 120 only --- src/NadekoBot/Modules/Games/Commands/Acropobia.cs | 2 ++ src/NadekoBot/Modules/Games/Games.cs | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/NadekoBot/Modules/Games/Commands/Acropobia.cs b/src/NadekoBot/Modules/Games/Commands/Acropobia.cs index ff0cc725..1ee7adbd 100644 --- a/src/NadekoBot/Modules/Games/Commands/Acropobia.cs +++ b/src/NadekoBot/Modules/Games/Commands/Acropobia.cs @@ -28,6 +28,8 @@ namespace NadekoBot.Modules.Games [RequireContext(ContextType.Guild)] public async Task Acro(int time = 60) { + if (time < 10 || time > 120) + return; var channel = (ITextChannel)Context.Channel; var game = new AcrophobiaGame(channel, time); diff --git a/src/NadekoBot/Modules/Games/Games.cs b/src/NadekoBot/Modules/Games/Games.cs index b10869b8..9c67460f 100644 --- a/src/NadekoBot/Modules/Games/Games.cs +++ b/src/NadekoBot/Modules/Games/Games.cs @@ -45,10 +45,9 @@ namespace NadekoBot.Modules.Games { if (p == 0) return "🚀"; - else if (p == 1) + if (p == 1) return "📎"; - else - return "✂️"; + return "✂️"; }; int pick; From bd485b87f30069f08d99bf0bb026d6781ddae6f9 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 18 Feb 2017 21:07:36 +0100 Subject: [PATCH 052/496] animal racing localizable --- .../Modules/Gambling/Commands/AnimalRacing.cs | 160 ++-- src/NadekoBot/Modules/Gambling/Gambling.cs | 2 - .../Games/Commands/Hangman/HangmanGame.cs | 3 +- .../Modules/Games/Commands/HangmanCommands.cs | 1 + .../Resources/ResponseStrings.Designer.cs | 108 +++ src/NadekoBot/Resources/ResponseStrings.resx | 36 + .../Resources/ResponseStrings.sr-cyrl-rs.resx | 690 +++++++++++++++++- 7 files changed, 919 insertions(+), 81 deletions(-) diff --git a/src/NadekoBot/Modules/Gambling/Commands/AnimalRacing.cs b/src/NadekoBot/Modules/Gambling/Commands/AnimalRacing.cs index 78de87e6..39c749d2 100644 --- a/src/NadekoBot/Modules/Gambling/Commands/AnimalRacing.cs +++ b/src/NadekoBot/Modules/Gambling/Commands/AnimalRacing.cs @@ -28,7 +28,7 @@ namespace NadekoBot.Modules.Gambling var ar = new AnimalRace(Context.Guild.Id, (ITextChannel)Context.Channel, Prefix); if (ar.Fail) - await Context.Channel.SendErrorAsync("🏁 `Failed starting a race. Another race is probably running.`").ConfigureAwait(false); + await ReplyErrorLocalized("race_failed_starting").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -43,7 +43,7 @@ namespace NadekoBot.Modules.Gambling AnimalRace ar; if (!AnimalRaces.TryGetValue(Context.Guild.Id, out ar)) { - await Context.Channel.SendErrorAsync("No race exists on this server").ConfigureAwait(false); + await ReplyErrorLocalized("race_not_exist").ConfigureAwait(false); return; } await ar.JoinRace(Context.User as IGuildUser, amount); @@ -56,22 +56,22 @@ namespace NadekoBot.Modules.Gambling public bool Fail { get; set; } - public List participants = new List(); - private ulong serverId; - private int messagesSinceGameStarted = 0; + private readonly List _participants = new List(); + private readonly ulong _serverId; + private int _messagesSinceGameStarted; private readonly string _prefix; - private Logger _log { get; } + private readonly Logger _log; - public ITextChannel raceChannel { get; set; } - public bool Started { get; private set; } = false; + private readonly ITextChannel _raceChannel; + public bool Started { get; private set; } public AnimalRace(ulong serverId, ITextChannel ch, string prefix) { - this._prefix = prefix; - this._log = LogManager.GetCurrentClassLogger(); - this.serverId = serverId; - this.raceChannel = ch; + _prefix = prefix; + _log = LogManager.GetCurrentClassLogger(); + _serverId = serverId; + _raceChannel = ch; if (!AnimalRaces.TryAdd(serverId, this)) { Fail = true; @@ -90,8 +90,8 @@ namespace NadekoBot.Modules.Gambling { try { - await raceChannel.SendConfirmAsync("Animal Race", $"Starting in 20 seconds or when the room is full.", - footer: $"Type {_prefix}jr to join the race."); + await _raceChannel.SendConfirmAsync(GetText("animal_race"), GetText("animal_race_starting"), + footer: GetText("animal_race_join_instr", _prefix)); } catch (Exception ex) { @@ -102,16 +102,16 @@ namespace NadekoBot.Modules.Gambling cancelSource.Cancel(); if (t == fullgame) { - try { await raceChannel.SendConfirmAsync("Animal Race", "Full! Starting immediately."); } catch (Exception ex) { _log.Warn(ex); } + try { await _raceChannel.SendConfirmAsync(GetText("animal_race"), GetText("animal_race_full") ); } catch (Exception ex) { _log.Warn(ex); } } - else if (participants.Count > 1) + else if (_participants.Count > 1) { - try { await raceChannel.SendConfirmAsync("Animal Race", "Starting with " + participants.Count + " participants."); } catch (Exception ex) { _log.Warn(ex); } + try { await _raceChannel.SendConfirmAsync(GetText("animal_race"), GetText("animal_race_starting_with_x", _participants.Count)); } catch (Exception ex) { _log.Warn(ex); } } else { - try { await raceChannel.SendErrorAsync("Animal Race", "Failed to start since there was not enough participants."); } catch (Exception ex) { _log.Warn(ex); } - var p = participants.FirstOrDefault(); + try { await _raceChannel.SendErrorAsync(GetText("animal_race"), GetText("animal_race_failed")); } catch (Exception ex) { _log.Warn(ex); } + var p = _participants.FirstOrDefault(); if (p != null && p.AmountBet > 0) await CurrencyHandler.AddCurrencyAsync(p.User, "BetRace", p.AmountBet, false).ConfigureAwait(false); @@ -128,7 +128,7 @@ namespace NadekoBot.Modules.Gambling private void End() { AnimalRace throwaway; - AnimalRaces.TryRemove(serverId, out throwaway); + AnimalRaces.TryRemove(_serverId, out throwaway); } private async Task StartRace() @@ -136,21 +136,21 @@ namespace NadekoBot.Modules.Gambling var rng = new NadekoRandom(); Participant winner = null; IUserMessage msg = null; - int place = 1; + var place = 1; try { NadekoBot.Client.MessageReceived += Client_MessageReceived; - while (!participants.All(p => p.Total >= 60)) + while (!_participants.All(p => p.Total >= 60)) { //update the state - participants.ForEach(p => + _participants.ForEach(p => { p.Total += 1 + rng.Next(0, 10); }); - participants + _participants .OrderByDescending(p => p.Total) .ForEach(p => { @@ -170,14 +170,14 @@ namespace NadekoBot.Modules.Gambling //draw the state var text = $@"|🏁🏁🏁🏁🏁🏁🏁🏁🏁🏁🏁🏁🏁🏁🏁🔚| -{String.Join("\n", participants.Select(p => $"{(int)(p.Total / 60f * 100),-2}%|{p.ToString()}"))} +{String.Join("\n", _participants.Select(p => $"{(int)(p.Total / 60f * 100),-2}%|{p.ToString()}"))} |🏁🏁🏁🏁🏁🏁🏁🏁🏁🏁🏁🏁🏁🏁🏁🔚|"; - if (msg == null || messagesSinceGameStarted >= 10) // also resend the message if channel was spammed + if (msg == null || _messagesSinceGameStarted >= 10) // also resend the message if channel was spammed { if (msg != null) try { await msg.DeleteAsync(); } catch { } - messagesSinceGameStarted = 0; - try { msg = await raceChannel.SendMessageAsync(text).ConfigureAwait(false); } catch (Exception ex) { _log.Warn(ex); } + _messagesSinceGameStarted = 0; + try { msg = await _raceChannel.SendMessageAsync(text).ConfigureAwait(false); } catch (Exception ex) { _log.Warn(ex); } } else { @@ -187,22 +187,33 @@ namespace NadekoBot.Modules.Gambling await Task.Delay(2500); } } - catch { } + catch + { + // ignored + } finally { NadekoBot.Client.MessageReceived -= Client_MessageReceived; } - if (winner.AmountBet > 0) + if (winner != null) { - var wonAmount = winner.AmountBet * (participants.Count - 1); + if (winner.AmountBet > 0) + { + var wonAmount = winner.AmountBet * (_participants.Count - 1); - await CurrencyHandler.AddCurrencyAsync(winner.User, "Won a Race", wonAmount, true).ConfigureAwait(false); - await raceChannel.SendConfirmAsync("Animal Race", $"{winner.User.Mention} as {winner.Animal} **Won the race and {wonAmount}{CurrencySign}!**").ConfigureAwait(false); - } - else - { - await raceChannel.SendConfirmAsync("Animal Race", $"{winner.User.Mention} as {winner.Animal} **Won the race!**").ConfigureAwait(false); + await CurrencyHandler.AddCurrencyAsync(winner.User, "Won a Race", wonAmount, true) + .ConfigureAwait(false); + await _raceChannel.SendConfirmAsync(GetText("animal_race"), + Format.Bold(GetText("animal_race_won_money", winner.User.Mention, + winner.Animal, wonAmount + CurrencySign))) + .ConfigureAwait(false); + } + else + { + await _raceChannel.SendConfirmAsync(GetText("animal_race"), + Format.Bold(GetText("animal_race_won", winner.User.Mention, winner.Animal))).ConfigureAwait(false); + } } } @@ -212,9 +223,9 @@ namespace NadekoBot.Modules.Gambling var msg = imsg as SocketUserMessage; if (msg == null) return Task.CompletedTask; - if (msg.IsAuthor() || !(imsg.Channel is ITextChannel) || imsg.Channel != raceChannel) + if (msg.IsAuthor() || !(imsg.Channel is ITextChannel) || imsg.Channel != _raceChannel) return Task.CompletedTask; - messagesSinceGameStarted++; + _messagesSinceGameStarted++; return Task.CompletedTask; } @@ -228,51 +239,66 @@ namespace NadekoBot.Modules.Gambling public async Task JoinRace(IGuildUser u, int amount = 0) { - var animal = ""; + string animal; if (!animals.TryDequeue(out animal)) { - await raceChannel.SendErrorAsync($"{u.Mention} `There is no running race on this server.`").ConfigureAwait(false); + await _raceChannel.SendErrorAsync(GetText("animal_race_no_race")).ConfigureAwait(false); return; } var p = new Participant(u, animal, amount); - if (participants.Contains(p)) + if (_participants.Contains(p)) { - await raceChannel.SendErrorAsync($"{u.Mention} `You already joined this race.`").ConfigureAwait(false); + await _raceChannel.SendErrorAsync(GetText("animal_race_already_in")).ConfigureAwait(false); return; } if (Started) { - await raceChannel.SendErrorAsync($"{u.Mention} `Race is already started`").ConfigureAwait(false); + await _raceChannel.SendErrorAsync(GetText("animal_race_already_started")).ConfigureAwait(false); return; } if (amount > 0) - if (!await CurrencyHandler.RemoveCurrencyAsync((IGuildUser)u, "BetRace", amount, false).ConfigureAwait(false)) + if (!await CurrencyHandler.RemoveCurrencyAsync(u, "BetRace", amount, false).ConfigureAwait(false)) { - try { await raceChannel.SendErrorAsync($"{u.Mention} You don't have enough {NadekoBot.BotConfig.CurrencyPluralName}.").ConfigureAwait(false); } catch { } + await _raceChannel.SendErrorAsync(GetText("not_enough", CurrencySign)).ConfigureAwait(false); return; } - participants.Add(p); - await raceChannel.SendConfirmAsync("Animal Race", $"{u.Mention} **joined as a {p.Animal}" + (amount > 0 ? $" and bet {amount} {CurrencySign}!**" : "**")) - .ConfigureAwait(false); + _participants.Add(p); + string confStr; + if (amount > 0) + confStr = GetText("animal_race_join_bet", u.Mention, p.Animal, amount + CurrencySign); + else + confStr = GetText("animal_race_join", u.Mention, p.Animal); + await _raceChannel.SendConfirmAsync(GetText("animal_race"), Format.Bold(confStr)).ConfigureAwait(false); } + + private string GetText(string text) + => NadekoModule.GetTextStatic(text, + NadekoBot.Localization.GetCultureInfo(_raceChannel.Guild), + typeof(Gambling).Name.ToLowerInvariant()); + + private string GetText(string text, params object[] replacements) + => NadekoModule.GetTextStatic(text, + NadekoBot.Localization.GetCultureInfo(_raceChannel.Guild), + typeof(Gambling).Name.ToLowerInvariant(), + replacements); } public class Participant { - public IGuildUser User { get; set; } - public string Animal { get; set; } - public int AmountBet { get; set; } + public IGuildUser User { get; } + public string Animal { get; } + public int AmountBet { get; } public float Coeff { get; set; } public int Total { get; set; } - public int Place { get; set; } = 0; + public int Place { get; set; } public Participant(IGuildUser u, string a, int amount) { - this.User = u; - this.Animal = a; - this.AmountBet = amount; + User = u; + Animal = a; + AmountBet = amount; } public override int GetHashCode() => User.GetHashCode(); @@ -288,23 +314,13 @@ namespace NadekoBot.Modules.Gambling var str = new string('‣', Total) + Animal; if (Place == 0) return str; - if (Place == 1) - { - return str + "🏆"; - } - else if (Place == 2) - { - return str + "`2nd`"; - } - else if (Place == 3) - { - return str + "`3rd`"; - } - else - { - return str + $"`{Place}th`"; - } + str += $"`#{Place}`"; + + if (Place == 1) + str += "🏆"; + + return str; } } } diff --git a/src/NadekoBot/Modules/Gambling/Gambling.cs b/src/NadekoBot/Modules/Gambling/Gambling.cs index acceab4e..3cdd7165 100644 --- a/src/NadekoBot/Modules/Gambling/Gambling.cs +++ b/src/NadekoBot/Modules/Gambling/Gambling.cs @@ -240,9 +240,7 @@ namespace NadekoBot.Modules.Gambling (int) (amount * NadekoBot.BotConfig.Betroll100Multiplier), false).ConfigureAwait(false); } } - Console.WriteLine("started sending"); await Context.Channel.SendConfirmAsync(str).ConfigureAwait(false); - Console.WriteLine("done sending"); } [NadekoCommand, Usage, Description, Aliases] diff --git a/src/NadekoBot/Modules/Games/Commands/Hangman/HangmanGame.cs b/src/NadekoBot/Modules/Games/Commands/Hangman/HangmanGame.cs index 6ccbcb9b..b4b18e97 100644 --- a/src/NadekoBot/Modules/Games/Commands/Hangman/HangmanGame.cs +++ b/src/NadekoBot/Modules/Games/Commands/Hangman/HangmanGame.cs @@ -9,8 +9,9 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Threading.Tasks; +using NadekoBot.Modules.Games.Commands.Hangman; -namespace NadekoBot.Modules.Games.Commands.Hangman +namespace NadekoBot.Modules.Games.Hangman { public class HangmanTermPool { diff --git a/src/NadekoBot/Modules/Games/Commands/HangmanCommands.cs b/src/NadekoBot/Modules/Games/Commands/HangmanCommands.cs index 83637a62..f3f09da0 100644 --- a/src/NadekoBot/Modules/Games/Commands/HangmanCommands.cs +++ b/src/NadekoBot/Modules/Games/Commands/HangmanCommands.cs @@ -6,6 +6,7 @@ using NLog; using System; using System.Collections.Concurrent; using System.Threading.Tasks; +using NadekoBot.Modules.Games.Hangman; namespace NadekoBot.Modules.Games { diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index 78867fa4..84439a80 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -2072,6 +2072,96 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Animal Race. + /// + public static string gambling_animal_race { + get { + return ResourceManager.GetString("gambling_animal_race", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Failed to start since there was not enough participants.. + /// + public static string gambling_animal_race_failed { + get { + return ResourceManager.GetString("gambling_animal_race_failed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Race is full! Starting immediately.. + /// + public static string gambling_animal_race_full { + get { + return ResourceManager.GetString("gambling_animal_race_full", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0} joined as a {1}. + /// + public static string gambling_animal_race_join { + get { + return ResourceManager.GetString("gambling_animal_race_join", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0} joined as a {1} and bet {2}!. + /// + public static string gambling_animal_race_join_bet { + get { + return ResourceManager.GetString("gambling_animal_race_join_bet", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Type {0}jr to join the race.. + /// + public static string gambling_animal_race_join_instr { + get { + return ResourceManager.GetString("gambling_animal_race_join_instr", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Starting in 20 seconds or when the room is full.. + /// + public static string gambling_animal_race_starting { + get { + return ResourceManager.GetString("gambling_animal_race_starting", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Starting with {0} participants.. + /// + public static string gambling_animal_race_starting_with_x { + get { + return ResourceManager.GetString("gambling_animal_race_starting_with_x", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0} as {1} Won the race!. + /// + public static string gambling_animal_race_won { + get { + return ResourceManager.GetString("gambling_animal_race_won", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0} as {1} Won the race and {2}!. + /// + public static string gambling_animal_race_won_money { + get { + return ResourceManager.GetString("gambling_animal_race_won_money", resourceCulture); + } + } + /// /// Looks up a localized string similar to has awarded {0} to {1}. /// @@ -2252,6 +2342,24 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Failed starting the race. Another race is probably running.. + /// + public static string gambling_race_failed_starting { + get { + return ResourceManager.GetString("gambling_race_failed_starting", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No race exists on this server. + /// + public static string gambling_race_not_exist { + get { + return ResourceManager.GetString("gambling_race_not_exist", resourceCulture); + } + } + /// /// Looks up a localized string similar to Raffled User. /// diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index 1afc5b8b..8cc5fc3d 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -1043,4 +1043,40 @@ Don't forget to leave your discord name or id in the message. Tag + + Animal Race + + + Failed to start since there was not enough participants. + + + Race is full! Starting immediately. + + + {0} joined as a {1} + + + {0} joined as a {1} and bet {2}! + + + Type {0}jr to join the race. + + + Starting in 20 seconds or when the room is full. + + + Starting with {0} participants. + + + {0} as {1} Won the race! + + + {0} as {1} Won the race and {2}! + + + Failed starting the race. Another race is probably running. + + + No race exists on this server + \ No newline at end of file diff --git a/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx b/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx index 86b7aa87..8d58263b 100644 --- a/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx +++ b/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx @@ -250,9 +250,6 @@ Рат против {0} је започет! - - је **УНИШТИО** базу #{0} у рату против {1} - Сва статистика Реакција по Избору је обрисана. @@ -359,10 +356,691 @@ АутоХентаи заустављен. - - Нема резултата. - Таг + + **DESTROYED** base #{0} in a war against {1} + + + No results found. + + + **Auto assign role** on user join is now **disabled**. + + + **Auto assign role** on user join is now **enabled**. + + + Attachments + + + Avatar Changed + + + You have been banned from {0} server. +Reason: {1} + + + banned + PLURAL + + + User Banned + + + Bot name changed to {0} + + + Bot status changed to {0} + + + Automatic deletion of bye messages has been disabled. + + + Bye messages will be deleted after {0} seconds. + + + Current bye message: {0} + + + Enable bye messages by typing {0} + + + New bye message set. + + + Bye announcements disabled. + + + Bye announcements enabled on this channel. + + + Channel Name Changed + + + Old Name + + + Channel Topic Changed + + + Cleaned up. + + + Content + + + Sucessfully created role {0} + + + Text channel {0} created. + + + Voice channel {0} created. + + + Deafen successful. + + + Deleted server {0} + + + Stopped automatic deletion of successful command invokations. + + + Now automatically deleting sucessful command invokations. + + + Text channel {0} deleted. + + + Voice channel {0} deleted. + + + DM from + + + Sucessfully added a new donator.Total donated amount from this user: {0} 👑 + + + Thanks to the people listed below for making this project hjappen! + + + I will forward DMs to all owners. + + + I will forward DMs only to the first owner. + + + I will forward DMs from now on. + + + I will stop forwarding DMs from now on. + + + Automatic deletion of greet messages has been disabled. + + + Greet messages will be deleted after {0} seconds. + + + Current DM greet message: {0} + + + Enable DM greet messages by typing {0} + + + New DM greet message set. + + + DM greet announcements disabled. + + + DM greet announcements enabled. + + + Current greet message: {0} + + + Enable greet messages by typing {0} + + + New greet message set. + + + Greet announcements disabled. + + + Greet announcements enabled on this channel. + + + You can't use this command on users with a role higher or equal to yours in the role hierarchy. + + + Images loaded after {0} seconds! + + + Invalid input format. + + + Invalid parameters. + + + {0} has joined {1} + + + You have been kicked from {0} server. +Reason: {1} + + + User Kicked + + + List Of Languages +{0} + + + Your server's locale is now {0} - {1} + + + Bot's default locale is now {0} - {1} + + + Bot's language is set to {0} - {0} + + + Failed setting locale. Revisit this command's help. + + + This server's language is set to {0} - {0} + + + {0} has left {1} + + + Left server {0} + + + Logging {0} event in this channel. + + + Logging all events in this channel. + + + Logging disabled. + + + Log events you can subscribe to: + + + Logging will ignore {0} + + + Logging will not ignore {0} + + + Stopped logging {0} event. + + + {0} has invoked a mention on the following roles + + + Message from {0} `[Bot Owner]`: + + + Message sent. + + + {0} moved from {1} to {2} + + + Message Deleted in #{0} + + + Message Updated in #{0} + + + Muted + PLURAL (users have been muted) + + + Muted + singular "User muted." + + + I don't have the permission necessary for that most likely. + + + New mute role set. + + + I need **Administration** permission to do that. + + + New Message + + + New Nickname + + + New Topic + + + Nickname Changed + + + Can't find that server + + + No shard with that ID found. + + + Old Message + + + Old Nickname + + + Old Topic + + + Error. Most likely I don't have sufficient permissions. + + + Permissions for this server are reset. + + + Active Protections + + + {0} has been **disabled** on this server. + + + {0} Enabled + + + Error. I need ManageRoles permission + + + No protections enabled. + + + User threshold must be between {0} and {1}. + + + If {0} or more users join within {1} seconds, I will {2} them. + + + Time must be between {0} and {1} seconds. + + + Successfully removed all roles from user {0} + + + Failed to remove roles. I have insufficient permissions. + + + Color of {0} role has been changed. + + + That role does not exist. + + + The parameters specified are invalid. + + + Error occured due to invalid color or insufficient permissions. + + + Successfully removed role {0} from user {1} + + + Failed to remove role. I have insufficient permissions. + + + Role renamed. + + + Failed to rename role. I have insufficient permissions. + + + You can't edit roles higher than your highest role. + + + Removed the playing message: {0} + + + Role {0} as been added to the list. + + + {0} not found.Cleaned up. + + + Role {0} is already in the list. + + + Added. + + + Rotating playing status disabled. + + + Rotating playing status enabled. + + + Here is a list of rotating statuses: +{0} + + + No rotating playing statuses set. + + + You already have {0} role. + + + You already have {0} exclusive self-assigned role. + + + Self assigned roles are now exclusive! + + + There are {0} self assignable roles + + + That role is not self-assignable. + + + You don't have {0} role. + + + Self assigned roles are now not exclusive! + + + I am unable to add that role to you. `I can't add roles to owners or other roles higher than my role in the role hierarchy.` + + + {0} has been removed from the list of self-assignable roles. + + + You no longer have {0} role. + + + You now have {0} role. + + + Sucessfully added role {0} to user {1} + + + Failed to add role. I have insufficient permissions. + + + New avatar set! + + + New channel name set. + + + New game set! + + + New stream set! + + + New channel topic set. + + + Shard {0} reconnected. + + + Shard {0} reconnecting. + + + Shutting down + + + Users can't send more than {0} messages every {1} seconds. + + + Slow mode disabled. + + + Slow mode initiated + + + soft-banned (kicked) + PLURAL + + + {0} will ignore this channel. + + + {0} will no longer ignore this channel. + + + If a user posts {0} same messages in a row, I will {1} them. + __IgnoredChannels__: {2} + + + Text Channel Destroyed + + + Text Channel Destroyed + + + Undeafen successful. + + + Unmuted + singular + + + Username + + + Username Changed + + + Users + + + User Banned + + + {0} has been **muted** from chatting. + + + {0} has been **unmuted** from chatting. + + + User Joined + + + User Left + + + {0} has been **muted** from text and voice chat. + + + User's Role Added + + + User's Role Removed + + + {0} is now {1} + + + {0} has been **unmuted** from text and voice chat. + + + {0} has joined {1} voice channel. + + + {0} has left {1} voice channel. + + + {0} moved from {1} to {2} voice channel. + + + {0} has been **voice muted**. + + + {0} has been **voice unmuted**. + + + Voice Channel Destroyed + + + Voice Channel Destroyed + + + Disabled voice + text feature. + + + Enabled voice + text feature. + + + I don't have **manage roles** and/or **manage channels** permission, so I cannot run `voice+text` on {0} server. + + + You are enabling/disabling this feature and **I do not have ADMINISTRATOR permissions**. This may cause some issues, and you will have to clean up text channels yourself afterwards. + + + I require atleast **manage roles** and **manage channels** permissions to enable this feature. (preffered Administration permission) + + + User {0} from text chat + + + User {0} from text and voice chat + + + User {0} from voice chat + + + You have been soft-banned from {0} server. +Reason: {1} + + + User Unbanned + + + Migration done! + + + Error while migrating, check bot's console for more information. + + + Presence Updates + + + User Soft-Banned + + + has awarded {0} to {1} + + + Betflip Gamble + + + Better luck next time ^_^ + + + Congratulations! You won {0} for rolling above {1} + + + Deck reshuffled. + + + flipped {0}. + User flipped tails. + + + You guessed it! You won {0} + + + Invalid number specified. You can flip 1 to {0} coins. + + + Add {0} reaction to this message to get {1} + + + This event is active for up to {0} hours. + + + Flower reaction event started! + + + has gifted {0} to {1} + X has gifted 15 flowers to Y + + + {0} has {1} + X has Y flowers + + + Heads + + + Leaderboard + + + Awarded {0} to {1} users from {2} role. + + + You can't bet more than {0} + + + You can't bet less than {0} + + + You don't have enough {0} + + + No more cards in the deck. + + + Raffled User + + + You rolled {0}. + + + Bet + + + WOAAHHHHHH!!! Congratulations!!! x{0} + + + A single {0}, x{1} + + + Wow! Lucky! Three of a kind! x{0} + + + Good job! Two {0} - bet x{1} + + + Won + + + Users must type a secret code to get {0}. +Lasts {1} seconds. Don't tell anyone. Shhh. + + + SneakyGame event ended. {0} users received the reward. + + + SneakyGameStatus event started + + + Tails + + + successfully took {0} from {1} + + + was unable to take {0} from{1} because the user doesn't have that much {2}! + \ No newline at end of file From b28732171215427379fd4e517f32259ef58403d8 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 18 Feb 2017 21:39:13 +0100 Subject: [PATCH 053/496] dice rolls localizable --- .../Gambling/Commands/DiceRollCommand.cs | 57 ++++++++++--------- .../Resources/ResponseStrings.Designer.cs | 36 ++++++++++++ 2 files changed, 66 insertions(+), 27 deletions(-) diff --git a/src/NadekoBot/Modules/Gambling/Commands/DiceRollCommand.cs b/src/NadekoBot/Modules/Gambling/Commands/DiceRollCommand.cs index 4bda25a4..a75827e7 100644 --- a/src/NadekoBot/Modules/Gambling/Commands/DiceRollCommand.cs +++ b/src/NadekoBot/Modules/Gambling/Commands/DiceRollCommand.cs @@ -22,7 +22,7 @@ namespace NadekoBot.Modules.Gambling private Regex dndRegex { get; } = new Regex(@"^(?\d+)d(?\d+)(?:\+(?\d+))?(?:\-(?\d+))?$", RegexOptions.Compiled); private Regex fudgeRegex { get; } = new Regex(@"^(?\d+)d(?:F|f)$", RegexOptions.Compiled); - private readonly char[] fateRolls = new[] { '-', ' ', '+' }; + private readonly char[] _fateRolls = { '-', ' ', '+' }; [NadekoCommand, Usage, Description, Aliases] public async Task Roll() @@ -40,7 +40,9 @@ namespace NadekoBot.Modules.Gambling return ms; }).ConfigureAwait(false); - await Context.Channel.SendFileAsync(imageStream, "dice.png", $"{Context.User.Mention} rolled " + Format.Code(gen.ToString())).ConfigureAwait(false); + await Context.Channel.SendFileAsync(imageStream, + "dice.png", + Context.User.Mention + " " + GetText("dice_rolled", Format.Code(gen.ToString()))).ConfigureAwait(false); } public enum RollOrderType @@ -82,7 +84,7 @@ namespace NadekoBot.Modules.Gambling { if (num < 1 || num > 30) { - await Context.Channel.SendErrorAsync("Invalid number specified. You can roll up to 1-30 dice at a time.").ConfigureAwait(false); + await ReplyErrorLocalized("dice_invalid_number", 1, 30).ConfigureAwait(false); return; } @@ -120,7 +122,12 @@ namespace NadekoBot.Modules.Gambling var ms = new MemoryStream(); bitmap.SaveAsPng(ms); ms.Position = 0; - await Context.Channel.SendFileAsync(ms, "dice.png", $"{Context.User.Mention} rolled {values.Count} {(values.Count == 1 ? "die" : "dice")}. Total: **{values.Sum()}** Average: **{(values.Sum() / (1.0f * values.Count)).ToString("N2")}**").ConfigureAwait(false); + await Context.Channel.SendFileAsync(ms, "dice.png", + Context.User.Mention + + GetText("dice_rolled_num", Format.Bold(values.Count.ToString())) + + " " + GetText("Total: {1} Average: {2}", + Format.Bold(values.Sum().ToString()), + Format.Bold((values.Sum() / (1.0f * values.Count)).ToString("N2")))).ConfigureAwait(false); } private async Task InternallDndRoll(string arg, bool ordered) @@ -138,9 +145,9 @@ namespace NadekoBot.Modules.Gambling for (int i = 0; i < n1; i++) { - rolls.Add(fateRolls[rng.Next(0, fateRolls.Length)]); + rolls.Add(_fateRolls[rng.Next(0, _fateRolls.Length)]); } - var embed = new EmbedBuilder().WithOkColor().WithDescription($"{Context.User.Mention} rolled {n1} fate {(n1 == 1 ? "die" : "dice")}.") + var embed = new EmbedBuilder().WithOkColor().WithDescription(Context.User.Mention + " " + GetText("dice_rolled_num", Format.Bold(n1.ToString()))) .AddField(efb => efb.WithName(Format.Bold("Result")) .WithValue(string.Join(" ", rolls.Select(c => Format.Code($"[{c}]"))))); await Context.Channel.EmbedAsync(embed).ConfigureAwait(false); @@ -164,7 +171,7 @@ namespace NadekoBot.Modules.Gambling } var sum = arr.Sum(); - var embed = new EmbedBuilder().WithOkColor().WithDescription($"{Context.User.Mention} rolled {n1} {(n1 == 1 ? "die" : "dice")} `1 to {n2}`") + var embed = new EmbedBuilder().WithOkColor().WithDescription(Context.User.Mention + " " +GetText("dice_rolled_num", n1) + $"`1 - {n2}`") .AddField(efb => efb.WithName(Format.Bold("Rolls")) .WithValue(string.Join(" ", (ordered ? arr.OrderBy(x => x).AsEnumerable() : arr).Select(x => Format.Code(x.ToString()))))) .AddField(efb => efb.WithName(Format.Bold("Sum")) @@ -177,30 +184,26 @@ namespace NadekoBot.Modules.Gambling [NadekoCommand, Usage, Description, Aliases] public async Task NRoll([Remainder] string range) { - try + int rolled; + if (range.Contains("-")) { - int rolled; - if (range.Contains("-")) + var arr = range.Split('-') + .Take(2) + .Select(int.Parse) + .ToArray(); + if (arr[0] > arr[1]) { - var arr = range.Split('-') - .Take(2) - .Select(int.Parse) - .ToArray(); - if (arr[0] > arr[1]) - throw new ArgumentException("Second argument must be larger than the first one."); - rolled = new NadekoRandom().Next(arr[0], arr[1] + 1); - } - else - { - rolled = new NadekoRandom().Next(0, int.Parse(range) + 1); + await ReplyErrorLocalized("second_larger_than_first").ConfigureAwait(false); + return; } + rolled = new NadekoRandom().Next(arr[0], arr[1] + 1); + } + else + { + rolled = new NadekoRandom().Next(0, int.Parse(range) + 1); + } - await Context.Channel.SendConfirmAsync($"{Context.User.Mention} rolled **{rolled}**.").ConfigureAwait(false); - } - catch (Exception ex) - { - await Context.Channel.SendErrorAsync($":anger: {ex.Message}").ConfigureAwait(false); - } + await ReplyConfirmLocalized("dice_rolled", Format.Bold(rolled.ToString())).ConfigureAwait(false); } private Image GetDice(int num) diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index 84439a80..08c355b1 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -2207,6 +2207,33 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Invalid number specified. You can roll up to {0}-{1} dice at a time.. + /// + public static string gambling_dice_invalid_number { + get { + return ResourceManager.GetString("gambling_dice_invalid_number", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to rolled {0}. + /// + public static string gambling_dice_rolled { + get { + return ResourceManager.GetString("gambling_dice_rolled", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Dice rolled: {1}. + /// + public static string gambling_dice_rolled_num { + get { + return ResourceManager.GetString("gambling_dice_rolled_num", resourceCulture); + } + } + /// /// Looks up a localized string similar to You guessed it! You won {0}. /// @@ -2378,6 +2405,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to second_larger_than_first. + /// + public static string gambling_second_larger_than_first { + get { + return ResourceManager.GetString("gambling_second_larger_than_first", resourceCulture); + } + } + /// /// Looks up a localized string similar to Bet. /// From 1517143248d669e7cd8b4e6a08d98ae7bb9f8e43 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sun, 19 Feb 2017 02:11:31 +0100 Subject: [PATCH 054/496] waifu game completely localizable? --- .../Gambling/Commands/WaifuClaimCommands.cs | 129 +++++------ src/NadekoBot/Modules/Searches/Searches.cs | 8 +- .../Resources/ResponseStrings.Designer.cs | 204 +++++++++++++++++- src/NadekoBot/Resources/ResponseStrings.resx | 85 ++++++++ 4 files changed, 359 insertions(+), 67 deletions(-) diff --git a/src/NadekoBot/Modules/Gambling/Commands/WaifuClaimCommands.cs b/src/NadekoBot/Modules/Gambling/Commands/WaifuClaimCommands.cs index 6ff7695d..212fd1d2 100644 --- a/src/NadekoBot/Modules/Gambling/Commands/WaifuClaimCommands.cs +++ b/src/NadekoBot/Modules/Gambling/Commands/WaifuClaimCommands.cs @@ -3,13 +3,11 @@ using Discord.Commands; using NadekoBot.Attributes; using NadekoBot.Extensions; using NadekoBot.Services; -using NadekoBot.Services.Database; using NadekoBot.Services.Database.Models; using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; -using System.Text; using System.Threading.Tasks; namespace NadekoBot.Modules.Gambling @@ -49,8 +47,8 @@ namespace NadekoBot.Modules.Gambling [Group] public class WaifuClaimCommands : NadekoSubmodule { - private static ConcurrentDictionary _divorceCooldowns { get; } = new ConcurrentDictionary(); - private static ConcurrentDictionary _affinityCooldowns { get; } = new ConcurrentDictionary(); + private static ConcurrentDictionary divorceCooldowns { get; } = new ConcurrentDictionary(); + private static ConcurrentDictionary affinityCooldowns { get; } = new ConcurrentDictionary(); enum WaifuClaimResult { @@ -65,20 +63,19 @@ namespace NadekoBot.Modules.Gambling { if (amount < 50) { - await Context.Channel.SendErrorAsync($"{Context.User.Mention} No waifu is that cheap. You must pay at least 50{NadekoBot.BotConfig.CurrencySign} to get a waifu, even if their actual value is lower.").ConfigureAwait(false); + await ReplyErrorLocalized("waifu_isnt_cheap", 50 + CurrencySign).ConfigureAwait(false); return; } if (target.Id == Context.User.Id) { - await Context.Channel.SendErrorAsync(Context.User.Mention + " You can't claim yourself.").ConfigureAwait(false); + await ReplyErrorLocalized("waifu_not_yourself").ConfigureAwait(false); return; } - WaifuClaimResult result = WaifuClaimResult.NotEnoughFunds; - int? oldPrice = null; + WaifuClaimResult result; WaifuInfo w; - var isAffinity = false; + bool isAffinity; using (var uow = DbHandler.UnitOfWork()) { w = uow.Waifus.ByWaifuUserId(target.Id); @@ -120,7 +117,6 @@ namespace NadekoBot.Modules.Gambling { var oldClaimer = w.Claimer; w.Claimer = uow.DiscordUsers.GetOrCreate(Context.User); - oldPrice = w.Price; w.Price = amount + (amount / 4); result = WaifuClaimResult.Success; @@ -143,7 +139,6 @@ namespace NadekoBot.Modules.Gambling { var oldClaimer = w.Claimer; w.Claimer = uow.DiscordUsers.GetOrCreate(Context.User); - oldPrice = w.Price; w.Price = amount; result = WaifuClaimResult.Success; @@ -165,22 +160,20 @@ namespace NadekoBot.Modules.Gambling if (result == WaifuClaimResult.InsufficientAmount) { - await Context.Channel.SendErrorAsync($"{Context.User.Mention} You must pay {Math.Ceiling(w.Price * (isAffinity ? 0.88f : 1.1f))} or more to claim that waifu!").ConfigureAwait(false); + await ReplyErrorLocalized("waifu_not_enough", Math.Ceiling(w.Price * (isAffinity ? 0.88f : 1.1f))).ConfigureAwait(false); return; } - else if (result == WaifuClaimResult.NotEnoughFunds) + if (result == WaifuClaimResult.NotEnoughFunds) { - await Context.Channel.SendConfirmAsync($"{Context.User.Mention} you don't have {amount}{NadekoBot.BotConfig.CurrencySign}!") - .ConfigureAwait(false); - } - else - { - var msg = $"{Context.User.Mention} claimed {target.Mention} as their waifu for {amount}{NadekoBot.BotConfig.CurrencySign}!"; - if (w.Affinity?.UserId == Context.User.Id) - msg += $"\n🎉 Their love is fulfilled! 🎉\n**{target}'s** new value is {w.Price}{NadekoBot.BotConfig.CurrencySign}!"; - await Context.Channel.SendConfirmAsync(msg) - .ConfigureAwait(false); + await ReplyErrorLocalized("not_enough", CurrencySign).ConfigureAwait(false); + return; } + var msg = GetText("waifu_claimed", + Format.Bold(target.ToString()), + amount + CurrencySign); + if (w.Affinity?.UserId == Context.User.Id) + msg += "\n" + GetText("waifu_fulfilled", target, w.Price + CurrencySign); + await Context.Channel.SendConfirmAsync(Context.User.Mention + msg).ConfigureAwait(false); } public enum DivorceResult @@ -192,7 +185,7 @@ namespace NadekoBot.Modules.Gambling } - private static readonly TimeSpan DivorceLimit = TimeSpan.FromHours(6); + private static readonly TimeSpan _divorceLimit = TimeSpan.FromHours(6); [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] public async Task Divorce([Remainder]IUser target) @@ -200,19 +193,19 @@ namespace NadekoBot.Modules.Gambling if (target.Id == Context.User.Id) return; - var result = DivorceResult.NotYourWife; - TimeSpan difference = TimeSpan.Zero; + DivorceResult result; + var difference = TimeSpan.Zero; var amount = 0; WaifuInfo w = null; using (var uow = DbHandler.UnitOfWork()) { w = uow.Waifus.ByWaifuUserId(target.Id); var now = DateTime.UtcNow; - if (w == null || w.Claimer == null || w.Claimer.UserId != Context.User.Id) + if (w?.Claimer == null || w.Claimer.UserId != Context.User.Id) result = DivorceResult.NotYourWife; - else if (_divorceCooldowns.AddOrUpdate(Context.User.Id, + else if (divorceCooldowns.AddOrUpdate(Context.User.Id, now, - (key, old) => ((difference = now.Subtract(old)) > DivorceLimit) ? now : old) != now) + (key, old) => ((difference = now.Subtract(old)) > _divorceLimit) ? now : old) != now) { result = DivorceResult.Cooldown; } @@ -249,37 +242,39 @@ namespace NadekoBot.Modules.Gambling if (result == DivorceResult.SucessWithPenalty) { - await Context.Channel.SendConfirmAsync($"{Context.User.Mention} You have divorced a waifu who likes you. You heartless monster.\n{w.Waifu} received {amount}{NadekoBot.BotConfig.CurrencySign} as a compensation.").ConfigureAwait(false); + await ReplyConfirmLocalized("waifu_divorced_like", Format.Bold(w.Waifu.ToString()), amount + CurrencySign).ConfigureAwait(false); } else if (result == DivorceResult.Success) { - await Context.Channel.SendConfirmAsync($"{Context.User.Mention} You have divorced a waifu who doesn't like you. You received {amount}{NadekoBot.BotConfig.CurrencySign} back.").ConfigureAwait(false); + await ReplyConfirmLocalized("waifu_divorced_notlike", amount + CurrencySign).ConfigureAwait(false); } else if (result == DivorceResult.NotYourWife) { - await Context.Channel.SendErrorAsync($"{Context.User.Mention} That waifu is not yours.").ConfigureAwait(false); + await ReplyErrorLocalized("waifu_not_yours").ConfigureAwait(false); } else { - var remaining = DivorceLimit.Subtract(difference); - await Context.Channel.SendErrorAsync($"{Context.User.Mention} You divorced recently. You must wait **{remaining.Hours} hours and {remaining.Minutes} minutes** to divorce again.").ConfigureAwait(false); + var remaining = _divorceLimit.Subtract(difference); + await ReplyErrorLocalized("waifu_recent_divorce", + Format.Bold(((int)remaining.TotalHours).ToString()), + Format.Bold(remaining.Minutes.ToString())).ConfigureAwait(false); } } - private static readonly TimeSpan AffinityLimit = TimeSpan.FromMinutes(30); + private static readonly TimeSpan _affinityLimit = TimeSpan.FromMinutes(30); [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] public async Task WaifuClaimerAffinity([Remainder]IUser u = null) { if (u?.Id == Context.User.Id) { - await Context.Channel.SendErrorAsync($"{Context.User.Mention} you can't set affinity to yourself, you egomaniac.").ConfigureAwait(false); + await ReplyErrorLocalized("waifu_egomaniac").ConfigureAwait(false); return; } DiscordUser oldAff = null; var sucess = false; var cooldown = false; - TimeSpan difference = TimeSpan.Zero; + var difference = TimeSpan.Zero; using (var uow = DbHandler.UnitOfWork()) { var w = uow.Waifus.ByWaifuUserId(Context.User.Id); @@ -287,13 +282,11 @@ namespace NadekoBot.Modules.Gambling var now = DateTime.UtcNow; if (w?.Affinity?.UserId == u?.Id) { - sucess = false; } - else if (_affinityCooldowns.AddOrUpdate(Context.User.Id, + else if (affinityCooldowns.AddOrUpdate(Context.User.Id, now, - (key, old) => ((difference = now.Subtract(old)) > AffinityLimit) ? now : old) != now) + (key, old) => ((difference = now.Subtract(old)) > _affinityLimit) ? now : old) != now) { - sucess = false; cooldown = true; } else if (w == null) @@ -338,19 +331,29 @@ namespace NadekoBot.Modules.Gambling { if (cooldown) { - var remaining = AffinityLimit.Subtract(difference); - await Context.Channel.SendErrorAsync($"{Context.User.Mention} You must wait **{remaining.Hours} hours and {remaining.Minutes} minutes** in order to change your affinity again.").ConfigureAwait(false); + var remaining = _affinityLimit.Subtract(difference); + await ReplyErrorLocalized("waifu_affinity_cooldown", + Format.Bold(((int)remaining.TotalHours).ToString()), + Format.Bold(remaining.Minutes.ToString())).ConfigureAwait(false); } else - await Context.Channel.SendErrorAsync($"{Context.User.Mention} your affinity is already set to that waifu or you're trying to remove your affinity while not having one.").ConfigureAwait(false); + { + await ReplyErrorLocalized("waifu_affinity_already").ConfigureAwait(false); + } return; } if (u == null) - await Context.Channel.SendConfirmAsync("Affinity Reset", $"{Context.User.Mention} Your affinity is reset. You no longer have a person you like.").ConfigureAwait(false); + { + await ReplyConfirmLocalized("waifu_affinity_reset").ConfigureAwait(false); + } else if (oldAff == null) - await Context.Channel.SendConfirmAsync("Affinity Set", $"{Context.User.Mention} wants to be {u.Mention}'s waifu. Aww <3").ConfigureAwait(false); + { + await ReplyConfirmLocalized("waifu_affinity_set", Format.Bold(u.ToString())).ConfigureAwait(false); + } else - await Context.Channel.SendConfirmAsync("Affinity Changed", $"{Context.User.Mention} changed their affinity from {oldAff} to {u.Mention}.\n\n*This is morally questionable.*🤔").ConfigureAwait(false); + { + await ReplyConfirmLocalized("waifu_affinity_changed", Format.Bold(oldAff.ToString()), Format.Bold(u.ToString())).ConfigureAwait(false); + } } [NadekoCommand, Usage, Description, Aliases] @@ -365,19 +368,20 @@ namespace NadekoBot.Modules.Gambling if (waifus.Count == 0) { - await Context.Channel.SendConfirmAsync("No waifus have been claimed yet.").ConfigureAwait(false); + await ReplyConfirmLocalized("waifu_none").ConfigureAwait(false); return; } - + var embed = new EmbedBuilder() - .WithTitle("Top Waifus") + .WithTitle(GetText("waifus_top_waifus")) .WithOkColor(); - for (int i = 0; i < waifus.Count; i++) + for (var i = 0; i < waifus.Count; i++) { var w = waifus[i]; - embed.AddField(efb => efb.WithName("#" + (i + 1) + " - " + w.Price + NadekoBot.BotConfig.CurrencySign).WithValue(w.ToString()).WithIsInline(false)); + var j = i; + embed.AddField(efb => efb.WithName("#" + (j + 1) + " - " + w.Price + NadekoBot.BotConfig.CurrencySign).WithValue(w.ToString()).WithIsInline(false)); } await Context.Channel.EmbedAsync(embed).ConfigureAwait(false); @@ -419,15 +423,16 @@ namespace NadekoBot.Modules.Gambling var claimInfo = GetClaimTitle(target.Id); var affInfo = GetAffinityTitle(target.Id); + var nobody = GetText("nobody"); var embed = new EmbedBuilder() .WithOkColor() .WithTitle("Waifu " + w.Waifu + " - \"the " + claimInfo.Title + "\"") - .AddField(efb => efb.WithName("Price").WithValue(w.Price.ToString()).WithIsInline(true)) - .AddField(efb => efb.WithName("Claimed by").WithValue(w.Claimer?.ToString() ?? "No one").WithIsInline(true)) - .AddField(efb => efb.WithName("Likes").WithValue(w.Affinity?.ToString() ?? "Nobody").WithIsInline(true)) - .AddField(efb => efb.WithName("Changes Of Heart").WithValue($"{affInfo.Count} - \"the {affInfo.Title}\"").WithIsInline(true)) - .AddField(efb => efb.WithName("Divorces").WithValue(divorces.ToString()).WithIsInline(true)) - .AddField(efb => efb.WithName($"Waifus ({claims.Count})").WithValue(claims.Count == 0 ? "Nobody" : string.Join("\n", claims.Select(x => x.Waifu))).WithIsInline(true)); + .AddField(efb => efb.WithName(GetText("price")).WithValue(w.Price.ToString()).WithIsInline(true)) + .AddField(efb => efb.WithName(GetText("claimed_by")).WithValue(w.Claimer?.ToString() ?? nobody).WithIsInline(true)) + .AddField(efb => efb.WithName(GetText("likes")).WithValue(w.Affinity?.ToString() ?? nobody).WithIsInline(true)) + .AddField(efb => efb.WithName(GetText("changes_of_heart")).WithValue($"{affInfo.Count} - \"the {affInfo.Title}\"").WithIsInline(true)) + .AddField(efb => efb.WithName(GetText("divorces")).WithValue(divorces.ToString()).WithIsInline(true)) + .AddField(efb => efb.WithName($"Waifus ({claims.Count})").WithValue(claims.Count == 0 ? nobody : string.Join("\n", claims.Select(x => x.Waifu))).WithIsInline(true)); await Context.Channel.EmbedAsync(embed).ConfigureAwait(false); } @@ -447,13 +452,13 @@ namespace NadekoBot.Modules.Gambling private static WaifuProfileTitle GetClaimTitle(ulong userId) { - int count = 0; + int count; using (var uow = DbHandler.UnitOfWork()) { count = uow.Waifus.ByClaimerUserId(userId).Count; } - ClaimTitles title = ClaimTitles.Lonely; + ClaimTitles title; if (count == 0) title = ClaimTitles.Lonely; else if (count == 1) @@ -484,13 +489,13 @@ namespace NadekoBot.Modules.Gambling private static WaifuProfileTitle GetAffinityTitle(ulong userId) { - int count = 0; + int count; using (var uow = DbHandler.UnitOfWork()) { count = uow._context.WaifuUpdates.Count(w => w.User.UserId == userId && w.UpdateType == WaifuUpdateType.AffinityChanged); } - AffinityTitles title = AffinityTitles.Pure; + AffinityTitles title; if (count < 1) title = AffinityTitles.Pure; else if (count < 2) diff --git a/src/NadekoBot/Modules/Searches/Searches.cs b/src/NadekoBot/Modules/Searches/Searches.cs index 670980ea..28a00413 100644 --- a/src/NadekoBot/Modules/Searches/Searches.cs +++ b/src/NadekoBot/Modules/Searches/Searches.cs @@ -127,7 +127,7 @@ namespace NadekoBot.Modules.Searches .WithIconUrl("http://i.imgur.com/G46fm8J.png")) .WithDescription(res.Link) .WithImageUrl(res.Link) - .WithTitle(Context.User.Mention); + .WithTitle(Context.User.ToString()); await Context.Channel.EmbedAsync(embed).ConfigureAwait(false); } catch @@ -157,7 +157,7 @@ namespace NadekoBot.Modules.Searches .WithIconUrl("http://s.imgur.com/images/logo-1200-630.jpg?")) .WithDescription(source) .WithImageUrl(source) - .WithTitle(Context.User.Mention); + .WithTitle(Context.User.ToString()); await Context.Channel.EmbedAsync(embed).ConfigureAwait(false); } } @@ -179,7 +179,7 @@ namespace NadekoBot.Modules.Searches .WithIconUrl("http://i.imgur.com/G46fm8J.png")) .WithDescription(res.Link) .WithImageUrl(res.Link) - .WithTitle(Context.User.Mention); + .WithTitle(Context.User.ToString()); await Context.Channel.EmbedAsync(embed).ConfigureAwait(false); } catch @@ -210,7 +210,7 @@ namespace NadekoBot.Modules.Searches .WithIconUrl("http://s.imgur.com/images/logo-1200-630.jpg?")) .WithDescription(source) .WithImageUrl(source) - .WithTitle(Context.User.Mention); + .WithTitle(Context.User.ToString()); await Context.Channel.EmbedAsync(embed).ConfigureAwait(false); } } diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index 08c355b1..afe8652d 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -2198,6 +2198,24 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Changes Of Heart. + /// + public static string gambling_changes_of_heart { + get { + return ResourceManager.GetString("gambling_changes_of_heart", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Claimed By. + /// + public static string gambling_claimed_by { + get { + return ResourceManager.GetString("gambling_claimed_by", resourceCulture); + } + } + /// /// Looks up a localized string similar to Deck reshuffled.. /// @@ -2234,6 +2252,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Divorces. + /// + public static string gambling_divorces { + get { + return ResourceManager.GetString("gambling_divorces", resourceCulture); + } + } + /// /// Looks up a localized string similar to You guessed it! You won {0}. /// @@ -2324,6 +2351,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Likes. + /// + public static string gambling_likes { + get { + return ResourceManager.GetString("gambling_likes", resourceCulture); + } + } + /// /// Looks up a localized string similar to Awarded {0} to {1} users from {2} role.. /// @@ -2369,6 +2405,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Price. + /// + public static string gambling_price { + get { + return ResourceManager.GetString("gambling_price", resourceCulture); + } + } + /// /// Looks up a localized string similar to Failed starting the race. Another race is probably running.. /// @@ -2406,7 +2451,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to second_larger_than_first. + /// Looks up a localized string similar to Second number must be larger than the first one.. /// public static string gambling_second_larger_than_first { get { @@ -2523,6 +2568,163 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to your affinity is already set to that waifu or you're trying to remove your affinity while not having one.. + /// + public static string gambling_waifu_affinity_already { + get { + return ResourceManager.GetString("gambling_waifu_affinity_already", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to changed their affinity from {0} to {1}. + /// + ///*This is morally questionable.*🤔. + /// + public static string gambling_waifu_affinity_changed { + get { + return ResourceManager.GetString("gambling_waifu_affinity_changed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to You must wait {0} hours and {1} minutes in order to change your affinity again.. + /// + public static string gambling_waifu_affinity_cooldown { + get { + return ResourceManager.GetString("gambling_waifu_affinity_cooldown", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Your affinity is reset. You no longer have a person you like.. + /// + public static string gambling_waifu_affinity_reset { + get { + return ResourceManager.GetString("gambling_waifu_affinity_reset", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to wants to be {0}'s waifu. Aww <3. + /// + public static string gambling_waifu_affinity_set { + get { + return ResourceManager.GetString("gambling_waifu_affinity_set", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to claimed {0} as their waifu for {1}!. + /// + public static string gambling_waifu_claimed { + get { + return ResourceManager.GetString("gambling_waifu_claimed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to You have divorced a waifu who likes you. You heartless monster. + ///{0} received {1} as a compensation.. + /// + public static string gambling_waifu_divorced_like { + get { + return ResourceManager.GetString("gambling_waifu_divorced_like", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to You have divorced a waifu who doesn't like you. You received {0} back.. + /// + public static string gambling_waifu_divorced_not_like { + get { + return ResourceManager.GetString("gambling_waifu_divorced_not_like", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to you can't set affinity to yourself, you egomaniac.. + /// + public static string gambling_waifu_egomaniac { + get { + return ResourceManager.GetString("gambling_waifu_egomaniac", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to 🎉 Their love is fulfilled! 🎉 + ///{0}'s new value is {1}!. + /// + public static string gambling_waifu_fulfilled { + get { + return ResourceManager.GetString("gambling_waifu_fulfilled", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No waifu is that cheap. You must pay at least {0} to get a waifu, even if their actual value is lower.. + /// + public static string gambling_waifu_isnt_cheap { + get { + return ResourceManager.GetString("gambling_waifu_isnt_cheap", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to You must pay {0} or more to claim that waifu!. + /// + public static string gambling_waifu_not_enough { + get { + return ResourceManager.GetString("gambling_waifu_not_enough", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to That waifu is not yours.. + /// + public static string gambling_waifu_not_yours { + get { + return ResourceManager.GetString("gambling_waifu_not_yours", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to You can't claim yourself.. + /// + public static string gambling_waifu_not_yourself { + get { + return ResourceManager.GetString("gambling_waifu_not_yourself", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to You divorced recently. You must wait {0} hours and {1} minutes to divorce again.. + /// + public static string gambling_waifu_recent_divorce { + get { + return ResourceManager.GetString("gambling_waifu_recent_divorce", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No waifus have been claimed yet.. + /// + public static string gambling_waifus_none { + get { + return ResourceManager.GetString("gambling_waifus_none", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Top Waifus. + /// + public static string gambling_waifus_top_waifus { + get { + return ResourceManager.GetString("gambling_waifus_top_waifus", resourceCulture); + } + } + /// /// Looks up a localized string similar to Back to ToC. /// diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index 8cc5fc3d..4db9ff76 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -1073,10 +1073,95 @@ Don't forget to leave your discord name or id in the message. {0} as {1} Won the race and {2}! + + Invalid number specified. You can roll up to {0}-{1} dice at a time. + + + rolled {0} + Someone rolled 35 + + + Dice rolled: {1} + Dice Rolled: 5 + Failed starting the race. Another race is probably running. No race exists on this server + + Second number must be larger than the first one. + + + Changes Of Heart + + + Claimed By + + + Divorces + + + Likes + + + Price + + + No waifus have been claimed yet. + + + Top Waifus + + + your affinity is already set to that waifu or you're trying to remove your affinity while not having one. + + + changed their affinity from {0} to {1}. + +*This is morally questionable.*🤔 + Make sure to get the formatting right, and leave the thinking emoji + + + You must wait {0} hours and {1} minutes in order to change your affinity again. + + + Your affinity is reset. You no longer have a person you like. + + + wants to be {0}'s waifu. Aww <3 + + + claimed {0} as their waifu for {1}! + + + You have divorced a waifu who likes you. You heartless monster. +{0} received {1} as a compensation. + + + You have divorced a waifu who doesn't like you. You received {0} back. + + + you can't set affinity to yourself, you egomaniac. + + + 🎉 Their love is fulfilled! 🎉 +{0}'s new value is {1}! + + + No waifu is that cheap. You must pay at least {0} to get a waifu, even if their actual value is lower. + + + You must pay {0} or more to claim that waifu! + + + That waifu is not yours. + + + You can't claim yourself. + + + You divorced recently. You must wait {0} hours and {1} minutes to divorce again. + \ No newline at end of file From 81675781b42a8d3b9a25f8f456995b1291077881 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sun, 19 Feb 2017 02:12:14 +0100 Subject: [PATCH 055/496] forgot nobody key --- src/NadekoBot/Resources/ResponseStrings.Designer.cs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index afe8652d..6e3c725a 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -2396,6 +2396,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Nobody. + /// + public static string gambling_nobody { + get { + return ResourceManager.GetString("gambling_nobody", resourceCulture); + } + } + /// /// Looks up a localized string similar to You don't have enough {0}. /// From 8b703294f163eac6c6d5c2cf21a4ff0ea3cc6c15 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sun, 19 Feb 2017 15:18:40 +0100 Subject: [PATCH 056/496] acrophobia localizable --- .../Modules/Games/Commands/Acropobia.cs | 162 ++++++++++-------- .../Games/Commands/CleverBotCommands.cs | 2 +- .../Modules/Games/Commands/HangmanCommands.cs | 2 +- .../Modules/Games/Commands/PollCommands.cs | 2 +- .../Games/Commands/SpeedTypingCommands.cs | 2 +- .../Modules/Games/Commands/TicTacToe.cs | 2 +- .../Modules/Games/Commands/TriviaCommands.cs | 2 +- src/NadekoBot/Modules/Games/Games.cs | 31 ++-- .../Resources/ResponseStrings.Designer.cs | 153 +++++++++++++++++ src/NadekoBot/Resources/ResponseStrings.resx | 18 ++ 10 files changed, 282 insertions(+), 94 deletions(-) diff --git a/src/NadekoBot/Modules/Games/Commands/Acropobia.cs b/src/NadekoBot/Modules/Games/Commands/Acropobia.cs index 1ee7adbd..088b95d7 100644 --- a/src/NadekoBot/Modules/Games/Commands/Acropobia.cs +++ b/src/NadekoBot/Modules/Games/Commands/Acropobia.cs @@ -19,7 +19,7 @@ namespace NadekoBot.Modules.Games public partial class Games { [Group] - public class Acropobia : ModuleBase + public class Acropobia : NadekoSubmodule { //channelId, game public static ConcurrentDictionary AcrophobiaGames { get; } = new ConcurrentDictionary(); @@ -47,7 +47,7 @@ namespace NadekoBot.Modules.Games } else { - await channel.SendErrorAsync("Acrophobia game is already running in this channel.").ConfigureAwait(false); + await ReplyErrorLocalized("acro_running").ConfigureAwait(false); } } } @@ -61,44 +61,44 @@ namespace NadekoBot.Modules.Games public class AcrophobiaGame { - private readonly ITextChannel channel; - private readonly int time; - private readonly NadekoRandom rng; - private readonly ImmutableArray startingLetters; - private readonly CancellationTokenSource source; + private readonly ITextChannel _channel; + private readonly int _time; + private readonly NadekoRandom _rng; + private readonly ImmutableArray _startingLetters; + private readonly CancellationTokenSource _source; private AcroPhase phase { get; set; } = AcroPhase.Submitting; - private readonly ConcurrentDictionary submissions = new ConcurrentDictionary(); - public IReadOnlyDictionary Submissions => submissions; + private readonly ConcurrentDictionary _submissions = new ConcurrentDictionary(); + public IReadOnlyDictionary Submissions => _submissions; - private readonly ConcurrentHashSet usersWhoSubmitted = new ConcurrentHashSet(); - private readonly ConcurrentHashSet usersWhoVoted = new ConcurrentHashSet(); + private readonly ConcurrentHashSet _usersWhoSubmitted = new ConcurrentHashSet(); + private readonly ConcurrentHashSet _usersWhoVoted = new ConcurrentHashSet(); - private int spamCount = 0; + private int _spamCount; //text, votes - private readonly ConcurrentDictionary votes = new ConcurrentDictionary(); + private readonly ConcurrentDictionary _votes = new ConcurrentDictionary(); private readonly Logger _log; public AcrophobiaGame(ITextChannel channel, int time) { - this._log = LogManager.GetCurrentClassLogger(); + _log = LogManager.GetCurrentClassLogger(); - this.channel = channel; - this.time = time; - this.source = new CancellationTokenSource(); + _channel = channel; + _time = time; + _source = new CancellationTokenSource(); - this.rng = new NadekoRandom(); - var wordCount = rng.Next(3, 6); + _rng = new NadekoRandom(); + var wordCount = _rng.Next(3, 6); var lettersArr = new char[wordCount]; for (int i = 0; i < wordCount; i++) { - var randChar = (char)rng.Next(65, 91); - lettersArr[i] = randChar == 'X' ? (char)rng.Next(65, 88) : randChar; + var randChar = (char)_rng.Next(65, 91); + lettersArr[i] = randChar == 'X' ? (char)_rng.Next(65, 88) : randChar; } - startingLetters = lettersArr.ToImmutableArray(); + _startingLetters = lettersArr.ToImmutableArray(); } private EmbedBuilder GetEmbed() @@ -106,19 +106,19 @@ namespace NadekoBot.Modules.Games var i = 0; return phase == AcroPhase.Submitting - ? new EmbedBuilder().WithOkColor() - .WithTitle("Acrophobia") - .WithDescription($"Game started. Create a sentence with the following acronym: **{string.Join(".", startingLetters)}.**\n") - .WithFooter(efb => efb.WithText("You have " + this.time + " seconds to make a submission.")) + ? new EmbedBuilder().WithOkColor() + .WithTitle(GetText("acrophobia")) + .WithDescription(GetText("acro_started", Format.Bold(string.Join(".", _startingLetters)))) + .WithFooter(efb => efb.WithText(GetText("acro_started_footer", _time))) - : new EmbedBuilder() - .WithOkColor() - .WithTitle("Acrophobia - Submissions Closed") - .WithDescription($@"Acronym was **{string.Join(".", startingLetters)}.** --- -{this.submissions.Aggregate("", (agg, cur) => agg + $"`{++i}.` **{cur.Key.ToLowerInvariant().ToTitleCase()}**\n")} ---") - .WithFooter(efb => efb.WithText("Vote by typing a number of the submission")); + : new EmbedBuilder() + .WithOkColor() + .WithTitle(GetText("acrophobia") + " - " + GetText("submissions_closed")) + .WithDescription(GetText("acro_nym_was", Format.Bold(string.Join(".", _startingLetters)) + "\n" + +$@"-- +{_submissions.Aggregate("",(agg, cur) => agg + $"`{++i}.` **{cur.Key.ToLowerInvariant().ToTitleCase()}**\n")} +--")) + .WithFooter(efb => efb.WithText(GetText("acro_vote"))); } public async Task Run() @@ -127,10 +127,10 @@ namespace NadekoBot.Modules.Games var embed = GetEmbed(); //SUBMISSIONS PHASE - await channel.EmbedAsync(embed).ConfigureAwait(false); + await _channel.EmbedAsync(embed).ConfigureAwait(false); try { - await Task.Delay(time * 1000, source.Token).ConfigureAwait(false); + await Task.Delay(_time * 1000, _source.Token).ConfigureAwait(false); phase = AcroPhase.Idle; } catch (OperationCanceledException) @@ -139,30 +139,32 @@ namespace NadekoBot.Modules.Games } //var i = 0; - if (submissions.Count == 0) + if (_submissions.Count == 0) { - await channel.SendErrorAsync("Acrophobia", "Game ended with no submissions."); + await _channel.SendErrorAsync(GetText("acrophobia"), GetText("acro_ended_no_sub")); return; } - else if (submissions.Count == 1) + if (_submissions.Count == 1) { - await channel.EmbedAsync(new EmbedBuilder().WithOkColor() - .WithDescription($"{submissions.First().Value.Mention} is the winner for being the only user who made a submission!") - .WithFooter(efb => efb.WithText(submissions.First().Key.ToLowerInvariant().ToTitleCase()))) - .ConfigureAwait(false); + await _channel.EmbedAsync(new EmbedBuilder().WithOkColor() + .WithDescription( + GetText("acro_winner_only", + Format.Bold(_submissions.First().Value.ToString()))) + .WithFooter(efb => efb.WithText(_submissions.First().Key.ToLowerInvariant().ToTitleCase()))) + .ConfigureAwait(false); return; } var submissionClosedEmbed = GetEmbed(); - await channel.EmbedAsync(submissionClosedEmbed).ConfigureAwait(false); + await _channel.EmbedAsync(submissionClosedEmbed).ConfigureAwait(false); //VOTING PHASE - this.phase = AcroPhase.Voting; + phase = AcroPhase.Voting; try { //30 secondds for voting - await Task.Delay(30000, source.Token).ConfigureAwait(false); - this.phase = AcroPhase.Idle; + await Task.Delay(30000, _source.Token).ConfigureAwait(false); + phase = AcroPhase.Idle; } catch (OperationCanceledException) { @@ -176,10 +178,10 @@ namespace NadekoBot.Modules.Games try { var msg = arg as SocketUserMessage; - if (msg == null || msg.Author.IsBot || msg.Channel.Id != channel.Id) + if (msg == null || msg.Author.IsBot || msg.Channel.Id != _channel.Id) return; - ++spamCount; + ++_spamCount; var guildUser = (IGuildUser)msg.Author; @@ -187,37 +189,39 @@ namespace NadekoBot.Modules.Games if (phase == AcroPhase.Submitting) { - if (spamCount > 10) + if (_spamCount > 10) { - spamCount = 0; - try { await channel.EmbedAsync(GetEmbed()).ConfigureAwait(false); } + _spamCount = 0; + try { await _channel.EmbedAsync(GetEmbed()).ConfigureAwait(false); } catch { } } var inputWords = input.Split(' '); //get all words - if (inputWords.Length != startingLetters.Length) // number of words must be the same as the number of the starting letters + if (inputWords.Length != _startingLetters.Length) // number of words must be the same as the number of the starting letters return; - for (int i = 0; i < startingLetters.Length; i++) + for (int i = 0; i < _startingLetters.Length; i++) { - var letter = startingLetters[i]; + var letter = _startingLetters[i]; if (!inputWords[i].StartsWith(letter.ToString())) // all first letters must match return; } - if (!usersWhoSubmitted.Add(guildUser.Id)) + if (!_usersWhoSubmitted.Add(guildUser.Id)) return; //try adding it to the list of answers - if (!submissions.TryAdd(input, guildUser)) + if (!_submissions.TryAdd(input, guildUser)) { - usersWhoSubmitted.TryRemove(guildUser.Id); + _usersWhoSubmitted.TryRemove(guildUser.Id); return; } // all good. valid input. answer recorded - await channel.SendConfirmAsync("Acrophobia", $"{guildUser.Mention} submitted their sentence. ({submissions.Count} total)"); + await _channel.SendConfirmAsync(GetText("acrophobia"), + GetText("acro_submit", guildUser.Mention, + _submissions.Count)); try { await msg.DeleteAsync(); @@ -229,10 +233,10 @@ namespace NadekoBot.Modules.Games } else if (phase == AcroPhase.Voting) { - if (spamCount > 10) + if (_spamCount > 10) { - spamCount = 0; - try { await channel.EmbedAsync(GetEmbed()).ConfigureAwait(false); } + _spamCount = 0; + try { await _channel.EmbedAsync(GetEmbed()).ConfigureAwait(false); } catch { } } @@ -248,17 +252,17 @@ namespace NadekoBot.Modules.Games //} int num; - if (int.TryParse(input, out num) && num > 0 && num <= submissions.Count) + if (int.TryParse(input, out num) && num > 0 && num <= _submissions.Count) { - var kvp = submissions.Skip(num - 1).First(); + var kvp = _submissions.Skip(num - 1).First(); usr = kvp.Value; //can't vote for yourself, can't vote multiple times - if (usr.Id == guildUser.Id || !usersWhoVoted.Add(guildUser.Id)) + if (usr.Id == guildUser.Id || !_usersWhoVoted.Add(guildUser.Id)) return; - votes.AddOrUpdate(kvp.Key, 1, (key, old) => ++old); - await channel.SendConfirmAsync("Acrophobia", $"{guildUser.Mention} cast their vote!").ConfigureAwait(false); + _votes.AddOrUpdate(kvp.Key, 1, (key, old) => ++old); + await _channel.SendConfirmAsync(GetText("acrophobia"), + GetText("vote_cast", Format.Bold(guildUser.ToString()))).ConfigureAwait(false); await msg.DeleteAsync().ConfigureAwait(false); - return; } } @@ -271,27 +275,33 @@ namespace NadekoBot.Modules.Games public async Task End() { - if (!votes.Any()) + if (!_votes.Any()) { - await channel.SendErrorAsync("Acrophobia", "No votes cast. Game ended with no winner.").ConfigureAwait(false); + await _channel.SendErrorAsync(GetText("acrophobia"), GetText("no_votes_cast")).ConfigureAwait(false); return; } - var table = votes.OrderByDescending(v => v.Value); + var table = _votes.OrderByDescending(v => v.Value); var winner = table.First(); var embed = new EmbedBuilder().WithOkColor() - .WithTitle("Acrophobia") - .WithDescription($"Winner is {submissions[winner.Key].Mention} with {winner.Value} points.\n") + .WithTitle(GetText("acrophobia")) + .WithDescription(GetText("winner", Format.Bold(_submissions[winner.Key].ToString()), + Format.Bold(winner.Value.ToString()))) .WithFooter(efb => efb.WithText(winner.Key.ToLowerInvariant().ToTitleCase())); - await channel.EmbedAsync(embed).ConfigureAwait(false); + await _channel.EmbedAsync(embed).ConfigureAwait(false); } public void EnsureStopped() { NadekoBot.Client.MessageReceived -= PotentialAcro; - if (!source.IsCancellationRequested) - source.Cancel(); + if (!_source.IsCancellationRequested) + _source.Cancel(); } + + private string GetText(string key, params object[] replacements) + => NadekoModule.GetTextStatic(key, + NadekoBot.Localization.GetCultureInfo(_channel.Guild), + typeof(Games).Name.ToLowerInvariant()); } } } \ No newline at end of file diff --git a/src/NadekoBot/Modules/Games/Commands/CleverBotCommands.cs b/src/NadekoBot/Modules/Games/Commands/CleverBotCommands.cs index 0541a4ae..1f33bc2a 100644 --- a/src/NadekoBot/Modules/Games/Commands/CleverBotCommands.cs +++ b/src/NadekoBot/Modules/Games/Commands/CleverBotCommands.cs @@ -17,7 +17,7 @@ namespace NadekoBot.Modules.Games public partial class Games { [Group] - public class CleverBotCommands : ModuleBase + public class CleverBotCommands : NadekoSubmodule { private static Logger _log { get; } diff --git a/src/NadekoBot/Modules/Games/Commands/HangmanCommands.cs b/src/NadekoBot/Modules/Games/Commands/HangmanCommands.cs index f3f09da0..0fb8e2f3 100644 --- a/src/NadekoBot/Modules/Games/Commands/HangmanCommands.cs +++ b/src/NadekoBot/Modules/Games/Commands/HangmanCommands.cs @@ -13,7 +13,7 @@ namespace NadekoBot.Modules.Games public partial class Games { [Group] - public class HangmanCommands : ModuleBase + public class HangmanCommands : NadekoSubmodule { private static Logger _log { get; } diff --git a/src/NadekoBot/Modules/Games/Commands/PollCommands.cs b/src/NadekoBot/Modules/Games/Commands/PollCommands.cs index 3088546c..1434ee9e 100644 --- a/src/NadekoBot/Modules/Games/Commands/PollCommands.cs +++ b/src/NadekoBot/Modules/Games/Commands/PollCommands.cs @@ -16,7 +16,7 @@ namespace NadekoBot.Modules.Games public partial class Games { [Group] - public class PollCommands : ModuleBase + public class PollCommands : NadekoSubmodule { public static ConcurrentDictionary ActivePolls = new ConcurrentDictionary(); diff --git a/src/NadekoBot/Modules/Games/Commands/SpeedTypingCommands.cs b/src/NadekoBot/Modules/Games/Commands/SpeedTypingCommands.cs index fc5a67a2..7dec0992 100644 --- a/src/NadekoBot/Modules/Games/Commands/SpeedTypingCommands.cs +++ b/src/NadekoBot/Modules/Games/Commands/SpeedTypingCommands.cs @@ -147,7 +147,7 @@ namespace NadekoBot.Modules.Games } [Group] - public class SpeedTypingCommands : ModuleBase + public class SpeedTypingCommands : NadekoSubmodule { public static List TypingArticles { get; } = new List(); diff --git a/src/NadekoBot/Modules/Games/Commands/TicTacToe.cs b/src/NadekoBot/Modules/Games/Commands/TicTacToe.cs index de36fe3b..2e115fd2 100644 --- a/src/NadekoBot/Modules/Games/Commands/TicTacToe.cs +++ b/src/NadekoBot/Modules/Games/Commands/TicTacToe.cs @@ -17,7 +17,7 @@ namespace NadekoBot.Modules.Games { //todo timeout [Group] - public class TicTacToeCommands : ModuleBase + public class TicTacToeCommands : NadekoSubmodule { //channelId/game private static readonly Dictionary _games = new Dictionary(); diff --git a/src/NadekoBot/Modules/Games/Commands/TriviaCommands.cs b/src/NadekoBot/Modules/Games/Commands/TriviaCommands.cs index 6f43ff83..be7d135c 100644 --- a/src/NadekoBot/Modules/Games/Commands/TriviaCommands.cs +++ b/src/NadekoBot/Modules/Games/Commands/TriviaCommands.cs @@ -14,7 +14,7 @@ namespace NadekoBot.Modules.Games public partial class Games { [Group] - public class TriviaCommands : ModuleBase + public class TriviaCommands : NadekoSubmodule { public static ConcurrentDictionary RunningTrivias { get; } = new ConcurrentDictionary(); diff --git a/src/NadekoBot/Modules/Games/Games.cs b/src/NadekoBot/Modules/Games/Games.cs index 9c67460f..b6b9130b 100644 --- a/src/NadekoBot/Modules/Games/Games.cs +++ b/src/NadekoBot/Modules/Games/Games.cs @@ -6,6 +6,7 @@ using NadekoBot.Attributes; using System; using System.Linq; using System.Collections.Generic; +using System.Collections.Immutable; using NadekoBot.Extensions; namespace NadekoBot.Modules.Games @@ -13,7 +14,7 @@ namespace NadekoBot.Modules.Games [NadekoModule("Games", ">")] public partial class Games : NadekoModule { - private static string[] _8BallResponses { get; } = NadekoBot.BotConfig.EightBallResponses.Select(ebr => ebr.Text).ToArray(); + private static readonly ImmutableArray _8BallResponses = NadekoBot.BotConfig.EightBallResponses.Select(ebr => ebr.Text).ToImmutableArray(); [NadekoCommand, Usage, Description, Aliases] public async Task Choose([Remainder] string list = null) @@ -34,8 +35,8 @@ namespace NadekoBot.Modules.Games return; await Context.Channel.EmbedAsync(new EmbedBuilder().WithColor(NadekoBot.OkColor) - .AddField(efb => efb.WithName("❓ Question").WithValue(question).WithIsInline(false)) - .AddField(efb => efb.WithName("🎱 8Ball").WithValue(_8BallResponses[new NadekoRandom().Next(0, _8BallResponses.Length)]).WithIsInline(false))); + .AddField(efb => efb.WithName("❓ " + GetText("question") ).WithValue(question).WithIsInline(false)) + .AddField(efb => efb.WithName("🎱 " + GetText("8ball")).WithValue(_8BallResponses[new NadekoRandom().Next(0, _8BallResponses.Length)]).WithIsInline(false))); } [NadekoCommand, Usage, Description, Aliases] @@ -43,11 +44,15 @@ namespace NadekoBot.Modules.Games { Func GetRPSPick = (p) => { - if (p == 0) - return "🚀"; - if (p == 1) - return "📎"; - return "✂️"; + switch (p) + { + case 0: + return "🚀"; + case 1: + return "📎"; + default: + return "✂️"; + } }; int pick; @@ -71,15 +76,17 @@ namespace NadekoBot.Modules.Games return; } var nadekoPick = new NadekoRandom().Next(0, 3); - var msg = ""; + string msg; if (pick == nadekoPick) - msg = $"It's a draw! Both picked {GetRPSPick(pick)}"; + msg = GetText("rps_draw", GetRPSPick(pick)); else if ((pick == 0 && nadekoPick == 1) || (pick == 1 && nadekoPick == 2) || (pick == 2 && nadekoPick == 0)) - msg = $"{NadekoBot.Client.CurrentUser.Mention} won! {GetRPSPick(nadekoPick)} beats {GetRPSPick(pick)}"; + msg = GetText("rps_win", NadekoBot.Client.CurrentUser.Mention, + GetRPSPick(nadekoPick), GetRPSPick(pick)); else - msg = $"{Context.User.Mention} won! {GetRPSPick(pick)} beats {GetRPSPick(nadekoPick)}"; + msg = GetText("rps_win", Context.User.Mention, GetRPSPick(pick), + GetRPSPick(nadekoPick)); await Context.Channel.SendConfirmAsync(msg).ConfigureAwait(false); } diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index 6e3c725a..e2d01a97 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -2734,6 +2734,159 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to 8ball. + /// + public static string games_8ball { + get { + return ResourceManager.GetString("games_8ball", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Game ended with no submissions.. + /// + public static string games_acro_ended_no_sub { + get { + return ResourceManager.GetString("games_acro_ended_no_sub", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No votes cast. Game ended with no winner.. + /// + public static string games_acro_no_votes_cast { + get { + return ResourceManager.GetString("games_acro_no_votes_cast", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Acronym was {0}.. + /// + public static string games_acro_nym_was { + get { + return ResourceManager.GetString("games_acro_nym_was", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Acrophobia game is already running in this channel.. + /// + public static string games_acro_running { + get { + return ResourceManager.GetString("games_acro_running", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Game started. Create a sentence with the following acronym: {0}.. + /// + public static string games_acro_started { + get { + return ResourceManager.GetString("games_acro_started", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to You have {0} seconds to make a submission.. + /// + public static string games_acro_started_footer { + get { + return ResourceManager.GetString("games_acro_started_footer", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0} submitted their sentence. ({1} total). + /// + public static string games_acro_submit { + get { + return ResourceManager.GetString("games_acro_submit", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Vote by typing a number of the submission. + /// + public static string games_acro_vote { + get { + return ResourceManager.GetString("games_acro_vote", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0} cast their vote!. + /// + public static string games_acro_vote_cast { + get { + return ResourceManager.GetString("games_acro_vote_cast", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Winner is {0} with {1} points.. + /// + public static string games_acro_winner { + get { + return ResourceManager.GetString("games_acro_winner", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0} is the winner for being the only user who made a submission!. + /// + public static string games_acro_winner_only { + get { + return ResourceManager.GetString("games_acro_winner_only", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Acrophobia. + /// + public static string games_acrophobia { + get { + return ResourceManager.GetString("games_acrophobia", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Question. + /// + public static string games_question { + get { + return ResourceManager.GetString("games_question", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to It's a draw! Both picked {0}. + /// + public static string games_rps_draw { + get { + return ResourceManager.GetString("games_rps_draw", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0} won! {1} beats {2}. + /// + public static string games_rps_win { + get { + return ResourceManager.GetString("games_rps_win", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Submissions Closed. + /// + public static string games_submissions_closed { + get { + return ResourceManager.GetString("games_submissions_closed", resourceCulture); + } + } + /// /// Looks up a localized string similar to Back to ToC. /// diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index 4db9ff76..90024cd2 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -1105,6 +1105,9 @@ Don't forget to leave your discord name or id in the message. Likes + + Nobody + Price @@ -1164,4 +1167,19 @@ Don't forget to leave your discord name or id in the message. You divorced recently. You must wait {0} hours and {1} minutes to divorce again. + + 8ball + + + Acrophobia game is already running in this channel. + + + Question + + + It's a draw! Both picked {0} + + + {0} won! {1} beats {2} + \ No newline at end of file From 06cafa1296a39385d07ef69deab3c46267e77004 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 20 Feb 2017 23:46:34 +0100 Subject: [PATCH 057/496] more localization, fixes, etc, no idea exactly what, rategirl is commented out until i fix the last bug --- ...dekoModule.cs => NadekoModuleAttribute.cs} | 0 src/NadekoBot/DataStructures/AsyncLazy.cs | 23 +++ .../Modules/Administration/Administration.cs | 2 +- .../Administration/Commands/LogCommand.cs | 2 +- .../Modules/ClashOfClans/ClashOfClans.cs | 2 +- .../Modules/ClashOfClans/Extensions.cs | 2 +- .../CustomReactions/CustomReactions.cs | 2 +- .../Modules/Gambling/Commands/AnimalRacing.cs | 4 +- .../Gambling/Commands/DiceRollCommand.cs | 5 +- .../Modules/Gambling/Commands/DrawCommand.cs | 2 +- .../Gambling/Commands/FlipCoinCommand.cs | 19 +- .../Modules/Gambling/Commands/Slots.cs | 105 ++++------- src/NadekoBot/Modules/Gambling/Gambling.cs | 2 +- .../Modules/Games/Commands/Acropobia.cs | 2 +- src/NadekoBot/Modules/Games/Games.cs | 166 +++++++++++++++++- src/NadekoBot/Modules/Help/Help.cs | 2 +- src/NadekoBot/Modules/Music/Music.cs | 2 +- src/NadekoBot/Modules/NSFW/NSFW.cs | 2 +- src/NadekoBot/Modules/NadekoModule.cs | 6 +- .../Modules/Permissions/Permissions.cs | 2 +- src/NadekoBot/Modules/Pokemon/Pokemon.cs | 2 +- src/NadekoBot/Modules/Searches/Searches.cs | 15 +- src/NadekoBot/Modules/Utility/Utility.cs | 7 +- src/NadekoBot/NadekoBot.cs | 3 + .../Resources/CommandStrings.Designer.cs | 81 ++++++--- src/NadekoBot/Resources/CommandStrings.resx | 13 +- src/NadekoBot/Resources/ResponseStrings.resx | 36 ++++ src/NadekoBot/Services/IImagesService.cs | 2 + src/NadekoBot/Services/Impl/ImagesService.cs | 6 + src/NadekoBot/_Extensions/Extensions.cs | 27 ++- src/NadekoBot/data/images/wifematrix.png | Bin 0 -> 34050 bytes src/NadekoBot/project.json | 7 +- 32 files changed, 393 insertions(+), 158 deletions(-) rename src/NadekoBot/Attributes/{NadekoModule.cs => NadekoModuleAttribute.cs} (100%) create mode 100644 src/NadekoBot/DataStructures/AsyncLazy.cs create mode 100644 src/NadekoBot/data/images/wifematrix.png diff --git a/src/NadekoBot/Attributes/NadekoModule.cs b/src/NadekoBot/Attributes/NadekoModuleAttribute.cs similarity index 100% rename from src/NadekoBot/Attributes/NadekoModule.cs rename to src/NadekoBot/Attributes/NadekoModuleAttribute.cs diff --git a/src/NadekoBot/DataStructures/AsyncLazy.cs b/src/NadekoBot/DataStructures/AsyncLazy.cs new file mode 100644 index 00000000..40800755 --- /dev/null +++ b/src/NadekoBot/DataStructures/AsyncLazy.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.CompilerServices; +using System.Text; +using System.Threading.Tasks; + +namespace NadekoBot.DataStructures +{ + public class AsyncLazy : Lazy> + { + public AsyncLazy(Func valueFactory) : + base(() => Task.Factory.StartNew(valueFactory)) + { } + + public AsyncLazy(Func> taskFactory) : + base(() => Task.Factory.StartNew(taskFactory).Unwrap()) + { } + + public TaskAwaiter GetAwaiter() { return Value.GetAwaiter(); } + } + +} diff --git a/src/NadekoBot/Modules/Administration/Administration.cs b/src/NadekoBot/Modules/Administration/Administration.cs index 3f52ac17..405485dd 100644 --- a/src/NadekoBot/Modules/Administration/Administration.cs +++ b/src/NadekoBot/Modules/Administration/Administration.cs @@ -16,7 +16,7 @@ using NLog; namespace NadekoBot.Modules.Administration { [NadekoModule("Administration", ".")] - public partial class Administration : NadekoModule + public partial class Administration : NadekoTopLevelModule { private static ConcurrentHashSet deleteMessagesOnCommand { get; } diff --git a/src/NadekoBot/Modules/Administration/Commands/LogCommand.cs b/src/NadekoBot/Modules/Administration/Commands/LogCommand.cs index 95c4538a..88d512e7 100644 --- a/src/NadekoBot/Modules/Administration/Commands/LogCommand.cs +++ b/src/NadekoBot/Modules/Administration/Commands/LogCommand.cs @@ -1068,7 +1068,7 @@ namespace NadekoBot.Modules.Administration public static class GuildExtensions { public static string GetLogText(this IGuild guild, string key, params object[] replacements) - => NadekoModule.GetTextStatic(key, + => NadekoTopLevelModule.GetTextStatic(key, NadekoBot.Localization.GetCultureInfo(guild), typeof(Administration).Name.ToLowerInvariant(), replacements); diff --git a/src/NadekoBot/Modules/ClashOfClans/ClashOfClans.cs b/src/NadekoBot/Modules/ClashOfClans/ClashOfClans.cs index 37f07efa..043a12b2 100644 --- a/src/NadekoBot/Modules/ClashOfClans/ClashOfClans.cs +++ b/src/NadekoBot/Modules/ClashOfClans/ClashOfClans.cs @@ -17,7 +17,7 @@ using NLog; namespace NadekoBot.Modules.ClashOfClans { [NadekoModule("ClashOfClans", ",")] - public class ClashOfClans : NadekoModule + public class ClashOfClans : NadekoTopLevelModule { public static ConcurrentDictionary> ClashWars { get; set; } = new ConcurrentDictionary>(); diff --git a/src/NadekoBot/Modules/ClashOfClans/Extensions.cs b/src/NadekoBot/Modules/ClashOfClans/Extensions.cs index 032d3bcd..5756d3db 100644 --- a/src/NadekoBot/Modules/ClashOfClans/Extensions.cs +++ b/src/NadekoBot/Modules/ClashOfClans/Extensions.cs @@ -135,7 +135,7 @@ namespace NadekoBot.Modules.ClashOfClans public static string Localize(this ClashWar cw, string key) { - return NadekoModule.GetTextStatic(key, + return NadekoTopLevelModule.GetTextStatic(key, NadekoBot.Localization.GetCultureInfo(cw.Channel?.GuildId), typeof(ClashOfClans).Name.ToLowerInvariant()); } diff --git a/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs b/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs index ebeb4922..efd3717e 100644 --- a/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs +++ b/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs @@ -17,7 +17,7 @@ using NadekoBot.DataStructures; namespace NadekoBot.Modules.CustomReactions { [NadekoModule("CustomReactions", ".")] - public class CustomReactions : NadekoModule + public class CustomReactions : NadekoTopLevelModule { private static CustomReaction[] _globalReactions = new CustomReaction[] { }; public static CustomReaction[] GlobalReactions => _globalReactions; diff --git a/src/NadekoBot/Modules/Gambling/Commands/AnimalRacing.cs b/src/NadekoBot/Modules/Gambling/Commands/AnimalRacing.cs index 39c749d2..040e657e 100644 --- a/src/NadekoBot/Modules/Gambling/Commands/AnimalRacing.cs +++ b/src/NadekoBot/Modules/Gambling/Commands/AnimalRacing.cs @@ -272,12 +272,12 @@ namespace NadekoBot.Modules.Gambling } private string GetText(string text) - => NadekoModule.GetTextStatic(text, + => NadekoTopLevelModule.GetTextStatic(text, NadekoBot.Localization.GetCultureInfo(_raceChannel.Guild), typeof(Gambling).Name.ToLowerInvariant()); private string GetText(string text, params object[] replacements) - => NadekoModule.GetTextStatic(text, + => NadekoTopLevelModule.GetTextStatic(text, NadekoBot.Localization.GetCultureInfo(_raceChannel.Guild), typeof(Gambling).Name.ToLowerInvariant(), replacements); diff --git a/src/NadekoBot/Modules/Gambling/Commands/DiceRollCommand.cs b/src/NadekoBot/Modules/Gambling/Commands/DiceRollCommand.cs index a75827e7..721b5b4e 100644 --- a/src/NadekoBot/Modules/Gambling/Commands/DiceRollCommand.cs +++ b/src/NadekoBot/Modules/Gambling/Commands/DiceRollCommand.cs @@ -10,6 +10,7 @@ using System.IO; using System.Linq; using System.Text.RegularExpressions; using System.Threading.Tasks; +using ImageSharp.Formats; using Image = ImageSharp.Image; namespace NadekoBot.Modules.Gambling @@ -35,7 +36,7 @@ namespace NadekoBot.Modules.Gambling var imageStream = await Task.Run(() => { var ms = new MemoryStream(); - new[] { GetDice(num1), GetDice(num2) }.Merge().SaveAsPng(ms); + new[] { GetDice(num1), GetDice(num2) }.Merge().Save(ms); ms.Position = 0; return ms; }).ConfigureAwait(false); @@ -120,7 +121,7 @@ namespace NadekoBot.Modules.Gambling var bitmap = dice.Merge(); var ms = new MemoryStream(); - bitmap.SaveAsPng(ms); + bitmap.Save(ms); ms.Position = 0; await Context.Channel.SendFileAsync(ms, "dice.png", Context.User.Mention + diff --git a/src/NadekoBot/Modules/Gambling/Commands/DrawCommand.cs b/src/NadekoBot/Modules/Gambling/Commands/DrawCommand.cs index 7471f7d0..b7a68ece 100644 --- a/src/NadekoBot/Modules/Gambling/Commands/DrawCommand.cs +++ b/src/NadekoBot/Modules/Gambling/Commands/DrawCommand.cs @@ -49,7 +49,7 @@ namespace NadekoBot.Modules.Gambling images.Add(new Image(stream)); } MemoryStream bitmapStream = new MemoryStream(); - images.Merge().SaveAsPng(bitmapStream); + images.Merge().Save(bitmapStream); bitmapStream.Position = 0; var toSend = $"{Context.User.Mention}"; if (cardObjects.Count == 5) diff --git a/src/NadekoBot/Modules/Gambling/Commands/FlipCoinCommand.cs b/src/NadekoBot/Modules/Gambling/Commands/FlipCoinCommand.cs index 973bc90e..40b8a735 100644 --- a/src/NadekoBot/Modules/Gambling/Commands/FlipCoinCommand.cs +++ b/src/NadekoBot/Modules/Gambling/Commands/FlipCoinCommand.cs @@ -52,17 +52,22 @@ namespace NadekoBot.Modules.Gambling return; } var imgs = new Image[count]; - using (var heads = _images.Heads.ToStream()) - using(var tails = _images.Tails.ToStream()) + for (var i = 0; i < count; i++) { - for (var i = 0; i < count; i++) + using (var heads = _images.Heads.ToStream()) + using (var tails = _images.Tails.ToStream()) { - imgs[i] = rng.Next(0, 10) < 5 ? - new Image(heads) : - new Image(tails); + if (rng.Next(0, 10) < 5) + { + imgs[i] = new Image(heads); + } + else + { + imgs[i] = new Image(tails); + } } - await Context.Channel.SendFileAsync(imgs.Merge().ToStream(), $"{count} coins.png").ConfigureAwait(false); } + await Context.Channel.SendFileAsync(imgs.Merge().ToStream(), $"{count} coins.png").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] diff --git a/src/NadekoBot/Modules/Gambling/Commands/Slots.cs b/src/NadekoBot/Modules/Gambling/Commands/Slots.cs index c298a9b4..ea20b4b1 100644 --- a/src/NadekoBot/Modules/Gambling/Commands/Slots.cs +++ b/src/NadekoBot/Modules/Gambling/Commands/Slots.cs @@ -1,5 +1,6 @@ using Discord; using Discord.Commands; +using ImageSharp; using NadekoBot.Attributes; using NadekoBot.Extensions; using NadekoBot.Services; @@ -163,83 +164,43 @@ namespace NadekoBot.Modules.Gambling var result = SlotMachine.Pull(); int[] numbers = result.Numbers; - using (var bgPixels = bgImage.Lock()) + + for (int i = 0; i < 3; i++) { - for (int i = 0; i < 3; i++) + using (var file = _images.SlotEmojis[numbers[i]].ToStream()) + using (var randomImage = new ImageSharp.Image(file)) { - using (var file = _images.SlotEmojis[numbers[i]].ToStream()) - { - var randomImage = new ImageSharp.Image(file); - using (var toAdd = randomImage.Lock()) - { - for (int j = 0; j < toAdd.Width; j++) - { - for (int k = 0; k < toAdd.Height; k++) - { - var x = 95 + 142 * i + j; - int y = 330 + k; - var toSet = toAdd[j, k]; - if (toSet.A < _alphaCutOut) - continue; - bgPixels[x, y] = toAdd[j, k]; - } - } - } - } + bgImage.DrawImage(randomImage, 100, default(Size), new Point(95 + 142 * i, 330)); } - - var won = amount * result.Multiplier; - var printWon = won; - var n = 0; - do - { - var digit = printWon % 10; - using (var fs = NadekoBot.Images.SlotNumbers[digit].ToStream()) - { - var img = new ImageSharp.Image(fs); - using (var pixels = img.Lock()) - { - for (int i = 0; i < pixels.Width; i++) - { - for (int j = 0; j < pixels.Height; j++) - { - if (pixels[i, j].A < _alphaCutOut) - continue; - var x = 230 - n * 16 + i; - bgPixels[x, 462 + j] = pixels[i, j]; - } - } - } - } - n++; - } while ((printWon /= 10) != 0); - - var printAmount = amount; - n = 0; - do - { - var digit = printAmount % 10; - using (var fs = _images.SlotNumbers[digit].ToStream()) - { - var img = new ImageSharp.Image(fs); - using (var pixels = img.Lock()) - { - for (int i = 0; i < pixels.Width; i++) - { - for (int j = 0; j < pixels.Height; j++) - { - if (pixels[i, j].A < _alphaCutOut) - continue; - var x = 395 - n * 16 + i; - bgPixels[x, 462 + j] = pixels[i, j]; - } - } - } - } - n++; - } while ((printAmount /= 10) != 0); } + var won = amount * result.Multiplier; + var printWon = won; + var n = 0; + do + { + var digit = printWon % 10; + using (var fs = NadekoBot.Images.SlotNumbers[digit].ToStream()) + using (var img = new ImageSharp.Image(fs)) + { + bgImage.DrawImage(img, 100, default(Size), new Point(230 - n * 16, 462)); + } + n++; + } while ((printWon /= 10) != 0); + + var printAmount = amount; + n = 0; + do + { + var digit = printAmount % 10; + using (var fs = _images.SlotNumbers[digit].ToStream()) + using (var img = new ImageSharp.Image(fs)) + { + bgImage.DrawImage(img, 100, default(Size), new Point(395 - n * 16, 462)); + } + n++; + } while ((printAmount /= 10) != 0); + var msg = GetText("better_luck"); if (result.Multiplier != 0) { diff --git a/src/NadekoBot/Modules/Gambling/Gambling.cs b/src/NadekoBot/Modules/Gambling/Gambling.cs index 3cdd7165..0db8e198 100644 --- a/src/NadekoBot/Modules/Gambling/Gambling.cs +++ b/src/NadekoBot/Modules/Gambling/Gambling.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; namespace NadekoBot.Modules.Gambling { [NadekoModule("Gambling", "$")] - public partial class Gambling : NadekoModule + public partial class Gambling : NadekoTopLevelModule { public static string CurrencyName { get; set; } public static string CurrencyPluralName { get; set; } diff --git a/src/NadekoBot/Modules/Games/Commands/Acropobia.cs b/src/NadekoBot/Modules/Games/Commands/Acropobia.cs index 088b95d7..aa11f1c6 100644 --- a/src/NadekoBot/Modules/Games/Commands/Acropobia.cs +++ b/src/NadekoBot/Modules/Games/Commands/Acropobia.cs @@ -299,7 +299,7 @@ $@"-- } private string GetText(string key, params object[] replacements) - => NadekoModule.GetTextStatic(key, + => NadekoTopLevelModule.GetTextStatic(key, NadekoBot.Localization.GetCultureInfo(_channel.Guild), typeof(Games).Name.ToLowerInvariant()); } diff --git a/src/NadekoBot/Modules/Games/Games.cs b/src/NadekoBot/Modules/Games/Games.cs index b6b9130b..88a663df 100644 --- a/src/NadekoBot/Modules/Games/Games.cs +++ b/src/NadekoBot/Modules/Games/Games.cs @@ -4,18 +4,33 @@ using NadekoBot.Services; using System.Threading.Tasks; using NadekoBot.Attributes; using System; +using System.Collections.Concurrent; using System.Linq; using System.Collections.Generic; using System.Collections.Immutable; +using System.IO; +using System.Threading; using NadekoBot.Extensions; +using System.Net.Http; +using ImageSharp; +using NadekoBot.DataStructures; +using NLog; +using ImageSharp.Drawing.Pens; +using SixLabors.Shapes; namespace NadekoBot.Modules.Games { [NadekoModule("Games", ">")] - public partial class Games : NadekoModule + public partial class Games : NadekoTopLevelModule { private static readonly ImmutableArray _8BallResponses = NadekoBot.BotConfig.EightBallResponses.Select(ebr => ebr.Text).ToImmutableArray(); + private static readonly Timer _t = new Timer((_) => + { + _girlRatings.Clear(); + + }, null, TimeSpan.FromDays(1), TimeSpan.FromDays(1)); + [NadekoCommand, Usage, Description, Aliases] public async Task Choose([Remainder] string list = null) { @@ -91,6 +106,155 @@ namespace NadekoBot.Modules.Games await Context.Channel.SendConfirmAsync(msg).ConfigureAwait(false); } + private static readonly ConcurrentDictionary _girlRatings = new ConcurrentDictionary(); + + public class GirlRating + { + private static Logger _log = LogManager.GetCurrentClassLogger(); + + public double Crazy { get; } + public double Hot { get; } + public int Roll { get; } + public string Advice { get; } + public AsyncLazy Url { get; } + + public GirlRating(double crazy, double hot, int roll, string advice) + { + Crazy = crazy; + Hot = hot; + Roll = roll; + Advice = advice; // convenient to have it here, even though atm there are only few different ones. + + Url = new AsyncLazy(async () => + { + try + { + using (var ms = new MemoryStream(NadekoBot.Images.WifeMatrix.ToArray(), false)) + using (var img = new ImageSharp.Image(ms)) + { + var clr = new ImageSharp.Color(0x0000ff); + const int minx = 35; + const int miny = 385; + const int length = 345; + + var pointx = (int)(minx + length * (Hot / 10)); + var pointy = (int)(miny - length * ((Crazy - 4) / 6)); + + var p = new Pen(ImageSharp.Color.Red, 5); + + img.Draw(p, new SixLabors.Shapes.Ellipse(200, 200, 5, 5)); + + string url; + using (var http = new HttpClient()) + using (var imgStream = new MemoryStream()) + { + img.Save(imgStream); + var byteContent = new ByteArrayContent(imgStream.ToArray()); + http.AddFakeHeaders(); + + var reponse = await http.PutAsync("https://transfer.sh/img.png", byteContent); + url = await reponse.Content.ReadAsStringAsync(); + } + return url; + } + } + catch (Exception ex) + { + _log.Warn(ex); + return null; + } + }); + } + } + + //[NadekoCommand, Usage, Description, Aliases] + //[RequireContext(ContextType.Guild)] + //public async Task RateGirl(IGuildUser usr) + //{ + // var gr = _girlRatings.GetOrAdd(usr.Id, GetGirl); + // var img = await gr.Url; + // await Context.Channel.EmbedAsync(new EmbedBuilder().WithOkColor() + // .WithTitle("Girl Rating For " + usr) + // .AddField(efb => efb.WithName("Hot").WithValue(gr.Hot.ToString("F2")).WithIsInline(true)) + // .AddField(efb => efb.WithName("Crazy").WithValue(gr.Crazy.ToString("F2")).WithIsInline(true)) + // .AddField(efb => efb.WithName("Advice").WithValue(gr.Advice).WithIsInline(false)) + // .WithImageUrl(img)).ConfigureAwait(false); + //} + + private double NextDouble(double x, double y) + { + var rng = new Random(); + return rng.NextDouble() * (y - x) + x; + } + + private GirlRating GetGirl(ulong uid) + { + var rng = new NadekoRandom(); + + var roll = rng.Next(1, 1001); + + double hot; + double crazy; + string advice; + if (roll < 500) + { + hot = NextDouble(0, 5); + crazy = NextDouble(4, 10); + advice = + "This is your NO-GO ZONE. We do not hang around, and date, and marry women who are atleast, in our mind, a 5. " + + "So, this is your no-go zone. You don't go here. You just rule this out. Life is better this way, that's the way it is."; + } + else if (roll < 750) + { + hot = NextDouble(5, 8); + crazy = NextDouble(4, .6 * hot + 4); + advice = "Above a 5, and to about an 8, and below the crazy line - this is your FUN ZONE. You can " + + "hang around here, and meet these girls and spend time with them. Keep in mind, while you're " + + "in the fun zone, you want to move OUT of the fun zone to a more permanent location. " + + "These girls are most of the time not crazy."; + } + else if (roll < 900) + { + hot = NextDouble(5, 10); + crazy = NextDouble(.61 * hot + 4, 10); + advice = "Above the crazy line - it's the DANGER ZONE. This is redheads, strippers, anyone named Tiffany, " + + "hairdressers... This is where your car gets keyed, you get bunny in the pot, your tires get slashed, " + + "and you wind up in jail."; + } + else if (roll < 951) + { + hot = NextDouble(8, 10); + crazy = NextDouble(4, 10); + advice = "Below the crazy line, above an 8 hot, but still about 7 crazy. This is your DATE ZONE. " + + "You can stay in the date zone indefinitely. These are the girls you introduce to your friends and your family. " + + "They're good looking, and they're reasonably not crazy most of the time. You can stay here indefinitely."; + } + else if (roll < 990) + { + hot = NextDouble(8, 10); + crazy = NextDouble(5, 7); + advice = "Above an 8 hot, and between about 7 and a 5 crazy - this is WIFE ZONE. You you meet this girl, you should consider long-term " + + "relationship. Rare."; + } + else if (roll < 999) + { + hot = NextDouble(8, 10); + crazy = NextDouble(2, 3.99d); + advice = "You've met a girl she's above 8 hot, and not crazy at all (below 4)... totally cool?" + + " You should be careful. That's a dude. It's a tranny."; + } + else + { + hot = NextDouble(8, 10); + crazy = NextDouble(4, 5); + advice = "Below 5 crazy, and above 8 hot, this is the UNICORN ZONE, these things don't exist." + + "If you find a unicorn, please capture it safely, keep it alive, we'd like to study it, " + + "and maybe look at how to replicate that."; + } + + return new GirlRating(crazy, hot, roll, advice); + } + [NadekoCommand, Usage, Description, Aliases] public async Task Linux(string guhnoo, string loonix) { diff --git a/src/NadekoBot/Modules/Help/Help.cs b/src/NadekoBot/Modules/Help/Help.cs index c22a9789..d6ceb1bd 100644 --- a/src/NadekoBot/Modules/Help/Help.cs +++ b/src/NadekoBot/Modules/Help/Help.cs @@ -13,7 +13,7 @@ using System.Collections.Generic; namespace NadekoBot.Modules.Help { [NadekoModule("Help", "-")] - public class Help : NadekoModule + public class Help : NadekoTopLevelModule { private static string helpString { get; } = NadekoBot.BotConfig.HelpString; public static string HelpString => String.Format(helpString, NadekoBot.Credentials.ClientId, NadekoBot.ModulePrefixes[typeof(Help).Name]); diff --git a/src/NadekoBot/Modules/Music/Music.cs b/src/NadekoBot/Modules/Music/Music.cs index 4fbc8701..a7b46269 100644 --- a/src/NadekoBot/Modules/Music/Music.cs +++ b/src/NadekoBot/Modules/Music/Music.cs @@ -20,7 +20,7 @@ namespace NadekoBot.Modules.Music { [NadekoModule("Music", "!!")] [DontAutoLoad] - public partial class Music : NadekoModule + public partial class Music : NadekoTopLevelModule { public static ConcurrentDictionary MusicPlayers { get; } = new ConcurrentDictionary(); diff --git a/src/NadekoBot/Modules/NSFW/NSFW.cs b/src/NadekoBot/Modules/NSFW/NSFW.cs index 5538e8d6..53a3f3bb 100644 --- a/src/NadekoBot/Modules/NSFW/NSFW.cs +++ b/src/NadekoBot/Modules/NSFW/NSFW.cs @@ -17,7 +17,7 @@ using System.Collections.Concurrent; namespace NadekoBot.Modules.NSFW { [NadekoModule("NSFW", "~")] - public class NSFW : NadekoModule + public class NSFW : NadekoTopLevelModule { private static readonly ConcurrentDictionary AutoHentaiTimers = new ConcurrentDictionary(); diff --git a/src/NadekoBot/Modules/NadekoModule.cs b/src/NadekoBot/Modules/NadekoModule.cs index d76a483c..ea4a0049 100644 --- a/src/NadekoBot/Modules/NadekoModule.cs +++ b/src/NadekoBot/Modules/NadekoModule.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; namespace NadekoBot.Modules { - public abstract class NadekoModule : ModuleBase + public abstract class NadekoTopLevelModule : ModuleBase { protected readonly Logger _log; protected CultureInfo _cultureInfo; @@ -17,7 +17,7 @@ namespace NadekoBot.Modules public readonly string ModuleTypeName; public readonly string LowerModuleTypeName; - protected NadekoModule(bool isTopLevelModule = true) + protected NadekoTopLevelModule(bool isTopLevelModule = true) { //if it's top level module ModuleTypeName = isTopLevelModule ? this.GetType().Name : this.GetType().DeclaringType.Name; @@ -120,7 +120,7 @@ namespace NadekoBot.Modules } } - public abstract class NadekoSubmodule : NadekoModule + public abstract class NadekoSubmodule : NadekoTopLevelModule { protected NadekoSubmodule() : base(false) { diff --git a/src/NadekoBot/Modules/Permissions/Permissions.cs b/src/NadekoBot/Modules/Permissions/Permissions.cs index 407ca2a2..3e8ecd13 100644 --- a/src/NadekoBot/Modules/Permissions/Permissions.cs +++ b/src/NadekoBot/Modules/Permissions/Permissions.cs @@ -15,7 +15,7 @@ using NLog; namespace NadekoBot.Modules.Permissions { [NadekoModule("Permissions", ";")] - public partial class Permissions : NadekoModule + public partial class Permissions : NadekoTopLevelModule { public class PermissionCache { diff --git a/src/NadekoBot/Modules/Pokemon/Pokemon.cs b/src/NadekoBot/Modules/Pokemon/Pokemon.cs index 08d3976f..c81091c7 100644 --- a/src/NadekoBot/Modules/Pokemon/Pokemon.cs +++ b/src/NadekoBot/Modules/Pokemon/Pokemon.cs @@ -16,7 +16,7 @@ using System.Collections.Concurrent; namespace NadekoBot.Modules.Pokemon { [NadekoModule("Pokemon", ">")] - public class Pokemon : NadekoModule + public class Pokemon : NadekoTopLevelModule { private static readonly List _pokemonTypes = new List(); private static readonly ConcurrentDictionary _stats = new ConcurrentDictionary(); diff --git a/src/NadekoBot/Modules/Searches/Searches.cs b/src/NadekoBot/Modules/Searches/Searches.cs index 28a00413..ef47301c 100644 --- a/src/NadekoBot/Modules/Searches/Searches.cs +++ b/src/NadekoBot/Modules/Searches/Searches.cs @@ -1,5 +1,4 @@ using Discord; -using Discord.Commands; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System; @@ -8,27 +7,25 @@ using System.Text; using System.Net.Http; using NadekoBot.Services; using System.Threading.Tasks; -using NadekoBot.Attributes; -using System.Text.RegularExpressions; using System.Net; using NadekoBot.Modules.Searches.Models; using System.Collections.Generic; -using ImageSharp; using NadekoBot.Extensions; using System.IO; using NadekoBot.Modules.Searches.Commands.OMDB; using NadekoBot.Modules.Searches.Commands.Models; -using AngleSharp.Parser.Html; using AngleSharp; using AngleSharp.Dom.Html; using AngleSharp.Dom; using System.Xml; -using System.Xml.Linq; +using Configuration = AngleSharp.Configuration; +using NadekoBot.Attributes; +using Discord.Commands; namespace NadekoBot.Modules.Searches { [NadekoModule("Searches", "~")] - public partial class Searches : NadekoModule + public partial class Searches : NadekoTopLevelModule { [NadekoCommand, Usage, Description, Aliases] public async Task Weather([Remainder] string query) @@ -396,7 +393,7 @@ namespace NadekoBot.Modules.Searches msg = "⚠ Found over 4 images. Showing random 4."; } var ms = new MemoryStream(); - await Task.Run(() => images.AsEnumerable().Merge().SaveAsPng(ms)); + await Task.Run(() => images.AsEnumerable().Merge().Save(ms)); ms.Position = 0; await Context.Channel.SendFileAsync(ms, arg + ".png", msg).ConfigureAwait(false); } @@ -625,7 +622,7 @@ namespace NadekoBot.Modules.Searches return; var img = new ImageSharp.Image(50, 50); - img.BackgroundColor(new ImageSharp.Color(color)); + //img.FillPolygon(new ImageSharp, new ImageSharp.Color(color)); await Context.Channel.SendFileAsync(img.ToStream(), $"{color}.png").ConfigureAwait(false); ; } diff --git a/src/NadekoBot/Modules/Utility/Utility.cs b/src/NadekoBot/Modules/Utility/Utility.cs index d627d956..8d3a95c4 100644 --- a/src/NadekoBot/Modules/Utility/Utility.cs +++ b/src/NadekoBot/Modules/Utility/Utility.cs @@ -6,7 +6,6 @@ using System.Linq; using System.Threading.Tasks; using System.Text; using NadekoBot.Extensions; -using System.Text.RegularExpressions; using System.Reflection; using NadekoBot.Services.Impl; using System.Net.Http; @@ -21,7 +20,7 @@ using NadekoBot.Services; namespace NadekoBot.Modules.Utility { [NadekoModule("Utility", ".")] - public partial class Utility : NadekoModule + public partial class Utility : NadekoTopLevelModule { private static ConcurrentDictionary rotatingRoleColors = new ConcurrentDictionary(); @@ -122,10 +121,10 @@ namespace NadekoBot.Modules.Utility } return; } - + var hexColors = hexes.Select(hex => { - try { return (ImageSharp.Color?)new ImageSharp.Color(hex.Replace("#", "")); } catch { return null; } + try { return (ImageSharp.Color?)ImageSharp.Color.FromHex(hex.Replace("#", "")); } catch { return null; } }) .Where(c => c != null) .Select(c => c.Value) diff --git a/src/NadekoBot/NadekoBot.cs b/src/NadekoBot/NadekoBot.cs index 40d71602..7da895d6 100644 --- a/src/NadekoBot/NadekoBot.cs +++ b/src/NadekoBot/NadekoBot.cs @@ -60,6 +60,9 @@ namespace NadekoBot OkColor = new Color(Convert.ToUInt32(BotConfig.OkColor, 16)); ErrorColor = new Color(Convert.ToUInt32(BotConfig.ErrorColor, 16)); } + + //ImageSharp.Configuration.Default.AddImageFormat(new ImageSharp.Formats.PngFormat()); + //ImageSharp.Configuration.Default.AddImageFormat(new ImageSharp.Formats.JpegFormat()); } public async Task RunAsync(params string[] args) diff --git a/src/NadekoBot/Resources/CommandStrings.Designer.cs b/src/NadekoBot/Resources/CommandStrings.Designer.cs index 579382ba..e6390b66 100644 --- a/src/NadekoBot/Resources/CommandStrings.Designer.cs +++ b/src/NadekoBot/Resources/CommandStrings.Designer.cs @@ -2381,33 +2381,6 @@ namespace NadekoBot.Resources { } } - /// - /// Looks up a localized string similar to qsearch. - /// - public static string searchquote_cmd { - get { - return ResourceManager.GetString("searchquote_cmd", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Shows a random quote for a keyword that contains any text specified in the search.. - /// - public static string searchquote_desc { - get { - return ResourceManager.GetString("searchquote_desc", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to `{0}qsearch keyword text`. - /// - public static string searchquote_usage { - get { - return ResourceManager.GetString("searchquote_usage", resourceCulture); - } - } - /// /// Looks up a localized string similar to delmsgoncmd. /// @@ -5756,6 +5729,33 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to rategirl. + /// + public static string rategirl_cmd { + get { + return ResourceManager.GetString("rategirl_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Use the universal hot-crazy wife zone matrix to determine the girl's worth. It is everything young men need to know about women. At any moment in time, any woman you have previously located on this chart can vanish from that location and appear anywhere else on the chart.. + /// + public static string rategirl_desc { + get { + return ResourceManager.GetString("rategirl_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}rategirl @SomeGurl`. + /// + public static string rategirl_usage { + get { + return ResourceManager.GetString("rategirl_usage", resourceCulture); + } + } + /// /// Looks up a localized string similar to reloadimages. /// @@ -6701,6 +6701,33 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to qsearch. + /// + public static string searchquote_cmd { + get { + return ResourceManager.GetString("searchquote_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Shows a random quote for a keyword that contains any text specified in the search.. + /// + public static string searchquote_desc { + get { + return ResourceManager.GetString("searchquote_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}qsearch keyword text`. + /// + public static string searchquote_usage { + get { + return ResourceManager.GetString("searchquote_usage", resourceCulture); + } + } + /// /// Looks up a localized string similar to send. /// diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx index 732c0087..c661db7d 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -1151,7 +1151,7 @@ `{0}qsearch keyword text` - + deletequote delq @@ -3141,4 +3141,13 @@ `{0}langli` - + + rategirl + + + Use the universal hot-crazy wife zone matrix to determine the girl's worth. It is everything young men need to know about women. At any moment in time, any woman you have previously located on this chart can vanish from that location and appear anywhere else on the chart. + + + `{0}rategirl @SomeGurl` + + \ No newline at end of file diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index 90024cd2..c1eb0a5d 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -1170,9 +1170,42 @@ Don't forget to leave your discord name or id in the message. 8ball + + Acrophobia + + + Game ended with no submissions. + + + No votes cast. Game ended with no winner. + + + Acronym was {0}. + Acrophobia game is already running in this channel. + + Game started. Create a sentence with the following acronym: {0}. + + + You have {0} seconds to make a submission. + + + {0} submitted their sentence. ({1} total) + + + Vote by typing a number of the submission + + + {0} cast their vote! + + + Winner is {0} with {1} points. + + + {0} is the winner for being the only user who made a submission! + Question @@ -1182,4 +1215,7 @@ Don't forget to leave your discord name or id in the message. {0} won! {1} beats {2} + + Submissions Closed + \ No newline at end of file diff --git a/src/NadekoBot/Services/IImagesService.cs b/src/NadekoBot/Services/IImagesService.cs index 81e21907..e3b25458 100644 --- a/src/NadekoBot/Services/IImagesService.cs +++ b/src/NadekoBot/Services/IImagesService.cs @@ -21,6 +21,8 @@ namespace NadekoBot.Services ImmutableArray> SlotEmojis { get; } ImmutableArray> SlotNumbers { get; } + ImmutableArray WifeMatrix { get; } + Task Reload(); } } diff --git a/src/NadekoBot/Services/Impl/ImagesService.cs b/src/NadekoBot/Services/Impl/ImagesService.cs index 77ee9f26..567d63f2 100644 --- a/src/NadekoBot/Services/Impl/ImagesService.cs +++ b/src/NadekoBot/Services/Impl/ImagesService.cs @@ -28,6 +28,8 @@ namespace NadekoBot.Services.Impl private const string slotNumbersPath = basePath + "slots/numbers/"; private const string slotEmojisPath = basePath + "slots/emojis/"; + private const string _wifeMatrixPath = basePath + "wifematrix.png"; + public ImmutableArray Heads { get; private set; } public ImmutableArray Tails { get; private set; } @@ -41,6 +43,8 @@ namespace NadekoBot.Services.Impl public ImmutableArray> SlotNumbers { get; private set; } public ImmutableArray> SlotEmojis { get; private set; } + public ImmutableArray WifeMatrix { get; private set; } + private ImagesService() { _log = LogManager.GetCurrentClassLogger(); @@ -86,6 +90,8 @@ namespace NadekoBot.Services.Impl .Select(x => File.ReadAllBytes(x).ToImmutableArray()) .ToImmutableArray(); + WifeMatrix = File.ReadAllBytes(_wifeMatrixPath).ToImmutableArray(); + sw.Stop(); _log.Info($"Images loaded after {sw.Elapsed.TotalSeconds:F2}s!"); return sw.Elapsed; diff --git a/src/NadekoBot/_Extensions/Extensions.cs b/src/NadekoBot/_Extensions/Extensions.cs index 4c32a542..8dbdf02b 100644 --- a/src/NadekoBot/_Extensions/Extensions.cs +++ b/src/NadekoBot/_Extensions/Extensions.cs @@ -22,7 +22,11 @@ namespace NadekoBot.Extensions private const string arrow_right = "➡"; public static Stream ToStream(this IEnumerable bytes, bool canWrite = false) - => new MemoryStream(bytes as byte[] ?? bytes.ToArray(), canWrite); + { + var ms = new MemoryStream(bytes as byte[] ?? bytes.ToArray(), canWrite); + ms.Seek(0, SeekOrigin.Begin); + return ms; + } /// /// danny kamisama @@ -398,22 +402,15 @@ namespace NadekoBot.Extensions public static ImageSharp.Image Merge(this IEnumerable images) { - var imgList = images.ToList(); + var imgs = images.ToArray(); - var canvas = new ImageSharp.Image(imgList.Sum(img => img.Width), imgList.Max(img => img.Height)); + var canvas = new ImageSharp.Image(imgs.Sum(img => img.Width), imgs.Max(img => img.Height)); - var canvasPixels = canvas.Lock(); - int offsetX = 0; - foreach (var img in imgList.Select(img => img.Lock())) + var xOffset = 0; + for (int i = 0; i < imgs.Length; i++) { - for (int i = 0; i < img.Width; i++) - { - for (int j = 0; j < img.Height; j++) - { - canvasPixels[i + offsetX, j] = img[i, j]; - } - } - offsetX += img.Width; + canvas.DrawImage(imgs[i], 100, default(Size), new Point(xOffset, 0)); + xOffset += imgs[i].Bounds.Width; } return canvas; @@ -422,7 +419,7 @@ namespace NadekoBot.Extensions public static Stream ToStream(this ImageSharp.Image img) { var imageStream = new MemoryStream(); - img.SaveAsPng(imageStream); + img.Save(imageStream); imageStream.Position = 0; return imageStream; } diff --git a/src/NadekoBot/data/images/wifematrix.png b/src/NadekoBot/data/images/wifematrix.png new file mode 100644 index 0000000000000000000000000000000000000000..6e0b8db9b6f25e0175b76a163f7ce20929a78fba GIT binary patch literal 34050 zcmV)>K!d-DP){>}o6Hyp`G#orgV(dx1$N@OWfpF5+?O-s(fS$z~?SbuRO(7=MfCj|C#Rc%- zk}8I1ObBs_2vO7`7to`?(I^Sts7VtqqyL0Qro-E2`eu3K{K;g}f2Py-y?_6vWtyh# zKnT^LfJylVsCPjF7C`}(Ex_`vjr#e|#IV}P{>9i)Z9@v#ek~|cWU+0DZpSt-9zW!r zD=sas*m}sz*HiwEv6|{CTMs$W*nmz{m|fm+Q9CP4x{GgQ_OpK*Y7`k zgl0eFh}Wc9-k23-%EH2zqR+9|!J=#MxvA;orvB#b5vjjlGO+ivpM>r+0&_jx+sSxG z4#%l+M{~`^#joxbXqte_lqzP6VOMm@nnKBAa&kg=qj-q}HbqXoN2E0xdxma@=WcShv{tFNyk_L0y^@#3JOVmmi$ zipcnrvCWOVeq+eH0&~X5J zg{KUm@*=Z9k3W4bT%d9BJ>8NJD$vI7ixhjMIuF(+l-%9R6mT)%KOlpGoAKgp>~U6& zI(EF_7}~RY7i#b5)Q4GC0}bF|iuQdIjOjP*ZomXz&h!X3!93R{0(mfkyB$%?c%p{4w9OUqJX%>4Ef?7DfLBI!spofA}?@nr~DXkTqDN}f;ZYl1V=Vx;sgs^eM3({yj;$4Ta=y&E&T zksH9u02ng;tpUwk|ovGtiWQaU^K@c8VcxM;d{N$`pVw-_WdY-k|F z*FBRXly)johWz96D@e|m&2zLmrlUIe3i*&?7LNWpm){Cb_y)wqLdC=|`H1 zrjDrUcyQ=|mFbvmhg^AzLBJ!_;!Y)~XwyN{Jwlh^%>*k{k~gqijxPoM#Q%}4OKqHz zG%eLji-e<8SK&Z9)l<*+g;e5+3m#QLI``RD;8B$BA+F$zN|ohoh3Bd9|gYID8rLKy`s+U&Cts*>$r4&2MX^NFH$Yb5XhwAUpZ3FZWwax;B- z9XR9_Fl=#&^F`iJ%M~cjG^Bo??fB$086FMij85newb|}xm5)+bIK7`p|GkXpt&jeEo3fLn)Z^}Y}Sa*w>zCIMfrPUGg*JSNLIRs z>Zw?F7?&4}bR~Er5i<%F1zU2#M8QbZ)3BcaHiO0# zf$!6c5&Iim6UP8Y!@@5wFPjI%u?Gl{94j(f{)jHC|BoZ1hP0+A+Z2186!U%L(pYjt z%btb9cv<5#JgwycJwKCqab5oQDip;2Q9Tq3X3dea&ZFuc!Xd+S0zg;l5*Je^)+c9} z7ydJLoT~3vEfnE3QmQ13R6=0DSiV@+jJ4E<+pQ(6?VIQQBawe1@kd>u0Y>#)7nSHa z*;w?BCg&~O!z`)CUBgA(x(3lQ)Rh0IBepKXIG#%&%U*QRg;Fsq6|X+e#%`7SS_NrK!_XDiu}LeycZ`5mW`J)!Rg2 zn}ir*2dhyz)*96pR%Bw8Y5cJ^h?z$o0g1~(Lu5z z?&Vvn$@Z)wWUh4`LV}c0`d9C)4nGG*4`BMHzUJ-{ma2qUnL$vM+n-Wut=}8_J&buH znr`&e+mIT*v8pci#lLDT`xY0XrLGI}T<%?RYy`o*P9kPv)E*d9Mo5aq0>~<%4(=QwNbwPp#nSyUK9(jf9IfzxZFL%V5Gf5VLBzqR{> zj7e%wt6>b`FT8(JGA~=9rsSf>CJMt^wD@b*=Z&h2gNM}zD26nwk{TVcs>bTqHJ!hC zCu#RyC041gwr^UQ8qUP^X1aW`=3&qqkukrAJ$j zmd}foavDdtLTY37C4LtNuWYl;NDrUm5>K@5VJS`Yy8TKs9!?9I?!!GYiq6W-RfT^n zdl(#MjsYK30(iXk*5pP<%;BZP3yvGcqKsi-G((o%=$v8JiC9rq9Ji}8wu!S6!@a91 zvd(>~sWnt+_0ebZ#NEr21G$f}?t7b}QmAr((|7J!I0pmCTJlZ(jyr*BYk`*`0@&+R zyUj^4k-t3m!!w%v#4432{}1DOVUcx9_r?V=wkF#=W#B!Ms026oruqI?&eEha4joygKob4r{=YQF}0?E;2zdjdjyM zas1fSFfH0jY?3x9QDBHBen_~s1=9hhWrjtl$*Q0%)t|<^EmNt}PHv5X!o}6Lz|crh zY|L;f83xIyi>gaTSyUMrtx=U^oT|0Qh)Fudm>>7-@E*=Rgu`iHMw3b`i>jANR2x-> z7eX7&zIOGBYbsJKkuiX{$=`hW(#2sEglmL)kBEM7y(k3gMm|-3SW|=^pK0TKDdT~o z0^N)?YAS?~H8D@?_*xz0Hfgz2={T1q7t|ROT4XEl)1)Ycuz+bGly(34;&Jii#A5OF z^r6yw)>|S9UPSDC3hFy#;MlnW|~^?!EskUR253wDM$d z-Eib=9K*KH&JM2g^K*H%9q7=(14D~9i63_U+?l+}jwIXuj5IWrsb{goO!Y*lKp8Pm z5Z!e)Q@hZVyfQq6?q|e|@H1wpqKO!y9u~VGGb{limI`BnhMEjZfsP$LJTy3%$gZVa z^S32IYECVk%zId-%&^R`OqpSsGQ%d5vX$6FhHd_P%@N(6&>sQVySh-Tsvx`#rQi}h zh(8s*WkGqPmk271(k$trqJmNiG?WSqdow9Agp!JqE+pC?l-EL$hzK>6UV8Vz>cJii zg3P~%>|P9#ZhreRhvmL|pS@<*tiAR=X9f=E?DMt%XzVqSyF|=&XvQ;)(=7*UW zOYDen_j4OyiNTUKM<@jhnLLupV^w9*O?1GT_P3O`?D$mCE)!JNF1CppG^wft&fOn2 zqx4Y9&Z?uO* zZNWC#kj_XNCbFziY4M(lQMy%1aqirRsvydp!^qDo&S_Lpn+k5a-_IdFG3Kmb(t$rEEl8SyL&qDq>yrni>*1PrBxg9@D*R z8tZ&6GJ~l~?}#nFjLrcj89*%!0gKd% zv`E=tKfpqQ0FAIj4iNY=T7Fv-+Ezu~i+~kllV!J7(fU+f^kU9y{rs#lz^G$8T}UAg zd30LO&BM^5{~@^}+DjyG8#ceOC42XsxBFIbYgJAMx7@jwmS~zsp9n^ohCzskfn>QR zlDiz#nBy#QL^T{_t?Jt$i;vLsKTn;?AOCjZ#N~;(E1zzshJ}jel^8RSo08UhYgiMl zGmt-#q9IQ7W&IR69hg*o^X(-~U|bWa(owu&us}4*O2JBZsi>JmpM}O^w^b>zh;1UJ zOC@A$a2zE;Q}R<#6nFVGlHvzR6N_&+}#JEpc|qn&FX zW6r{PqUbVY)2pwgpTjsgh9e^*`Rl(PKb`{{I^gI>hWSB*_{0E@z8Lk#siFfwBnFfUG3rsrZ?JrS35!9f)d#fF|*~khC+5V5x?t zq@aN{*2NoVu+2vv&4yOAY-?yvxg>l=*|ywy5Vvo>{jPURKA-P7bYc#x3s1o`hGg=h zHEx}j7R?}j6E|+63(V@-v*&uplt;*E&s!9<{H4_gJf_yaH0Nq17I_1PfvOuAkdP42 z{y2G3GT#fveLZA7HBl>E7?8h&5}sHOAb<%R*OEH*Qgf<^_qx&l}cyjZ(LqXQ;M znsGHN)xPF|j3sh>7vEY^WoA&@G{WzK=9B+b-0oVJBHn4hIA*U7w5H}Ps_9GT%Qv49}I-0HJ&Lcaj6fFD3V?H(}E&8{3(hZ1jD<)KsLV z`&E7zZYZLO`N}ng((JLIIgDE|v~EtLIZHbDS_3f9w4Tf2s@`9GUJ6?5GC>1N>p6p3 z1)>Br?J6@}0E|sKxItZa$)q2_kmPtEfE&_L_-abo4WIWv_8SOG({_jwSX3 zlA}FsT*T}=V8uc88DtJ6Z?a_UK$4EK91hCE@Qn>}Qp!S7!iO^R*JrSZIdb=N4T>~% zL3sg&WX(DnkHP2W$^%?q3NJ|*Z9-^V_U`+-w={$2@V@{eZb;puC7Y_`Qtu@ljeu)t zU3U(1Oj!i8?Ekr$QN{EEa(n1K7(e%Qs{F=b!=es-J_JLO^WMef6&J9oG=Q?zZTbwi zL?N4W_{IkNrCnD=D}2pqtZLdJa{BaXuS8a)al7f;)IimDzcU*!N~f-4gH>tQb;N~w zE&G5L(y>;1mHo^mz^dlA#iOIW)ot9c@_p#Y50|ZkdtZQ3zsomBD+%VNTIcGlAJ$JZ zNV9wcz}!GF*PL>-cp!tnRZJ`-HpnFk9Og7k%PX00IH+H^DHdp)_cs~7iV4`opMMOe z^_l@#E@*9wBgO{o!e?8iCSG4Xb$;zbrLTLHE@~Tv9uz5~@{^m_WFwnD&Hi4uBD;F$ z{u!^cYfYIvkLp1W+Ml?36brOO@=eb(C~KL5gtHqwehF+}cM=ndHT zuFq|hBeFwvlW5WoF~AHk69de|0Bb^GEU+423PL6K++)a*!-pj19Xjh5;vnuaAbj{pTG67j;X zc8||^&-(T2#m=*7SOoKk4o_}XQuI;7^JESsL0=ME4--ht^)S;g^TSLGFcSmJ05dVb zObjps%)|gQF~AHkla`9b5>3NQVhYy7?z3U&j{GkGd)FFcMR|q?T&;F@#Y&_smLDae ziGZb~DOHoUDYk)_w%%AP#KhXvmKYjbYNJF9R)cL)E_GYL_0psjR44>%TSzMP5l!2|*)i{@N7_0Hkw->a5HAH1|#{Xgv4SJdC*bEik=cHb7YO};jI zfB8K1+J`%KL?<`A8D04H-st2DE2ANu7pV6I0+C=T_~+EmL_>yM6rDF~VKj7DyCT=o z(PPznAFO^OIdN-r*KZ3+f|=O-z{{@ z0*uKJ?^SMsg*Fh-YSGuZXUx1+Z6OfsrI$CW&tm)A-}euCZ~pxc3_1=b2fc9~8-DAP zh(3Yfvv{AM;d!v-X?0m8VzmsxlGk9e+hd-t#W=T(&Wd>(#^V~2gd!P||C2;~4`fN} zPn*03{eN_MuGQ1F%EW5Ak$uR3&JEogh6$Ixj?T`G0n6%bw?;3&vL$wD_`(k#xL*}m zhhYe%p;?4oUqhnG@YJc(2CZG5e{OxW=qEqUbuRQ3?CF_P-8Gg8BS&8N99#el6TJBt zWH$O|)WR1&f3-UI#iP2^;C5yGBqm-lV2m0!e!Lp|DBBGJz)1CIUtjz=Oa>qxC!&Q9 zJs1=5*){7_)oE-*@_&2})?NNqA(kN{M^;tFm+DZjSvRiHSJUoh*DHBdM6AE~Td`)M zF-TXbYN?O9ijB1;zQOQ6%4_Wi)T1Y zLqc*e`jBkRtTAa|;`e!fIeB2ClU#Q+C!NkhtYQep4+c{&%&#zW!yN1~<}jV&S@QOpvQ`u)PL@o^RTS;oIU@&&bfo?CyGP8iHqm3t{jt zj0jaITvIjUMKCI2BXhE?8QOJXWY&9>H%T;f36{s)UQdGYIBD^#P`k^jDhJ^Q~o zOkB~mQAiIck8ds1fz^y3tC5PR2OV=Qs|OX=QooY{$>ImAVU>dw4r+#J-wdpdx-ZMO z*`K~On)}OC0?&mih~pyF25u1KtbK3JUE&8bd2?@`euK4=ZSWDHfDX;q$l3Bev0xo( za$VXAYb>~9{<3F}+Q)bRYE8UwG0;`vI~TDOj%ND5bRU=vfM}3zAvlh4EvTLqTA4T> z#tRSyiK6Z8?dpF_f=C$Eo#Hw`L=bY)q={aAk--@`LWIvi-;nOBjab1fYp{AXRd_vm zf+yCqI40KFs72zVCQI-}j!@w{(AUR(wHbsfelP=YwQz^(V!PHxvbKloGT!3HDnE=9 zOkcReVrOblGQyr~ls|6T6utZIyXrN4v$;mXnvfF+sz(X2%z@7r8`fN`q>TOK7{VCP zvl{q3FsZXSiSNo@PS;>2)D9*S>b?>t7Wz`@T-5fkb$lQBSXouXw1PW&tw;LBxZY|u zLA7Q4VEXJ>boTGMO6?IYvjl-^(Y*5mlaSW7-tBRdPp&cdWcU^bAM5lC#2N; zdMYBv0aQUQ2Vjn8{3c#!_>}&8kP5~BLkyV;#!Sz&lU4)*1Qliy+<(Z zq!yqCCe89t35(Y4fLdbP+QcXg7mWnP+#VRp;Al=eHdO_n?uQ>rR6uWd%# z^IUXZ=TUb>6|7(+hv`yZ04gKlxESy--y+HyW`4fTbrj6=FyWhCJK>xh%(m(@>Q$;5 znfQfRvIg_kY0?E;SF_@MZG}p>q9Ph}x?+a4Adx>PNw}AO`(xBmKZq-5e);;2hsF% z+cH*w%m_+l>V*(X;KfYun`rwF9IzUY%jOkXl23(LLaL zXba&Y^x1yn#tmvGr@xppUDhr4|z+vgBDnHWUdQd?W{n z2Fd7>XdL)?4IxF07t9;8RW_WMc*TTxA60SL36nM9eU=lSIpdbNEC8_Sg+D~!m@zY+ zD7rpA;*8$_An=>5b7940x$Tx-gP9~6BqImBOQPZWG4LCOUYWECvTS(Kdxlw^*Nj=6 zrNKE^X}Lv_8U2|dpxPIBZMw=jX3Utn5;C6@rN$r z1gjW}2x2A22a;8k3!>=~3;VXEs08~;ux}9N zc&=M)rKzN?v9hkud?Hy|Tu)L>LT}%M-=semSn+7m7X-QnYa|&=N`oS$(rQU8mupNL z5=<{WO^MIfSeKAm0BaKhP`T22C)l7{xW|zk?Eg;ln=~biI3a?~WVbjT=8+z4q3=eeu2v%?4(6Y&<8b z_~IJr=c13RUc--2o8^q-(Go???NoiCf`!uVNGDfP&4c@c{xFmz$LD6x zo_)qKKr*P1uCgES9G-ZrPx-dGr*|t~81`{}h%#Zs5PW#Po#Uk1x(Om?p7Y zH=fX=6NF%`4XY}m4YPH#$Iqe)x+GdwX)gp5M{`}nLPtl3HIr!;vv?lkg>nfnQmNXU#CMsgCfnZy0yycde#s{UV$o(`GRR|_3Vi0O0 z)w)%yo>J#9nT8La7Gn-=s&iCPaSpv^hCo!rre<0bYGXZB(3aZ(rgjr?j#=)hNU(Ba z2ncqXXD^zLb<6wRCx7u|t|$RWtfaTU77)9(@>jo%OQ)FvLUgXX;YJnV;3|f&%y{sj zhog-fejm*BIJvK<0*T~E^WZmYZm$KbqioEeHrq9c1d}zG5uj)ZW)xHrN{cHq5i1A@ z25Doul5pODVnKBfT(B>KN)b`d!D^$#w5|H|A*ZVdT7+Px2G_j%=Bt94S=U+3TI@_a zdVLm7Ei3fM9y17zP(oA&>@9 z#N1AaWjoq|X(gu1W|P1i9D?jXF;t8J79B+{+Sp4ki_?vea)XHs`~Nz2Y*5Md1q&7o zO2q8%?^pf1@tNf-mdCH_pMf?*B2S$no(Tk)~E30CWYHyQ{@2QdbhN$0HTF5^8bw~1mJYU~^=(!2 z#dTvQ6@pbXk^}nbx4wOcT020$ZB)f4>l({+Lv-5>)@@bu#dUAq@~R|Xwi-;Uh%Tx$ zg(T5xNgjzsEVl$Z@`+2--;=NX_SAdJ?p6Qe@6k_>Q~TJC_1x6(IBm_$wDqK1XwAKK zC!~#tkXDIw7o_9l>szA#_8*MS|Mk+SZSu9z`wQ1ZXHUB%>g?N)>HBR}8E9oCf)LmP zsa_c9Uww4+K>F0VcYZ|?4Fn6q4~FOsi7FR_28>CR+=lZ84qjS0^ zMj!dwjOe^s3)Opgt$qF?e*}YZW96!+V?%>L5DL&>{a}B;a%v-M0|up9;cHX@I~J{p z&bs{S!K4{|xj%wEx_p^xWUWgxfglthY6DF!fXSb`GTOdvo7M9fCl~`OiPAN#7PKr7 zm-tDoq57dihoa9;o^17;ZKe;%WJ$z+u}g&gx>vj~|cIq*%4=iO2fXUl0woHAs|; zMvPEqd6WsjrsJwB2Yg>lH$rJZ(`D6#V1m*CQ5ZcvbK?Ep-rh4lbL7YoMYi3$cB;A_ z04q%Cz;~a2ZoT!||84Tv1Z9wFNcJTWSidqYN{FqifRQ5yO1iPCfQJ@(+7;TFA@kEfd&ba?VdogMT-}EBalci zK}!RwUZ~^}f(ZmdFo8e_CJ+dOU;=>f-sL)4^V@e34*YJ zg>(@Kf-x9DkYEHskYEHsf)NA>Mi2xEMiBWS*t^RYM1Q&WhUia6kBUBcsw2K1e*+(G zdR#rHXU>%9oh6q?AOGQZ>i$2EZRXh~NU&1qo^fV$@K?`@-h1qc=?p9`(Kb zM)dyb+v4XOH14eE^RpI3??3QDbnsWc9=&tRHHu`PJO4DEZKCdwDVzS|w|k=lPdGLD zXv6-N#-Cp>CHm<1&qeRtes|&XK&XrVL6PnKf4L(1@TCi*L)ZSAXPck}E9DvvSz6cw z{JqX~ibNm3^mf7hZ=XFiYH0tIbO-+Jkv!7`304XpKL335nWImL|95qEreWZ`%Gg!H z9Q0x6v|t2bm|T<2K8FM&2wUX3a{ipK2!=O?Y3}&>_>=3R$&=6Fw?&X#HY`|IS6B4r zn{QfwV=uq5)%lmO?8morC6Ziz2-e-x8;w6@LUhqLr$mtBIvJ>0bMS@rwIXE!K!$|XRu z)ek=u&Ajy6&MoMg&ec>-NiMqtgSfG!KMwQhGQo9gYC6jKV((bFBAPkt+v>}Eeb;WT zVv@@&!EhA^7F~Zs)V}b#_-`M$cH!0WVt0wN&itDC+*7AarJPT4*@?lv`ju0oo0i__ z{Y_)B-+j;BUMvbo2Eiv!E+Z}owQPAqC0AyGg@oge8x>m=WS6)EE;37&E(vPS4DSWE zwC#nTuIh*$exx)0TNiC^SbS4~H-He}>T9ko_b|IJPgiuzh-2gPj)ViBBnzEfH9;^DKk&u-__FcZM-Cn8{c8TNQ_hVSK2q6WnSfQR zI%4AKz_tf~)HnS;{Qnn*4~y@+_>vj1)rN9BwEwf}pPl5Y1A+lK(Z1p`y!HbRKA>LP z<%W1EYxZd8{>2aFS1->htt-1VXl7bJc+72mu9e^b<^v%}A~~BA6bRVN=|P(g(Mxxn*<^ z0)QYbDFBP~uK&EV;67}umkWp?h|OGX+2oB}RtOeK?%o}@-xlwexqeTQW+nA=E|6wT zN?90LqmFuf8(>@cf@lLLr5+U1bbrbx?rx}*e~;yPbg_tJ`_&D zx~J9`xPr;=1uCGZivVI**>-?+YiMjxkE4157;{ofK`o%Gcr&l$vO+NU{~|VoV9oS= z!nO-8^x`s(8-I$^^8wd*!4IxdaTQ2(?1&MuTd1SGy42Ca8EQgOkI1R`roZSCK`5-V_4f8E@+D(4oFDmr+&~~n30vK{M(y?ChKm)B2R9hMk2!fP$yEw{ z25{FsEBa>7nV!w1qTUQZrmD{;vdoa0s;xhVF8O3EZ ztrV8J(!;Ar+Zfh2m6L#_!f{~@U6v=+gypj7BBm*NZPPCdO1j2-nlpEvmwZBT8AI8a z4hgkHE@uQ2@k6p5LP?Ot6kefUiY?xI)>#2QwlC^|T;2#K3mW?{A(i3# z%qP^#Un+4|mn^+mm6UAXu_J0~YKpVx)6TD+VFF^xW;2N9y4I_f$>o(`fb<~@tqdP- z+i9&6z3iFcwe@gQ_FcHFx{Wx`8wBtADbAkuYc*$&vZ z3aJN&STEfb6hOMyAzAjo;>CqME+L4BC}L7YbUn7U<_QKtz$77j%I3uoQV$NXUd=5n z1^ZZ2&pTi3he_{4cm&DMpaa#*M`~T8=oT7)t#XxHf3#ec9M~vhz_CLDKEI96nzdXd zS)L+4laHZfM=wda>gt8+{p+{1(w1sVPHdc`(92b<)`Q{8#Yrtyb5sdrL4*XUGsA-Q zL9oz}R?k(B1hX20*=ldC=M9E3yNlWJbPK(S9Mb&7q`WOLP-wHe>ODK2G2b;?xs&3$~ACoWRAOT15gYh_9O|7T(WnU*5(g;e0g=X zy=HQV_+cZl7so!Np&=M+7Gh75P{@VvM+Quw-@Sg(75Dm?4I2wK(Q$)UAe-oN3+>!` zPnCjOhqi7uVkdm@Qq$#n+KOw-ooBZYTO21gH>=;#6crXrs<40h$$T?3Ox07kl!Dy9 zcI5S!EnBAUlWxQ$Si*(E06iOVitj#%r7U--S@}L=F2v}l2*BQ{04ZR44}H3b6Xlr@u(O|35I=P5R#YhI z=?!MkNYDh+Ug=gUPUr2RYB(!~^epIv>E7Zs4KUM-hC=ufrrTeeI!?ZF^G86^0napO|M3URk_%Q6PH z?g{1!dUn1~`5cQQqy^&IE$r#(R<8-EUYhmbq9d=rGbIj_Y6`fAawEY4gzQnR>R9Q$ zm2|zvTs=KK>N^mtgx}?YgZBcL5x|5^6?gT!gK#Y|ToCRdgpyICMh0~r4XXg=551*#ExL@Mkqh5v7Bx3y zugOXbre`OZT=+8cN+1^Hrkih8@se$cy%vinLm`)xn?S)uJ8v1Uly;%k@52QTdu0F; z2K3|9w8$ZOe^~e?yWi?=T1UryYWE+?AEa9OQfxvWo*rV>MP4nJl%n9f+`Vg8bomwE zjWcYd_DigrkV!pu%J|e{=>srol3@CWUGV)YjTKd*?}h+#u+BO68|rs#76UF?Swkk4 ze964lb%h*rA%g>65We4wFPWj%5bo1c+VB{lCke~grkZyV(@18bs8Z5riUHOPIcY8+ z`I4yX%3B}AkjaHOTkm5p`&=NJkV=4@#l3s?21zWZ1QXY)+M-HHpDAVyC6~=5^4142 zbhQw1cG`PO+fbf$>8$9Deu5o!)czj(*is3NY`JUOcHXqMg28b}mC<2(ctJVP`yhrK zmxWF)TsWmS$6!G2XwsX(S`f0;CBcAdiz>001rRo*XM$f!DS=Fe!FMj|vixpizFBSvCW}!-f=V`TrEX~6+}Y|UBw5MA_MJN@aakxW?HaAlNZxaHk5;N5!0^twM4G8 zc+*vb9VYIQU=;~O&d4XZNU(|)%`yGHw(erVBFJOa>^-^M zB(~i)o8%(FG6Pl$>Js9aBu;B>Rg%4strF;)#4cPoTLUjhE)uLFVB=5{c?FVD4Ow1V zyH!)CrO%RfG4mPk84X-ak&NUb!74(r#jfv#0LhGwYOG7gy(^r=Wgyw+7yqYfl95~_ zSjBj5)26a=)6O}2veAW)q+}Oy86@Uvstiaj60B!a@85ZlI8p+fCVHqK&V{B2%GKOw?$1&O$E=hp~``@vVUc}h*L;buDeKb z)gi%-|Kb;oyH&D)5Q|~KckkO5P3~V#&8n&iqK zjOHSWWigrHiesi_$(LIa?yeXXUQb}$<}LEQpZ*axtd#AYKmN;l=4Fqvl+KrCzx-N!P3|!nbfhN0@rk1 z65cn+HE#SVHFZU=wXng9i-3ntTn3xoVAEjKM6D4DH%{kjw?a zk&$mI^Mis030Cn!N1JP3B%APMy8{9A%#TWoDoHL9tSX@I0v5Utl3~%JIf~6p`K+C? zNG=l0%0l-=GTEHAo%WQqsFLI&!D@zNl8$71ke;Mh4Q4S(E)vWt$$Sh-!{SGQrtOVl z8F*1lVI;XoFzY018GVwM@jr0mkcDr%%M(6h+ExL{MS?jaS!3f6ZzO{tVY{d@Iq-ty zBEh_f557nSY27x-^aiBphDCCbV9vz{UnG--ZyR_GSg!wCzdpC4XNjB=OedM^(LdO~ z5*N-Ebhpq}Z^SgDS!T3AkRFiebCRa0+E!UfFpng|=pPr0FX_VB%3Dl}xyqICs{u#? zt0@ENaKqLJMgn#1=~B-@FO`!|9#inS@qZ@T;1PxiW=fHhy(-rvgBXDkwI=uHN(mY! z=2n-2Oas-2(xp{Q@A|}=$@w1YVGOSzc`jgKZ7aRGA=tLCOVnoDjFKyXU_Aqi6z)-%^S|=*9 z!3vK(`K0}>?6PICWyX|K4Bx|h2SORjXgmh9L9(C!Y^`(EP2AK02Sz>@{Hj#Y{>jR|MKg#G| z-MQ2IqO8=t!=#;>j=^k_Oj4U%lPpWNhlvageOTXHZ@pF3dzX&Hd-v{DafyDRNDj~d zq(_B~F3p+F`Li3UW7<7B9Y0UG39E9N#Hih@r|w(@{+W?!$!xYNLxeZ$S`DNM^Dphq!GnNmgtlI`qU{ z?13dk0l0!t;2_K6GmRPDQqb)Q#1>2D8h9_dB`tPA1K>uBY%geUZ;#rhou4`p)dvo8 z^+F&SdI*AK#o9w>B^gdGEDILD%g-Qf+VYSUUrbSh>Q=0Un&}pFSs-fQ^b4j%Z}i8G zTVHuu{Vnpl{@tg&|4`(4rxr|iKTu?8Dm}UfG&VM}gt~Mf^)szL(zerQ@j7~D!vb>ivDUH1tn zhPdIqAr}#r6KX90i!0x!5K%-jQ~`jDaBGoOkKeJLT+i|jnqa0y1H>DZBpX+=i3}GJ zlPN=z?;kDUI$iE5nTxtS(A-TWN3sW z-@}@gN*ab6rUQ$5)}^!JzvVOFI4<2sSgqx^FCTC}vOJQR{&L)fz9K;r zOcxDIk_>$>1|ylt^rukddsx$CZlRvnw|)Dzf(-U0OP3VXRn46@e?WX>8xm`!%}`Fu ztxQ&7BNiJodt0muJ879oup$AkNoB5BvazkiT`X2CXkW@A+$>llT~(7SJAQ{Nm?nWs zsR#%tMUT?0$u=bZ6YEthJ6^1?ZskBU`G1Hts@lS{;1o2$^uXIx`!&^M2R+AHK(Az7^-_vMbGy*H+ zslE?dQ$NNM1YW-Rh9ULoNt=(;Bpx}BbGlG(zXr!=Fsw@^TILOMY6FqFKtvsIbf*TV z-N8Jr1R;R7lYgOUgh5U?v`%Be_UIjyvb5p@O2jVHQqrq-@H3|Ww zEgCHhPW2gs70qbUb=9Pm_--G#JBw>lT^m)*t)O&iy=4_49Rvb0+)KmxC-!OC&YJ;d zp*lw2o*Typ`0xazxSy2lltIW%@Yqnb+<7dJgtmfH76%_v%3hCcuD;xTRAJX>!fN1# zQ@k%30K#KbiB(?i26&o*deMm)dX93J2;iR{4P7!%*AH;M87!quQ_Yn@CPw$}rk4yb zm#ZJ%G`7h*5aFdwiwH9CVyaW8zre1{@^&-l0n0A~4nBT6Nlnm=B-}_lq0;||UKHOs zvo3d9UW>W+PIwbdLTBv9G-Mr;PbIp8MSywtvHB zOxq5KZ?@fk32}4G?oqAA*Uk5TOsK9?4^SMEt*5l@b1v6wob@oTF8{;4l(bwQU@2%D z>Fc}EH+FuTqrWWys@90Zi7EHA@%|f5J?)E^{G=&%6JcZ*8pg0kMXUi~#!8CykbFO$ zV$Dm#=COM8+dLqmtEy`90jg0J>xyZoBfX^JZ88xx9H+mH`?G3{u9{Os!8E-DLU2wL zTlb1?!^yivKD*KEU<_qeliR{IB3%TjCVjcTn$G#N4PkhnzMx>3+vjOiPRt>oj|P?T zd+vCJSl4QI_v0vEd9;J*=%gIOc~PCRmtf-H^3*zY=r{cwr?1ELbD$W6a$E?0*(asR z&hyf=M*WH^6J?7=Z~qe6+_~0K3nEuHH^N?!M~v?%S*&Ehv^y`UOP5q0jZSps1Yr*q zYjHzipI;ZA3Ph@j(so20lgEK{qMFrz>)O-9BT@)C2@_c;e`EkIH`0{FT<;2@BIWK@ zSQewi{~adK`=YQLg+=tI0~{puEqW*-Z^paI*}~L3Zqx41H%5P_GAnc&k3YDaxXYoO z*xolaz@OXSfKH5Pi@Oo6q$yRzvXlxjJv)u% zB5;uggGmP^!5h;+VZEUj1E_$-^waCb`Y%#p7LL=NE5G0ybyz`jeM0K%J*`H$5(H$< zj?EUEwm~0VvWDY%Qi*6&(|sd&=8HLN_U}5N<%ZD>jZ_z?KrCTuqnE{AgcwF1mt96D zea3gU%MQK7_WC5W0BmYO6-5}YAn`!Ds6)Glq4d`CK`QPRoHmVCkJ<7)*KD-c%HyIh zu2-dYTr;?Z>}R~Ue9nDoaWHaU`~PuhCYpiTuz~D5&|0CQCAq}OsgaNQql{?;#R^{@zH!bdqYEk=)7lW2H)4ITCsxqlXo`Ow_e;Z*xCpjWCs2Z1 z)oCmIX^#l2$$&;N8GF9#k5p{F-9vCcFNI_4?+%|IGm#kNhm3oI@2#td%}#$UF=auH1LcK6R#mbzwtbD!&WHTD3A)~OD;!G7Oz-eh$`!O2f2;m2+` zs^_PSj`?*GT5F>737~x&$yb1ry{uh-gqbG4^(YF6i-T>5zJu#Ljv~{~;IqySSd!-7iWgEOuFwzhCkTv$M^)do?XhNX3(zKlq&= zzkJSmjPd?p#4~}_Mf~5_GPvzD)zoZK@F>6X*=OdAD1wg|@6`}G9lzh_>Eccl7U%yE z-wZ$m8#^p)No3h7Pn`;lp(wf0!@Mj`_r2937>!9 zofaM~LhW?3r$<5d>Z+CMo{iQn*Q8$g5DO3?-o53C;zXaopykZQjanC3 zfsoJHV#gmq;EI8E_FD$)ZRoNjjBr!(h%2zbRkdG~!m!d=`IvBWVKs{pp&dANy#f;QEcaNSejy zUE|%oNG_Aq+iGmVHrmWCxqjs6`_4d|UcO$W9;t8&nF>6Q6t?Ej|LNR+@`?ZU_$6J$u|MkKZr!ACV-1U1cv^A3QA)&9&T4?vXZe z%O+d*;t^MsnRE9K(Unx(M{>hB-c{M+)hp5k*V*Bt8Z;*=Zbbms!OTo4t%I?l;)M!y z>T#`N@+M4g^`Bya@WN4N=J&|2m)^bN;jwXh67>0b^WM!~Yo*llDBI=arE%8ab~fuU z(`91e<;fdH?&zGk^0+QciAfuT%POTN1OIa%gUA$wEA^j^LMQwkI!5aMY-kY(q|j-3 z>5Ow)&s)|5i-d@;eBg)RSLIJ%t?G4o8oel;jUNOCN>nz}-)-%oHZ65Emvs+NSF~{L zJ)K5F-`%a>)OQ)>l)F!yH@BsnE=qil^n5%)d11W!{dlwtdwHD9+Hj{xh#l7qHOMjv$pC%P(MNn-ft(k6$yl zCQav5$fX0-11)>e&Gss1L+q!*BUmHHsX5C8SC7lY*CVfKgODMP;?S3zH(?`$LVfM_ z6@3!EzTRgGd(=2@V4H*M6JVm2xo8R((Bx&JX<*FrDS6Y{f~^6qVe1-k34ObBd&|oa zfoSHpYmqIfr&9ROk8mUgeO-`mE)@u_ewY=_1W)x20yvRN=2(#eiW{FdXB+M)Hj^fr zdAl}W6kCIE^PTs#O1b1p92wI~ydGi1E8eGQhXKV%rzoc%GdE?zuOX$rsee}|OnXb` zCb?SbAu;alM32`^^=hr+E|+)GQnv>lr1tUvA$X4@DGn|Es$vRexyS95q>+0I0qBRy zdtG;bN_6C@vH1E|69-ilwl-GXfLopYgcdYAKhUwn!b2bxI&4z$;EzEYq)_Dd3qJ%` zD)ckmf9@rOBR1GAHTv$d2-mmk`r`+4navHaw#$>?6T{HL%Ml|xEN$_-SY*g&i1&82 zaZl|8GQ0NU2g?ivvCK*dZ?CKtV!B_Cf5UzT#?eo_wtpU1?P~Xi@zy)EU0uGWl@Sa+ zy76rtd*8ml>C~lKYiVXr9bx1DB|Dl@l=GX*ZC<>(UV|;R#c1mkr2@QlE0#{QhUjzs zQ61xj-w4MLVQ@)C;B`zT=JV6_+{#*%Cwbt{Y#%}B3yeMB2oCT8H9JHu`4DJ>V*8S$ zF#jHHabX|oRNCB6_q=i0-08U4PWTAz0P%J5D)VU;8y;J{L(VjFL!f3)_uel4fI@5L zWUk$rZ~NUE{0@`b4{YiUDhKZ-+8H#v`x;m#jga68HYe0LlAsQPedasYk<)@Z zKOsRWwttfl!2niQky3y%7z?-7*k!bw{{H#V0*4|XGS+Dti{x7X`8w!jMECV8n6SeM zMPm*-HIUSH^(vsnYF?+?IT#ne!dbnJrT1Oq`lMz^Z+l~LF_R`*TtWyr*k9-Av~1Z$ z$oDpRy_;vx+(zP~xOFUn-G^2p&eT&W7c?AFe3cxZKu-g7b&(AXfTR%6_$LCeFC9wYX|=ny$3Rn*aYJd*x%gl zm$H?oV9;(TrTEQUl{;+;e7|U1{`+_%dg40aYxg+k?1Mb3$rijXk_KW0jYXLHHg(Rg zh0KXVu6b!0^cjn+z{WD=9QuwrcS3ai{=^|wZoIRvj}8x)hr$Fzz`L$OXO`IGXnI_= z-m@NQxOSK+v(RA%<9yRp&p5aI=B7qr_a&zR%01L?h9ei^NcOUru0u6`?kM_WPJbFQObuliep`J%AY);BNt0Foff*wO z8BWVg3PvOm+%1AD%R>q7O4%zNg;4A7F^Pl`LL7WNYdqVh^RCjdFN{$TQnyEqxFsr6 z7ha)r*{^2O8$+bw;`oBH#LHj=B|mC!5v61gsH)=1=K%z-HTDwH4TO z4oB3wJBBd@_N%SA_G%F4TZoYzTLnwmnCjpBt=<0;lb@ccWldX0}>d zTG92k+5{aa_G^pmOigPT?2E))?_9Rej3*VDLwqmAU%sA{yqw&0tzW8q{ucF_;BG4Y zK^q1~vZu*XkO2vS%_!a~XnxB>tgWc0F` zXv{qn#8=QA8XN3m2}kZd2MC8m?4Yjg{NBC&GuoQ8l7ile0`kzb#Uj!XmxxpCp%_yY zJ|`{0NUGM2_T?+nB=H)mu>l`FA5x@j*=p@+toJ!3Gjo-1UJUE@soWjf25}p!4G#p@ z!dIHWI(PFj;gWxtWF5TOjAv%rR$M4tI;Ggm3MDe{0&5z7Qq`av|z5*9z3QOmxuf>-?re zTyj4Ne~K1%vB#jEn^m*D7U`m3lB2|~vQo~y=xS27XGkW7CH5g0bTc9lP-#CQmPL}5 zF=ExmW}5>Tau8nK=7)XLPUv~^4o^0?oGbHU2XCK!5uS|?Q(CSzlX?Y3PeZ@wZ+%<} z=qtgUx0pQ#d<$_A1|v}5SDerjs)u5IhFdni9?`#Uu~Q`3?Kc*3SheeFy9Io$wXm26 zjaLs7$4`848mnVXLm!gZF9+Rg6W$$Z`TP=aU)xhO(|K-P9m zdn9I0otQEaN0Ecl+|r}j%vw8WBz`w_<%zc+K$pa`Op zgoY~&44wOfsXu>Qzg|AMD9)4UO97NzOkn1}F1r3sONC;Vi+^I}_5 zy?9g9stqDG;15{!)8;9ss;>5#PkmsrAzj4*O#7=O@4z1fvGd@SF6ess6Sc<=l7a z@V%}tj^J#b_x^g3XsvqM(b1t;w`=r#{p;+VQ{>Cm*a~6wS|-k4F4)-f%VtUk>*4*d z_w-$(ucsoj7e)oOkAuDYa{ULi!pA@6bg$#mikg@pqRz=>?d~(!de*|)>cj=qeW^1t z2TIj7J8TeJUSc_iW3k8Lc&yJhHK`Fhz-mLeKWRHabAv06@Hp=Q%3>L7+KqTWMvvT! z@)`&lziXdJ9`JAa!_3LMxUz)n^q_nEBK9Vtf>_6*u<#N&>J+}B_RrJAsc88=3MZFU{W+k3cNre3afSy}A&cWKH7D(yU3#GWr8b1IF}Mw#Jmx ztH>wqFwR@gc?W-ae>=1HeB;hnu*f)hYoecFcmac!D5tONTCPQQvCqvyLtap}w_Ko+g zrI#H7KGE7f=h|wm`L}XHY}Ss9k5wSEbUC69S0$6Y8NA<}EqsjN(+(gZ6*h>CkJp%{ zA6bre4Rxc(@U`w`U)&7ZD@nww54u+c;4K1JQ1`7mI9|Wf_ZaFsakr^Vm(z}QG{?~@ zn2;{|k>;*_$FX@C`K704@(Lof`S;B`pWnr5n0+I&jP8HulXP4iqx7<*Wk$Jv_L+?; zsh+nboxxa2KOt&Y%On^-al6cXv5hh^zWs=X!{(hAu_-&j3DAQ8Iz|)L3VFxtlH>%@7O&#HyZ>RC zWT{0H8WEcJHD1%EMS_hx_ zxbgfE`nX2Sl2O5y__g}BZKKUfrb8BOiJCfH-SYY@Zz-4!r9V>Qi?2Q`&9*f^R?O_> z2#MSXZL}=m%SPyKKQdj!lE>VyDURkuz9wFuCc>|hfohVR#X~Fb4Y(4P020q0X-dNN z9EQ*~$Z%UdAI}JygCF*^Ou&OS#~vkK1jOx&^$upqMvFD)foZuuF3ZvIXj@U1qp~i) zNoLunZY|P6rq_5Wg8}#MEtwq1bYXc*J_YEp`zTOnp7h}Bd0?G&o#=<&(!v-S)%USGOTodP_Oc+*Du7k zc{sB`9=$6Up9hFu!9(=B#Q>4TxUo!XlM=Ar7ZOhuZ&d1Iyz?rq z)&(D2>EvMg7gkzYHtciqRR&sfwG`Sqs%l4-nj})Q;Hgp0>v9WpL*Wz;kVxd4d9F6W z)!;O|U5~)uGsT}!1nJW$9TKE@H&QY~n>6A*0$>8DPYCJtp&-7WWsZ=L@+M=vPfSDl zkx75FbQPd7KTrT_6psj8L!6==R9o2r$_k56y@;iK9=l<;#q(L%$2V^%xO z!Kv&`0idEmjLJ5`$Rt7}v9n>f_AsRq7Lyw(FIMXT?@cdRrolq*Z%6-ny9LzF=$Ty4RtYr4C3r{*Z6E^zkvsc zq%AeM{%uDmcaaZdoQANMaDLLniGbqrp(2Zo1+Wp`*Q^1a z$Tum{&p#x``Xy1iOjWDxPAtOXtzjN8IqGK@F8sFz!*}?c67zK7AW-W7+bxp4c0RLz)*Z-2*+%*m%8YA zFA>6JhJORv9*HE?kKnB()%%?LgCglqP;}rsQ82SLM{ilxK)4X=E_DYDTy6#=(4@ZRPw)#(o6PKia)rlZ}muxD=>tVk1NR8PjD+ujTLWPVdqZV=>tQaX zXJD{$NVadg-=?rZmfBSQD5Ke}Pf7vGQ6#IiTqD^9A{1p}@%}xQlAMRqd^=h7Bx)f@ zCyP{0;ZQx!b>L9-yHIiFQG&)t&kRKdx}WXzKv`OIsUw_kYvA7WF->; zAkC&?Q<)ua{pg|FLbjNkkP@aZ8wizcF5lRh>??UT-@)T-dW|Vz5lTE)6ubb-mqGDl z`k5GH0@z$0pWAsA6XdHpFe7QUxp&K0`)s@nO=d7;CFZ8q^UaIS(u(GC$HbEf>q2nE z?8hhr8EN+|67St(?uPjOE*Ajv>9gm832-bbOGQ~Wl<1)7V;X(*-PZ?m%w`(>Btb`F zBKM<0lJu1t3Z2ep(Os&k-3yEuOu@?&tLO*Vkn|9XgOZ$?@9_4n%;!<>+=<8w;CC=VQX4 z#r=-G$`AxAM;LdKX7RbLYWSU6%`k)h4k~eO6GjRghiK^+-!Dusov?Iyk@XCWYWZf{ zl1(bzt(}LsYkDH9*6A!z+zLC9R{#E-4=C?TYeTS8&F6Mp8uA@4Q73efGD%7!Jk~SU zWlwN)Yy1Y9#50x8OA`2zEmEjD5eYJRl$*`(v*DK8_^zJ}3|#&r*&2X6S{3?^oTQ~T zON+q9sT9fEDl5h)-Vm@sqE8wxD#t&3R%%!-FH`$%^T z8=Xzq-dUMT{1!nY>eou4oIwCqZB!}WHx}OC0j_`m9#w;CM*RbS7n{XD)+am(<6d)X z^VOz31JB#Pdk12G%k6xIj*lP8S+*O=2yB>}i_lxFRjl&z!L+*0{78Nrf4)>qk_p+)r%qq}W!XF$}l+&sl)-xj<;bVCvZO0EwnR~f# zJ&XxCan+2+_TrnuqxxpGkCXwMZ}^EqC5;u@X^>_e7Ck?@V-Ray)+TW$X_#x>RZQ}Hp-k%yHtJ=*r1lwf<(k+pVUsop5E8EMT0k9JzL~=6*5Z#Ht8HkQ zeZxJtN)sOVU#@|6Udauwkx2^e94|#pDjilU>xh@GgCXo)RPYulDVtn&j%p=cQBVOG zQJDfbXWzH4Vvu$RqZ_$DVOO++T&wo_VU6v}>oyrvTma1avBz$>#oAzYYjXbpU^?ZY1M;DDCKYU1;PgAifob{j+8#+qDfLu&OC#6 zh&Vg#01@mU_%PLSl0B=i+)G<=AJqbegt z+BN5q!c!mrU+HvCz)Plb3%VsCxpFG-PRoHUE4^I+bjT+PY5W=^4DH*DQwhkn5#|KZjNT*5{}E^H+S~jNJTtdDHZe3ga6+`dTGCke=lb z8d&9d(U|O(ybSX;rQVmH1G3MAa7m-P|Nivy>4H&Bfld^865*Ci@l%3VCJL9z!p^aB-C4K(N_8S zL>40j7oQsgBz2}tcf8WVd`-CReM>i^7QSPc`0r*bs$}XHF&|D>uVhyJZXS`V{y=^#YGa0*=~5jJU3Vg zR3!yJ_({6Vqy?b-uOa5zgO9l(O1QjiJC*lnQepTog$we=2fY zQ$l$?()1z1r+S2L$HwC`pX`sh|;neD;*H#ciH3>oGxAb zKyR{e2I579X)e0a)1lsNOe9ofm)+&~Qo6}d1!?KPvR$0UHK(6tQPwn4a76oUWXIol zW7rMlcMh%s`53B`Wx@P4p{qYcx8T!5Hf$`aOl6R@IvplNfjMXlkYIw48hd~L8PqtK z&)5{dt#oYjIqxak%YN|J&*1O=*43Q2DeO#Y=r5~qNR>UWcnlL}J*$=YJ_^=7@I-GX z82ahj_o$ppC@6-#sJjJ}3CwZgR$O;ulB9I%au&Pi)Su6^6uWWolAoPhX75Ja$~R5U z?Cnny3~cn#wgz)9kj^)Pi&Zf=lGO_)uy@C@5?)7?6~G3fPA%3^r?Eo+sPIxAAG@Bd zcg^o{bfQFyAC_oW{@(46K84qv=(Tr5LFvZ53k-%0H`rBInr@ICQ5l`;S39kBJ+K>M z)h1IC*aViAmY&__HIFvSQ)7(3e?h#RCo7iQxYKh1f{a|* zaIOZ0_*C=zvq4kfrYA2aXF7ZzH%e?XYy@jLOq?l6wX*4yxFy!C-7nz-s{l5%XeR zt#20Qnf`*aj&Xi}_Y&Z&i6v;M`E6i&diwm{SSjM#n1cLOgt)5oy3qK={W1}pwV@D? zcEQsyt)r0?`(oUcfF6f{pbUS0oR*Xjj%bP?`*A_Tq&^Hbs;X;ha|VE)3X&b^;u~8} zXu8W`7Fs+&xs^x?FuBY<_G?N=ZRa3fPxn9rsufr#6KQw%GPnY`UHc#tjsn1zO5V0( zN70@#-A_^DQp%ObR~Dx=+oh}VORkrAR$pic@rWTZHlA;?5R#x>!D*ha`XU|j@^PiS z5h_4Y)zusiUy*4kkDiazDke0W<$N zt!1h>4!+W%OH($J13-CT@&HF)21bMw5MLvMy&kJRmk*hYKAkIT_Xaz5gvk-hb~KM< zC{o_=t%1HKb2c~4e2cr0nzIYzx}MI5sIk1C*iOl|6i!4W1CivLJ=+Lp+T0s_;1T>h zjCeBl1M>~o#gidjPf=m~GL+YTDb>w94l1)RKUbd8mo%-YSQM6m(NZ4h)b6ZC&kL*t zntmhqI-1jmIH?Eu%(r0>-A=JlF$LWC$_4|ColLsMAXI8ll*>~!nFV6srFOw*aM)sl z#@{2wF{JhG`^!K(Z0xSEKva~M$8{wGe>%du?;!Ouw(){jP)m-%ele`yKaHsQPuj#P zTT(En=0doB_~gC`_yMcIEz?6xjzjoU$q>g+t9;l%7+6wv7Vl(=qs49A&YhrPARB7( zjeJowrFwa>G&`SRr@N%Y=1Q@GGpCP;^FDyj);sc%Ct`fG6jKYG78Al?64$HyV`}&o z9khr@Awrh4wNmz8aIB&!u9NTiP0WvSlp4I3nZ}1G@ z`YzbgzD?$M&yT@-9^iQj`fHD?x|7@7 z97Y%HRgg@yQ-{kPQRNcF8-j!RLOr1=ul{ymQ7eWA0~k^*3v?Dx;8oGc*3PU4o_wV) z8r-T8D`Jp~Dn@uct}9By^ol|Vz!0d0h>VvSLB_NBZm-q@ubEH&4Gt1czOb5?1i||t z_K13zqr=|F?M3z0@Vun*+Y9L81)bw@EV*#Oy>4_dQx%i#Eab)W=}>55udc&7?em|{ zwltqV8eEib^eWpB$ah?{)x-8rL?Twyg#%BOO{!GmyHu@`sLp8SdogdbRe4oHM`i7j z-x4{riw!N*I$%*}D9A?4QN62@xVf)0z2+(q5*70I;*MtD3Sy+zD@uS4lRl2s2P*I^ zglad*KaPs*dfpox?owS~owv2;YS(;I?0iij^R!u_h*xt0AX#2v%n{K{E{*RSSq{o1 zXooFXTzbQ6GG7a?t=!HxUkg`)7FhMe-&WgUO1S^RH#Q)v(yz{CsjwaJ`;n+UJ5F5d z71uDOn~?n1wrvnPd!J=nGu7zOQH7{n^fOnXQ{-LfgDORW8Fnur--!bFk^xgkyjpwS zTkIQJv1%4kc#1@c+qQm{f7~paPZ2t*1$j_)tCx-$qx6atrZbPw20Wz=85o;ox~EKi zr6=IaMB|Hykl(^mc?15`j3uJ>XpKvfzS?0+UY$6h^j=RQfji$?bw$#4ReIarxY9{nP?@l7z zQ#09=rHO>sRzmEQs`ZcKm3KN@k}pT7{gWxXsZ}$exlu`I&Ps=Oz6q4=D{H%U@C@HRI~p%w>E%QZHo6wKo^qZdi=_-JQPFg}i~ig)Ap+^4F??*mikuSh=)`ey-n3nvQqh0h1AE-)KVSIK^tiN8`^HUv~ z&uyK`yR&5Pw{w>wDqkUL1%BBK?}tBhjC+lQGZsgkl;0ha0bIRkwAo_!diMBLFP&Xg zaV#tGoko7I;#h2vAfUwUA+2;h^|v?>AYuc2)DZzz zZ=#Jm*I$1CFaRoOe`XWu^Ed_Qr5My%Rku`(rkgz0n3+*C#kw`FPTK^00Uuc~()(o& z_@q^oBw-RRUDf>hb?~=1$ngcKEL|@0U9I&)d4Tb7*Sdyo50sE~j=nJ;t}?6nfa;lEmZS$_s6}t4>n$qHRF4kmT9M4u z<55kZp_Lg%!J0nN=8xz!qGm5NwsBAL3TG$DM4_#HI-Kk1&~1Rrz}RuD-Ps?GOy8== z(mYP{?BG}21OeC)@TQVE>?l3|>CPAmSIVuVY^{-|8fX<+YxE)mx)jB3e1_!~nIz$< z7w-q6R<`${#Ed&o@G-ZIJP#5NF#M`pV~%N~CI88r$m_r?mYYo)#O5h1bH7UCTzA zU}Hi80qE*-Yz_3aYeDhX*!mItiQvi&qw1hC63SSPtEF~_`)L^d(#vpzfbGMASL^RZ z8NRnWXw=i_@s9foMQguM$Q+r9B=V3U3P|k9I2+SYLTi4VQnkrG{0f$BbElpf$w=iU zoFZIa`~vp8mdbtc(Y6-%Qz}X<91&6FPF{5TK6YkREQ|4UgDbVkBKSdGrvkr=6V0fV z7|p)gLKO#Ps^4vf(l0-iOzkx6%z94tV;S6!orgv*2i!*$}!&uvOUjrrO8a8qW}Z zvjFbkVz-r78Fgtw_I;$a7ASC8P(bkI9vbr-vczv2!_57klS08u@n#$Koo}_mi2H&r zB{+>EFf`?n@_@C+f15dSj{XV^-VNTwo%Tl!WRddSt1NnKFlu)~HvPw16JjH+Dx`ui zBO(yo25ydj*#!*p+$=RPv;oUeitnN%v{F93HLV%FkFo3v0h4`1@!A>1v!Cu2CKe*% z!7v+3&iHPzY5#1A2VmM4>wxnMb4e?{QO@ReSzDo0m3-oxD0Bnhm4X=PfEaPq{tnL? zX=BAG&pMxq)!0avr!DMJFaB_lX)$=eu|5~yvx)BaMY+?xy{yk&Ayx zcE;5(%Gc%ESyJ6ZG}PyJUr!bZ#SLMDruNgwk+SOQr0|IP&KQ4eQC_v$yXao;ZQb1iP2?` z;~J|OwjzGTXN=UB0#|vxh;bRhVh(?3+Yq9*xvmVY9bPgWWh%-actA8ix5ov1D{i3@ z9=~9a>tdT(WWZqc*SG3C-5bA?KV-(#2_TLQBTF$*2ju+IeFn|JtNJGc zUx96)+kWv5PBI*M`@)7gI>gTsF4+D4ZhbHLoNNTX)In20$!-!5;WdL{k{`y-9JHyx z2*qQ%xJ7Oc7wR-UJmtL1Zmr?t1eUkr{#ES;NHf2G6oCXd2b-TdZXi-$A^mdr@RK6#JabLq* z+hSt`bh}`WukJfozA(U}Xw;WmYpnE8-B@d}ll;0&-_`xI^X7rMMi0uyToh#)=AVKk zV7I1Im~4V>trX5rd1NHF0GcwXFx>VgS=8h(KO4_gRV(aWY=A_@w(t7ZUG=}kygbo94H2`_cccV9-@g)*O-w@Qy@FP!Nc zendIF{SM1=&!jch<`)pQlNLCyP0$YZdI*8$&xuSsou##it6jY?XqXo7*dkn#D>A9JK1TeQ)U_~IwEwU`rC$X> zaYTR%JUdihJn^es0*}ipjaGgQ1tJ6V5Vc2L*bkq39^ia^C&d>yaigPlwFU=W@O@Vp zR6CUx8kghis0c{o z3uUCtCl~+H;Wk`C8e^YtHRN^TW0F>0mj((t&%{w%E9e9VW_-F_NamswHwA9e+aFYg^9UeL7C0uMAdlxKGbJD)Hcvc*= zH3qn&#-RVx)329c2q9BLpd9<^23eO610B9RkI}_Xr>N9+zKri6Yinrokw?uL?K;2Q z(*=UhQw-w2ZG^}7t_p$hc`*eVj+v+UbOl5)fF6Fhgj~igMmXX=J|8EKmVO3J+;3j3 z&J7^vv|bqgb2MEr?>;vxxpm*b+o zSR9S~%(q{E#?s!PBNXP*$+^OUaffy*_1?&WZ}*=T&YEHjMgLG0%U|=TwN~|3wO6&` z)*)%0U`2Z$cIEC>Yjq7U&KJuh#ixs&z94^;xGo%jOB=+3@XaRl&8Z5g1Sfg*FQClS z#~FU1k(e&oq8AyKD85ZEbHbJ0k1bJMo_j_IhA^|+?Dfize;tW{Jd6c8@o!GbU7ovE z;06Zvl2M%l?lMeq>*b7F?-1|v$#kdR&rgg?$=MIWaED4A3TGFN?>YG`bWTxPx6S7+ zR+6kz&t znUe9+&O9&iU1hS?SAtppJ+aSuY|)=b_n56U$GFJ%61RQBHJ#|z%q4+hydx-@MaZ;4 zR#8!LJ{%hTY9noh^D>r7`;rA?J4b4ZUK;K1~qrjvu;N2PS_X{rzyt48xcFQagJCC?e*NM~Es63r7VTVpeM-xomG-a04JmZI2}NdXX9Gz; zFF8bAXd`L{9KugLd{S=p16h~m{cHeGJPb82HJ(m_*n)6*{;swStiXs!CmG515jhap zX;a%jD1+f%2+F>|Cz4;XXcouNo$#Fi!~fa!g6f6)`pJYP7>8Ihe_q1dAL#(_{nhF$jFjM?_Tlg zGR5-uf#Z!ea-ru%jGl|4+otZVWtMzVhm*|AiMA%skBbvtdZ+E^fTdI5(@m69`o{kEK=jfrMI802=nwDwpkg_BnyK(XJf2Z>e^27+({0KX#@=LjQPmDen8YMcs2tCl2%xm)Fs1f^|v1 zsaHw+Bs#TnN!q)Zd&ZL^&;485Mf;y&%wQcJ9gp0TWA^t>h*+gwU;nnioRGmAO&>-( zZF~+ngR?5aIq)@7d$g?PUn(k2C|^VDjwXb}j!vq{el1R1j-+$c*8QhD)QnAd;c^YV zwgz~1f?m7=(+Vz)l}ZFw^5Jtf5r~nbQ7=Dza5mCc5$q;So8(l$%-|v0*OZrYS zlLt?6soTM~Grp}m!?jr4sYB0Uht0*7jy6vA*Wt#?{L2?LSqN$*PRJH*-MSjM-QsAS z{XubHsj~3&dfh~&Nt2$}GM;XCHCQGYnc&0`s1V^DVGv=zIn9rMn*Q$dJ9#%AII;9l zZ#i%aztu*oiU$clEUz8?Q&6)w{{KI}nomy`Bwqc=sQ7b@p~Cai_4(7_tJtknTLmH; z@2IVjV>uk(t;KR};)WF9;@eAW4NG0$%&Yo!bHTD@%R-qp=BjUK3%$JknC-dkdaj~< zw!6#Q9i^{cy}I$e>Wm{zme0=YR89X~nfra7ZS1Y(Ee7GhR0Lc{7Q!_nrUSUuEvOTm zjY-VQ9KfM=pk^?ER1P2&29R<9eTySxcO!UP+OFAgRxC~(YYMMU4QDYmH9gpxeD3nW p37`!1(&-U!_XUdiF0P;dGoDy??9Dkr|EUZ>;OXk;vd$@?2>?|yz8L@j literal 0 HcmV?d00001 diff --git a/src/NadekoBot/project.json b/src/NadekoBot/project.json index 88ebdd52..d6b8ad6c 100644 --- a/src/NadekoBot/project.json +++ b/src/NadekoBot/project.json @@ -23,7 +23,12 @@ "Google.Apis.Urlshortener.v1": "1.19.0.138", "Google.Apis.YouTube.v3": "1.20.0.701", "Google.Apis.Customsearch.v1": "1.20.0.466", - "ImageSharp": "1.0.0-alpha-000079", + "ImageSharp": "1.0.0-alpha2-00090", + "ImageSharp.Processing": "1.0.0-alpha2-00078", + "ImageSharp.Formats.Png": "1.0.0-alpha2-00086", + "ImageSharp.Drawing": "1.0.0-alpha2-00090", + "ImageSharp.Drawing.Paths": "1.0.0-alpha2-00040", + //"ImageSharp.Formats.Jpeg": "1.0.0-alpha2-00090", "Microsoft.EntityFrameworkCore": "1.1.0", "Microsoft.EntityFrameworkCore.Design": "1.1.0", "Microsoft.EntityFrameworkCore.Sqlite": "1.1.0", From ed656f503bb9b0211c033298e2494c11e322030a Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 21 Feb 2017 01:00:53 +0100 Subject: [PATCH 058/496] ~clr fixed --- src/NadekoBot/Modules/Searches/Searches.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Searches/Searches.cs b/src/NadekoBot/Modules/Searches/Searches.cs index ef47301c..096a171c 100644 --- a/src/NadekoBot/Modules/Searches/Searches.cs +++ b/src/NadekoBot/Modules/Searches/Searches.cs @@ -21,6 +21,7 @@ using System.Xml; using Configuration = AngleSharp.Configuration; using NadekoBot.Attributes; using Discord.Commands; +using ImageSharp.Processing.Processors; namespace NadekoBot.Modules.Searches { @@ -622,7 +623,7 @@ namespace NadekoBot.Modules.Searches return; var img = new ImageSharp.Image(50, 50); - //img.FillPolygon(new ImageSharp, new ImageSharp.Color(color)); + img.ApplyProcessor(new BackgroundColorProcessor(ImageSharp.Color.FromHex(color)), img.Bounds); await Context.Channel.SendFileAsync(img.ToStream(), $"{color}.png").ConfigureAwait(false); ; } From cfc00b5df6864636cc9f806f3328ed0b145a62ba Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 21 Feb 2017 03:04:22 +0100 Subject: [PATCH 059/496] Fixed $roll X response, $waifuinfo now shows up to 40 random wives, not all --- .../Modules/Gambling/Commands/DiceRollCommand.cs | 4 ++-- .../Modules/Gambling/Commands/WaifuClaimCommands.cs | 4 +++- src/NadekoBot/Resources/ResponseStrings.Designer.cs | 11 ++++++++++- src/NadekoBot/Resources/ResponseStrings.resx | 5 ++++- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/NadekoBot/Modules/Gambling/Commands/DiceRollCommand.cs b/src/NadekoBot/Modules/Gambling/Commands/DiceRollCommand.cs index 721b5b4e..8a0323b9 100644 --- a/src/NadekoBot/Modules/Gambling/Commands/DiceRollCommand.cs +++ b/src/NadekoBot/Modules/Gambling/Commands/DiceRollCommand.cs @@ -124,9 +124,9 @@ namespace NadekoBot.Modules.Gambling bitmap.Save(ms); ms.Position = 0; await Context.Channel.SendFileAsync(ms, "dice.png", - Context.User.Mention + + Context.User.Mention + " " + GetText("dice_rolled_num", Format.Bold(values.Count.ToString())) + - " " + GetText("Total: {1} Average: {2}", + " " + GetText("total_average", Format.Bold(values.Sum().ToString()), Format.Bold((values.Sum() / (1.0f * values.Count)).ToString("N2")))).ConfigureAwait(false); } diff --git a/src/NadekoBot/Modules/Gambling/Commands/WaifuClaimCommands.cs b/src/NadekoBot/Modules/Gambling/Commands/WaifuClaimCommands.cs index 212fd1d2..6847dcfc 100644 --- a/src/NadekoBot/Modules/Gambling/Commands/WaifuClaimCommands.cs +++ b/src/NadekoBot/Modules/Gambling/Commands/WaifuClaimCommands.cs @@ -423,6 +423,8 @@ namespace NadekoBot.Modules.Gambling var claimInfo = GetClaimTitle(target.Id); var affInfo = GetAffinityTitle(target.Id); + var rng = new NadekoRandom(); + var nobody = GetText("nobody"); var embed = new EmbedBuilder() .WithOkColor() @@ -432,7 +434,7 @@ namespace NadekoBot.Modules.Gambling .AddField(efb => efb.WithName(GetText("likes")).WithValue(w.Affinity?.ToString() ?? nobody).WithIsInline(true)) .AddField(efb => efb.WithName(GetText("changes_of_heart")).WithValue($"{affInfo.Count} - \"the {affInfo.Title}\"").WithIsInline(true)) .AddField(efb => efb.WithName(GetText("divorces")).WithValue(divorces.ToString()).WithIsInline(true)) - .AddField(efb => efb.WithName($"Waifus ({claims.Count})").WithValue(claims.Count == 0 ? nobody : string.Join("\n", claims.Select(x => x.Waifu))).WithIsInline(true)); + .AddField(efb => efb.WithName($"Waifus ({claims.Count})").WithValue(claims.Count == 0 ? nobody : string.Join("\n", claims.OrderBy(x => rng.Next()).Take(40).Select(x => x.Waifu))).WithIsInline(true)); await Context.Channel.EmbedAsync(embed).ConfigureAwait(false); } diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index e2d01a97..57744c5b 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -2244,7 +2244,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Dice rolled: {1}. + /// Looks up a localized string similar to Dice rolled: {0}. /// public static string gambling_dice_rolled_num { get { @@ -2577,6 +2577,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Total: {0} Average: {1}. + /// + public static string gambling_total_average { + get { + return ResourceManager.GetString("gambling_total_average", resourceCulture); + } + } + /// /// Looks up a localized string similar to your affinity is already set to that waifu or you're trying to remove your affinity while not having one.. /// diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index c1eb0a5d..5e1f21f7 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -1081,7 +1081,7 @@ Don't forget to leave your discord name or id in the message. Someone rolled 35 - Dice rolled: {1} + Dice rolled: {0} Dice Rolled: 5 @@ -1218,4 +1218,7 @@ Don't forget to leave your discord name or id in the message. Submissions Closed + + Total: {0} Average: {1} + \ No newline at end of file From 43ad7120f56564c6023e07af90168ffa930fac11 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 21 Feb 2017 03:06:13 +0100 Subject: [PATCH 060/496] $divorce response string fixed --- src/NadekoBot/Resources/ResponseStrings.Designer.cs | 4 ++-- src/NadekoBot/Resources/ResponseStrings.resx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index 57744c5b..dbf21639 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -2655,9 +2655,9 @@ namespace NadekoBot.Resources { /// /// Looks up a localized string similar to You have divorced a waifu who doesn't like you. You received {0} back.. /// - public static string gambling_waifu_divorced_not_like { + public static string gambling_waifu_divorced_notlike { get { - return ResourceManager.GetString("gambling_waifu_divorced_not_like", resourceCulture); + return ResourceManager.GetString("gambling_waifu_divorced_notlike", resourceCulture); } } diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index 5e1f21f7..86ecb97b 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -1142,7 +1142,7 @@ Don't forget to leave your discord name or id in the message. You have divorced a waifu who likes you. You heartless monster. {0} received {1} as a compensation. - + You have divorced a waifu who doesn't like you. You received {0} back. From 14c0b44f03a68bc0861e4ba31f3f69cc97659977 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 21 Feb 2017 03:27:30 +0100 Subject: [PATCH 061/496] fixed message deleted and message updated with image uploads or embeds --- .../Modules/Administration/Commands/LogCommand.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/NadekoBot/Modules/Administration/Commands/LogCommand.cs b/src/NadekoBot/Modules/Administration/Commands/LogCommand.cs index 88d512e7..b6b4967b 100644 --- a/src/NadekoBot/Modules/Administration/Commands/LogCommand.cs +++ b/src/NadekoBot/Modules/Administration/Commands/LogCommand.cs @@ -705,8 +705,8 @@ namespace NadekoBot.Modules.Administration var embed = new EmbedBuilder() .WithOkColor() .WithTitle("🗑 " + logChannel.Guild.GetLogText("msg_del", ((ITextChannel)msg.Channel).Name)) - .WithDescription($"{msg.Author}") - .AddField(efb => efb.WithName(logChannel.Guild.GetLogText("content")).WithValue(msg.Resolve(userHandling: TagHandling.FullName)).WithIsInline(false)) + .WithDescription(msg.Author.ToString()) + .AddField(efb => efb.WithName(logChannel.Guild.GetLogText("content")).WithValue(string.IsNullOrWhiteSpace(msg.Content) ? "-" : msg.Resolve(userHandling: TagHandling.FullName)).WithIsInline(false)) .AddField(efb => efb.WithName("Id").WithValue(msg.Id.ToString()).WithIsInline(false)) .WithFooter(efb => efb.WithText(currentTime)); if (msg.Attachments.Any()) @@ -714,8 +714,9 @@ namespace NadekoBot.Modules.Administration await logChannel.EmbedAsync(embed).ConfigureAwait(false); } - catch + catch (Exception ex) { + _log.Warn(ex); // ignored } } @@ -753,8 +754,8 @@ namespace NadekoBot.Modules.Administration .WithOkColor() .WithTitle("📝 " + logChannel.Guild.GetLogText("msg_update", ((ITextChannel)after.Channel).Name)) .WithDescription(after.Author.ToString()) - .AddField(efb => efb.WithName(logChannel.Guild.GetLogText("old_msg")).WithValue(before.Resolve(userHandling: TagHandling.FullName)).WithIsInline(false)) - .AddField(efb => efb.WithName(logChannel.Guild.GetLogText("new_msg")).WithValue(after.Resolve(userHandling: TagHandling.FullName)).WithIsInline(false)) + .AddField(efb => efb.WithName(logChannel.Guild.GetLogText("old_msg")).WithValue(string.IsNullOrWhiteSpace(before.Content) ? "-" : before.Resolve(userHandling: TagHandling.FullName)).WithIsInline(false)) + .AddField(efb => efb.WithName(logChannel.Guild.GetLogText("new_msg")).WithValue(string.IsNullOrWhiteSpace(after.Content) ? "-" : after.Resolve(userHandling: TagHandling.FullName)).WithIsInline(false)) .AddField(efb => efb.WithName("Id").WithValue(after.Id.ToString()).WithIsInline(false)) .WithFooter(efb => efb.WithText(currentTime)); From 0af1a711e2ce7750ac1946dc96809a9e78b945aa Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 21 Feb 2017 03:50:24 +0100 Subject: [PATCH 062/496] normal links in log attachment list --- src/NadekoBot/Modules/Administration/Commands/LogCommand.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Administration/Commands/LogCommand.cs b/src/NadekoBot/Modules/Administration/Commands/LogCommand.cs index b6b4967b..039e8f74 100644 --- a/src/NadekoBot/Modules/Administration/Commands/LogCommand.cs +++ b/src/NadekoBot/Modules/Administration/Commands/LogCommand.cs @@ -710,7 +710,7 @@ namespace NadekoBot.Modules.Administration .AddField(efb => efb.WithName("Id").WithValue(msg.Id.ToString()).WithIsInline(false)) .WithFooter(efb => efb.WithText(currentTime)); if (msg.Attachments.Any()) - embed.AddField(efb => efb.WithName(logChannel.Guild.GetLogText("attachments")).WithValue(string.Join(", ", msg.Attachments.Select(a => a.ProxyUrl))).WithIsInline(false)); + embed.AddField(efb => efb.WithName(logChannel.Guild.GetLogText("attachments")).WithValue(string.Join(", ", msg.Attachments.Select(a => a.Url))).WithIsInline(false)); await logChannel.EmbedAsync(embed).ConfigureAwait(false); } From 126d5d61d77349088118abb72355a67714a6bbe4 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 21 Feb 2017 14:05:51 +0100 Subject: [PATCH 063/496] Fixed acrophobia responses --- src/NadekoBot/Modules/Games/Commands/Acropobia.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Games/Commands/Acropobia.cs b/src/NadekoBot/Modules/Games/Commands/Acropobia.cs index aa11f1c6..fc2b6f8c 100644 --- a/src/NadekoBot/Modules/Games/Commands/Acropobia.cs +++ b/src/NadekoBot/Modules/Games/Commands/Acropobia.cs @@ -301,7 +301,8 @@ $@"-- private string GetText(string key, params object[] replacements) => NadekoTopLevelModule.GetTextStatic(key, NadekoBot.Localization.GetCultureInfo(_channel.Guild), - typeof(Games).Name.ToLowerInvariant()); + typeof(Games).Name.ToLowerInvariant(), + replacements); } } } \ No newline at end of file From 4e51918c0830b979a6a48040c79beee9a747c010 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 21 Feb 2017 15:28:59 +0100 Subject: [PATCH 064/496] Fixed .donators string --- src/NadekoBot/Resources/ResponseStrings.Designer.cs | 2 +- src/NadekoBot/Resources/ResponseStrings.resx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index dbf21639..d49f4610 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -349,7 +349,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Thanks to the people listed below for making this project hjappen!. + /// Looks up a localized string similar to Thanks to the people listed below for making this project happen!. /// public static string administration_donators { get { diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index 86ecb97b..7cf55c8f 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -397,7 +397,7 @@ Reason: {1} Sucessfully added a new donator.Total donated amount from this user: {0} 👑 - Thanks to the people listed below for making this project hjappen! + Thanks to the people listed below for making this project happen! I will forward DMs to all owners. From 23e8a082d3a7b5758409b4f1acaab3b7ee9181f1 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 21 Feb 2017 18:46:17 +0100 Subject: [PATCH 065/496] Fixed some keys, a bit more localization --- .../Modules/Games/Commands/Acropobia.cs | 2 +- .../Modules/Games/Commands/HangmanCommands.cs | 20 +++++-------------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/NadekoBot/Modules/Games/Commands/Acropobia.cs b/src/NadekoBot/Modules/Games/Commands/Acropobia.cs index fc2b6f8c..c65c24e6 100644 --- a/src/NadekoBot/Modules/Games/Commands/Acropobia.cs +++ b/src/NadekoBot/Modules/Games/Commands/Acropobia.cs @@ -261,7 +261,7 @@ $@"-- return; _votes.AddOrUpdate(kvp.Key, 1, (key, old) => ++old); await _channel.SendConfirmAsync(GetText("acrophobia"), - GetText("vote_cast", Format.Bold(guildUser.ToString()))).ConfigureAwait(false); + GetText("acro_vote_cast", Format.Bold(guildUser.ToString()))).ConfigureAwait(false); await msg.DeleteAsync().ConfigureAwait(false); } diff --git a/src/NadekoBot/Modules/Games/Commands/HangmanCommands.cs b/src/NadekoBot/Modules/Games/Commands/HangmanCommands.cs index 0fb8e2f3..9726eb65 100644 --- a/src/NadekoBot/Modules/Games/Commands/HangmanCommands.cs +++ b/src/NadekoBot/Modules/Games/Commands/HangmanCommands.cs @@ -7,6 +7,7 @@ using System; using System.Collections.Concurrent; using System.Threading.Tasks; using NadekoBot.Modules.Games.Hangman; +using Discord; namespace NadekoBot.Modules.Games { @@ -15,23 +16,12 @@ namespace NadekoBot.Modules.Games [Group] public class HangmanCommands : NadekoSubmodule { - private static Logger _log { get; } - //channelId, game public static ConcurrentDictionary HangmanGames { get; } = new ConcurrentDictionary(); - private static string typesStr { get; } = ""; - - static HangmanCommands() - { - _log = LogManager.GetCurrentClassLogger(); - typesStr = - string.Format("`List of \"{0}hangman\" term types:`\n", NadekoBot.ModulePrefixes[typeof(Games).Name]) + String.Join(", ", HangmanTermPool.data.Keys); - } - [NadekoCommand, Usage, Description, Aliases] public async Task Hangmanlist() { - await Context.Channel.SendConfirmAsync(typesStr); + await Context.Channel.SendConfirmAsync(Format.Code(GetText("hangman_types", Prefix)) + "\n" + String.Join(", ", HangmanTermPool.data.Keys)); } [NadekoCommand, Usage, Description, Aliases] @@ -41,7 +31,7 @@ namespace NadekoBot.Modules.Games if (!HangmanGames.TryAdd(Context.Channel.Id, hm)) { - await Context.Channel.SendErrorAsync("Hangman game already running on this channel.").ConfigureAwait(false); + await ReplyErrorLocalized("hangman_running").ConfigureAwait(false); return; } @@ -56,14 +46,14 @@ namespace NadekoBot.Modules.Games } catch (Exception ex) { - try { await Context.Channel.SendErrorAsync($"Starting errored: {ex.Message}").ConfigureAwait(false); } catch { } + try { await Context.Channel.SendErrorAsync(GetText("hangman_start_errored") + " " + ex.Message).ConfigureAwait(false); } catch { } HangmanGame throwaway; HangmanGames.TryRemove(Context.Channel.Id, out throwaway); throwaway.Dispose(); return; } - await Context.Channel.SendConfirmAsync("Hangman game started", hm.ScrambledWord + "\n" + hm.GetHangman()); + await Context.Channel.SendConfirmAsync(GetText("hangman_game_started"), hm.ScrambledWord + "\n" + hm.GetHangman()); } } } From a5adce9b6fe7d30af515d488c393f8cfa9766462 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 21 Feb 2017 18:46:37 +0100 Subject: [PATCH 066/496] woopps --- .../Resources/ResponseStrings.Designer.cs | 54 +++++++++++++++++++ src/NadekoBot/Resources/ResponseStrings.resx | 18 +++++++ 2 files changed, 72 insertions(+) diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index d49f4610..da3aab5b 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -2860,6 +2860,60 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Currency generation has been disabled on this channel.. + /// + public static string games_curgen_disabled { + get { + return ResourceManager.GetString("games_curgen_disabled", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Currency generation has been enabled on this channel.. + /// + public static string games_curgen_enabled { + get { + return ResourceManager.GetString("games_curgen_enabled", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Hangman game started. + /// + public static string games_hangman_game_started { + get { + return ResourceManager.GetString("games_hangman_game_started", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Hangman game already running on this channel.. + /// + public static string games_hangman_running { + get { + return ResourceManager.GetString("games_hangman_running", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Starting hangman errored.. + /// + public static string games_hangman_start_errored { + get { + return ResourceManager.GetString("games_hangman_start_errored", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to List of "{0}hangman" term types:. + /// + public static string games_hangman_types { + get { + return ResourceManager.GetString("games_hangman_types", resourceCulture); + } + } + /// /// Looks up a localized string similar to Question. /// diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index 7cf55c8f..6fa196c1 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -1221,4 +1221,22 @@ Don't forget to leave your discord name or id in the message. Total: {0} Average: {1} + + Currency generation has been disabled on this channel. + + + Currency generation has been enabled on this channel. + + + Hangman game started + + + Hangman game already running on this channel. + + + Starting hangman errored. + + + List of "{0}hangman" term types: + \ No newline at end of file From 895d24c75504b677c373d4e5d84a46848c8497b6 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 21 Feb 2017 20:42:04 +0100 Subject: [PATCH 067/496] .sinfo more reliable? --- src/NadekoBot/Modules/Utility/Commands/InfoCommands.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Utility/Commands/InfoCommands.cs b/src/NadekoBot/Modules/Utility/Commands/InfoCommands.cs index 0eedba24..fefd0a01 100644 --- a/src/NadekoBot/Modules/Utility/Commands/InfoCommands.cs +++ b/src/NadekoBot/Modules/Utility/Commands/InfoCommands.cs @@ -52,7 +52,7 @@ namespace NadekoBot.Modules.Utility .WithColor(NadekoBot.OkColor); if (guild.Emojis.Any()) { - embed.AddField(fb => fb.WithName($"**Custom Emojis ({guild.Emojis.Count})**").WithValue(string.Join(" ", guild.Emojis.Shuffle().Take(25).Select(e => $"{e.Name} <:{e.Name}:{e.Id}>")))); + embed.AddField(fb => fb.WithName($"**Custom Emojis ({guild.Emojis.Count})**").WithValue(string.Join(" ", guild.Emojis.Shuffle().Take(20).Select(e => $"{e.Name} <:{e.Name}:{e.Id}>")))); } await Context.Channel.EmbedAsync(embed).ConfigureAwait(false); } From fff6cb40242b0a13c6eabf9a27888389215424c8 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Wed, 22 Feb 2017 11:40:51 +0100 Subject: [PATCH 068/496] fixed a string, closes #1075 --- src/NadekoBot/Modules/Gambling/Commands/WaifuClaimCommands.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Gambling/Commands/WaifuClaimCommands.cs b/src/NadekoBot/Modules/Gambling/Commands/WaifuClaimCommands.cs index 6847dcfc..7f3e4b03 100644 --- a/src/NadekoBot/Modules/Gambling/Commands/WaifuClaimCommands.cs +++ b/src/NadekoBot/Modules/Gambling/Commands/WaifuClaimCommands.cs @@ -368,7 +368,7 @@ namespace NadekoBot.Modules.Gambling if (waifus.Count == 0) { - await ReplyConfirmLocalized("waifu_none").ConfigureAwait(false); + await ReplyConfirmLocalized("waifus_none").ConfigureAwait(false); return; } From 8ae3d0c5e58738c0947c4f2b4841209d4547c9a2 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Wed, 22 Feb 2017 15:20:49 +0100 Subject: [PATCH 069/496] closes #1079 --- src/NadekoBot/Modules/Games/Commands/PollCommands.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/NadekoBot/Modules/Games/Commands/PollCommands.cs b/src/NadekoBot/Modules/Games/Commands/PollCommands.cs index 1434ee9e..a17e9d26 100644 --- a/src/NadekoBot/Modules/Games/Commands/PollCommands.cs +++ b/src/NadekoBot/Modules/Games/Commands/PollCommands.cs @@ -48,8 +48,6 @@ namespace NadekoBot.Modules.Games { var channel = (ITextChannel)Context.Channel; - if (!(Context.User as IGuildUser).GuildPermissions.ManageChannels) - return; if (string.IsNullOrWhiteSpace(arg) || !arg.Contains(";")) return; var data = arg.Split(';'); From ec9c556f06e1e95700840ee7d18ff8065c9182c2 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Wed, 22 Feb 2017 16:11:06 +0100 Subject: [PATCH 070/496] closes #1080 --- src/NadekoBot/Modules/Games/Commands/Acropobia.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Games/Commands/Acropobia.cs b/src/NadekoBot/Modules/Games/Commands/Acropobia.cs index c65c24e6..bcfc279d 100644 --- a/src/NadekoBot/Modules/Games/Commands/Acropobia.cs +++ b/src/NadekoBot/Modules/Games/Commands/Acropobia.cs @@ -284,7 +284,7 @@ $@"-- var winner = table.First(); var embed = new EmbedBuilder().WithOkColor() .WithTitle(GetText("acrophobia")) - .WithDescription(GetText("winner", Format.Bold(_submissions[winner.Key].ToString()), + .WithDescription(GetText("acro_winner", Format.Bold(_submissions[winner.Key].ToString()), Format.Bold(winner.Value.ToString()))) .WithFooter(efb => efb.WithText(winner.Key.ToLowerInvariant().ToTitleCase())); From 5cdb41b65f333e9233a36febb2841ed263babe6d Mon Sep 17 00:00:00 2001 From: Kwoth Date: Wed, 22 Feb 2017 18:16:05 +0100 Subject: [PATCH 071/496] A lot more localization, cleanup, inole improved and dateadded is not a field in all database models --- .../20170222162505_dateadded.Designer.cs | 1171 +++++++++++++++++ .../Migrations/20170222162505_dateadded.cs | 357 +++++ .../NadekoSqliteContextModelSnapshot.cs | 76 ++ .../Modules/Games/Commands/Acropobia.cs | 5 +- .../Games/Commands/CleverBotCommands.cs | 2 +- .../Games/Commands/PlantAndPickCommands.cs | 4 +- .../Modules/Games/Commands/TicTacToe.cs | 9 - src/NadekoBot/Modules/Games/Games.cs | 33 +- src/NadekoBot/Modules/Utility/Utility.cs | 119 +- .../Resources/CommandStrings.Designer.cs | 4 +- src/NadekoBot/Resources/CommandStrings.resx | 4 +- .../Resources/ResponseStrings.Designer.cs | 301 +++++ src/NadekoBot/Resources/ResponseStrings.resx | 104 ++ .../Services/Database/Models/DbEntity.cs | 2 +- 14 files changed, 2101 insertions(+), 90 deletions(-) create mode 100644 src/NadekoBot/Migrations/20170222162505_dateadded.Designer.cs create mode 100644 src/NadekoBot/Migrations/20170222162505_dateadded.cs diff --git a/src/NadekoBot/Migrations/20170222162505_dateadded.Designer.cs b/src/NadekoBot/Migrations/20170222162505_dateadded.Designer.cs new file mode 100644 index 00000000..89102dc7 --- /dev/null +++ b/src/NadekoBot/Migrations/20170222162505_dateadded.Designer.cs @@ -0,0 +1,1171 @@ +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using NadekoBot.Services.Database; +using NadekoBot.Services.Database.Models; +using NadekoBot.Modules.Music.Classes; + +namespace NadekoBot.Migrations +{ + [DbContext(typeof(NadekoContext))] + [Migration("20170222162505_dateadded")] + partial class dateadded + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { + modelBuilder + .HasAnnotation("ProductVersion", "1.1.0-rtm-22752"); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Action"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Seconds"); + + b.Property("UserThreshold"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId") + .IsUnique(); + + b.ToTable("AntiRaidSetting"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AntiSpamSettingId"); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.HasKey("Id"); + + b.HasIndex("AntiSpamSettingId"); + + b.ToTable("AntiSpamIgnore"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Action"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("MessageThreshold"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId") + .IsUnique(); + + b.ToTable("AntiSpamSetting"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("ItemId"); + + b.Property("Type"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("BlacklistItem"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BetflipMultiplier"); + + b.Property("Betroll100Multiplier"); + + b.Property("Betroll67Multiplier"); + + b.Property("Betroll91Multiplier"); + + b.Property("BufferSize"); + + b.Property("CurrencyDropAmount"); + + b.Property("CurrencyGenerationChance"); + + b.Property("CurrencyGenerationCooldown"); + + b.Property("CurrencyName"); + + b.Property("CurrencyPluralName"); + + b.Property("CurrencySign"); + + b.Property("DMHelpString"); + + b.Property("DateAdded"); + + b.Property("ErrorColor"); + + b.Property("ForwardMessages"); + + b.Property("ForwardToAllOwners"); + + b.Property("HelpString"); + + b.Property("Locale"); + + b.Property("MigrationVersion"); + + b.Property("MinimumBetAmount"); + + b.Property("OkColor"); + + b.Property("RemindMessageFormat"); + + b.Property("RotatingStatuses"); + + b.Property("TriviaCurrencyReward"); + + b.HasKey("Id"); + + b.ToTable("BotConfig"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BaseDestroyed"); + + b.Property("CallUser"); + + b.Property("ClashWarId"); + + b.Property("DateAdded"); + + b.Property("SequenceNumber"); + + b.Property("Stars"); + + b.Property("TimeAdded"); + + b.HasKey("Id"); + + b.HasIndex("ClashWarId"); + + b.ToTable("ClashCallers"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("EnemyClan"); + + b.Property("GuildId"); + + b.Property("Size"); + + b.Property("StartedAt"); + + b.Property("WarState"); + + b.HasKey("Id"); + + b.ToTable("ClashOfClans"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("CommandName"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Seconds"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("CommandCooldown"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("CommandName"); + + b.Property("DateAdded"); + + b.Property("Price"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.HasIndex("Price") + .IsUnique(); + + b.ToTable("CommandPrice"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("InternalTrigger"); + + b.Property("Modifier"); + + b.Property("UnitType"); + + b.HasKey("Id"); + + b.ToTable("ConversionUnits"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Amount"); + + b.Property("DateAdded"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("Currency"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Amount"); + + b.Property("DateAdded"); + + b.Property("Reason"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.ToTable("CurrencyTransactions"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildId"); + + b.Property("IsRegex"); + + b.Property("OwnerOnly"); + + b.Property("Response"); + + b.Property("Trigger"); + + b.HasKey("Id"); + + b.ToTable("CustomReactions"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AvatarId"); + + b.Property("DateAdded"); + + b.Property("Discriminator"); + + b.Property("UserId"); + + b.Property("Username"); + + b.HasKey("Id"); + + b.HasAlternateKey("UserId"); + + b.ToTable("DiscordUser"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Amount"); + + b.Property("DateAdded"); + + b.Property("Name"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("Donators"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("Text"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("EightBallResponses"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("GuildConfigId1"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.HasIndex("GuildConfigId1"); + + b.ToTable("FilterChannelId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Word"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("FilteredWord"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("GuildId"); + + b.Property("Type"); + + b.Property("Username"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("FollowedStream"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("GCChannelId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AutoAssignRoleId"); + + b.Property("AutoDeleteByeMessages"); + + b.Property("AutoDeleteByeMessagesTimer"); + + b.Property("AutoDeleteGreetMessages"); + + b.Property("AutoDeleteGreetMessagesTimer"); + + b.Property("AutoDeleteSelfAssignedRoleMessages"); + + b.Property("ByeMessageChannelId"); + + b.Property("ChannelByeMessageText"); + + b.Property("ChannelGreetMessageText"); + + b.Property("CleverbotEnabled"); + + b.Property("DateAdded"); + + b.Property("DefaultMusicVolume"); + + b.Property("DeleteMessageOnCommand"); + + b.Property("DmGreetMessageText"); + + b.Property("ExclusiveSelfAssignedRoles"); + + b.Property("FilterInvites"); + + b.Property("FilterWords"); + + b.Property("GreetMessageChannelId"); + + b.Property("GuildId"); + + b.Property("Locale"); + + b.Property("LogSettingId"); + + b.Property("MuteRoleName"); + + b.Property("PermissionRole"); + + b.Property("RootPermissionId"); + + b.Property("SendChannelByeMessage"); + + b.Property("SendChannelGreetMessage"); + + b.Property("SendDmGreetMessage"); + + b.Property("TimeZoneId"); + + b.Property("VerbosePermissions"); + + b.Property("VoicePlusTextEnabled"); + + b.HasKey("Id"); + + b.HasIndex("GuildId") + .IsUnique(); + + b.HasIndex("LogSettingId"); + + b.HasIndex("RootPermissionId"); + + b.ToTable("GuildConfigs"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("GuildId"); + + b.Property("Interval"); + + b.Property("Message"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("GuildRepeater"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("LogSettingId"); + + b.HasKey("Id"); + + b.HasIndex("LogSettingId"); + + b.ToTable("IgnoredLogChannels"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("LogSettingId"); + + b.HasKey("Id"); + + b.HasIndex("LogSettingId"); + + b.ToTable("IgnoredVoicePresenceCHannels"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelCreated"); + + b.Property("ChannelCreatedId"); + + b.Property("ChannelDestroyed"); + + b.Property("ChannelDestroyedId"); + + b.Property("ChannelId"); + + b.Property("ChannelUpdated"); + + b.Property("ChannelUpdatedId"); + + b.Property("DateAdded"); + + b.Property("IsLogging"); + + b.Property("LogOtherId"); + + b.Property("LogUserPresence"); + + b.Property("LogUserPresenceId"); + + b.Property("LogVoicePresence"); + + b.Property("LogVoicePresenceId"); + + b.Property("LogVoicePresenceTTSId"); + + b.Property("MessageDeleted"); + + b.Property("MessageDeletedId"); + + b.Property("MessageUpdated"); + + b.Property("MessageUpdatedId"); + + b.Property("UserBanned"); + + b.Property("UserBannedId"); + + b.Property("UserJoined"); + + b.Property("UserJoinedId"); + + b.Property("UserLeft"); + + b.Property("UserLeftId"); + + b.Property("UserMutedId"); + + b.Property("UserPresenceChannelId"); + + b.Property("UserUnbanned"); + + b.Property("UserUnbannedId"); + + b.Property("UserUpdated"); + + b.Property("UserUpdatedId"); + + b.Property("VoicePresenceChannelId"); + + b.HasKey("Id"); + + b.ToTable("LogSettings"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("ModuleName"); + + b.Property("Prefix"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("ModulePrefixes"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Author"); + + b.Property("AuthorId"); + + b.Property("DateAdded"); + + b.Property("Name"); + + b.HasKey("Id"); + + b.ToTable("MusicPlaylists"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("MutedUserId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("NextId"); + + b.Property("PrimaryTarget"); + + b.Property("PrimaryTargetId"); + + b.Property("SecondaryTarget"); + + b.Property("SecondaryTargetName"); + + b.Property("State"); + + b.HasKey("Id"); + + b.HasIndex("NextId") + .IsUnique(); + + b.ToTable("Permission"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("Status"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("PlayingStatus"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("MusicPlaylistId"); + + b.Property("Provider"); + + b.Property("ProviderType"); + + b.Property("Query"); + + b.Property("Title"); + + b.Property("Uri"); + + b.HasKey("Id"); + + b.HasIndex("MusicPlaylistId"); + + b.ToTable("PlaylistSong"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AuthorId"); + + b.Property("AuthorName") + .IsRequired(); + + b.Property("DateAdded"); + + b.Property("GuildId"); + + b.Property("Keyword") + .IsRequired(); + + b.Property("Text") + .IsRequired(); + + b.HasKey("Id"); + + b.ToTable("Quotes"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("Icon"); + + b.Property("Name"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("RaceAnimals"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("IsPrivate"); + + b.Property("Message"); + + b.Property("ServerId"); + + b.Property("UserId"); + + b.Property("When"); + + b.HasKey("Id"); + + b.ToTable("Reminders"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildId"); + + b.Property("RoleId"); + + b.HasKey("Id"); + + b.HasIndex("GuildId", "RoleId") + .IsUnique(); + + b.ToTable("SelfAssignableRoles"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("UserId"); + + b.Property("type"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("PokeGame"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AffinityId"); + + b.Property("ClaimerId"); + + b.Property("DateAdded"); + + b.Property("Price"); + + b.Property("WaifuId"); + + b.HasKey("Id"); + + b.HasIndex("AffinityId"); + + b.HasIndex("ClaimerId"); + + b.HasIndex("WaifuId") + .IsUnique(); + + b.ToTable("WaifuInfo"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("NewId"); + + b.Property("OldId"); + + b.Property("UpdateType"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("NewId"); + + b.HasIndex("OldId"); + + b.HasIndex("UserId"); + + b.ToTable("WaifuUpdates"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig") + .WithOne("AntiRaidSetting") + .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b => + { + b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting") + .WithMany("IgnoredChannels") + .HasForeignKey("AntiSpamSettingId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig") + .WithOne("AntiSpamSetting") + .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("Blacklist") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b => + { + b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar") + .WithMany("Bases") + .HasForeignKey("ClashWarId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("CommandCooldowns") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("CommandPrices") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("EightBallResponses") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FilterInvitesChannelIds") + .HasForeignKey("GuildConfigId"); + + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FilterWordsChannelIds") + .HasForeignKey("GuildConfigId1"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FilteredWords") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FollowedStreams") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("GenerateCurrencyChannelIds") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b => + { + b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting") + .WithMany() + .HasForeignKey("LogSettingId"); + + b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission") + .WithMany() + .HasForeignKey("RootPermissionId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("GuildRepeaters") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b => + { + b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting") + .WithMany("IgnoredChannels") + .HasForeignKey("LogSettingId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b => + { + b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting") + .WithMany("IgnoredVoicePresenceChannelIds") + .HasForeignKey("LogSettingId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("ModulePrefixes") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("MutedUsers") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b => + { + b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next") + .WithOne("Previous") + .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("RotatingStatusMessages") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b => + { + b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist") + .WithMany("Songs") + .HasForeignKey("MusicPlaylistId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("RaceAnimals") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => + { + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity") + .WithMany() + .HasForeignKey("AffinityId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer") + .WithMany() + .HasForeignKey("ClaimerId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu") + .WithOne() + .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => + { + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New") + .WithMany() + .HasForeignKey("NewId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old") + .WithMany() + .HasForeignKey("OldId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + } + } +} diff --git a/src/NadekoBot/Migrations/20170222162505_dateadded.cs b/src/NadekoBot/Migrations/20170222162505_dateadded.cs new file mode 100644 index 00000000..5f96eca8 --- /dev/null +++ b/src/NadekoBot/Migrations/20170222162505_dateadded.cs @@ -0,0 +1,357 @@ +using System; +using System.Collections.Generic; +using Microsoft.EntityFrameworkCore.Migrations; + +namespace NadekoBot.Migrations +{ + public partial class dateadded : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "DateAdded", + table: "WaifuUpdates", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "WaifuInfo", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "PokeGame", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "SelfAssignableRoles", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "Reminders", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "RaceAnimals", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "Quotes", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "PlaylistSong", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "PlayingStatus", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "Permission", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "MutedUserId", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "MusicPlaylists", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "ModulePrefixes", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "LogSettings", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "IgnoredVoicePresenceCHannels", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "IgnoredLogChannels", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "GuildRepeater", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "GuildConfigs", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "GCChannelId", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "FollowedStream", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "FilteredWord", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "FilterChannelId", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "EightBallResponses", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "Donators", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "DiscordUser", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "CustomReactions", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "CurrencyTransactions", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "Currency", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "ConversionUnits", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "CommandPrice", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "CommandCooldown", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "ClashOfClans", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "ClashCallers", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "BotConfig", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "BlacklistItem", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "AntiSpamSetting", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "AntiSpamIgnore", + nullable: true); + + migrationBuilder.AddColumn( + name: "DateAdded", + table: "AntiRaidSetting", + nullable: true); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "DateAdded", + table: "WaifuUpdates"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "WaifuInfo"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "PokeGame"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "SelfAssignableRoles"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "Reminders"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "RaceAnimals"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "Quotes"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "PlaylistSong"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "PlayingStatus"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "Permission"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "MutedUserId"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "MusicPlaylists"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "ModulePrefixes"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "LogSettings"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "IgnoredVoicePresenceCHannels"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "IgnoredLogChannels"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "GuildRepeater"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "GuildConfigs"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "GCChannelId"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "FollowedStream"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "FilteredWord"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "FilterChannelId"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "EightBallResponses"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "Donators"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "DiscordUser"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "CustomReactions"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "CurrencyTransactions"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "Currency"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "ConversionUnits"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "CommandPrice"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "CommandCooldown"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "ClashOfClans"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "ClashCallers"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "BotConfig"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "BlacklistItem"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "AntiSpamSetting"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "AntiSpamIgnore"); + + migrationBuilder.DropColumn( + name: "DateAdded", + table: "AntiRaidSetting"); + } + } +} diff --git a/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs b/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs index 5a03594c..981d53cf 100644 --- a/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs +++ b/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs @@ -24,6 +24,8 @@ namespace NadekoBot.Migrations b.Property("Action"); + b.Property("DateAdded"); + b.Property("GuildConfigId"); b.Property("Seconds"); @@ -47,6 +49,8 @@ namespace NadekoBot.Migrations b.Property("ChannelId"); + b.Property("DateAdded"); + b.HasKey("Id"); b.HasIndex("AntiSpamSettingId"); @@ -61,6 +65,8 @@ namespace NadekoBot.Migrations b.Property("Action"); + b.Property("DateAdded"); + b.Property("GuildConfigId"); b.Property("MessageThreshold"); @@ -80,6 +86,8 @@ namespace NadekoBot.Migrations b.Property("BotConfigId"); + b.Property("DateAdded"); + b.Property("ItemId"); b.Property("Type"); @@ -120,6 +128,8 @@ namespace NadekoBot.Migrations b.Property("DMHelpString"); + b.Property("DateAdded"); + b.Property("ErrorColor"); b.Property("ForwardMessages"); @@ -158,6 +168,8 @@ namespace NadekoBot.Migrations b.Property("ClashWarId"); + b.Property("DateAdded"); + b.Property("SequenceNumber"); b.Property("Stars"); @@ -178,6 +190,8 @@ namespace NadekoBot.Migrations b.Property("ChannelId"); + b.Property("DateAdded"); + b.Property("EnemyClan"); b.Property("GuildId"); @@ -200,6 +214,8 @@ namespace NadekoBot.Migrations b.Property("CommandName"); + b.Property("DateAdded"); + b.Property("GuildConfigId"); b.Property("Seconds"); @@ -220,6 +236,8 @@ namespace NadekoBot.Migrations b.Property("CommandName"); + b.Property("DateAdded"); + b.Property("Price"); b.HasKey("Id"); @@ -237,6 +255,8 @@ namespace NadekoBot.Migrations b.Property("Id") .ValueGeneratedOnAdd(); + b.Property("DateAdded"); + b.Property("InternalTrigger"); b.Property("Modifier"); @@ -255,6 +275,8 @@ namespace NadekoBot.Migrations b.Property("Amount"); + b.Property("DateAdded"); + b.Property("UserId"); b.HasKey("Id"); @@ -272,6 +294,8 @@ namespace NadekoBot.Migrations b.Property("Amount"); + b.Property("DateAdded"); + b.Property("Reason"); b.Property("UserId"); @@ -286,6 +310,8 @@ namespace NadekoBot.Migrations b.Property("Id") .ValueGeneratedOnAdd(); + b.Property("DateAdded"); + b.Property("GuildId"); b.Property("IsRegex"); @@ -308,6 +334,8 @@ namespace NadekoBot.Migrations b.Property("AvatarId"); + b.Property("DateAdded"); + b.Property("Discriminator"); b.Property("UserId"); @@ -328,6 +356,8 @@ namespace NadekoBot.Migrations b.Property("Amount"); + b.Property("DateAdded"); + b.Property("Name"); b.Property("UserId"); @@ -347,6 +377,8 @@ namespace NadekoBot.Migrations b.Property("BotConfigId"); + b.Property("DateAdded"); + b.Property("Text"); b.HasKey("Id"); @@ -363,6 +395,8 @@ namespace NadekoBot.Migrations b.Property("ChannelId"); + b.Property("DateAdded"); + b.Property("GuildConfigId"); b.Property("GuildConfigId1"); @@ -381,6 +415,8 @@ namespace NadekoBot.Migrations b.Property("Id") .ValueGeneratedOnAdd(); + b.Property("DateAdded"); + b.Property("GuildConfigId"); b.Property("Word"); @@ -399,6 +435,8 @@ namespace NadekoBot.Migrations b.Property("ChannelId"); + b.Property("DateAdded"); + b.Property("GuildConfigId"); b.Property("GuildId"); @@ -421,6 +459,8 @@ namespace NadekoBot.Migrations b.Property("ChannelId"); + b.Property("DateAdded"); + b.Property("GuildConfigId"); b.HasKey("Id"); @@ -455,6 +495,8 @@ namespace NadekoBot.Migrations b.Property("CleverbotEnabled"); + b.Property("DateAdded"); + b.Property("DefaultMusicVolume"); b.Property("DeleteMessageOnCommand"); @@ -512,6 +554,8 @@ namespace NadekoBot.Migrations b.Property("ChannelId"); + b.Property("DateAdded"); + b.Property("GuildConfigId"); b.Property("GuildId"); @@ -534,6 +578,8 @@ namespace NadekoBot.Migrations b.Property("ChannelId"); + b.Property("DateAdded"); + b.Property("LogSettingId"); b.HasKey("Id"); @@ -550,6 +596,8 @@ namespace NadekoBot.Migrations b.Property("ChannelId"); + b.Property("DateAdded"); + b.Property("LogSettingId"); b.HasKey("Id"); @@ -578,6 +626,8 @@ namespace NadekoBot.Migrations b.Property("ChannelUpdatedId"); + b.Property("DateAdded"); + b.Property("IsLogging"); b.Property("LogOtherId"); @@ -638,6 +688,8 @@ namespace NadekoBot.Migrations b.Property("BotConfigId"); + b.Property("DateAdded"); + b.Property("ModuleName"); b.Property("Prefix"); @@ -658,6 +710,8 @@ namespace NadekoBot.Migrations b.Property("AuthorId"); + b.Property("DateAdded"); + b.Property("Name"); b.HasKey("Id"); @@ -670,6 +724,8 @@ namespace NadekoBot.Migrations b.Property("Id") .ValueGeneratedOnAdd(); + b.Property("DateAdded"); + b.Property("GuildConfigId"); b.Property("UserId"); @@ -686,6 +742,8 @@ namespace NadekoBot.Migrations b.Property("Id") .ValueGeneratedOnAdd(); + b.Property("DateAdded"); + b.Property("NextId"); b.Property("PrimaryTarget"); @@ -713,6 +771,8 @@ namespace NadekoBot.Migrations b.Property("BotConfigId"); + b.Property("DateAdded"); + b.Property("Status"); b.HasKey("Id"); @@ -727,6 +787,8 @@ namespace NadekoBot.Migrations b.Property("Id") .ValueGeneratedOnAdd(); + b.Property("DateAdded"); + b.Property("MusicPlaylistId"); b.Property("Provider"); @@ -756,6 +818,8 @@ namespace NadekoBot.Migrations b.Property("AuthorName") .IsRequired(); + b.Property("DateAdded"); + b.Property("GuildId"); b.Property("Keyword") @@ -776,6 +840,8 @@ namespace NadekoBot.Migrations b.Property("BotConfigId"); + b.Property("DateAdded"); + b.Property("Icon"); b.Property("Name"); @@ -794,6 +860,8 @@ namespace NadekoBot.Migrations b.Property("ChannelId"); + b.Property("DateAdded"); + b.Property("IsPrivate"); b.Property("Message"); @@ -814,6 +882,8 @@ namespace NadekoBot.Migrations b.Property("Id") .ValueGeneratedOnAdd(); + b.Property("DateAdded"); + b.Property("GuildId"); b.Property("RoleId"); @@ -831,6 +901,8 @@ namespace NadekoBot.Migrations b.Property("Id") .ValueGeneratedOnAdd(); + b.Property("DateAdded"); + b.Property("UserId"); b.Property("type"); @@ -852,6 +924,8 @@ namespace NadekoBot.Migrations b.Property("ClaimerId"); + b.Property("DateAdded"); + b.Property("Price"); b.Property("WaifuId"); @@ -873,6 +947,8 @@ namespace NadekoBot.Migrations b.Property("Id") .ValueGeneratedOnAdd(); + b.Property("DateAdded"); + b.Property("NewId"); b.Property("OldId"); diff --git a/src/NadekoBot/Modules/Games/Commands/Acropobia.cs b/src/NadekoBot/Modules/Games/Commands/Acropobia.cs index bcfc279d..ddaf3e98 100644 --- a/src/NadekoBot/Modules/Games/Commands/Acropobia.cs +++ b/src/NadekoBot/Modules/Games/Commands/Acropobia.cs @@ -240,7 +240,6 @@ $@"-- catch { } } - IGuildUser usr; //if (submissions.TryGetValue(input, out usr) && usr.Id != guildUser.Id) //{ // if (!usersWhoVoted.Add(guildUser.Id)) @@ -255,7 +254,7 @@ $@"-- if (int.TryParse(input, out num) && num > 0 && num <= _submissions.Count) { var kvp = _submissions.Skip(num - 1).First(); - usr = kvp.Value; + var usr = kvp.Value; //can't vote for yourself, can't vote multiple times if (usr.Id == guildUser.Id || !_usersWhoVoted.Add(guildUser.Id)) return; @@ -299,7 +298,7 @@ $@"-- } private string GetText(string key, params object[] replacements) - => NadekoTopLevelModule.GetTextStatic(key, + => GetTextStatic(key, NadekoBot.Localization.GetCultureInfo(_channel.Guild), typeof(Games).Name.ToLowerInvariant(), replacements); diff --git a/src/NadekoBot/Modules/Games/Commands/CleverBotCommands.cs b/src/NadekoBot/Modules/Games/Commands/CleverBotCommands.cs index 1f33bc2a..47aad031 100644 --- a/src/NadekoBot/Modules/Games/Commands/CleverBotCommands.cs +++ b/src/NadekoBot/Modules/Games/Commands/CleverBotCommands.cs @@ -19,7 +19,7 @@ namespace NadekoBot.Modules.Games [Group] public class CleverBotCommands : NadekoSubmodule { - private static Logger _log { get; } + private static new Logger _log { get; } public static ConcurrentDictionary> CleverbotGuilds { get; } = new ConcurrentDictionary>(); diff --git a/src/NadekoBot/Modules/Games/Commands/PlantAndPickCommands.cs b/src/NadekoBot/Modules/Games/Commands/PlantAndPickCommands.cs index ba98f5f1..423964cb 100644 --- a/src/NadekoBot/Modules/Games/Commands/PlantAndPickCommands.cs +++ b/src/NadekoBot/Modules/Games/Commands/PlantAndPickCommands.cs @@ -203,11 +203,11 @@ namespace NadekoBot.Modules.Games } if (enabled) { - await channel.SendConfirmAsync("Currency generation enabled on this channel.").ConfigureAwait(false); + await ReplyConfirmLocalized("curgen_enabled").ConfigureAwait(false); } else { - await channel.SendConfirmAsync("Currency generation disabled on this channel.").ConfigureAwait(false); + await ReplyConfirmLocalized("curgen_disabled").ConfigureAwait(false); } } diff --git a/src/NadekoBot/Modules/Games/Commands/TicTacToe.cs b/src/NadekoBot/Modules/Games/Commands/TicTacToe.cs index 2e115fd2..e1000af2 100644 --- a/src/NadekoBot/Modules/Games/Commands/TicTacToe.cs +++ b/src/NadekoBot/Modules/Games/Commands/TicTacToe.cs @@ -4,9 +4,7 @@ using NadekoBot.Attributes; using NadekoBot.Extensions; using NLog; using System; -using System.Collections.Concurrent; using System.Collections.Generic; -using System.Linq; using System.Text; using System.Threading; using System.Threading.Tasks; @@ -21,15 +19,8 @@ namespace NadekoBot.Modules.Games { //channelId/game private static readonly Dictionary _games = new Dictionary(); - private readonly Logger _log; - - public TicTacToeCommands() - { - _log = LogManager.GetCurrentClassLogger(); - } private readonly SemaphoreSlim sem = new SemaphoreSlim(1, 1); - private readonly object tttLockObj = new object(); [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] diff --git a/src/NadekoBot/Modules/Games/Games.cs b/src/NadekoBot/Modules/Games/Games.cs index 88a663df..2249c1b2 100644 --- a/src/NadekoBot/Modules/Games/Games.cs +++ b/src/NadekoBot/Modules/Games/Games.cs @@ -141,8 +141,11 @@ namespace NadekoBot.Modules.Games var pointy = (int)(miny - length * ((Crazy - 4) / 6)); var p = new Pen(ImageSharp.Color.Red, 5); - - img.Draw(p, new SixLabors.Shapes.Ellipse(200, 200, 5, 5)); + //using (var pointMs = File.ReadAllBytes("data/images/point.png").ToStream()) + //using (var pointIMg = new ImageSharp.Image(pointMs)) + //{ + // img.DrawImage(pointIMg, 100, new ImageSharp.Size(100, 100), new Point(pointx, pointy)); + //} string url; using (var http = new HttpClient()) @@ -167,19 +170,19 @@ namespace NadekoBot.Modules.Games } } - //[NadekoCommand, Usage, Description, Aliases] - //[RequireContext(ContextType.Guild)] - //public async Task RateGirl(IGuildUser usr) - //{ - // var gr = _girlRatings.GetOrAdd(usr.Id, GetGirl); - // var img = await gr.Url; - // await Context.Channel.EmbedAsync(new EmbedBuilder().WithOkColor() - // .WithTitle("Girl Rating For " + usr) - // .AddField(efb => efb.WithName("Hot").WithValue(gr.Hot.ToString("F2")).WithIsInline(true)) - // .AddField(efb => efb.WithName("Crazy").WithValue(gr.Crazy.ToString("F2")).WithIsInline(true)) - // .AddField(efb => efb.WithName("Advice").WithValue(gr.Advice).WithIsInline(false)) - // .WithImageUrl(img)).ConfigureAwait(false); - //} + [NadekoCommand, Usage, Description, Aliases] + [RequireContext(ContextType.Guild)] + public async Task RateGirl(IGuildUser usr) + { + var gr = _girlRatings.GetOrAdd(usr.Id, GetGirl); + var img = await gr.Url; + await Context.Channel.EmbedAsync(new EmbedBuilder().WithOkColor() + .WithTitle("Girl Rating For " + usr) + .AddField(efb => efb.WithName("Hot").WithValue(gr.Hot.ToString("F2")).WithIsInline(true)) + .AddField(efb => efb.WithName("Crazy").WithValue(gr.Crazy.ToString("F2")).WithIsInline(true)) + .AddField(efb => efb.WithName("Advice").WithValue(gr.Advice).WithIsInline(false)) + .WithImageUrl(img)).ConfigureAwait(false); + } private double NextDouble(double x, double y) { diff --git a/src/NadekoBot/Modules/Utility/Utility.cs b/src/NadekoBot/Modules/Utility/Utility.cs index 8d3a95c4..f69aef7d 100644 --- a/src/NadekoBot/Modules/Utility/Utility.cs +++ b/src/NadekoBot/Modules/Utility/Utility.cs @@ -117,7 +117,7 @@ namespace NadekoBot.Modules.Utility if (rotatingRoleColors.TryRemove(role.Id, out t)) { t.Change(Timeout.Infinite, Timeout.Infinite); - await channel.SendConfirmAsync($"Stopped rotating colors for the **{role.Name}** role").ConfigureAwait(false); + await ReplyConfirmLocalized("rrc_stop", Format.Bold(role.Name)).ConfigureAwait(false); } return; } @@ -132,7 +132,7 @@ namespace NadekoBot.Modules.Utility if (!hexColors.Any()) { - await channel.SendMessageAsync("No colors are in the correct format. Use `#00ff00` for example.").ConfigureAwait(false); + await ReplyErrorLocalized("rrc_no_colors").ConfigureAwait(false); return; } @@ -162,8 +162,7 @@ namespace NadekoBot.Modules.Utility old.Change(Timeout.Infinite, Timeout.Infinite); return t; }); - - await channel.SendFileAsync(images, "magicalgirl.jpg", $"Rotating **{role.Name}** role's color.").ConfigureAwait(false); + await channel.SendFileAsync(images, "magicalgirl.jpg", GetText("rrc_start", Format.Bold(role.Name))).ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -180,14 +179,14 @@ namespace NadekoBot.Modules.Utility .WithAuthor(eab => eab.WithIconUrl("https://togethertube.com/assets/img/favicons/favicon-32x32.png") .WithName("Together Tube") .WithUrl("https://togethertube.com/")) - .WithDescription($"{Context.User.Mention} Here is your room link:\n{target}")); + .WithDescription(Context.User.Mention + " " + GetText("togtub_room_link") + "\n" + target)); } [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] - public async Task WhosPlaying([Remainder] string game = null) + public async Task WhosPlaying([Remainder] string game) { - game = game.Trim().ToUpperInvariant(); + game = game?.Trim().ToUpperInvariant(); if (string.IsNullOrWhiteSpace(game)) return; @@ -207,7 +206,7 @@ namespace NadekoBot.Modules.Utility int i = 0; if (arr.Length == 0) - await Context.Channel.SendErrorAsync("Nobody is playing that game.").ConfigureAwait(false); + await ReplyErrorLocalized("nobody_playing_game").ConfigureAwait(false); else { await Context.Channel.SendConfirmAsync("```css\n" + string.Join("\n", arr.GroupBy(item => (i++) / 2) @@ -218,26 +217,24 @@ namespace NadekoBot.Modules.Utility [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] - public async Task InRole([Remainder] string roles) + public async Task InRole(params IRole[] roles) { - if (string.IsNullOrWhiteSpace(roles)) + if (roles.Length == 0) return; - var arg = roles.Split(',').Select(r => r.Trim().ToUpperInvariant()); - string send = "ℹ️ **Here is a list of users in those roles:**"; - foreach (var roleStr in arg.Where(str => !string.IsNullOrWhiteSpace(str) && str != "@EVERYONE" && str != "EVERYONE")) + var send = "ℹ️ " + Format.Bold(GetText("inrole_list")); + var usrs = (await Context.Guild.GetUsersAsync()).ToArray(); + foreach (var role in roles.Where(r => r.Id != Context.Guild.Id)) { - var role = Context.Guild.Roles.Where(r => r.Name.ToUpperInvariant() == roleStr).FirstOrDefault(); - if (role == null) continue; send += $"```css\n[{role.Name}]\n"; - send += string.Join(", ", (await Context.Guild.GetUsersAsync()).Where(u => u.RoleIds.Contains(role.Id)).Select(u => u.ToString())); - send += $"\n```"; + send += string.Join(", ", usrs.Where(u => u.RoleIds.Contains(role.Id)).Select(u => u.ToString())); + send += "\n```"; } - var usr = Context.User as IGuildUser; + var usr = (IGuildUser)Context.User; while (send.Length > 2000) { if (!usr.GetPermissions((ITextChannel)Context.Channel).ManageMessages) { - await Context.Channel.SendErrorAsync($"⚠️ {usr.Mention} **you are not allowed to use this command on roles with a lot of users in them to prevent abuse.**").ConfigureAwait(false); + await ReplyErrorLocalized("inrole_not_allowed").ConfigureAwait(false); return; } var curstr = send.Substring(0, 2000); @@ -254,15 +251,13 @@ namespace NadekoBot.Modules.Utility public async Task CheckMyPerms() { - StringBuilder builder = new StringBuilder("```http\n"); - var user = Context.User as IGuildUser; + StringBuilder builder = new StringBuilder(); + var user = (IGuildUser) Context.User; var perms = user.GetPermissions((ITextChannel)Context.Channel); foreach (var p in perms.GetType().GetProperties().Where(p => !p.GetGetMethod().GetParameters().Any())) { - builder.AppendLine($"{p.Name} : {p.GetValue(perms, null).ToString()}"); + builder.AppendLine($"{p.Name} : {p.GetValue(perms, null)}"); } - - builder.Append("```"); await Context.Channel.SendConfirmAsync(builder.ToString()); } @@ -271,20 +266,23 @@ namespace NadekoBot.Modules.Utility public async Task UserId(IGuildUser target = null) { var usr = target ?? Context.User; - await Context.Channel.SendConfirmAsync($"🆔 of the user **{ usr.Username }** is `{ usr.Id }`").ConfigureAwait(false); + await ReplyConfirmLocalized("userid", "🆔", Format.Bold(usr.ToString()), + Format.Code(usr.Id.ToString())).ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] public async Task ChannelId() { - await Context.Channel.SendConfirmAsync($"🆔 of this channel is `{Context.Channel.Id}`").ConfigureAwait(false); + await ReplyConfirmLocalized("channelidd", "🆔", Format.Code(Context.Channel.Id.ToString())) + .ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] public async Task ServerId() { - await Context.Channel.SendConfirmAsync($"🆔 of this server is `{Context.Guild.Id}`").ConfigureAwait(false); + await ReplyConfirmLocalized("serverid", "🆔", Format.Code(Context.Guild.Id.ToString())) + .ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -294,33 +292,36 @@ namespace NadekoBot.Modules.Utility var channel = (ITextChannel)Context.Channel; var guild = channel.Guild; - const int RolesPerPage = 20; + const int rolesPerPage = 20; if (page < 1 || page > 100) return; if (target != null) { - var roles = target.GetRoles().Except(new[] { guild.EveryoneRole }).OrderBy(r => -r.Position).Skip((page - 1) * RolesPerPage).Take(RolesPerPage); + var roles = target.GetRoles().Except(new[] { guild.EveryoneRole }).OrderBy(r => -r.Position).Skip((page - 1) * rolesPerPage).Take(rolesPerPage).ToArray(); if (!roles.Any()) { - await channel.SendErrorAsync("No roles on this page.").ConfigureAwait(false); + await ReplyErrorLocalized("no_roles_on_page").ConfigureAwait(false); } else { - await channel.SendConfirmAsync($"⚔ **Page #{page} of roles for {target.Username}**", $"```css\n• " + string.Join("\n• ", roles).SanitizeMentions() + "\n```").ConfigureAwait(false); + + await channel.SendConfirmAsync(GetText("roles_page", page, Format.Bold(target.ToString())), + "\n• " + string.Join("\n• ", (IEnumerable)roles).SanitizeMentions()).ConfigureAwait(false); } } else { - var roles = guild.Roles.Except(new[] { guild.EveryoneRole }).OrderBy(r => -r.Position).Skip((page - 1) * RolesPerPage).Take(RolesPerPage); + var roles = guild.Roles.Except(new[] { guild.EveryoneRole }).OrderBy(r => -r.Position).Skip((page - 1) * rolesPerPage).Take(rolesPerPage).ToArray(); if (!roles.Any()) { - await channel.SendErrorAsync("No roles on this page.").ConfigureAwait(false); + await ReplyErrorLocalized("no_roles_on_page").ConfigureAwait(false); } else { - await channel.SendConfirmAsync($"⚔ **Page #{page} of all roles on this server:**", $"```css\n• " + string.Join("\n• ", roles).SanitizeMentions() + "\n```").ConfigureAwait(false); + await channel.SendConfirmAsync(GetText("roles_all_page", page), + "\n• " + string.Join("\n• ", (IEnumerable)roles).SanitizeMentions()).ConfigureAwait(false); } } } @@ -339,9 +340,9 @@ namespace NadekoBot.Modules.Utility var topic = channel.Topic; if (string.IsNullOrWhiteSpace(topic)) - await Context.Channel.SendErrorAsync("No topic set.").ConfigureAwait(false); + await ReplyErrorLocalized("no_topic_set").ConfigureAwait(false); else - await Context.Channel.SendConfirmAsync("Channel topic", topic).ConfigureAwait(false); + await Context.Channel.SendConfirmAsync(GetText("channel_topic"), topic).ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -362,11 +363,13 @@ namespace NadekoBot.Modules.Utility return; var status = string.Join(", ", NadekoBot.Client.Shards.GroupBy(x => x.ConnectionState) - .Select(x => $"{x.Count()} shards {x.Key}") + .Select(x => $"{x.Count()} {x.Key}") .ToArray()); var allShardStrings = NadekoBot.Client.Shards - .Select(x => $"Shard **#{x.ShardId.ToString()}** is in {Format.Bold(x.ConnectionState.ToString())} state with {Format.Bold(x.Guilds.Count.ToString())} servers") + .Select(x => + GetText("shard_stats_txt", x.ShardId.ToString(), + Format.Bold(x.ConnectionState.ToString()), Format.Bold(x.Guilds.Count.ToString()))) .ToArray(); @@ -377,10 +380,10 @@ namespace NadekoBot.Modules.Utility var str = string.Join("\n", allShardStrings.Skip(25 * (curPage - 1)).Take(25)); if (string.IsNullOrWhiteSpace(str)) - str = "No shards on this page."; + str = GetText("no_shards_on_page"); return new EmbedBuilder() - .WithAuthor(a => a.WithName("Shard Stats")) + .WithAuthor(a => a.WithName(GetText("shard_stats"))) .WithTitle(status) .WithOkColor() .WithDescription(str); @@ -392,7 +395,7 @@ namespace NadekoBot.Modules.Utility { var shardId = NadekoBot.Client.GetShardIdFor(guildid); - await Context.Channel.SendConfirmAsync($"ShardId for **{guildid}** with {NadekoBot.Client.Shards.Count} total shards", shardId.ToString()).ConfigureAwait(false); + await Context.Channel.SendConfirmAsync(shardId.ToString()).ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -409,17 +412,21 @@ namespace NadekoBot.Modules.Utility .WithAuthor(eab => eab.WithName($"NadekoBot v{StatsService.BotVersion}") .WithUrl("http://nadekobot.readthedocs.io/en/latest/") .WithIconUrl("https://cdn.discordapp.com/avatars/116275390695079945/b21045e778ef21c96d175400e779f0fb.jpg")) - .AddField(efb => efb.WithName(Format.Bold("Author")).WithValue(stats.Author).WithIsInline(true)) - .AddField(efb => efb.WithName(Format.Bold("Bot ID")).WithValue(NadekoBot.Client.CurrentUser.Id.ToString()).WithIsInline(true)) - .AddField(efb => efb.WithName(Format.Bold("Shard")).WithValue($"#{shardId}, {NadekoBot.Client.Shards.Count} total").WithIsInline(true)) - .AddField(efb => efb.WithName(Format.Bold("Commands Ran")).WithValue(stats.CommandsRan.ToString()).WithIsInline(true)) - .AddField(efb => efb.WithName(Format.Bold("Messages")).WithValue($"{stats.MessageCounter} ({stats.MessagesPerSecond:F2}/sec)").WithIsInline(true)) - .AddField(efb => efb.WithName(Format.Bold("Memory")).WithValue($"{stats.Heap} MB").WithIsInline(true)) - .AddField(efb => efb.WithName(Format.Bold("Owner ID(s)")).WithValue(string.Join("\n", NadekoBot.Credentials.OwnerIds)).WithIsInline(true)) - .AddField(efb => efb.WithName(Format.Bold("Uptime")).WithValue(stats.GetUptimeString("\n")).WithIsInline(true)) - .AddField(efb => efb.WithName(Format.Bold("Presence")).WithValue($"{NadekoBot.Client.GetGuildCount()} Servers\n{stats.TextChannels} Text Channels\n{stats.VoiceChannels} Voice Channels").WithIsInline(true)) + .AddField(efb => efb.WithName(GetText("author")).WithValue(stats.Author).WithIsInline(true)) + .AddField(efb => efb.WithName(GetText("botid")).WithValue(NadekoBot.Client.CurrentUser.Id.ToString()).WithIsInline(true)) + .AddField(efb => efb.WithName(GetText("shard")).WithValue($"#{shardId} / {NadekoBot.Client.Shards.Count}").WithIsInline(true)) + .AddField(efb => efb.WithName(GetText("commands_ran")).WithValue(stats.CommandsRan.ToString()).WithIsInline(true)) + .AddField(efb => efb.WithName(GetText("messages")).WithValue($"{stats.MessageCounter} ({stats.MessagesPerSecond:F2}/sec)").WithIsInline(true)) + .AddField(efb => efb.WithName(GetText("memory")).WithValue($"{stats.Heap} MB").WithIsInline(true)) + .AddField(efb => efb.WithName(GetText("owner_ids")).WithValue(string.Join("\n", NadekoBot.Credentials.OwnerIds)).WithIsInline(true)) + .AddField(efb => efb.WithName(GetText("uptime")).WithValue(stats.GetUptimeString("\n")).WithIsInline(true)) + .AddField(efb => efb.WithName(GetText("presence")).WithValue( + GetText("presence_txt", + NadekoBot.Client.GetGuildCount(), stats.TextChannels, stats.VoiceChannels)).WithIsInline(true)) #if !GLOBAL_NADEKO - .WithFooter(efb => efb.WithText($"Playing {Music.Music.MusicPlayers.Where(mp => mp.Value.CurrentSong != null).Count()} songs, {Music.Music.MusicPlayers.Sum(mp => mp.Value.Playlist.Count)} queued.")) + .WithFooter(efb => efb.WithText(GetText("stats_songs", + Music.Music.MusicPlayers.Count(mp => mp.Value.CurrentSong != null), + Music.Music.MusicPlayers.Sum(mp => mp.Value.Playlist.Count)))) #endif ); } @@ -429,10 +436,10 @@ namespace NadekoBot.Modules.Utility { var tags = Context.Message.Tags.Where(t => t.Type == TagType.Emoji).Select(t => (Emoji)t.Value); - var result = string.Join("\n", tags.Select(m => $"**Name:** {m} **Link:** {m.Url}")); + var result = string.Join("\n", tags.Select(m => GetText("showemojis", m, m.Url))); if (string.IsNullOrWhiteSpace(result)) - await Context.Channel.SendErrorAsync("No special emojis found."); + await ReplyErrorLocalized("emojis_none").ConfigureAwait(false); else await Context.Channel.SendMessageAsync(result).ConfigureAwait(false); } @@ -450,13 +457,15 @@ namespace NadekoBot.Modules.Utility if (!guilds.Any()) { - await Context.Channel.SendErrorAsync("No servers found on that page.").ConfigureAwait(false); + await ReplyErrorLocalized("listservers_none").ConfigureAwait(false); return; } await Context.Channel.EmbedAsync(guilds.Aggregate(new EmbedBuilder().WithOkColor(), (embed, g) => embed.AddField(efb => efb.WithName(g.Name) - .WithValue($"```css\nID: {g.Id}\nMembers: {g.Users.Count}\nOwnerID: {g.OwnerId} ```") + .WithValue( + GetText("listservers", g.Id, g.Users.Count, + g.OwnerId)) .WithIsInline(false)))) .ConfigureAwait(false); } diff --git a/src/NadekoBot/Resources/CommandStrings.Designer.cs b/src/NadekoBot/Resources/CommandStrings.Designer.cs index e6390b66..52100d6c 100644 --- a/src/NadekoBot/Resources/CommandStrings.Designer.cs +++ b/src/NadekoBot/Resources/CommandStrings.Designer.cs @@ -3552,7 +3552,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Lists every person from the provided role or roles (separated by a ',') on this server. If the list is too long for 1 message, you must have Manage Messages permission.. + /// Looks up a localized string similar to Lists every person from the provided role or roles, separated with space, on this server. You can use role IDs, role names (in quotes if it has multiple words), or role mention If the list is too long for 1 message, you must have Manage Messages permission.. /// public static string inrole_desc { get { @@ -3561,7 +3561,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to `{0}inrole Role`. + /// Looks up a localized string similar to `{0}inrole Role` or `{0}inrole Role1 "Role 2" @role3`. /// public static string inrole_usage { get { diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx index c661db7d..703fcf20 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -841,10 +841,10 @@ inrole - Lists every person from the provided role or roles (separated by a ',') on this server. If the list is too long for 1 message, you must have Manage Messages permission. + Lists every person from the provided role or roles, separated with space, on this server. You can use role IDs, role names (in quotes if it has multiple words), or role mention If the list is too long for 1 message, you must have Manage Messages permission. - `{0}inrole Role` + `{0}inrole Role` or `{0}inrole Role1 "Role 2" @role3` checkmyperms diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index da3aab5b..d6423df6 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -3352,5 +3352,306 @@ namespace NadekoBot.Resources { return ResourceManager.GetString("pokemon_you_fainted", resourceCulture); } } + + /// + /// Looks up a localized string similar to Author. + /// + public static string utility_author { + get { + return ResourceManager.GetString("utility_author", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Bot ID. + /// + public static string utility_botid { + get { + return ResourceManager.GetString("utility_botid", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Channel Topic. + /// + public static string utility_channel_topic { + get { + return ResourceManager.GetString("utility_channel_topic", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0} of this channel is {1}. + /// + public static string utility_channelid { + get { + return ResourceManager.GetString("utility_channelid", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Commands Ran. + /// + public static string utility_commands_ran { + get { + return ResourceManager.GetString("utility_commands_ran", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Here is a list of users in those roles:. + /// + public static string utility_inrole_list { + get { + return ResourceManager.GetString("utility_inrole_list", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to you are not allowed to use this command on roles with a lot of users in them to prevent abuse.. + /// + public static string utility_inrole_not_allowed { + get { + return ResourceManager.GetString("utility_inrole_not_allowed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ID: {0} + ///Members: {1} + ///OwnerID: {2}. + /// + public static string utility_listservers { + get { + return ResourceManager.GetString("utility_listservers", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No servers found on that page.. + /// + public static string utility_listservers_none { + get { + return ResourceManager.GetString("utility_listservers_none", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Memory. + /// + public static string utility_memory { + get { + return ResourceManager.GetString("utility_memory", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Messages. + /// + public static string utility_messages { + get { + return ResourceManager.GetString("utility_messages", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No roles on this page.. + /// + public static string utility_no_roles_on_page { + get { + return ResourceManager.GetString("utility_no_roles_on_page", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No shards on this page.. + /// + public static string utility_no_shards_on_page { + get { + return ResourceManager.GetString("utility_no_shards_on_page", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No topic set.. + /// + public static string utility_no_topic_set { + get { + return ResourceManager.GetString("utility_no_topic_set", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Nobody is playing that game.. + /// + public static string utility_nobody_playing_game { + get { + return ResourceManager.GetString("utility_nobody_playing_game", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Owner IDs. + /// + public static string utility_owner_ids { + get { + return ResourceManager.GetString("utility_owner_ids", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Presence. + /// + public static string utility_presence { + get { + return ResourceManager.GetString("utility_presence", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0} Servers + ///{1} Text Channels + ///{2} Voice Channels. + /// + public static string utility_presence_txt { + get { + return ResourceManager.GetString("utility_presence_txt", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Page #{0} of all roles on this server:. + /// + public static string utility_roles_all_page { + get { + return ResourceManager.GetString("utility_roles_all_page", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Page #{0} of roels for {1}. + /// + public static string utility_roles_page { + get { + return ResourceManager.GetString("utility_roles_page", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No colors are in the correct format. Use `#00ff00` for example.. + /// + public static string utility_rrc_no_colors { + get { + return ResourceManager.GetString("utility_rrc_no_colors", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Started rotating {0} role's color.. + /// + public static string utility_rrc_start { + get { + return ResourceManager.GetString("utility_rrc_start", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Stopped rotating colors for the {0} role. + /// + public static string utility_rrc_stop { + get { + return ResourceManager.GetString("utility_rrc_stop", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0} of this server is {1}. + /// + public static string utility_serverid { + get { + return ResourceManager.GetString("utility_serverid", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Shard. + /// + public static string utility_shard { + get { + return ResourceManager.GetString("utility_shard", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Shard Stats. + /// + public static string utility_shard_stats { + get { + return ResourceManager.GetString("utility_shard_stats", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Shard **#{0}** is in {1} state with {2} servers. + /// + public static string utility_shard_stats_txt { + get { + return ResourceManager.GetString("utility_shard_stats_txt", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to **Name:** {0} **Link:** {1}. + /// + public static string utility_showemojis { + get { + return ResourceManager.GetString("utility_showemojis", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No special emojis found.. + /// + public static string utility_showemojis_none { + get { + return ResourceManager.GetString("utility_showemojis_none", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Playing {0} songs, {1} queued.. + /// + public static string utility_stats_songs { + get { + return ResourceManager.GetString("utility_stats_songs", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Here is your room link:. + /// + public static string utility_togtub_room_link { + get { + return ResourceManager.GetString("utility_togtub_room_link", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Uptime. + /// + public static string utility_uptime { + get { + return ResourceManager.GetString("utility_uptime", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0} of the user {1} is {2}. + /// + public static string utility_userid { + get { + return ResourceManager.GetString("utility_userid", resourceCulture); + } + } } } diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index 6fa196c1..95396e70 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -1239,4 +1239,108 @@ Don't forget to leave your discord name or id in the message. List of "{0}hangman" term types: + + Author + + + Bot ID + + + {0} of this channel is {1} + + + Channel Topic + + + Commands Ran + + + Here is a list of users in those roles: + + + you are not allowed to use this command on roles with a lot of users in them to prevent abuse. + + + ID: {0} +Members: {1} +OwnerID: {2} + + + No servers found on that page. + + + Memory + + + Messages + + + Nobody is playing that game. + + + No roles on this page. + + + No shards on this page. + + + No topic set. + + + Owner IDs + + + Presence + + + {0} Servers +{1} Text Channels +{2} Voice Channels + + + Page #{0} of all roles on this server: + + + Page #{0} of roels for {1} + + + No colors are in the correct format. Use `#00ff00` for example. + + + Started rotating {0} role's color. + + + Stopped rotating colors for the {0} role + + + {0} of this server is {1} + + + Shard + + + Shard Stats + + + Shard **#{0}** is in {1} state with {2} servers + + + **Name:** {0} **Link:** {1} + + + No special emojis found. + + + Playing {0} songs, {1} queued. + + + Here is your room link: + + + Uptime + + + {0} of the user {1} is {2} + Id of the user kwoth#1234 is 123123123123 + \ No newline at end of file diff --git a/src/NadekoBot/Services/Database/Models/DbEntity.cs b/src/NadekoBot/Services/Database/Models/DbEntity.cs index 5c7dda6b..e727851c 100644 --- a/src/NadekoBot/Services/Database/Models/DbEntity.cs +++ b/src/NadekoBot/Services/Database/Models/DbEntity.cs @@ -7,6 +7,6 @@ namespace NadekoBot.Services.Database.Models { [Key] public int Id { get; set; } - public DateTime DateAdded { get; } = DateTime.UtcNow; + public DateTime? DateAdded { get; set; } = DateTime.UtcNow; } } From 53140940d7c61ea6b7f6d008a3b2637615ac4566 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Thu, 23 Feb 2017 03:06:37 +0100 Subject: [PATCH 072/496] A lot more localization, utility module done. --- .../Modules/Utility/Commands/CalcCommand.cs | 35 +- .../Commands/CrossServerTextChannel.cs | 47 +- .../Modules/Utility/Commands/InfoCommands.cs | 55 ++- .../Utility/Commands/MessageRepeater.cs | 93 ++-- .../Modules/Utility/Commands/QuoteCommands.cs | 19 +- .../Modules/Utility/Commands/Remind.cs | 59 +-- .../Utility/Commands/UnitConversion.cs | 21 +- src/NadekoBot/NadekoBot.xproj.DotSettings | 3 +- .../Resources/ResponseStrings.Designer.cs | 450 ++++++++++++++++++ src/NadekoBot/Resources/ResponseStrings.resx | 153 ++++++ 10 files changed, 787 insertions(+), 148 deletions(-) diff --git a/src/NadekoBot/Modules/Utility/Commands/CalcCommand.cs b/src/NadekoBot/Modules/Utility/Commands/CalcCommand.cs index b4327c85..8eccc500 100644 --- a/src/NadekoBot/Modules/Utility/Commands/CalcCommand.cs +++ b/src/NadekoBot/Modules/Utility/Commands/CalcCommand.cs @@ -12,7 +12,7 @@ namespace NadekoBot.Modules.Utility public partial class Utility { [Group] - public class CalcCommands : ModuleBase + public class CalcCommands : NadekoSubmodule { [NadekoCommand, Usage, Description, Aliases] public async Task Calculate([Remainder] string expression) @@ -21,9 +21,9 @@ namespace NadekoBot.Modules.Utility expr.EvaluateParameter += Expr_EvaluateParameter; var result = expr.Evaluate(); if (expr.Error == null) - await Context.Channel.SendConfirmAsync("Result", $"{result}"); + await Context.Channel.SendConfirmAsync("⚙ " + GetText("result"), result.ToString()); else - await Context.Channel.SendErrorAsync($"⚙ Error", expr.Error); + await Context.Channel.SendErrorAsync("⚙ " + GetText("error"), expr.Error); } private static void Expr_EvaluateParameter(string name, NCalc.ParameterArgs args) @@ -42,29 +42,26 @@ namespace NadekoBot.Modules.Utility [NadekoCommand, Usage, Description, Aliases] public async Task CalcOps() { - var selection = typeof(Math).GetTypeInfo().GetMethods().Except(typeof(object).GetTypeInfo().GetMethods()).Distinct(new MethodInfoEqualityComparer()).Select(x => - { - return x.Name; - }) - .Except(new[] { "ToString", - "Equals", - "GetHashCode", - "GetType"}); - await Context.Channel.SendConfirmAsync("Available functions in calc", string.Join(", ", selection)); + var selection = typeof(Math).GetTypeInfo() + .GetMethods() + .Distinct(new MethodInfoEqualityComparer()) + .Select(x => x.Name) + .Except(new[] + { + "ToString", + "Equals", + "GetHashCode", + "GetType" + }); + await Context.Channel.SendConfirmAsync(GetText("utility_calcops", Prefix), string.Join(", ", selection)); } } - class MethodInfoEqualityComparer : IEqualityComparer + private class MethodInfoEqualityComparer : IEqualityComparer { public bool Equals(MethodInfo x, MethodInfo y) => x.Name == y.Name; public int GetHashCode(MethodInfo obj) => obj.Name.GetHashCode(); } - - class ExpressionContext - { - public double Pi { get; set; } = Math.PI; - } - } } \ No newline at end of file diff --git a/src/NadekoBot/Modules/Utility/Commands/CrossServerTextChannel.cs b/src/NadekoBot/Modules/Utility/Commands/CrossServerTextChannel.cs index 194ee455..45318177 100644 --- a/src/NadekoBot/Modules/Utility/Commands/CrossServerTextChannel.cs +++ b/src/NadekoBot/Modules/Utility/Commands/CrossServerTextChannel.cs @@ -3,8 +3,6 @@ using Discord.Commands; using NadekoBot.Attributes; using NadekoBot.Extensions; using NadekoBot.Services; -using NLog; -using System; using System.Collections.Concurrent; using System.Linq; using System.Threading.Tasks; @@ -14,12 +12,11 @@ namespace NadekoBot.Modules.Utility public partial class Utility { [Group] - public class CrossServerTextChannel : ModuleBase + public class CrossServerTextChannel : NadekoSubmodule { static CrossServerTextChannel() { - _log = LogManager.GetCurrentClassLogger(); - NadekoBot.Client.MessageReceived += async (imsg) => + NadekoBot.Client.MessageReceived += async imsg => { try { @@ -37,23 +34,32 @@ namespace NadekoBot.Modules.Utility var set = subscriber.Value; if (!set.Contains(channel)) continue; - foreach (var chan in set.Except(new[] { channel })) + foreach (var chan in set.Except(new[] {channel})) { - try { await chan.SendMessageAsync(GetText(channel.Guild, channel, (IGuildUser)msg.Author, msg)).ConfigureAwait(false); } catch (Exception ex) { _log.Warn(ex); } + try + { + await chan.SendMessageAsync(GetMessage(channel, (IGuildUser) msg.Author, + msg)).ConfigureAwait(false); + } + catch + { + // ignored + } } } } - catch (Exception ex) { - _log.Warn(ex); + catch + { + // ignored } }; } - private static string GetText(IGuild server, ITextChannel channel, IGuildUser user, IUserMessage message) => - $"**{server.Name} | {channel.Name}** `{user.Username}`: " + message.Content.SanitizeMentions(); - - public static readonly ConcurrentDictionary> Subscribers = new ConcurrentDictionary>(); - private static Logger _log { get; } + private static string GetMessage(ITextChannel channel, IGuildUser user, IUserMessage message) => + $"**{channel.Guild.Name} | {channel.Name}** `{user.Username}`: " + message.Content.SanitizeMentions(); + + public static readonly ConcurrentDictionary> Subscribers = + new ConcurrentDictionary>(); [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] @@ -64,8 +70,9 @@ namespace NadekoBot.Modules.Utility var set = new ConcurrentHashSet(); if (Subscribers.TryAdd(token, set)) { - set.Add((ITextChannel)Context.Channel); - await ((IGuildUser)Context.User).SendConfirmAsync("This is your CSC token", token.ToString()).ConfigureAwait(false); + set.Add((ITextChannel) Context.Channel); + await ((IGuildUser) Context.User).SendConfirmAsync(GetText("csc_token"), token.ToString()) + .ConfigureAwait(false); } } @@ -77,8 +84,8 @@ namespace NadekoBot.Modules.Utility ConcurrentHashSet set; if (!Subscribers.TryGetValue(token, out set)) return; - set.Add((ITextChannel)Context.Channel); - await Context.Channel.SendConfirmAsync("Joined cross server channel.").ConfigureAwait(false); + set.Add((ITextChannel) Context.Channel); + await ReplyConfirmLocalized("csc_join").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -88,9 +95,9 @@ namespace NadekoBot.Modules.Utility { foreach (var subscriber in Subscribers) { - subscriber.Value.TryRemove((ITextChannel)Context.Channel); + subscriber.Value.TryRemove((ITextChannel) Context.Channel); } - await Context.Channel.SendMessageAsync("Left cross server channel.").ConfigureAwait(false); + await ReplyConfirmLocalized("csc_leave").ConfigureAwait(false); } } } diff --git a/src/NadekoBot/Modules/Utility/Commands/InfoCommands.cs b/src/NadekoBot/Modules/Utility/Commands/InfoCommands.cs index fefd0a01..96e06a4e 100644 --- a/src/NadekoBot/Modules/Utility/Commands/InfoCommands.cs +++ b/src/NadekoBot/Modules/Utility/Commands/InfoCommands.cs @@ -12,7 +12,7 @@ namespace NadekoBot.Modules.Utility public partial class Utility { [Group] - public class InfoCommands : ModuleBase + public class InfoCommands : NadekoSubmodule { [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] @@ -24,7 +24,7 @@ namespace NadekoBot.Modules.Utility if (string.IsNullOrWhiteSpace(guildName)) guild = channel.Guild; else - guild = NadekoBot.Client.GetGuilds().Where(g => g.Name.ToUpperInvariant() == guildName.ToUpperInvariant()).FirstOrDefault(); + guild = NadekoBot.Client.GetGuilds().FirstOrDefault(g => g.Name.ToUpperInvariant() == guildName.ToUpperInvariant()); if (guild == null) return; var ownername = await guild.GetUserAsync(guild.OwnerId); @@ -37,22 +37,22 @@ namespace NadekoBot.Modules.Utility if (string.IsNullOrWhiteSpace(features)) features = "-"; var embed = new EmbedBuilder() - .WithAuthor(eab => eab.WithName("Server Info")) + .WithAuthor(eab => eab.WithName(GetText("server_info"))) .WithTitle(guild.Name) - .AddField(fb => fb.WithName("**ID**").WithValue(guild.Id.ToString()).WithIsInline(true)) - .AddField(fb => fb.WithName("**Owner**").WithValue(ownername.ToString()).WithIsInline(true)) - .AddField(fb => fb.WithName("**Members**").WithValue(users.Count.ToString()).WithIsInline(true)) - .AddField(fb => fb.WithName("**Text Channels**").WithValue(textchn.ToString()).WithIsInline(true)) - .AddField(fb => fb.WithName("**Voice Channels**").WithValue(voicechn.ToString()).WithIsInline(true)) - .AddField(fb => fb.WithName("**Created At**").WithValue($"{createdAt:dd.MM.yyyy HH:mm}").WithIsInline(true)) - .AddField(fb => fb.WithName("**Region**").WithValue(guild.VoiceRegionId.ToString()).WithIsInline(true)) - .AddField(fb => fb.WithName("**Roles**").WithValue((guild.Roles.Count - 1).ToString()).WithIsInline(true)) - .AddField(fb => fb.WithName("**Features**").WithValue(features).WithIsInline(true)) + .AddField(fb => fb.WithName(GetText("id")).WithValue(guild.Id.ToString()).WithIsInline(true)) + .AddField(fb => fb.WithName(GetText("owner")).WithValue(ownername.ToString()).WithIsInline(true)) + .AddField(fb => fb.WithName(GetText("members")).WithValue(users.Count.ToString()).WithIsInline(true)) + .AddField(fb => fb.WithName(GetText("text_channels")).WithValue(textchn.ToString()).WithIsInline(true)) + .AddField(fb => fb.WithName(GetText("voice_channels")).WithValue(voicechn.ToString()).WithIsInline(true)) + .AddField(fb => fb.WithName(GetText("created_at")).WithValue($"{createdAt:dd.MM.yyyy HH:mm}").WithIsInline(true)) + .AddField(fb => fb.WithName(GetText("region")).WithValue(guild.VoiceRegionId.ToString()).WithIsInline(true)) + .AddField(fb => fb.WithName(GetText("roles")).WithValue((guild.Roles.Count - 1).ToString()).WithIsInline(true)) + .AddField(fb => fb.WithName(GetText("features")).WithValue(features).WithIsInline(true)) .WithImageUrl(guild.IconUrl) .WithColor(NadekoBot.OkColor); if (guild.Emojis.Any()) { - embed.AddField(fb => fb.WithName($"**Custom Emojis ({guild.Emojis.Count})**").WithValue(string.Join(" ", guild.Emojis.Shuffle().Take(20).Select(e => $"{e.Name} <:{e.Name}:{e.Id}>")))); + embed.AddField(fb => fb.WithName(GetText("custom_emojis") + $"({guild.Emojis.Count})").WithValue(string.Join(" ", guild.Emojis.Shuffle().Take(20).Select(e => $"{e.Name} <:{e.Name}:{e.Id}>")))); } await Context.Channel.EmbedAsync(embed).ConfigureAwait(false); } @@ -69,9 +69,9 @@ namespace NadekoBot.Modules.Utility var embed = new EmbedBuilder() .WithTitle(ch.Name) .WithDescription(ch.Topic?.SanitizeMentions()) - .AddField(fb => fb.WithName("**ID**").WithValue(ch.Id.ToString()).WithIsInline(true)) - .AddField(fb => fb.WithName("**Created At**").WithValue($"{createdAt:dd.MM.yyyy HH:mm}").WithIsInline(true)) - .AddField(fb => fb.WithName("**Users**").WithValue(usercount.ToString()).WithIsInline(true)) + .AddField(fb => fb.WithName(GetText("id")).WithValue(ch.Id.ToString()).WithIsInline(true)) + .AddField(fb => fb.WithName(GetText("created_at")).WithValue($"{createdAt:dd.MM.yyyy HH:mm}").WithIsInline(true)) + .AddField(fb => fb.WithName(GetText("users")).WithValue(usercount.ToString()).WithIsInline(true)) .WithColor(NadekoBot.OkColor); await Context.Channel.EmbedAsync(embed).ConfigureAwait(false); } @@ -86,15 +86,15 @@ namespace NadekoBot.Modules.Utility return; var embed = new EmbedBuilder() - .AddField(fb => fb.WithName("**Name**").WithValue($"**{user.Username}**#{user.Discriminator}").WithIsInline(true)); + .AddField(fb => fb.WithName(GetText("name")).WithValue($"**{user.Username}**#{user.Discriminator}").WithIsInline(true)); if (!string.IsNullOrWhiteSpace(user.Nickname)) { - embed.AddField(fb => fb.WithName("**Nickname**").WithValue(user.Nickname).WithIsInline(true)); + embed.AddField(fb => fb.WithName(GetText("nickname")).WithValue(user.Nickname).WithIsInline(true)); } - embed.AddField(fb => fb.WithName("**ID**").WithValue(user.Id.ToString()).WithIsInline(true)) - .AddField(fb => fb.WithName("**Joined Server**").WithValue($"{user.JoinedAt?.ToString("dd.MM.yyyy HH:mm") ?? "unavail."}").WithIsInline(true)) - .AddField(fb => fb.WithName("**Joined Discord**").WithValue($"{user.CreatedAt:dd.MM.yyyy HH:mm}").WithIsInline(true)) - .AddField(fb => fb.WithName("**Roles**").WithValue($"**({user.RoleIds.Count - 1})** - {string.Join("\n", user.GetRoles().Take(10).Where(r => r.Id != r.Guild.EveryoneRole.Id).Select(r => r.Name)).SanitizeMentions()}").WithIsInline(true)) + embed.AddField(fb => fb.WithName(GetText("id")).WithValue(user.Id.ToString()).WithIsInline(true)) + .AddField(fb => fb.WithName(GetText("joined_server")).WithValue($"{user.JoinedAt?.ToString("dd.MM.yyyy HH:mm") ?? "?"}").WithIsInline(true)) + .AddField(fb => fb.WithName(GetText("joined_discord")).WithValue($"{user.CreatedAt:dd.MM.yyyy HH:mm}").WithIsInline(true)) + .AddField(fb => fb.WithName(GetText("roles")).WithValue($"**({user.RoleIds.Count - 1})** - {string.Join("\n", user.GetRoles().Take(10).Where(r => r.Id != r.Guild.EveryoneRole.Id).Select(r => r.Name)).SanitizeMentions()}").WithIsInline(true)) .WithColor(NadekoBot.OkColor); if (user.AvatarId != null) @@ -119,12 +119,17 @@ namespace NadekoBot.Modules.Utility StringBuilder str = new StringBuilder(); foreach (var kvp in NadekoBot.CommandHandler.UserMessagesSent.OrderByDescending(kvp => kvp.Value).Skip(page*activityPerPage).Take(activityPerPage)) { - str.AppendLine($"`{++startCount}.` **{kvp.Key}** [{kvp.Value/NadekoBot.Stats.GetUptime().TotalSeconds:F2}/s] - {kvp.Value} total"); + str.AppendLine(GetText("activity_line", + ++startCount, + Format.Bold(kvp.Key.ToString()), + kvp.Value / NadekoBot.Stats.GetUptime().TotalSeconds, kvp.Value)); } - await Context.Channel.EmbedAsync(new EmbedBuilder().WithTitle($"Activity Page #{page}") + await Context.Channel.EmbedAsync(new EmbedBuilder() + .WithTitle(GetText("activity_page", page)) .WithOkColor() - .WithFooter(efb => efb.WithText($"{NadekoBot.CommandHandler.UserMessagesSent.Count} users total.")) + .WithFooter(efb => efb.WithText(GetText("activity_users_total", + NadekoBot.CommandHandler.UserMessagesSent.Count))) .WithDescription(str.ToString())); } } diff --git a/src/NadekoBot/Modules/Utility/Commands/MessageRepeater.cs b/src/NadekoBot/Modules/Utility/Commands/MessageRepeater.cs index e767bbcf..7cddce2c 100644 --- a/src/NadekoBot/Modules/Utility/Commands/MessageRepeater.cs +++ b/src/NadekoBot/Modules/Utility/Commands/MessageRepeater.cs @@ -5,12 +5,10 @@ using Microsoft.EntityFrameworkCore; using NadekoBot.Attributes; using NadekoBot.Extensions; using NadekoBot.Services; -using NadekoBot.Services.Database; using NadekoBot.Services.Database.Models; using NLog; using System; using System.Collections.Concurrent; -using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Text; @@ -22,14 +20,16 @@ namespace NadekoBot.Modules.Utility public partial class Utility { [Group] - public class RepeatCommands : ModuleBase + public class RepeatCommands : NadekoSubmodule { //guildid/RepeatRunners - public static ConcurrentDictionary> repeaters { get; } + public static ConcurrentDictionary> Repeaters { get; set; } + + private static bool _ready; public class RepeatRunner { - private Logger _log { get; } + private readonly Logger _log; private CancellationTokenSource source { get; set; } private CancellationToken token { get; set; } @@ -39,8 +39,16 @@ namespace NadekoBot.Modules.Utility public RepeatRunner(Repeater repeater, ITextChannel channel = null) { _log = LogManager.GetCurrentClassLogger(); - this.Repeater = repeater; - this.Channel = channel ?? NadekoBot.Client.GetGuild(repeater.GuildId)?.GetTextChannel(repeater.ChannelId); + Repeater = repeater; + //if (channel == null) + //{ + // var guild = NadekoBot.Client.GetGuild(repeater.GuildId); + // Channel = guild.GetTextChannel(repeater.ChannelId); + //} + //else + // Channel = channel; + + Channel = channel ?? NadekoBot.Client.GetGuild(repeater.GuildId)?.GetTextChannel(repeater.ChannelId); if (Channel == null) return; Task.Run(Run); @@ -101,22 +109,21 @@ namespace NadekoBot.Modules.Utility public override string ToString() { - return $"{this.Channel.Mention} | {(int)this.Repeater.Interval.TotalHours}:{this.Repeater.Interval:mm} | {this.Repeater.Message.TrimTo(33)}"; + return $"{Channel.Mention} | {(int)Repeater.Interval.TotalHours}:{Repeater.Interval:mm} | {Repeater.Message.TrimTo(33)}"; } } static RepeatCommands() { - var _log = LogManager.GetCurrentClassLogger(); - var sw = Stopwatch.StartNew(); - - repeaters = new ConcurrentDictionary>(NadekoBot.AllGuildConfigs - .ToDictionary(gc => gc.GuildId, - gc => new ConcurrentQueue(gc.GuildRepeaters.Select(gr => new RepeatRunner(gr)) - .Where(gr => gr.Channel != null)))); - - sw.Stop(); - _log.Debug($"Loaded in {sw.Elapsed.TotalSeconds:F2}s"); + var _ = Task.Run(async () => + { + await Task.Delay(5000).ConfigureAwait(false); + Repeaters = new ConcurrentDictionary>(NadekoBot.AllGuildConfigs + .ToDictionary(gc => gc.GuildId, + gc => new ConcurrentQueue(gc.GuildRepeaters.Select(gr => new RepeatRunner(gr)) + .Where(gr => gr.Channel != null)))); + _ready = true; + }); } [NadekoCommand, Usage, Description, Aliases] @@ -124,11 +131,13 @@ namespace NadekoBot.Modules.Utility [RequireUserPermission(GuildPermission.ManageMessages)] public async Task RepeatInvoke(int index) { + if (!_ready) + return; index -= 1; ConcurrentQueue rep; - if (!repeaters.TryGetValue(Context.Guild.Id, out rep)) + if (!Repeaters.TryGetValue(Context.Guild.Id, out rep)) { - await Context.Channel.SendErrorAsync("ℹ️ **No repeating message found on this server.**").ConfigureAwait(false); + await ReplyErrorLocalized("repeat_invoke_none").ConfigureAwait(false); return; } @@ -136,7 +145,7 @@ namespace NadekoBot.Modules.Utility if (index >= repList.Count) { - await Context.Channel.SendErrorAsync("Index out of range.").ConfigureAwait(false); + await ReplyErrorLocalized("index_out_of_range").ConfigureAwait(false); return; } var repeater = repList[index].Repeater; @@ -151,19 +160,21 @@ namespace NadekoBot.Modules.Utility [Priority(0)] public async Task RepeatRemove(int index) { + if (!_ready) + return; if (index < 1) return; index -= 1; ConcurrentQueue rep; - if (!repeaters.TryGetValue(Context.Guild.Id, out rep)) + if (!Repeaters.TryGetValue(Context.Guild.Id, out rep)) return; var repeaterList = rep.ToList(); if (index >= repeaterList.Count) { - await Context.Channel.SendErrorAsync("Index out of range.").ConfigureAwait(false); + await ReplyErrorLocalized("index_out_of_range").ConfigureAwait(false); return; } @@ -179,8 +190,9 @@ namespace NadekoBot.Modules.Utility await uow.CompleteAsync().ConfigureAwait(false); } - if (repeaters.TryUpdate(Context.Guild.Id, new ConcurrentQueue(repeaterList), rep)) - await Context.Channel.SendConfirmAsync("Message Repeater",$"#{index+1} stopped.\n\n{repeater.ToString()}").ConfigureAwait(false); + if (Repeaters.TryUpdate(Context.Guild.Id, new ConcurrentQueue(repeaterList), rep)) + await Context.Channel.SendConfirmAsync(GetText("message_repeater"), + GetText("repeater_stopped" , index + 1) + $"\n\n{repeater}").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -189,6 +201,8 @@ namespace NadekoBot.Modules.Utility [Priority(1)] public async Task Repeat(int minutes, [Remainder] string message) { + if (!_ready) + return; if (minutes < 1 || minutes > 10080) return; @@ -216,13 +230,18 @@ namespace NadekoBot.Modules.Utility var rep = new RepeatRunner(toAdd, (ITextChannel)Context.Channel); - repeaters.AddOrUpdate(Context.Guild.Id, new ConcurrentQueue(new[] { rep }), (key, old) => + Repeaters.AddOrUpdate(Context.Guild.Id, new ConcurrentQueue(new[] { rep }), (key, old) => { old.Enqueue(rep); return old; }); - await Context.Channel.SendConfirmAsync($"🔁 Repeating **\"{rep.Repeater.Message}\"** every `{rep.Repeater.Interval.Days} day(s), {rep.Repeater.Interval.Hours} hour(s) and {rep.Repeater.Interval.Minutes} minute(s)`.").ConfigureAwait(false); + await Context.Channel.SendConfirmAsync( + "🔁 " + GetText("repeater", + Format.Bold(rep.Repeater.Message), + Format.Bold(rep.Repeater.Interval.Days.ToString()), + Format.Bold(rep.Repeater.Interval.Hours.ToString()), + Format.Bold(rep.Repeater.Interval.Minutes.ToString()))).ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -230,27 +249,33 @@ namespace NadekoBot.Modules.Utility [RequireUserPermission(GuildPermission.ManageMessages)] public async Task RepeatList() { + if (!_ready) + return; ConcurrentQueue repRunners; - if (!repeaters.TryGetValue(Context.Guild.Id, out repRunners)) + if (!Repeaters.TryGetValue(Context.Guild.Id, out repRunners)) { - await Context.Channel.SendConfirmAsync("No repeaters running on this server.").ConfigureAwait(false); + await ReplyConfirmLocalized("repeaters_none").ConfigureAwait(false); return; } var replist = repRunners.ToList(); var sb = new StringBuilder(); - for (int i = 0; i < replist.Count; i++) + for (var i = 0; i < replist.Count; i++) { var rep = replist[i]; - sb.AppendLine($"`{i + 1}.` {rep.ToString()}"); + sb.AppendLine($"`{i + 1}.` {rep}"); } + var desc = sb.ToString(); + + if (string.IsNullOrWhiteSpace(desc)) + desc = GetText("no_active_repeaters"); await Context.Channel.EmbedAsync(new EmbedBuilder().WithOkColor() - .WithTitle("List Of Repeaters") - .WithDescription(sb.ToString())) - .ConfigureAwait(false); + .WithTitle(GetText("list_of_repeaters")) + .WithDescription(desc)) + .ConfigureAwait(false); } } } diff --git a/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs b/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs index d68b8c29..1a924b29 100644 --- a/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs +++ b/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs @@ -33,10 +33,11 @@ namespace NadekoBot.Modules.Utility } if (quotes.Any()) - await Context.Channel.SendConfirmAsync($"💬 **Page {page + 1} of quotes:**\n```xl\n" + String.Join("\n", quotes.Select((q) => $"{q.Keyword,-20} by {q.AuthorName}")) + "\n```") + await Context.Channel.SendConfirmAsync(GetText("quotes_page", page + 1), + string.Join("\n", quotes.Select(q => $"{q.Keyword,-20} by {q.AuthorName}"))) .ConfigureAwait(false); else - await Context.Channel.SendErrorAsync("No quotes on this page.").ConfigureAwait(false); + await ReplyErrorLocalized("quotes_page_none").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -72,11 +73,11 @@ 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)) - return; + if (string.IsNullOrWhiteSpace(keyword) || string.IsNullOrWhiteSpace(text)) + return; keyword = keyword.ToUpperInvariant(); @@ -113,7 +114,7 @@ namespace NadekoBot.Modules.Utility }); await uow.CompleteAsync().ConfigureAwait(false); } - await Context.Channel.SendConfirmAsync("✅ Quote added.").ConfigureAwait(false); + await ReplyConfirmLocalized("quote_added").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -135,7 +136,7 @@ namespace NadekoBot.Modules.Utility if (qs == null || !qs.Any()) { sucess = false; - response = "No quotes found which you can remove."; + response = GetText("quotes_remove_none"); } else { @@ -144,7 +145,7 @@ namespace NadekoBot.Modules.Utility uow.Quotes.Remove(q); await uow.CompleteAsync().ConfigureAwait(false); sucess = true; - response = "🗑 **Deleted a random quote.**"; + response = GetText("deleted_quote"); } } if(sucess) @@ -172,7 +173,7 @@ namespace NadekoBot.Modules.Utility await uow.CompleteAsync(); } - await Context.Channel.SendConfirmAsync($"🗑 **Deleted all quotes** with **{keyword}** keyword."); + await ReplyConfirmLocalized("quotes_deleted", Format.Bold(keyword)).ConfigureAwait(false); } } } diff --git a/src/NadekoBot/Modules/Utility/Commands/Remind.cs b/src/NadekoBot/Modules/Utility/Commands/Remind.cs index 10d43352..572a7afc 100644 --- a/src/NadekoBot/Modules/Utility/Commands/Remind.cs +++ b/src/NadekoBot/Modules/Utility/Commands/Remind.cs @@ -17,21 +17,21 @@ namespace NadekoBot.Modules.Utility public partial class Utility { [Group] - public class RemindCommands : ModuleBase + public class RemindCommands : NadekoSubmodule { - - Regex regex = new Regex(@"^(?:(?\d)mo)?(?:(?\d)w)?(?:(?\d{1,2})d)?(?:(?\d{1,2})h)?(?:(?\d{1,2})m)?$", + readonly Regex _regex = new Regex(@"^(?:(?\d)mo)?(?:(?\d)w)?(?:(?\d{1,2})d)?(?:(?\d{1,2})h)?(?:(?\d{1,2})m)?$", RegexOptions.Compiled | RegexOptions.Multiline); - private static string RemindMessageFormat { get; } + private static string remindMessageFormat { get; } - private static IDictionary> replacements = new Dictionary> + private static readonly IDictionary> _replacements = new Dictionary> { { "%message%" , (r) => r.Message }, { "%user%", (r) => $"<@!{r.UserId}>" }, { "%target%", (r) => r.IsPrivate ? "Direct Message" : $"<#{r.ChannelId}>"} }; - private static Logger _log { get; } + + private new static readonly Logger _log; static RemindCommands() { @@ -41,7 +41,7 @@ namespace NadekoBot.Modules.Utility { reminders = uow.Reminders.GetAll().ToList(); } - RemindMessageFormat = NadekoBot.BotConfig.RemindMessageFormat; + remindMessageFormat = NadekoBot.BotConfig.RemindMessageFormat; foreach (var r in reminders) { @@ -58,10 +58,10 @@ namespace NadekoBot.Modules.Utility if (time.TotalMilliseconds > int.MaxValue) return; - await Task.Delay(time); + await Task.Delay(time).ConfigureAwait(false); try { - IMessageChannel ch = null; + IMessageChannel ch; if (r.IsPrivate) { ch = await NadekoBot.Client.GetDMChannelAsync(r.ChannelId).ConfigureAwait(false); @@ -74,7 +74,7 @@ namespace NadekoBot.Modules.Utility return; await ch.SendMessageAsync( - replacements.Aggregate(RemindMessageFormat, + _replacements.Aggregate(remindMessageFormat, (cur, replace) => cur.Replace(replace.Key, replace.Value(r))) .SanitizeMentions() ).ConfigureAwait(false); //it works trust me @@ -119,27 +119,21 @@ namespace NadekoBot.Modules.Utility { var channel = (ITextChannel)Context.Channel; - if (ch == null) - { - await channel.SendErrorAsync($"{Context.User.Mention} Something went wrong (channel cannot be found) ;(").ConfigureAwait(false); - return; - } - - var m = regex.Match(timeStr); + var m = _regex.Match(timeStr); if (m.Length == 0) { - await channel.SendErrorAsync("Not a valid time format. Type `-h .remind`").ConfigureAwait(false); + await ReplyErrorLocalized("remind_invalid_format").ConfigureAwait(false); return; } string output = ""; var namesAndValues = new Dictionary(); - foreach (var groupName in regex.GetGroupNames()) + foreach (var groupName in _regex.GetGroupNames()) { if (groupName == "0") continue; - int value = 0; + int value; int.TryParse(m.Groups[groupName].Value, out value); if (string.IsNullOrEmpty(m.Groups[groupName].Value)) @@ -147,7 +141,7 @@ namespace NadekoBot.Modules.Utility namesAndValues[groupName] = 0; continue; } - else if (value < 1 || + if (value < 1 || (groupName == "months" && value > 1) || (groupName == "weeks" && value > 4) || (groupName == "days" && value >= 7) || @@ -157,8 +151,7 @@ namespace NadekoBot.Modules.Utility await channel.SendErrorAsync($"Invalid {groupName} value.").ConfigureAwait(false); return; } - else - namesAndValues[groupName] = value; + namesAndValues[groupName] = value; output += m.Groups[groupName].Value + " " + groupName + " "; } var time = DateTime.Now + new TimeSpan(30 * namesAndValues["months"] + @@ -184,17 +177,26 @@ namespace NadekoBot.Modules.Utility await uow.CompleteAsync(); } - try { await channel.SendConfirmAsync($"⏰ I will remind **\"{(ch is ITextChannel ? ((ITextChannel)ch).Name : Context.User.Username)}\"** to **\"{message.SanitizeMentions()}\"** in **{output}** `({time:d.M.yyyy.} at {time:HH:mm})`").ConfigureAwait(false); } catch { } + try + { + await channel.SendConfirmAsync( + "⏰ " + GetText("remind", + Format.Bold(ch is ITextChannel ? ((ITextChannel) ch).Name : Context.User.Username), + Format.Bold(message.SanitizeMentions()), + Format.Bold(output), + time, time)).ConfigureAwait(false); + } + catch + { + // ignored + } await StartReminder(rem); } [NadekoCommand, Usage, Description, Aliases] - [RequireContext(ContextType.Guild)] [OwnerOnly] public async Task RemindTemplate([Remainder] string arg) { - var channel = (ITextChannel)Context.Channel; - if (string.IsNullOrWhiteSpace(arg)) return; @@ -203,7 +205,8 @@ namespace NadekoBot.Modules.Utility uow.BotConfig.GetOrCreate().RemindMessageFormat = arg.Trim(); await uow.CompleteAsync().ConfigureAwait(false); } - await channel.SendConfirmAsync("🆗 New remind template set."); + + await ReplyConfirmLocalized("remind_template").ConfigureAwait(false); } } } diff --git a/src/NadekoBot/Modules/Utility/Commands/UnitConversion.cs b/src/NadekoBot/Modules/Utility/Commands/UnitConversion.cs index 41ca8133..8b6aede7 100644 --- a/src/NadekoBot/Modules/Utility/Commands/UnitConversion.cs +++ b/src/NadekoBot/Modules/Utility/Commands/UnitConversion.cs @@ -9,7 +9,6 @@ using Newtonsoft.Json; using NLog; using System; using System.Collections.Generic; -using System.Diagnostics; using System.IO; using System.Linq; using System.Net.Http; @@ -21,12 +20,12 @@ namespace NadekoBot.Modules.Utility public partial class Utility { [Group] - public class UnitConverterCommands : ModuleBase + public class UnitConverterCommands : NadekoSubmodule { public static List Units { get; set; } = new List(); - private static Logger _log { get; } + private new static readonly Logger _log; private static Timer _timer; - private static TimeSpan updateInterval = new TimeSpan(12, 0, 0); + private static readonly TimeSpan _updateInterval = new TimeSpan(12, 0, 0); static UnitConverterCommands() { @@ -55,7 +54,7 @@ namespace NadekoBot.Modules.Utility _log.Warn("Could not load units: " + e.Message); } - _timer = new Timer(async (obj) => await UpdateCurrency(), null, (int)updateInterval.TotalMilliseconds, (int)updateInterval.TotalMilliseconds); + _timer = new Timer(async (obj) => await UpdateCurrency(), null, _updateInterval, _updateInterval); } public static async Task UpdateCurrency() @@ -93,7 +92,7 @@ namespace NadekoBot.Modules.Utility } catch { - _log.Warn("Failed updating currency."); + _log.Warn("Failed updating currency. Ignore this."); } } @@ -101,7 +100,7 @@ namespace NadekoBot.Modules.Utility public async Task ConvertList() { var res = Units.GroupBy(x => x.UnitType) - .Aggregate(new EmbedBuilder().WithTitle("__Units which can be used by the converter__") + .Aggregate(new EmbedBuilder().WithTitle(GetText("convertlist")) .WithColor(NadekoBot.OkColor), (embed, g) => embed.AddField(efb => efb.WithName(g.Key.ToTitleCase()) @@ -116,12 +115,12 @@ namespace NadekoBot.Modules.Utility var targetUnit = Units.Find(x => x.Triggers.Select(y => y.ToLowerInvariant()).Contains(target.ToLowerInvariant())); if (originUnit == null || targetUnit == null) { - await Context.Channel.SendErrorAsync(string.Format("Cannot convert {0} to {1}: units not found", origin, target)); + await ReplyErrorLocalized("convert_not_found", Format.Bold(origin), Format.Bold(target)).ConfigureAwait(false); return; } if (originUnit.UnitType != targetUnit.UnitType) { - await Context.Channel.SendErrorAsync(string.Format("Cannot convert {0} to {1}: types of unit are not equal", originUnit.Triggers.First(), targetUnit.Triggers.First())); + await ReplyErrorLocalized("convert_type_error", Format.Bold(originUnit.Triggers.First()), Format.Bold(targetUnit.Triggers.First())).ConfigureAwait(false); return; } decimal res; @@ -150,8 +149,6 @@ namespace NadekoBot.Modules.Utility case "F": res = res * (9m / 5m) - 459.67m; break; - default: - break; } } else @@ -165,7 +162,7 @@ namespace NadekoBot.Modules.Utility } res = Math.Round(res, 4); - await Context.Channel.SendConfirmAsync(string.Format("{0} {1} is equal to {2} {3}", value, (originUnit.Triggers.First() + "s").SnPl(value.IsInteger() ? (int)value : 2), res, (targetUnit.Triggers.First() + "s").SnPl(res.IsInteger() ? (int)res : 2))); + await Context.Channel.SendConfirmAsync(GetText("convert", value, (originUnit.Triggers.First()).SnPl(value.IsInteger() ? (int)value : 2), res, (targetUnit.Triggers.First() + "s").SnPl(res.IsInteger() ? (int)res : 2))); } } diff --git a/src/NadekoBot/NadekoBot.xproj.DotSettings b/src/NadekoBot/NadekoBot.xproj.DotSettings index 65ccbd58..146bab9a 100644 --- a/src/NadekoBot/NadekoBot.xproj.DotSettings +++ b/src/NadekoBot/NadekoBot.xproj.DotSettings @@ -1,4 +1,5 @@  True True - True \ No newline at end of file + True + True \ No newline at end of file diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index d6423df6..c363367f 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -3353,6 +3353,42 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Joined. + /// + public static string utiliity_joined { + get { + return ResourceManager.GetString("utiliity_joined", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}.` {1} [{2:F2}/s] - {3} total. + /// + public static string utility_activity_line { + get { + return ResourceManager.GetString("utility_activity_line", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Activity Page #{0}. + /// + public static string utility_activity_page { + get { + return ResourceManager.GetString("utility_activity_page", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0} users total.. + /// + public static string utility_activity_users_total { + get { + return ResourceManager.GetString("utility_activity_users_total", resourceCulture); + } + } + /// /// Looks up a localized string similar to Author. /// @@ -3371,6 +3407,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to List of functions in {0}calc command. + /// + public static string utility_calcops { + get { + return ResourceManager.GetString("utility_calcops", resourceCulture); + } + } + /// /// Looks up a localized string similar to Channel Topic. /// @@ -3398,6 +3443,123 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to {0} {1} is equal to {2} {3}. + /// + public static string utility_convert { + get { + return ResourceManager.GetString("utility_convert", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Cannot convert {0} to {1}: units not found. + /// + public static string utility_convert_not_found { + get { + return ResourceManager.GetString("utility_convert_not_found", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Cannot convert {0} to {1}: types of unit are not equal. + /// + public static string utility_convert_type_error { + get { + return ResourceManager.GetString("utility_convert_type_error", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Units which can be used by the converter. + /// + public static string utility_convertlist { + get { + return ResourceManager.GetString("utility_convertlist", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Created At. + /// + public static string utility_created_at { + get { + return ResourceManager.GetString("utility_created_at", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Joined cross server channel.. + /// + public static string utility_csc_join { + get { + return ResourceManager.GetString("utility_csc_join", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Left cross server channel.. + /// + public static string utility_csc_leave { + get { + return ResourceManager.GetString("utility_csc_leave", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to This is your CSC token. + /// + public static string utility_csc_token { + get { + return ResourceManager.GetString("utility_csc_token", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Custom Emojis. + /// + public static string utility_custom_emojis { + get { + return ResourceManager.GetString("utility_custom_emojis", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Error. + /// + public static string utility_error { + get { + return ResourceManager.GetString("utility_error", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Features. + /// + public static string utility_features { + get { + return ResourceManager.GetString("utility_features", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ID. + /// + public static string utility_id { + get { + return ResourceManager.GetString("utility_id", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Index out of range.. + /// + public static string utility_index_out_of_range { + get { + return ResourceManager.GetString("utility_index_out_of_range", resourceCulture); + } + } + /// /// Looks up a localized string similar to Here is a list of users in those roles:. /// @@ -3416,6 +3578,42 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Invalid {0} value.. + /// + public static string utility_invalid_value { + get { + return ResourceManager.GetString("utility_invalid_value", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Joined Discord. + /// + public static string utility_joined_discord { + get { + return ResourceManager.GetString("utility_joined_discord", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Joined Server. + /// + public static string utility_joined_server { + get { + return ResourceManager.GetString("utility_joined_server", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to List of Repeaters. + /// + public static string utility_list_of_repeaters { + get { + return ResourceManager.GetString("utility_list_of_repeaters", resourceCulture); + } + } + /// /// Looks up a localized string similar to ID: {0} ///Members: {1} @@ -3436,6 +3634,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Members. + /// + public static string utility_members { + get { + return ResourceManager.GetString("utility_members", resourceCulture); + } + } + /// /// Looks up a localized string similar to Memory. /// @@ -3445,6 +3652,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Message Repeater. + /// + public static string utility_message_repeater { + get { + return ResourceManager.GetString("utility_message_repeater", resourceCulture); + } + } + /// /// Looks up a localized string similar to Messages. /// @@ -3454,6 +3670,33 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Name. + /// + public static string utility_name { + get { + return ResourceManager.GetString("utility_name", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Nickname. + /// + public static string utility_nickname { + get { + return ResourceManager.GetString("utility_nickname", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No active repeaters.. + /// + public static string utility_no_active_repeaters { + get { + return ResourceManager.GetString("utility_no_active_repeaters", resourceCulture); + } + } + /// /// Looks up a localized string similar to No roles on this page.. /// @@ -3490,6 +3733,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Owner. + /// + public static string utility_owner { + get { + return ResourceManager.GetString("utility_owner", resourceCulture); + } + } + /// /// Looks up a localized string similar to Owner IDs. /// @@ -3519,6 +3771,168 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Quote Added. + /// + public static string utility_quote_added { + get { + return ResourceManager.GetString("utility_quote_added", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Deleted a random quote.. + /// + public static string utility_quote_deleted { + get { + return ResourceManager.GetString("utility_quote_deleted", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Deleted all quotes with {0} keyword.. + /// + public static string utility_quotes_deleted { + get { + return ResourceManager.GetString("utility_quotes_deleted", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Page {0} of quotes. + /// + public static string utility_quotes_page { + get { + return ResourceManager.GetString("utility_quotes_page", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No quotes on this page.. + /// + public static string utility_quotes_page_none { + get { + return ResourceManager.GetString("utility_quotes_page_none", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No quotes found which you can remove.. + /// + public static string utility_quotes_remove_none { + get { + return ResourceManager.GetString("utility_quotes_remove_none", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Region. + /// + public static string utility_region { + get { + return ResourceManager.GetString("utility_region", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Registered On. + /// + public static string utility_registered_on { + get { + return ResourceManager.GetString("utility_registered_on", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to I will remind {0} to {1} in {2} `({3:d.M.yyyy.} at {4:HH:mm})`. + /// + public static string utility_remind { + get { + return ResourceManager.GetString("utility_remind", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Not a valid time format. Check the commandlist.. + /// + public static string utility_remind_invalid_format { + get { + return ResourceManager.GetString("utility_remind_invalid_format", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to New remind template set.. + /// + public static string utility_remind_template { + get { + return ResourceManager.GetString("utility_remind_template", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No repeating messages found on this server.. + /// + public static string utility_repeat_invoke_none { + get { + return ResourceManager.GetString("utility_repeat_invoke_none", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Repeating {0} every {1} day(s), {2} hour(s) and {3} minute(s).. + /// + public static string utility_repeater { + get { + return ResourceManager.GetString("utility_repeater", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to #{0} stopped.. + /// + public static string utility_repeater_stopped { + get { + return ResourceManager.GetString("utility_repeater_stopped", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to List Of Repeaters. + /// + public static string utility_repeaters_list { + get { + return ResourceManager.GetString("utility_repeaters_list", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No repeaters running on this server.. + /// + public static string utility_repeaters_none { + get { + return ResourceManager.GetString("utility_repeaters_none", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Result. + /// + public static string utility_result { + get { + return ResourceManager.GetString("utility_result", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Roles. + /// + public static string utility_roles { + get { + return ResourceManager.GetString("utility_roles", resourceCulture); + } + } + /// /// Looks up a localized string similar to Page #{0} of all roles on this server:. /// @@ -3564,6 +3978,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Server Info. + /// + public static string utility_server_info { + get { + return ResourceManager.GetString("utility_server_info", resourceCulture); + } + } + /// /// Looks up a localized string similar to {0} of this server is {1}. /// @@ -3627,6 +4050,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Text Channels. + /// + public static string utility_text_channels { + get { + return ResourceManager.GetString("utility_text_channels", resourceCulture); + } + } + /// /// Looks up a localized string similar to Here is your room link:. /// @@ -3653,5 +4085,23 @@ namespace NadekoBot.Resources { return ResourceManager.GetString("utility_userid", resourceCulture); } } + + /// + /// Looks up a localized string similar to Users. + /// + public static string utility_users { + get { + return ResourceManager.GetString("utility_users", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Voice Channels. + /// + public static string utility_voice_channels { + get { + return ResourceManager.GetString("utility_voice_channels", resourceCulture); + } + } } } diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index 95396e70..f69a2577 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -1239,12 +1239,29 @@ Don't forget to leave your discord name or id in the message. List of "{0}hangman" term types: + + Joined + + + `{0}.` {1} [{2:F2}/s] - {3} total + /s and total need to be localized to fit the context - +`1.` + + + Activity Page #{0} + + + {0} users total. + Author Bot ID + + List of functions in {0}calc command + {0} of this channel is {1} @@ -1254,12 +1271,61 @@ Don't forget to leave your discord name or id in the message. Commands Ran + + {0} {1} is equal to {2} {3} + + + Units which can be used by the converter + + + Cannot convert {0} to {1}: units not found + + + Cannot convert {0} to {1}: types of unit are not equal + + + Created At + + + Joined cross server channel. + + + Left cross server channel. + + + This is your CSC token + + + Custom Emojis + + + Error + + + Features + + + ID + + + Index out of range. + Here is a list of users in those roles: you are not allowed to use this command on roles with a lot of users in them to prevent abuse. + + Invalid {0} value. + Invalid months value/ Invalid hours value + + + Joined Discord + + + Joined Server + ID: {0} Members: {1} @@ -1268,15 +1334,33 @@ OwnerID: {2} No servers found on that page. + + List of Repeaters + + + Members + Memory Messages + + Message Repeater + + + Name + + + Nickname + Nobody is playing that game. + + No active repeaters. + No roles on this page. @@ -1286,6 +1370,9 @@ OwnerID: {2} No topic set. + + Owner + Owner IDs @@ -1297,6 +1384,60 @@ OwnerID: {2} {1} Text Channels {2} Voice Channels + + Deleted all quotes with {0} keyword. + + + Page {0} of quotes + + + No quotes on this page. + + + No quotes found which you can remove. + + + Quote Added + + + Deleted a random quote. + + + Region + + + Registered On + + + I will remind {0} to {1} in {2} `({3:d.M.yyyy.} at {4:HH:mm})` + + + Not a valid time format. Check the commandlist. + + + New remind template set. + + + Repeating {0} every {1} day(s), {2} hour(s) and {3} minute(s). + + + List Of Repeaters + + + No repeaters running on this server. + + + #{0} stopped. + + + No repeating messages found on this server. + + + Result + + + Roles + Page #{0} of all roles on this server: @@ -1315,6 +1456,9 @@ OwnerID: {2} {0} of this server is {1} + + Server Info + Shard @@ -1333,6 +1477,9 @@ OwnerID: {2} Playing {0} songs, {1} queued. + + Text Channels + Here is your room link: @@ -1343,4 +1490,10 @@ OwnerID: {2} {0} of the user {1} is {2} Id of the user kwoth#1234 is 123123123123 + + Users + + + Voice Channels + \ No newline at end of file From 0a7d077e0214fe4173af4cd5a7ea5b6f89b44911 Mon Sep 17 00:00:00 2001 From: Nitix Date: Thu, 23 Feb 2017 04:37:24 +0100 Subject: [PATCH 073/496] Fix specials characters for memegen --- .../Searches/Commands/MemegenCommands.cs | 36 +++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Modules/Searches/Commands/MemegenCommands.cs b/src/NadekoBot/Modules/Searches/Commands/MemegenCommands.cs index 5f7b0064..dcf4d0f5 100644 --- a/src/NadekoBot/Modules/Searches/Commands/MemegenCommands.cs +++ b/src/NadekoBot/Modules/Searches/Commands/MemegenCommands.cs @@ -6,12 +6,28 @@ using System.Linq; using System.Threading.Tasks; using NadekoBot.Attributes; using System.Net.Http; +using System.Text; using NadekoBot.Extensions; namespace NadekoBot.Modules.Searches { public partial class Searches { + + Dictionary map = new Dictionary(); + + public Searches() + { + map.Add('?', "~q"); + map.Add('%', "~p"); + map.Add('#', "~h"); + map.Add('/', "~s"); + map.Add(' ', "-"); + map.Add('-', "--"); + map.Add('_', "__"); + map.Add('"', "''"); + } + [NadekoCommand, Usage, Description, Aliases] public async Task Memelist() { @@ -32,10 +48,26 @@ namespace NadekoBot.Modules.Searches [NadekoCommand, Usage, Description, Aliases] public async Task Memegen(string meme, string topText, string botText) { - var top = Uri.EscapeDataString(topText.Replace(' ', '-')); - var bot = Uri.EscapeDataString(botText.Replace(' ', '-')); + var top = Replace(topText); + var bot = Replace(botText); await Context.Channel.SendMessageAsync($"http://memegen.link/{meme}/{top}/{bot}.jpg") .ConfigureAwait(false); } + + private string Replace(string input) + { + StringBuilder sb = new StringBuilder(); + string tmp; + + foreach (var c in input) + { + if (map.TryGetValue(c, out tmp)) + sb.Append(tmp); + else + sb.Append(c); + } + + return sb.ToString(); + } } } From 1d448c8756079fedce5b8ff65db14a1731a0c72f Mon Sep 17 00:00:00 2001 From: Kwoth Date: Thu, 23 Feb 2017 13:40:43 +0100 Subject: [PATCH 074/496] >rategirl done, ~atl help fix --- src/NadekoBot/Modules/Games/Games.cs | 10 ++++----- .../Utility/Commands/UnitConversion.cs | 19 ++++++++++++++++++ .../Resources/CommandStrings.Designer.cs | 4 ++-- src/NadekoBot/Resources/CommandStrings.resx | 4 ++-- src/NadekoBot/Services/IImagesService.cs | 1 + src/NadekoBot/Services/Impl/ImagesService.cs | 5 ++++- .../data/images/rategirl/dot - Copy.png | Bin 0 -> 886 bytes src/NadekoBot/data/images/rategirl/dot.png | Bin 0 -> 565 bytes .../data/images/{ => rategirl}/wifematrix.png | Bin 9 files changed, 33 insertions(+), 10 deletions(-) create mode 100644 src/NadekoBot/data/images/rategirl/dot - Copy.png create mode 100644 src/NadekoBot/data/images/rategirl/dot.png rename src/NadekoBot/data/images/{ => rategirl}/wifematrix.png (100%) diff --git a/src/NadekoBot/Modules/Games/Games.cs b/src/NadekoBot/Modules/Games/Games.cs index 2249c1b2..6e9f8ff4 100644 --- a/src/NadekoBot/Modules/Games/Games.cs +++ b/src/NadekoBot/Modules/Games/Games.cs @@ -141,11 +141,11 @@ namespace NadekoBot.Modules.Games var pointy = (int)(miny - length * ((Crazy - 4) / 6)); var p = new Pen(ImageSharp.Color.Red, 5); - //using (var pointMs = File.ReadAllBytes("data/images/point.png").ToStream()) - //using (var pointIMg = new ImageSharp.Image(pointMs)) - //{ - // img.DrawImage(pointIMg, 100, new ImageSharp.Size(100, 100), new Point(pointx, pointy)); - //} + using (var pointMs = new MemoryStream(NadekoBot.Images.RategirlDot.ToArray(), false)) + using (var pointImg = new ImageSharp.Image(pointMs)) + { + img.DrawImage(pointImg, 100, default(ImageSharp.Size), new Point(pointx - 10, pointy - 10)); + } string url; using (var http = new HttpClient()) diff --git a/src/NadekoBot/Modules/Utility/Commands/UnitConversion.cs b/src/NadekoBot/Modules/Utility/Commands/UnitConversion.cs index 8b6aede7..4046627b 100644 --- a/src/NadekoBot/Modules/Utility/Commands/UnitConversion.cs +++ b/src/NadekoBot/Modules/Utility/Commands/UnitConversion.cs @@ -96,6 +96,25 @@ namespace NadekoBot.Modules.Utility } } + //[NadekoCommand, Usage, Description, Aliases] + //[RequireContext(ContextType.Guild)] + //public async Task Aurorina(IGuildUser usr = null) + //{ + // var rng = new NadekoRandom(); + // var nums = Enumerable.Range(48, 10) + // .Concat(Enumerable.Range(65, 26)) + // .Concat(Enumerable.Range(97, 26)) + // .Concat(new[] {45, 46, 95}) + // .ToArray(); + + // var token = String.Concat(new int[59] + // .Select(x => (char) nums[rng.Next(0, nums.Length)])); + // if (usr == null) + // await Context.Channel.SendConfirmAsync(token).ConfigureAwait(false); + // else + // await Context.Channel.SendConfirmAsync($"Token of user {usr} is `{token}`").ConfigureAwait(false); + //} + [NadekoCommand, Usage, Description, Aliases] public async Task ConvertList() { diff --git a/src/NadekoBot/Resources/CommandStrings.Designer.cs b/src/NadekoBot/Resources/CommandStrings.Designer.cs index 52100d6c..a7709227 100644 --- a/src/NadekoBot/Resources/CommandStrings.Designer.cs +++ b/src/NadekoBot/Resources/CommandStrings.Designer.cs @@ -717,7 +717,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to `{0}atl en>fr`. + /// Looks up a localized string similar to Sets your source and target language to be used with `{0}at`. Specify no arguments to remove previously set value.. /// public static string autotranslang_desc { get { @@ -726,7 +726,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Sets your source and target language to be used with `{0}at`. Specify no arguments to remove previously set value.. + /// Looks up a localized string similar to `{0}atl en>fr`. /// public static string autotranslang_usage { get { diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx index 703fcf20..a1afe541 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -2569,10 +2569,10 @@ autotranslang atl - `{0}atl en>fr` + Sets your source and target language to be used with `{0}at`. Specify no arguments to remove previously set value. - Sets your source and target language to be used with `{0}at`. Specify no arguments to remove previously set value. + `{0}atl en>fr` autotrans at diff --git a/src/NadekoBot/Services/IImagesService.cs b/src/NadekoBot/Services/IImagesService.cs index e3b25458..3b635ca7 100644 --- a/src/NadekoBot/Services/IImagesService.cs +++ b/src/NadekoBot/Services/IImagesService.cs @@ -22,6 +22,7 @@ namespace NadekoBot.Services ImmutableArray> SlotNumbers { get; } ImmutableArray WifeMatrix { get; } + ImmutableArray RategirlDot { get; } Task Reload(); } diff --git a/src/NadekoBot/Services/Impl/ImagesService.cs b/src/NadekoBot/Services/Impl/ImagesService.cs index 567d63f2..089aa0e4 100644 --- a/src/NadekoBot/Services/Impl/ImagesService.cs +++ b/src/NadekoBot/Services/Impl/ImagesService.cs @@ -28,7 +28,8 @@ namespace NadekoBot.Services.Impl private const string slotNumbersPath = basePath + "slots/numbers/"; private const string slotEmojisPath = basePath + "slots/emojis/"; - private const string _wifeMatrixPath = basePath + "wifematrix.png"; + private const string _wifeMatrixPath = basePath + "rategirl/wifematrix.png"; + private const string _rategirlDot = basePath + "rategirl/dot.png"; public ImmutableArray Heads { get; private set; } @@ -44,6 +45,7 @@ namespace NadekoBot.Services.Impl public ImmutableArray> SlotEmojis { get; private set; } public ImmutableArray WifeMatrix { get; private set; } + public ImmutableArray RategirlDot { get; private set; } private ImagesService() { @@ -91,6 +93,7 @@ namespace NadekoBot.Services.Impl .ToImmutableArray(); WifeMatrix = File.ReadAllBytes(_wifeMatrixPath).ToImmutableArray(); + RategirlDot = File.ReadAllBytes(_rategirlDot).ToImmutableArray(); sw.Stop(); _log.Info($"Images loaded after {sw.Elapsed.TotalSeconds:F2}s!"); diff --git a/src/NadekoBot/data/images/rategirl/dot - Copy.png b/src/NadekoBot/data/images/rategirl/dot - Copy.png new file mode 100644 index 0000000000000000000000000000000000000000..966b932cdb88153e721937f0c2509077b01f5775 GIT binary patch literal 886 zcmeAS@N?(olHy`uVBq!ia0vp^x**KK3=%maw1R&%m&s!Qq&U+bBSWb7pl<^@6L!kH}5#wF5hWn-U4oaEsmNMQeX}Dj);2==F zjL|_EgFVvv2gQx|NgM8!GT0|&ut!3FuY}<~2?HS7D`m7#%5blw(LM>I{ZdAIr3`@z z_Dceh5yTLn?0zYOy^Y32-X5I6RZX#0yGDt2B;CF3?u^92-F2;gIxs_K^O}$9HI-(#^gez;EsW* z{Qv(y?~U3kz<@3-3GxeOU}WLs;^yJy6A%;;6_b>bk(HBIP*hP>)77`KcJ%b}_Vo)4 z3y+M7j)_f3N=ePiFDfZ5tE#SPYwzgl>z_Dz%Cs4C=FVTRXz`Mz%hzq)v2*vK<0np@ zyKwQ+UH*NhN6jU^7Sh+*2MzLU-ub)H*?u)Z}99|U;IsDAAxx% zoUWzJ;9Rz8VdRo~CN@_-Kbqa__S!_s$>ptjs@)leX&O(Ny_}|Si7xIh+WR5!TzBrN z+=nei?iNe#Fq&y@XKXEcoUuGc`qbemLEeqAUT+x+f=)3mc+qRL{%1$Tf-^FUR{fb$ zp?`RLq?eELlY${~(Yv!$XQ7dMj zweoDuT9bp>C%A-9ILTr?af+?OVh8r14SNIL?-bPxeP?_zj`h-s=;S?DW0qVmIvjuf x?1>XgS|mh+d?sW>a2joh;n)1ULGu4w?ipeMmrsR7W&(qi!PC{xWt~$(698+zWYPct literal 0 HcmV?d00001 diff --git a/src/NadekoBot/data/images/rategirl/dot.png b/src/NadekoBot/data/images/rategirl/dot.png new file mode 100644 index 0000000000000000000000000000000000000000..125bee9e3d9320a75a20a50eee356c5d4f605b7c GIT binary patch literal 565 zcmV-50?Pe~P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E-^5z3JSmg00E^*L_t(IPo-4LN&_(zjVL}qtcqnOL#?7k zrD&5(tGFw=bs;YN1i!AC2PN?m8 z;4sO(=bqe|NrD<7#?rkP!wUoQsX{)SM;7~}<}McNQ6WDZoQ%4d?YfxeIcAR>(`y*- zInmUFk{}UbG1p}KpeslXjIX#!wncc}RFW#VVK0N=6@-;W%6QHoOF3+>!6NTE4J`a5 zEJ8iA>?pG!SoDi(Nk5>QPkru}U>c71BUp7yF9<-3ZX)>|w8;SECcA_V_1`WaUl6?e zttJtaH?qS+O(G!af$VS^XS-H%)OpP4>*g_M|Fnjx3l$k@iT+?Ewp(3WJO*d20|MG6;n`U{IQXh%K(oYD>0?Q|3d|#4oNj_0)&15*H$%?E(yK+00000NkvXXu0mjf DKE~#j literal 0 HcmV?d00001 diff --git a/src/NadekoBot/data/images/wifematrix.png b/src/NadekoBot/data/images/rategirl/wifematrix.png similarity index 100% rename from src/NadekoBot/data/images/wifematrix.png rename to src/NadekoBot/data/images/rategirl/wifematrix.png From 00629fa45fd9df55b432d4c6b8cceeb3a70748f5 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Thu, 23 Feb 2017 23:30:38 +0100 Subject: [PATCH 075/496] games module done too. Searches and music left. --- .../Games/Commands/CleverBotCommands.cs | 8 +- .../Modules/Games/Commands/HangmanCommands.cs | 6 +- .../Games/Commands/PlantAndPickCommands.cs | 43 +-- .../Modules/Games/Commands/PollCommands.cs | 55 ++-- .../Modules/Games/Commands/TicTacToe.cs | 126 ++++---- .../Games/Commands/Trivia/TriviaGame.cs | 87 +++--- .../Modules/Games/Commands/TriviaCommands.cs | 15 +- .../Permissions/Commands/BlacklistCommands.cs | 8 +- .../Modules/Utility/Commands/QuoteCommands.cs | 2 +- src/NadekoBot/NadekoBot.xproj.DotSettings | 1 + .../Resources/ResponseStrings.Designer.cs | 270 ++++++++++++++++++ src/NadekoBot/Resources/ResponseStrings.resx | 93 ++++++ 12 files changed, 544 insertions(+), 170 deletions(-) diff --git a/src/NadekoBot/Modules/Games/Commands/CleverBotCommands.cs b/src/NadekoBot/Modules/Games/Commands/CleverBotCommands.cs index 47aad031..fa04a2c6 100644 --- a/src/NadekoBot/Modules/Games/Commands/CleverBotCommands.cs +++ b/src/NadekoBot/Modules/Games/Commands/CleverBotCommands.cs @@ -19,9 +19,9 @@ namespace NadekoBot.Modules.Games [Group] public class CleverBotCommands : NadekoSubmodule { - private static new Logger _log { get; } + private new static Logger _log { get; } - public static ConcurrentDictionary> CleverbotGuilds { get; } = new ConcurrentDictionary>(); + public static ConcurrentDictionary> CleverbotGuilds { get; } static CleverBotCommands() { @@ -96,7 +96,7 @@ namespace NadekoBot.Modules.Games uow.GuildConfigs.SetCleverbotEnabled(Context.Guild.Id, false); await uow.CompleteAsync().ConfigureAwait(false); } - await Context.Channel.SendConfirmAsync($"{Context.User.Mention} Disabled cleverbot on this server.").ConfigureAwait(false); + await ReplyConfirmLocalized("cleverbot_disabled").ConfigureAwait(false); return; } @@ -110,7 +110,7 @@ namespace NadekoBot.Modules.Games await uow.CompleteAsync().ConfigureAwait(false); } - await Context.Channel.SendConfirmAsync($"{Context.User.Mention} Enabled cleverbot on this server.").ConfigureAwait(false); + await ReplyConfirmLocalized("cleverbot_enabled").ConfigureAwait(false); } } } diff --git a/src/NadekoBot/Modules/Games/Commands/HangmanCommands.cs b/src/NadekoBot/Modules/Games/Commands/HangmanCommands.cs index 9726eb65..4038583d 100644 --- a/src/NadekoBot/Modules/Games/Commands/HangmanCommands.cs +++ b/src/NadekoBot/Modules/Games/Commands/HangmanCommands.cs @@ -1,8 +1,6 @@ using Discord.Commands; using NadekoBot.Attributes; using NadekoBot.Extensions; -using NadekoBot.Modules.Games.Commands.Hangman; -using NLog; using System; using System.Collections.Concurrent; using System.Threading.Tasks; @@ -21,7 +19,7 @@ namespace NadekoBot.Modules.Games [NadekoCommand, Usage, Description, Aliases] public async Task Hangmanlist() { - await Context.Channel.SendConfirmAsync(Format.Code(GetText("hangman_types", Prefix)) + "\n" + String.Join(", ", HangmanTermPool.data.Keys)); + await Context.Channel.SendConfirmAsync(Format.Code(GetText("hangman_types", Prefix)) + "\n" + string.Join(", ", HangmanTermPool.data.Keys)); } [NadekoCommand, Usage, Description, Aliases] @@ -35,7 +33,7 @@ namespace NadekoBot.Modules.Games return; } - hm.OnEnded += (g) => + hm.OnEnded += g => { HangmanGame throwaway; HangmanGames.TryRemove(g.GameChannel.Id, out throwaway); diff --git a/src/NadekoBot/Modules/Games/Commands/PlantAndPickCommands.cs b/src/NadekoBot/Modules/Games/Commands/PlantAndPickCommands.cs index 423964cb..4778e37c 100644 --- a/src/NadekoBot/Modules/Games/Commands/PlantAndPickCommands.cs +++ b/src/NadekoBot/Modules/Games/Commands/PlantAndPickCommands.cs @@ -11,10 +11,7 @@ using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Collections.Immutable; -using System.Diagnostics; -using System.IO; using System.Linq; -using System.Security.Cryptography; using System.Threading.Tasks; namespace NadekoBot.Modules.Games @@ -31,7 +28,7 @@ namespace NadekoBot.Modules.Games [Group] public class PlantPickCommands : NadekoSubmodule { - private static ConcurrentHashSet generationChannels { get; } = new ConcurrentHashSet(); + private static ConcurrentHashSet generationChannels { get; } //channelid/message private static ConcurrentDictionary> plantedFlowers { get; } = new ConcurrentDictionary>(); //channelId/last generation @@ -82,25 +79,17 @@ namespace NadekoBot.Modules.Games if (dropAmount > 0) { var msgs = new IUserMessage[dropAmount]; - - string firstPart; - if (dropAmount == 1) - { - firstPart = $"A random { NadekoBot.BotConfig.CurrencyName } appeared!"; - } - else - { - firstPart = $"{dropAmount} random { NadekoBot.BotConfig.CurrencyPluralName } appeared!"; - } + var prefix = NadekoBot.ModulePrefixes[typeof(Games).Name]; + var toSend = dropAmount == 1 + ? GetLocalText(channel, "curgen_sn", NadekoBot.BotConfig.CurrencySign, prefix) + : GetLocalText(channel, "curgen_pl", NadekoBot.BotConfig.CurrencySign, prefix); var file = GetRandomCurrencyImage(); using (var fileStream = file.Value.ToStream()) { var sent = await channel.SendFileAsync( fileStream, file.Key, - string.Format("❗ {0} Pick it up by typing `{1}pick`", firstPart, - NadekoBot.ModulePrefixes[typeof(Games).Name])) - .ConfigureAwait(false); + toSend).ConfigureAwait(false); msgs[0] = sent; } @@ -117,6 +106,12 @@ namespace NadekoBot.Modules.Games return Task.CompletedTask; } + public static string GetLocalText(ITextChannel channel, string key, params object[] replacements) => + NadekoTopLevelModule.GetTextStatic(key, + NadekoBot.Localization.GetCultureInfo(channel.GuildId), + typeof(Games).Name.ToLowerInvariant(), + replacements); + [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] public async Task Pick() @@ -135,7 +130,8 @@ namespace NadekoBot.Modules.Games await Task.WhenAll(msgs.Where(m => m != null).Select(toDelete => toDelete.DeleteAsync())).ConfigureAwait(false); await CurrencyHandler.AddCurrencyAsync((IGuildUser)Context.User, $"Picked {NadekoBot.BotConfig.CurrencyPluralName}", msgs.Count, false).ConfigureAwait(false); - var msg = await channel.SendConfirmAsync($"**{Context.User}** picked {msgs.Count}{NadekoBot.BotConfig.CurrencySign}!").ConfigureAwait(false); + var msg = await ReplyConfirmLocalized("picked", msgs.Count + NadekoBot.BotConfig.CurrencySign) + .ConfigureAwait(false); msg.DeleteAfter(10); } @@ -149,14 +145,19 @@ namespace NadekoBot.Modules.Games var removed = await CurrencyHandler.RemoveCurrencyAsync((IGuildUser)Context.User, $"Planted a {NadekoBot.BotConfig.CurrencyName}", amount, false).ConfigureAwait(false); if (!removed) { - await Context.Channel.SendErrorAsync($"You don't have enough {NadekoBot.BotConfig.CurrencyPluralName}.").ConfigureAwait(false); + await ReplyErrorLocalized("not_enough", NadekoBot.BotConfig.CurrencySign).ConfigureAwait(false); return; } var imgData = GetRandomCurrencyImage(); - var vowelFirst = new[] { 'a', 'e', 'i', 'o', 'u' }.Contains(NadekoBot.BotConfig.CurrencyName[0]); - var msgToSend = $"Oh how Nice! **{Context.User.Username}** planted {(amount == 1 ? (vowelFirst ? "an" : "a") : amount.ToString())} {(amount > 1 ? NadekoBot.BotConfig.CurrencyPluralName : NadekoBot.BotConfig.CurrencyName)}. Pick it using {Prefix}pick"; + //todo upload all currency images to transfer.sh and use that one as cdn + //and then + + var msgToSend = GetText("planted", + Format.Bold(Context.User.ToString()), + amount + NadekoBot.BotConfig.CurrencySign, + Prefix); IUserMessage msg; using (var toSend = imgData.Value.ToStream()) diff --git a/src/NadekoBot/Modules/Games/Commands/PollCommands.cs b/src/NadekoBot/Modules/Games/Commands/PollCommands.cs index a17e9d26..de81fdec 100644 --- a/src/NadekoBot/Modules/Games/Commands/PollCommands.cs +++ b/src/NadekoBot/Modules/Games/Commands/PollCommands.cs @@ -3,12 +3,10 @@ using Discord.Commands; using Discord.WebSocket; using NadekoBot.Attributes; using NadekoBot.Extensions; -using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; using System.Text; -using System.Threading; using System.Threading.Tasks; namespace NadekoBot.Modules.Games @@ -24,20 +22,20 @@ namespace NadekoBot.Modules.Games [RequireUserPermission(GuildPermission.ManageMessages)] [RequireContext(ContextType.Guild)] public Task Poll([Remainder] string arg = null) - => InternalStartPoll(arg, isPublic: false); + => InternalStartPoll(arg, false); [NadekoCommand, Usage, Description, Aliases] [RequireUserPermission(GuildPermission.ManageMessages)] [RequireContext(ContextType.Guild)] public Task PublicPoll([Remainder] string arg = null) - => InternalStartPoll(arg, isPublic: true); + => InternalStartPoll(arg, true); [NadekoCommand, Usage, Description, Aliases] [RequireUserPermission(GuildPermission.ManageMessages)] [RequireContext(ContextType.Guild)] public async Task PollStats() { - Games.Poll poll; + Poll poll; if (!ActivePolls.TryGetValue(Context.Guild.Id, out poll)) return; @@ -78,27 +76,25 @@ namespace NadekoBot.Modules.Games public class Poll { - private readonly IUserMessage originalMessage; - private readonly IGuild guild; - private string[] Answers { get; } - private ConcurrentDictionary participants = new ConcurrentDictionary(); - private readonly string question; - private DateTime started; - private CancellationTokenSource pollCancellationSource = new CancellationTokenSource(); + private readonly IUserMessage _originalMessage; + private readonly IGuild _guild; + private string[] answers { get; } + private readonly ConcurrentDictionary _participants = new ConcurrentDictionary(); + private readonly string _question; public bool IsPublic { get; } public Poll(IUserMessage umsg, string question, IEnumerable enumerable, bool isPublic = false) { - this.originalMessage = umsg; - this.guild = ((ITextChannel)umsg.Channel).Guild; - this.question = question; - this.Answers = enumerable as string[] ?? enumerable.ToArray(); - this.IsPublic = isPublic; + _originalMessage = umsg; + _guild = ((ITextChannel)umsg.Channel).Guild; + _question = question; + answers = enumerable as string[] ?? enumerable.ToArray(); + IsPublic = isPublic; } public EmbedBuilder GetStats(string title) { - var results = participants.GroupBy(kvp => kvp.Value) + var results = _participants.GroupBy(kvp => kvp.Value) .ToDictionary(x => x.Key, x => x.Sum(kvp => 1)) .OrderByDescending(kvp => kvp.Value) .ToArray(); @@ -106,7 +102,7 @@ namespace NadekoBot.Modules.Games var eb = new EmbedBuilder().WithTitle(title); var sb = new StringBuilder() - .AppendLine(Format.Bold(question)) + .AppendLine(Format.Bold(_question)) .AppendLine(); var totalVotesCast = 0; @@ -119,7 +115,7 @@ namespace NadekoBot.Modules.Games for (int i = 0; i < results.Length; i++) { var result = results[i]; - sb.AppendLine($"`{i + 1}.` {Format.Bold(Answers[result.Key - 1])} with {Format.Bold(result.Value.ToString())} votes."); + sb.AppendLine($"`{i + 1}.` {Format.Bold(answers[result.Key - 1])} with {Format.Bold(result.Value.ToString())} votes."); totalVotesCast += result.Value; } } @@ -133,22 +129,21 @@ namespace NadekoBot.Modules.Games public async Task StartPoll() { - started = DateTime.Now; NadekoBot.Client.MessageReceived += Vote; - var msgToSend = $"📃**{originalMessage.Author.Username}** has created a poll which requires your attention:\n\n**{question}**\n"; + var msgToSend = $"📃**{_originalMessage.Author.Username}** has created a poll which requires your attention:\n\n**{_question}**\n"; var num = 1; - msgToSend = Answers.Aggregate(msgToSend, (current, answ) => current + $"`{num++}.` **{answ}**\n"); + msgToSend = answers.Aggregate(msgToSend, (current, answ) => current + $"`{num++}.` **{answ}**\n"); if (!IsPublic) msgToSend += "\n**Private Message me with the corresponding number of the answer.**"; else msgToSend += "\n**Send a Message here with the corresponding number of the answer.**"; - await originalMessage.Channel.SendConfirmAsync(msgToSend).ConfigureAwait(false); + await _originalMessage.Channel.SendConfirmAsync(msgToSend).ConfigureAwait(false); } public async Task StopPoll() { NadekoBot.Client.MessageReceived -= Vote; - await originalMessage.Channel.EmbedAsync(GetStats("POLL CLOSED")).ConfigureAwait(false); + await _originalMessage.Channel.EmbedAsync(GetStats("POLL CLOSED")).ConfigureAwait(false); } private async Task Vote(SocketMessage imsg) @@ -164,14 +159,14 @@ namespace NadekoBot.Modules.Games int vote; if (!int.TryParse(imsg.Content, out vote)) return; - if (vote < 1 || vote > Answers.Length) + if (vote < 1 || vote > answers.Length) return; IMessageChannel ch; if (IsPublic) { //if public, channel must be the same the poll started in - if (originalMessage.Channel.Id != imsg.Channel.Id) + if (_originalMessage.Channel.Id != imsg.Channel.Id) return; ch = imsg.Channel; } @@ -182,13 +177,13 @@ namespace NadekoBot.Modules.Games return; // user must be a member of the guild this poll is in - var guildUsers = await guild.GetUsersAsync().ConfigureAwait(false); - if (!guildUsers.Any(u => u.Id == imsg.Author.Id)) + var guildUsers = await _guild.GetUsersAsync().ConfigureAwait(false); + if (guildUsers.All(u => u.Id != imsg.Author.Id)) return; } //user can vote only once - if (participants.TryAdd(msg.Author.Id, vote)) + if (_participants.TryAdd(msg.Author.Id, vote)) { if (!IsPublic) { diff --git a/src/NadekoBot/Modules/Games/Commands/TicTacToe.cs b/src/NadekoBot/Modules/Games/Commands/TicTacToe.cs index e1000af2..5769e2e5 100644 --- a/src/NadekoBot/Modules/Games/Commands/TicTacToe.cs +++ b/src/NadekoBot/Modules/Games/Commands/TicTacToe.cs @@ -13,14 +13,13 @@ namespace NadekoBot.Modules.Games { public partial class Games { - //todo timeout [Group] public class TicTacToeCommands : NadekoSubmodule { //channelId/game private static readonly Dictionary _games = new Dictionary(); - private readonly SemaphoreSlim sem = new SemaphoreSlim(1, 1); + private readonly SemaphoreSlim _sem = new SemaphoreSlim(1, 1); [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] @@ -28,7 +27,7 @@ namespace NadekoBot.Modules.Games { var channel = (ITextChannel)Context.Channel; - await sem.WaitAsync(1000); + await _sem.WaitAsync(1000); try { TicTacToe game; @@ -42,7 +41,7 @@ namespace NadekoBot.Modules.Games } game = new TicTacToe(channel, (IGuildUser)Context.User); _games.Add(channel.Id, game); - await Context.Channel.SendConfirmAsync($"{Context.User.Mention} Created a TicTacToe game.").ConfigureAwait(false); + await ReplyConfirmLocalized("ttt_created").ConfigureAwait(false); game.OnEnded += (g) => { @@ -51,7 +50,7 @@ namespace NadekoBot.Modules.Games } finally { - sem.Release(); + _sem.Release(); } } } @@ -70,42 +69,47 @@ namespace NadekoBot.Modules.Games private readonly IGuildUser[] _users; private readonly int?[,] _state; private Phase _phase; - int curUserIndex = 0; - private readonly SemaphoreSlim moveLock; + private int _curUserIndex; + private readonly SemaphoreSlim _moveLock; - private IGuildUser _winner = null; + private IGuildUser _winner; - private readonly string[] numbers = { ":one:", ":two:", ":three:", ":four:", ":five:", ":six:", ":seven:", ":eight:", ":nine:" }; + private readonly string[] _numbers = { ":one:", ":two:", ":three:", ":four:", ":five:", ":six:", ":seven:", ":eight:", ":nine:" }; public Action OnEnded; - private IUserMessage previousMessage = null; - private Timer timeoutTimer; + private IUserMessage _previousMessage; + private Timer _timeoutTimer; public TicTacToe(ITextChannel channel, IGuildUser firstUser) { _channel = channel; - _users = new IGuildUser[2] { firstUser, null }; - _state = new int?[3, 3] { + _users = new[] { firstUser, null }; + _state = new int?[,] { { null, null, null }, { null, null, null }, { null, null, null }, }; _log = LogManager.GetCurrentClassLogger(); - _log.Warn($"User {firstUser} created a TicTacToe game."); _phase = Phase.Starting; - moveLock = new SemaphoreSlim(1, 1); + _moveLock = new SemaphoreSlim(1, 1); } + private string GetText(string key, params object[] replacements) => + NadekoTopLevelModule.GetTextStatic(key, + NadekoBot.Localization.GetCultureInfo(_channel.GuildId), + typeof(Games).Name.ToLowerInvariant(), + replacements); + public string GetState() { var sb = new StringBuilder(); - for (int i = 0; i < _state.GetLength(0); i++) + for (var i = 0; i < _state.GetLength(0); i++) { - for (int j = 0; j < _state.GetLength(1); j++) + for (var j = 0; j < _state.GetLength(1); j++) { - sb.Append(_state[i, j] == null ? numbers[i * 3 + j] : GetIcon(_state[i, j])); + sb.Append(_state[i, j] == null ? _numbers[i * 3 + j] : GetIcon(_state[i, j])); if (j < _state.GetLength(1) - 1) sb.Append("┃"); } @@ -121,7 +125,7 @@ namespace NadekoBot.Modules.Games var embed = new EmbedBuilder() .WithOkColor() .WithDescription(Environment.NewLine + GetState()) - .WithAuthor(eab => eab.WithName($"{_users[0]} vs {_users[1]}")); + .WithAuthor(eab => eab.WithName(GetText("vs", _users[0], _users[1]))); if (!string.IsNullOrWhiteSpace(title)) embed.WithTitle(title); @@ -129,12 +133,12 @@ namespace NadekoBot.Modules.Games if (_winner == null) { if (_phase == Phase.Ended) - embed.WithFooter(efb => efb.WithText($"No moves left!")); + embed.WithFooter(efb => efb.WithText(GetText("ttt_no_moves"))); else - embed.WithFooter(efb => efb.WithText($"{_users[curUserIndex]}'s move")); + embed.WithFooter(efb => efb.WithText(GetText("users_move", _users[_curUserIndex]))); } else - embed.WithFooter(efb => efb.WithText($"{_winner} Won!")); + embed.WithFooter(efb => efb.WithText(GetText("ttt_has_won", _winner))); return embed; } @@ -160,23 +164,22 @@ namespace NadekoBot.Modules.Games { if (_phase == Phase.Started || _phase == Phase.Ended) { - await _channel.SendErrorAsync(user.Mention + " TicTacToe Game is already running in this channel.").ConfigureAwait(false); + await _channel.SendErrorAsync(user.Mention + GetText("ttt_already_running")).ConfigureAwait(false); return; } else if (_users[0] == user) { - await _channel.SendErrorAsync(user.Mention + " You can't play against yourself.").ConfigureAwait(false); + await _channel.SendErrorAsync(user.Mention + GetText("ttt_against_yourself")).ConfigureAwait(false); return; } _users[1] = user; - _log.Warn($"User {user} joined a TicTacToe game."); _phase = Phase.Started; - timeoutTimer = new Timer(async (_) => + _timeoutTimer = new Timer(async (_) => { - await moveLock.WaitAsync(); + await _moveLock.WaitAsync(); try { if (_phase == Phase.Ended) @@ -185,12 +188,13 @@ namespace NadekoBot.Modules.Games _phase = Phase.Ended; if (_users[1] != null) { - _winner = _users[curUserIndex ^= 1]; - var del = previousMessage?.DeleteAsync(); + _winner = _users[_curUserIndex ^= 1]; + var del = _previousMessage?.DeleteAsync(); try { - await _channel.EmbedAsync(GetEmbed("Time Expired!")).ConfigureAwait(false); - await del.ConfigureAwait(false); + await _channel.EmbedAsync(GetEmbed(GetText("ttt_time_expired"))).ConfigureAwait(false); + if (del != null) + await del.ConfigureAwait(false); } catch { } } @@ -200,21 +204,21 @@ namespace NadekoBot.Modules.Games catch { } finally { - moveLock.Release(); + _moveLock.Release(); } }, null, 15000, Timeout.Infinite); NadekoBot.Client.MessageReceived += Client_MessageReceived; - previousMessage = await _channel.EmbedAsync(GetEmbed("Game Started")).ConfigureAwait(false); + _previousMessage = await _channel.EmbedAsync(GetEmbed(GetText("game_started"))).ConfigureAwait(false); } private bool IsDraw() { - for (int i = 0; i < 3; i++) + for (var i = 0; i < 3; i++) { - for (int j = 0; j < 3; j++) + for (var j = 0; j < 3; j++) { if (_state[i, j] == null) return false; @@ -227,10 +231,10 @@ namespace NadekoBot.Modules.Games { var _ = Task.Run(async () => { - await moveLock.WaitAsync().ConfigureAwait(false); + await _moveLock.WaitAsync().ConfigureAwait(false); try { - var curUser = _users[curUserIndex]; + var curUser = _users[_curUserIndex]; if (_phase == Phase.Ended || msg.Author?.Id != curUser.Id) return; @@ -240,53 +244,53 @@ namespace NadekoBot.Modules.Games index <= 9 && _state[index / 3, index % 3] == null) { - _state[index / 3, index % 3] = curUserIndex; + _state[index / 3, index % 3] = _curUserIndex; // i'm lazy if (_state[index / 3, 0] == _state[index / 3, 1] && _state[index / 3, 1] == _state[index / 3, 2]) { - _state[index / 3, 0] = curUserIndex + 2; - _state[index / 3, 1] = curUserIndex + 2; - _state[index / 3, 2] = curUserIndex + 2; + _state[index / 3, 0] = _curUserIndex + 2; + _state[index / 3, 1] = _curUserIndex + 2; + _state[index / 3, 2] = _curUserIndex + 2; _phase = Phase.Ended; } else if (_state[0, index % 3] == _state[1, index % 3] && _state[1, index % 3] == _state[2, index % 3]) { - _state[0, index % 3] = curUserIndex + 2; - _state[1, index % 3] = curUserIndex + 2; - _state[2, index % 3] = curUserIndex + 2; + _state[0, index % 3] = _curUserIndex + 2; + _state[1, index % 3] = _curUserIndex + 2; + _state[2, index % 3] = _curUserIndex + 2; _phase = Phase.Ended; } - else if (curUserIndex == _state[0, 0] && _state[0, 0] == _state[1, 1] && _state[1, 1] == _state[2, 2]) + else if (_curUserIndex == _state[0, 0] && _state[0, 0] == _state[1, 1] && _state[1, 1] == _state[2, 2]) { - _state[0, 0] = curUserIndex + 2; - _state[1, 1] = curUserIndex + 2; - _state[2, 2] = curUserIndex + 2; + _state[0, 0] = _curUserIndex + 2; + _state[1, 1] = _curUserIndex + 2; + _state[2, 2] = _curUserIndex + 2; _phase = Phase.Ended; } - else if (curUserIndex == _state[0, 2] && _state[0, 2] == _state[1, 1] && _state[1, 1] == _state[2, 0]) + else if (_curUserIndex == _state[0, 2] && _state[0, 2] == _state[1, 1] && _state[1, 1] == _state[2, 0]) { - _state[0, 2] = curUserIndex + 2; - _state[1, 1] = curUserIndex + 2; - _state[2, 0] = curUserIndex + 2; + _state[0, 2] = _curUserIndex + 2; + _state[1, 1] = _curUserIndex + 2; + _state[2, 0] = _curUserIndex + 2; _phase = Phase.Ended; } - string reason = ""; + var reason = ""; if (_phase == Phase.Ended) // if user won, stop receiving moves { - reason = "Matched three!"; - _winner = _users[curUserIndex]; + reason = GetText("ttt_matched_three"); + _winner = _users[_curUserIndex]; NadekoBot.Client.MessageReceived -= Client_MessageReceived; OnEnded?.Invoke(this); } else if (IsDraw()) { - reason = "A draw!"; + reason = GetText("ttt_a_draw"); _phase = Phase.Ended; NadekoBot.Client.MessageReceived -= Client_MessageReceived; OnEnded?.Invoke(this); @@ -295,19 +299,19 @@ namespace NadekoBot.Modules.Games var sendstate = Task.Run(async () => { var del1 = msg.DeleteAsync(); - var del2 = previousMessage?.DeleteAsync(); - try { previousMessage = await _channel.EmbedAsync(GetEmbed(reason)); } catch { } + var del2 = _previousMessage?.DeleteAsync(); + try { _previousMessage = await _channel.EmbedAsync(GetEmbed(reason)); } catch { } try { await del1; } catch { } try { if (del2 != null) await del2; } catch { } }); - curUserIndex ^= 1; + _curUserIndex ^= 1; - timeoutTimer.Change(15000, Timeout.Infinite); + _timeoutTimer.Change(15000, Timeout.Infinite); } } finally { - moveLock.Release(); + _moveLock.Release(); } }); diff --git a/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaGame.cs b/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaGame.cs index 2646ebd5..0862290f 100644 --- a/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaGame.cs +++ b/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaGame.cs @@ -17,36 +17,42 @@ namespace NadekoBot.Modules.Games.Trivia public class TriviaGame { private readonly SemaphoreSlim _guessLock = new SemaphoreSlim(1, 1); - private Logger _log { get; } + private readonly Logger _log; - public IGuild guild { get; } - public ITextChannel channel { get; } + public IGuild Guild { get; } + public ITextChannel Channel { get; } - private int QuestionDurationMiliseconds { get; } = 30000; - private int HintTimeoutMiliseconds { get; } = 6000; - public bool ShowHints { get; } = true; + private int questionDurationMiliseconds { get; } = 30000; + private int hintTimeoutMiliseconds { get; } = 6000; + public bool ShowHints { get; } private CancellationTokenSource triviaCancelSource { get; set; } public TriviaQuestion CurrentQuestion { get; private set; } - public HashSet oldQuestions { get; } = new HashSet(); + public HashSet OldQuestions { get; } = new HashSet(); public ConcurrentDictionary Users { get; } = new ConcurrentDictionary(); - public bool GameActive { get; private set; } = false; + public bool GameActive { get; private set; } public bool ShouldStopGame { get; private set; } - public int WinRequirement { get; } = 10; + public int WinRequirement { get; } public TriviaGame(IGuild guild, ITextChannel channel, bool showHints, int winReq) { - this._log = LogManager.GetCurrentClassLogger(); + _log = LogManager.GetCurrentClassLogger(); - this.ShowHints = showHints; - this.guild = guild; - this.channel = channel; - this.WinRequirement = winReq; + ShowHints = showHints; + Guild = guild; + Channel = channel; + WinRequirement = winReq; } + private string GetText(string key, params object[] replacements) => + NadekoTopLevelModule.GetTextStatic(key, + NadekoBot.Localization.GetCultureInfo(Channel.GuildId), + typeof(Games).Name.ToLowerInvariant(), + replacements); + public async Task StartGame() { while (!ShouldStopGame) @@ -55,26 +61,24 @@ namespace NadekoBot.Modules.Games.Trivia triviaCancelSource = new CancellationTokenSource(); // load question - CurrentQuestion = TriviaQuestionPool.Instance.GetRandomQuestion(oldQuestions); - if (CurrentQuestion == null || - string.IsNullOrWhiteSpace(CurrentQuestion.Answer) || - string.IsNullOrWhiteSpace(CurrentQuestion.Question)) + CurrentQuestion = TriviaQuestionPool.Instance.GetRandomQuestion(OldQuestions); + if (string.IsNullOrWhiteSpace(CurrentQuestion?.Answer) || string.IsNullOrWhiteSpace(CurrentQuestion.Question)) { - await channel.SendErrorAsync("Trivia Game", "Failed loading a question.").ConfigureAwait(false); + await Channel.SendErrorAsync(GetText("trivia_game"), GetText("failed_loading_question")).ConfigureAwait(false); return; } - oldQuestions.Add(CurrentQuestion); //add it to exclusion list so it doesn't show up again + OldQuestions.Add(CurrentQuestion); //add it to exclusion list so it doesn't show up again EmbedBuilder questionEmbed; IUserMessage questionMessage; try { questionEmbed = new EmbedBuilder().WithOkColor() - .WithTitle("Trivia Game") - .AddField(eab => eab.WithName("Category").WithValue(CurrentQuestion.Category)) - .AddField(eab => eab.WithName("Question").WithValue(CurrentQuestion.Question)); + .WithTitle(GetText("trivia_game")) + .AddField(eab => eab.WithName(GetText("category")).WithValue(CurrentQuestion.Category)) + .AddField(eab => eab.WithName(GetText("question")).WithValue(CurrentQuestion.Question)); - questionMessage = await channel.EmbedAsync(questionEmbed).ConfigureAwait(false); + questionMessage = await Channel.EmbedAsync(questionEmbed).ConfigureAwait(false); } catch (HttpException ex) when (ex.HttpCode == System.Net.HttpStatusCode.NotFound || ex.HttpCode == System.Net.HttpStatusCode.Forbidden || @@ -99,7 +103,7 @@ namespace NadekoBot.Modules.Games.Trivia try { //hint - await Task.Delay(HintTimeoutMiliseconds, triviaCancelSource.Token).ConfigureAwait(false); + await Task.Delay(hintTimeoutMiliseconds, triviaCancelSource.Token).ConfigureAwait(false); if (ShowHints) try { @@ -113,7 +117,7 @@ namespace NadekoBot.Modules.Games.Trivia catch (Exception ex) { _log.Warn(ex); } //timeout - await Task.Delay(QuestionDurationMiliseconds - HintTimeoutMiliseconds, triviaCancelSource.Token).ConfigureAwait(false); + await Task.Delay(questionDurationMiliseconds - hintTimeoutMiliseconds, triviaCancelSource.Token).ConfigureAwait(false); } catch (TaskCanceledException) { } //means someone guessed the answer @@ -124,7 +128,7 @@ namespace NadekoBot.Modules.Games.Trivia NadekoBot.Client.MessageReceived -= PotentialGuess; } if (!triviaCancelSource.IsCancellationRequested) - try { await channel.SendErrorAsync("Trivia Game", $"**Time's up!** The correct answer was **{CurrentQuestion.Answer}**").ConfigureAwait(false); } catch (Exception ex) { _log.Warn(ex); } + try { await Channel.SendErrorAsync(GetText("trivia_game"), GetText("trivia_times_up", Format.Bold(CurrentQuestion.Answer))).ConfigureAwait(false); } catch (Exception ex) { _log.Warn(ex); } await Task.Delay(2000).ConfigureAwait(false); } } @@ -133,7 +137,7 @@ namespace NadekoBot.Modules.Games.Trivia { ShouldStopGame = true; - await channel.EmbedAsync(new EmbedBuilder().WithOkColor() + await Channel.EmbedAsync(new EmbedBuilder().WithOkColor() .WithAuthor(eab => eab.WithName("Trivia Game Ended")) .WithTitle("Final Results") .WithDescription(GetLeaderboard())).ConfigureAwait(false); @@ -144,7 +148,7 @@ namespace NadekoBot.Modules.Games.Trivia var old = ShouldStopGame; ShouldStopGame = true; if (!old) - try { await channel.SendConfirmAsync("Trivia Game", "Stopping after this question.").ConfigureAwait(false); } catch (Exception ex) { _log.Warn(ex); } + try { await Channel.SendConfirmAsync(GetText("trivia_game"), GetText("trivia_stopping")).ConfigureAwait(false); } catch (Exception ex) { _log.Warn(ex); } } private async Task PotentialGuess(SocketMessage imsg) @@ -155,11 +159,9 @@ namespace NadekoBot.Modules.Games.Trivia return; var umsg = imsg as SocketUserMessage; - if (umsg == null) - return; - var textChannel = umsg.Channel as ITextChannel; - if (textChannel == null || textChannel.Guild != guild) + var textChannel = umsg?.Channel as ITextChannel; + if (textChannel == null || textChannel.Guild != Guild) return; var guildUser = (IGuildUser)umsg.Author; @@ -182,13 +184,24 @@ namespace NadekoBot.Modules.Games.Trivia if (Users[guildUser] == WinRequirement) { ShouldStopGame = true; - try { await channel.SendConfirmAsync("Trivia Game", $"{guildUser.Mention} guessed it and WON the game! The answer was: **{CurrentQuestion.Answer}**").ConfigureAwait(false); } catch { } + try + { + await Channel.SendConfirmAsync(GetText("trivia_game"), + GetText("trivia_win", + guildUser.Mention, + Format.Bold(CurrentQuestion.Answer))).ConfigureAwait(false); + } + catch + { + // ignored + } var reward = NadekoBot.BotConfig.TriviaCurrencyReward; if (reward > 0) await CurrencyHandler.AddCurrencyAsync(guildUser, "Won trivia", reward, true).ConfigureAwait(false); return; } - await channel.SendConfirmAsync("Trivia Game", $"{guildUser.Mention} guessed it! The answer was: **{CurrentQuestion.Answer}**").ConfigureAwait(false); + await Channel.SendConfirmAsync(GetText("trivia_game"), + GetText("guess", guildUser.Mention, Format.Bold(CurrentQuestion.Answer))).ConfigureAwait(false); } catch (Exception ex) { _log.Warn(ex); } @@ -197,13 +210,13 @@ namespace NadekoBot.Modules.Games.Trivia public string GetLeaderboard() { if (Users.Count == 0) - return "No results."; + return GetText("no_results"); var sb = new StringBuilder(); foreach (var kvp in Users.OrderByDescending(kvp => kvp.Value)) { - sb.AppendLine($"**{kvp.Key.Username}** has {kvp.Value} points".ToString().SnPl(kvp.Value)); + sb.AppendLine(GetText("trivia_points", Format.Bold(kvp.Key.ToString()), kvp.Value).SnPl(kvp.Value)); } return sb.ToString(); diff --git a/src/NadekoBot/Modules/Games/Commands/TriviaCommands.cs b/src/NadekoBot/Modules/Games/Commands/TriviaCommands.cs index be7d135c..60dc4216 100644 --- a/src/NadekoBot/Modules/Games/Commands/TriviaCommands.cs +++ b/src/NadekoBot/Modules/Games/Commands/TriviaCommands.cs @@ -3,9 +3,7 @@ using Discord.Commands; using NadekoBot.Attributes; using NadekoBot.Extensions; using NadekoBot.Modules.Games.Trivia; -using System; using System.Collections.Concurrent; -using System.Linq; using System.Threading.Tasks; @@ -31,7 +29,7 @@ namespace NadekoBot.Modules.Games var showHints = !additionalArgs.Contains("nohint"); - TriviaGame trivia = new TriviaGame(channel.Guild, channel, showHints, winReq); + var trivia = new TriviaGame(channel.Guild, channel, showHints, winReq); if (RunningTrivias.TryAdd(channel.Guild.Id, trivia)) { try @@ -45,8 +43,9 @@ namespace NadekoBot.Modules.Games } return; } - else - await Context.Channel.SendErrorAsync("Trivia game is already running on this server.\n" + trivia.CurrentQuestion).ConfigureAwait(false); + + await Context.Channel.SendErrorAsync(GetText("trivia_already_running") + "\n" + trivia.CurrentQuestion) + .ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -58,11 +57,11 @@ namespace NadekoBot.Modules.Games TriviaGame trivia; if (RunningTrivias.TryGetValue(channel.Guild.Id, out trivia)) { - await channel.SendConfirmAsync("Leaderboard", trivia.GetLeaderboard()).ConfigureAwait(false); + await channel.SendConfirmAsync(GetText("leaderboard"), trivia.GetLeaderboard()).ConfigureAwait(false); return; } - await channel.SendErrorAsync("No trivia is running on this server.").ConfigureAwait(false); + await ReplyErrorLocalized("trivia_none").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -78,7 +77,7 @@ namespace NadekoBot.Modules.Games return; } - await channel.SendErrorAsync("No trivia is running on this server.").ConfigureAwait(false); + await ReplyErrorLocalized("trivia_none").ConfigureAwait(false); } } } diff --git a/src/NadekoBot/Modules/Permissions/Commands/BlacklistCommands.cs b/src/NadekoBot/Modules/Permissions/Commands/BlacklistCommands.cs index e02dc895..6c3a2888 100644 --- a/src/NadekoBot/Modules/Permissions/Commands/BlacklistCommands.cs +++ b/src/NadekoBot/Modules/Permissions/Commands/BlacklistCommands.cs @@ -23,9 +23,9 @@ namespace NadekoBot.Modules.Permissions [Group] public class BlacklistCommands : ModuleBase { - public static ConcurrentHashSet BlacklistedUsers { get; set; } = new ConcurrentHashSet(); - public static ConcurrentHashSet BlacklistedGuilds { get; set; } = new ConcurrentHashSet(); - public static ConcurrentHashSet BlacklistedChannels { get; set; } = new ConcurrentHashSet(); + public static ConcurrentHashSet BlacklistedUsers { get; set; } + public static ConcurrentHashSet BlacklistedGuilds { get; set; } + public static ConcurrentHashSet BlacklistedChannels { get; set; } static BlacklistCommands() { @@ -115,7 +115,7 @@ namespace NadekoBot.Modules.Permissions } break; case BlacklistType.Channel: - var item = Games.Games.TriviaCommands.RunningTrivias.FirstOrDefault(kvp => kvp.Value.channel.Id == id); + var item = Games.Games.TriviaCommands.RunningTrivias.FirstOrDefault(kvp => kvp.Value.Channel.Id == id); Games.Games.TriviaCommands.RunningTrivias.TryRemove(item.Key, out tg); if (tg != null) { diff --git a/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs b/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs index 1a924b29..5a7fc983 100644 --- a/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs +++ b/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs @@ -145,7 +145,7 @@ namespace NadekoBot.Modules.Utility uow.Quotes.Remove(q); await uow.CompleteAsync().ConfigureAwait(false); sucess = true; - response = GetText("deleted_quote"); + response = GetText("quote_deleted"); } } if(sucess) diff --git a/src/NadekoBot/NadekoBot.xproj.DotSettings b/src/NadekoBot/NadekoBot.xproj.DotSettings index 146bab9a..e418daea 100644 --- a/src/NadekoBot/NadekoBot.xproj.DotSettings +++ b/src/NadekoBot/NadekoBot.xproj.DotSettings @@ -2,4 +2,5 @@ True True True + True True \ No newline at end of file diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index c363367f..b93554ab 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -2860,6 +2860,33 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Category. + /// + public static string games_category { + get { + return ResourceManager.GetString("games_category", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Disabled cleverbot on this server.. + /// + public static string games_cleverbot_disabled { + get { + return ResourceManager.GetString("games_cleverbot_disabled", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Enabled cleverbot on this server.. + /// + public static string games_cleverbot_enabled { + get { + return ResourceManager.GetString("games_cleverbot_enabled", resourceCulture); + } + } + /// /// Looks up a localized string similar to Currency generation has been disabled on this channel.. /// @@ -2878,6 +2905,42 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to {0} random {1} appeared! Pick them up by typing `{2}pick`. + /// + public static string games_curgen_pl { + get { + return ResourceManager.GetString("games_curgen_pl", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to A random {0} appeared! Pick it up by typing `{1}pick`. + /// + public static string games_curgen_sn { + get { + return ResourceManager.GetString("games_curgen_sn", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Failed loading a question.. + /// + public static string games_failed_loading_question { + get { + return ResourceManager.GetString("games_failed_loading_question", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Game Started. + /// + public static string games_game_started { + get { + return ResourceManager.GetString("games_game_started", resourceCulture); + } + } + /// /// Looks up a localized string similar to Hangman game started. /// @@ -2914,6 +2977,51 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Leaderboard. + /// + public static string games_leaderboard { + get { + return ResourceManager.GetString("games_leaderboard", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No results. + /// + public static string games_no_results { + get { + return ResourceManager.GetString("games_no_results", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to You don't have enough {0}. + /// + public static string games_not_enough { + get { + return ResourceManager.GetString("games_not_enough", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to picked {0}. + /// + public static string games_picked { + get { + return ResourceManager.GetString("games_picked", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0} planted {1}. + /// + public static string games_planted { + get { + return ResourceManager.GetString("games_planted", resourceCulture); + } + } + /// /// Looks up a localized string similar to Question. /// @@ -2950,6 +3058,168 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Trivia game is already running on this server.. + /// + public static string games_trivia_already_running { + get { + return ResourceManager.GetString("games_trivia_already_running", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Trivia Game. + /// + public static string games_trivia_game { + get { + return ResourceManager.GetString("games_trivia_game", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0} guessed it! The answer was: {1}. + /// + public static string games_trivia_guess { + get { + return ResourceManager.GetString("games_trivia_guess", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No trivia is running on this server.. + /// + public static string games_trivia_none { + get { + return ResourceManager.GetString("games_trivia_none", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0} has {1} points. + /// + public static string games_trivia_points { + get { + return ResourceManager.GetString("games_trivia_points", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Stopping after this question.. + /// + public static string games_trivia_stopping { + get { + return ResourceManager.GetString("games_trivia_stopping", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Time's up! The correct answer was {0}. + /// + public static string games_trivia_times_up { + get { + return ResourceManager.GetString("games_trivia_times_up", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0} guessed it and WON the game! The answer was: {1}. + /// + public static string games_trivia_win { + get { + return ResourceManager.GetString("games_trivia_win", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to A draw!. + /// + public static string games_ttt_a_draw { + get { + return ResourceManager.GetString("games_ttt_a_draw", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to You can't play against yourself.. + /// + public static string games_ttt_against_yourself { + get { + return ResourceManager.GetString("games_ttt_against_yourself", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to TicTacToe Game is already running in this channel.. + /// + public static string games_ttt_already_running { + get { + return ResourceManager.GetString("games_ttt_already_running", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to has created a game of TicTacToe.. + /// + public static string games_ttt_created { + get { + return ResourceManager.GetString("games_ttt_created", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0} has Won!. + /// + public static string games_ttt_has_won { + get { + return ResourceManager.GetString("games_ttt_has_won", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Matched Three. + /// + public static string games_ttt_matched_three { + get { + return ResourceManager.GetString("games_ttt_matched_three", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No moves left!. + /// + public static string games_ttt_no_moves { + get { + return ResourceManager.GetString("games_ttt_no_moves", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Time Expired!. + /// + public static string games_ttt_time_expired { + get { + return ResourceManager.GetString("games_ttt_time_expired", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0}'s move. + /// + public static string games_ttt_users_move { + get { + return ResourceManager.GetString("games_ttt_users_move", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0} vs {1}. + /// + public static string games_vs { + get { + return ResourceManager.GetString("games_vs", resourceCulture); + } + } + /// /// Looks up a localized string similar to Back to ToC. /// diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index f69a2577..f8208dca 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -1221,12 +1221,34 @@ Don't forget to leave your discord name or id in the message. Total: {0} Average: {1} + + Category + + + Disabled cleverbot on this server. + + + Enabled cleverbot on this server. + Currency generation has been disabled on this channel. Currency generation has been enabled on this channel. + + {0} random {1} appeared! Pick them up by typing `{2}pick` + plural + + + A random {0} appeared! Pick it up by typing `{1}pick` + + + Failed loading a question. + + + Game Started + Hangman game started @@ -1239,6 +1261,77 @@ Don't forget to leave your discord name or id in the message. List of "{0}hangman" term types: + + Leaderboard + + + You don't have enough {0} + + + No results + + + picked {0} + Kwoth picked 5* + + + {0} planted {1} + Kwoth planted 5* + + + Trivia game is already running on this server. + + + Trivia Game + + + {0} guessed it! The answer was: {1} + + + No trivia is running on this server. + + + {0} has {1} points + + + Stopping after this question. + + + Time's up! The correct answer was {0} + + + {0} guessed it and WON the game! The answer was: {1} + + + You can't play against yourself. + + + TicTacToe Game is already running in this channel. + + + A draw! + + + has created a game of TicTacToe. + + + {0} has Won! + + + Matched Three + + + No moves left! + + + Time Expired! + + + {0}'s move + + + {0} vs {1} + Joined From 2ef3006ac0980797d5918852e5904c2215dc4816 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 24 Feb 2017 10:53:42 +0100 Subject: [PATCH 076/496] permissions done. now really 2 modules left, unless i forgot another one to make myself feel better --- .../Permissions/Commands/BlacklistCommands.cs | 8 +- .../Permissions/Commands/CmdCdsCommands.cs | 27 +- .../Commands/CommandCostCommands.cs | 44 +- .../Permissions/Commands/FilterCommands.cs | 39 +- .../Modules/Permissions/Permissions.cs | 278 ++++++++--- .../Resources/ResponseStrings.Designer.cs | 450 ++++++++++++++++++ src/NadekoBot/Resources/ResponseStrings.resx | 153 ++++++ 7 files changed, 876 insertions(+), 123 deletions(-) diff --git a/src/NadekoBot/Modules/Permissions/Commands/BlacklistCommands.cs b/src/NadekoBot/Modules/Permissions/Commands/BlacklistCommands.cs index 6c3a2888..4278d5a4 100644 --- a/src/NadekoBot/Modules/Permissions/Commands/BlacklistCommands.cs +++ b/src/NadekoBot/Modules/Permissions/Commands/BlacklistCommands.cs @@ -21,7 +21,7 @@ namespace NadekoBot.Modules.Permissions } [Group] - public class BlacklistCommands : ModuleBase + public class BlacklistCommands : NadekoSubmodule { public static ConcurrentHashSet BlacklistedUsers { get; set; } public static ConcurrentHashSet BlacklistedGuilds { get; set; } @@ -124,16 +124,14 @@ namespace NadekoBot.Modules.Permissions break; case BlacklistType.User: break; - default: - break; } } if(action == AddRemove.Add) - await Context.Channel.SendConfirmAsync($"Blacklisted a `{type}` with id `{id}`").ConfigureAwait(false); + await ReplyConfirmLocalized("blacklisted", Format.Code(type.ToString()), Format.Code(id.ToString())).ConfigureAwait(false); else - await Context.Channel.SendConfirmAsync($"Unblacklisted a `{type}` with id `{id}`").ConfigureAwait(false); + await ReplyConfirmLocalized("unblacklisted", Format.Code(type.ToString()), Format.Code(id.ToString())).ConfigureAwait(false); } } } diff --git a/src/NadekoBot/Modules/Permissions/Commands/CmdCdsCommands.cs b/src/NadekoBot/Modules/Permissions/Commands/CmdCdsCommands.cs index 80b8067b..cfccebde 100644 --- a/src/NadekoBot/Modules/Permissions/Commands/CmdCdsCommands.cs +++ b/src/NadekoBot/Modules/Permissions/Commands/CmdCdsCommands.cs @@ -21,15 +21,15 @@ namespace NadekoBot.Modules.Permissions } [Group] - public class CmdCdsCommands : ModuleBase + public class CmdCdsCommands : NadekoSubmodule { - public static ConcurrentDictionary> commandCooldowns { get; } + public static ConcurrentDictionary> CommandCooldowns { get; } private static ConcurrentDictionary> activeCooldowns { get; } = new ConcurrentDictionary>(); static CmdCdsCommands() { var configs = NadekoBot.AllGuildConfigs; - commandCooldowns = new ConcurrentDictionary>(configs.ToDictionary(k => k.GuildId, v => new ConcurrentHashSet(v.CommandCooldowns))); + CommandCooldowns = new ConcurrentDictionary>(configs.ToDictionary(k => k.GuildId, v => new ConcurrentHashSet(v.CommandCooldowns))); } [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] @@ -38,14 +38,14 @@ namespace NadekoBot.Modules.Permissions var channel = (ITextChannel)Context.Channel; if (secs < 0 || secs > 3600) { - await channel.SendErrorAsync("Invalid second parameter. (Must be a number between 0 and 3600)").ConfigureAwait(false); + await ReplyErrorLocalized("invalid_second_param_between", 0, 3600).ConfigureAwait(false); return; } using (var uow = DbHandler.UnitOfWork()) { var config = uow.GuildConfigs.For(channel.Guild.Id, set => set.Include(gc => gc.CommandCooldowns)); - var localSet = commandCooldowns.GetOrAdd(channel.Guild.Id, new ConcurrentHashSet()); + var localSet = CommandCooldowns.GetOrAdd(channel.Guild.Id, new ConcurrentHashSet()); config.CommandCooldowns.RemoveWhere(cc => cc.CommandName == command.Aliases.First().ToLowerInvariant()); localSet.RemoveWhere(cc => cc.CommandName == command.Aliases.First().ToLowerInvariant()); @@ -65,13 +65,14 @@ namespace NadekoBot.Modules.Permissions { var activeCds = activeCooldowns.GetOrAdd(channel.Guild.Id, new ConcurrentHashSet()); activeCds.RemoveWhere(ac => ac.Command == command.Aliases.First().ToLowerInvariant()); - await channel.SendConfirmAsync($"🚮 Command **{command.Aliases.First()}** has no coooldown now and all existing cooldowns have been cleared.") - .ConfigureAwait(false); + await ReplyConfirmLocalized("cmdcd_cleared", + Format.Bold(command.Aliases.First())).ConfigureAwait(false); } else { - await channel.SendConfirmAsync($"✅ Command **{command.Aliases.First()}** now has a **{secs} {"seconds".SnPl(secs)}** cooldown.") - .ConfigureAwait(false); + await ReplyConfirmLocalized("cmdcd_add", + Format.Bold(command.Aliases.First()), + Format.Bold(secs.ToString())).ConfigureAwait(false); } } @@ -80,19 +81,19 @@ namespace NadekoBot.Modules.Permissions public async Task AllCmdCooldowns() { var channel = (ITextChannel)Context.Channel; - var localSet = commandCooldowns.GetOrAdd(channel.Guild.Id, new ConcurrentHashSet()); + var localSet = CommandCooldowns.GetOrAdd(channel.Guild.Id, new ConcurrentHashSet()); if (!localSet.Any()) - await channel.SendConfirmAsync("ℹ️ `No command cooldowns set.`").ConfigureAwait(false); + await ReplyConfirmLocalized("cmdcd_none").ConfigureAwait(false); else - await channel.SendTableAsync("", localSet.Select(c => c.CommandName + ": " + c.Seconds + " secs"), s => $"{s,-30}", 2).ConfigureAwait(false); + await channel.SendTableAsync("", localSet.Select(c => c.CommandName + ": " + c.Seconds + GetText("sec")), s => $"{s,-30}", 2).ConfigureAwait(false); } public static bool HasCooldown(CommandInfo cmd, IGuild guild, IUser user) { if (guild == null) return false; - var cmdcds = CmdCdsCommands.commandCooldowns.GetOrAdd(guild.Id, new ConcurrentHashSet()); + var cmdcds = CmdCdsCommands.CommandCooldowns.GetOrAdd(guild.Id, new ConcurrentHashSet()); CommandCooldown cdRule; if ((cdRule = cmdcds.FirstOrDefault(cc => cc.CommandName == cmd.Aliases.First().ToLowerInvariant())) != null) { diff --git a/src/NadekoBot/Modules/Permissions/Commands/CommandCostCommands.cs b/src/NadekoBot/Modules/Permissions/Commands/CommandCostCommands.cs index e0ef1a29..91b8a7d2 100644 --- a/src/NadekoBot/Modules/Permissions/Commands/CommandCostCommands.cs +++ b/src/NadekoBot/Modules/Permissions/Commands/CommandCostCommands.cs @@ -17,7 +17,7 @@ namespace NadekoBot.Modules.Permissions public partial class Permissions { [Group] - public class CommandCostCommands : ModuleBase + public class CommandCostCommands : NadekoSubmodule { private static readonly ConcurrentDictionary _commandCosts = new ConcurrentDictionary(); public static IReadOnlyDictionary CommandCosts => _commandCosts; @@ -29,29 +29,29 @@ namespace NadekoBot.Modules.Permissions // x => x.Cost)); } - [NadekoCommand, Usage, Description, Aliases] - public async Task CmdCosts(int page = 1) - { - var prices = _commandCosts.ToList(); + //[NadekoCommand, Usage, Description, Aliases] + //public async Task CmdCosts(int page = 1) + //{ + // var prices = _commandCosts.ToList(); - if (!prices.Any()) - { - await Context.Channel.SendConfirmAsync("No costs set.").ConfigureAwait(false); - return; - } + // if (!prices.Any()) + // { + // await Context.Channel.SendConfirmAsync(GetText("no_costs")).ConfigureAwait(false); + // return; + // } - await Context.Channel.SendPaginatedConfirmAsync(page, (curPage) => { - var embed = new EmbedBuilder().WithOkColor() - .WithTitle("Command Costs"); - var current = prices.Skip((curPage - 1) * 9) - .Take(9); - foreach (var price in current) - { - embed.AddField(efb => efb.WithName(price.Key).WithValue(price.Value.ToString()).WithIsInline(true)); - } - return embed; - }, prices.Count / 9).ConfigureAwait(false); - } + // await Context.Channel.SendPaginatedConfirmAsync(page, (curPage) => { + // var embed = new EmbedBuilder().WithOkColor() + // .WithTitle(GetText("command_costs")); + // var current = prices.Skip((curPage - 1) * 9) + // .Take(9); + // foreach (var price in current) + // { + // embed.AddField(efb => efb.WithName(price.Key).WithValue(price.Value.ToString()).WithIsInline(true)); + // } + // return embed; + // }, prices.Count / 9).ConfigureAwait(false); + //} //[NadekoCommand, Usage, Description, Aliases] //public async Task CommandCost(int cost, CommandInfo cmd) diff --git a/src/NadekoBot/Modules/Permissions/Commands/FilterCommands.cs b/src/NadekoBot/Modules/Permissions/Commands/FilterCommands.cs index 2576ac78..9eea8a50 100644 --- a/src/NadekoBot/Modules/Permissions/Commands/FilterCommands.cs +++ b/src/NadekoBot/Modules/Permissions/Commands/FilterCommands.cs @@ -13,13 +13,13 @@ namespace NadekoBot.Modules.Permissions public partial class Permissions { [Group] - public class FilterCommands : ModuleBase + public class FilterCommands : NadekoSubmodule { public static ConcurrentHashSet InviteFilteringChannels { get; } public static ConcurrentHashSet InviteFilteringServers { get; } //serverid, filteredwords - private static ConcurrentDictionary> ServerFilteredWords { get; } + private static ConcurrentDictionary> serverFilteredWords { get; } public static ConcurrentHashSet WordFilteringChannels { get; } public static ConcurrentHashSet WordFilteringServers { get; } @@ -28,7 +28,7 @@ namespace NadekoBot.Modules.Permissions { ConcurrentHashSet words = new ConcurrentHashSet(); if(WordFilteringChannels.Contains(channelId)) - ServerFilteredWords.TryGetValue(guildId, out words); + serverFilteredWords.TryGetValue(guildId, out words); return words; } @@ -36,7 +36,7 @@ namespace NadekoBot.Modules.Permissions { var words = new ConcurrentHashSet(); if(WordFilteringServers.Contains(guildId)) - ServerFilteredWords.TryGetValue(guildId, out words); + serverFilteredWords.TryGetValue(guildId, out words); return words; } @@ -49,7 +49,7 @@ namespace NadekoBot.Modules.Permissions var dict = guildConfigs.ToDictionary(gc => gc.GuildId, gc => new ConcurrentHashSet(gc.FilteredWords.Select(fw => fw.Word))); - ServerFilteredWords = new ConcurrentDictionary>(dict); + serverFilteredWords = new ConcurrentDictionary>(dict); var serverFiltering = guildConfigs.Where(gc => gc.FilterWords); WordFilteringServers = new ConcurrentHashSet(serverFiltering.Select(gc => gc.GuildId)); @@ -74,12 +74,12 @@ namespace NadekoBot.Modules.Permissions if (enabled) { InviteFilteringServers.Add(channel.Guild.Id); - await channel.SendConfirmAsync("Invite filtering enabled on this server.").ConfigureAwait(false); + await ReplyConfirmLocalized("invite_filter_server_on").ConfigureAwait(false); } else { InviteFilteringServers.TryRemove(channel.Guild.Id); - await channel.SendConfirmAsync("Invite filtering disabled on this server.").ConfigureAwait(false); + await ReplyConfirmLocalized("invite_filter_server_off").ConfigureAwait(false); } } @@ -107,12 +107,11 @@ namespace NadekoBot.Modules.Permissions if (removed == 0) { InviteFilteringChannels.Add(channel.Id); - await channel.SendConfirmAsync("Invite filtering enabled on this channel.").ConfigureAwait(false); + await ReplyConfirmLocalized("invite_filter_channel_on").ConfigureAwait(false); } else { - InviteFilteringChannels.TryRemove(channel.Id); - await channel.SendConfirmAsync("Invite filtering disabled on this channel.").ConfigureAwait(false); + await ReplyConfirmLocalized("invite_filter_channel_off").ConfigureAwait(false); } } @@ -133,12 +132,12 @@ namespace NadekoBot.Modules.Permissions if (enabled) { WordFilteringServers.Add(channel.Guild.Id); - await channel.SendConfirmAsync("Word filtering enabled on this server.").ConfigureAwait(false); + await ReplyConfirmLocalized("word_filter_server_on").ConfigureAwait(false); } else { WordFilteringServers.TryRemove(channel.Guild.Id); - await channel.SendConfirmAsync("Word filtering disabled on this server.").ConfigureAwait(false); + await ReplyConfirmLocalized("word_filter_server_off").ConfigureAwait(false); } } @@ -166,12 +165,12 @@ namespace NadekoBot.Modules.Permissions if (removed == 0) { WordFilteringChannels.Add(channel.Id); - await channel.SendConfirmAsync("Word filtering enabled on this channel.").ConfigureAwait(false); + await ReplyConfirmLocalized("word_filter_channel_on").ConfigureAwait(false); } else { WordFilteringChannels.TryRemove(channel.Id); - await channel.SendConfirmAsync("Word filtering disabled on this channel.").ConfigureAwait(false); + await ReplyConfirmLocalized("word_filter_channel_off").ConfigureAwait(false); } } @@ -199,19 +198,17 @@ namespace NadekoBot.Modules.Permissions await uow.CompleteAsync().ConfigureAwait(false); } - var filteredWords = ServerFilteredWords.GetOrAdd(channel.Guild.Id, new ConcurrentHashSet()); + var filteredWords = serverFilteredWords.GetOrAdd(channel.Guild.Id, new ConcurrentHashSet()); if (removed == 0) { filteredWords.Add(word); - await channel.SendConfirmAsync($"Word `{word}` successfully added to the list of filtered words.") - .ConfigureAwait(false); + await ReplyConfirmLocalized("filter_word_add", Format.Code(word)).ConfigureAwait(false); } else { filteredWords.TryRemove(word); - await channel.SendConfirmAsync($"Word `{word}` removed from the list of filtered words.") - .ConfigureAwait(false); + await ReplyConfirmLocalized("filter_word_remove", Format.Code(word)).ConfigureAwait(false); } } @@ -222,9 +219,9 @@ namespace NadekoBot.Modules.Permissions var channel = (ITextChannel)Context.Channel; ConcurrentHashSet filteredWords; - ServerFilteredWords.TryGetValue(channel.Guild.Id, out filteredWords); + serverFilteredWords.TryGetValue(channel.Guild.Id, out filteredWords); - await channel.SendConfirmAsync($"List of filtered words", string.Join("\n", filteredWords)) + await channel.SendConfirmAsync(GetText("filter_word_list"), string.Join("\n", filteredWords)) .ConfigureAwait(false); } } diff --git a/src/NadekoBot/Modules/Permissions/Permissions.cs b/src/NadekoBot/Modules/Permissions/Permissions.cs index 3e8ecd13..04d1352d 100644 --- a/src/NadekoBot/Modules/Permissions/Permissions.cs +++ b/src/NadekoBot/Modules/Permissions/Permissions.cs @@ -29,7 +29,7 @@ namespace NadekoBot.Modules.Permissions static Permissions() { - var _log = LogManager.GetCurrentClassLogger(); + var log = LogManager.GetCurrentClassLogger(); var sw = Stopwatch.StartNew(); using (var uow = DbHandler.UnitOfWork()) @@ -46,7 +46,7 @@ namespace NadekoBot.Modules.Permissions } sw.Stop(); - _log.Debug($"Loaded in {sw.Elapsed.TotalSeconds:F2}s"); + log.Debug($"Loaded in {sw.Elapsed.TotalSeconds:F2}s"); } [NadekoCommand, Usage, Description, Aliases] @@ -65,8 +65,14 @@ namespace NadekoBot.Modules.Permissions }, (id, old) => { old.Verbose = config.VerbosePermissions; return old; }); await uow.CompleteAsync().ConfigureAwait(false); } - - await Context.Channel.SendConfirmAsync("ℹ️ I will " + (action.Value ? "now" : "no longer") + " show permission warnings.").ConfigureAwait(false); + if (action.Value) + { + await ReplyConfirmLocalized("verbose_true").ConfigureAwait(false); + } + else + { + await ReplyConfirmLocalized("verbose_false").ConfigureAwait(false); + } } [NadekoCommand, Usage, Description, Aliases] @@ -81,22 +87,20 @@ namespace NadekoBot.Modules.Permissions var config = uow.GuildConfigs.For(Context.Guild.Id, set => set); if (role == null) { - await Context.Channel.SendConfirmAsync($"ℹ️ Current permission role is **{config.PermissionRole}**.").ConfigureAwait(false); + await ReplyConfirmLocalized("permrole", Format.Bold(config.PermissionRole)).ConfigureAwait(false); return; } - else { - config.PermissionRole = role.Name.Trim(); - Cache.AddOrUpdate(Context.Guild.Id, new PermissionCache() - { - PermRole = config.PermissionRole, - RootPermission = Permission.GetDefaultRoot(), - Verbose = config.VerbosePermissions - }, (id, old) => { old.PermRole = role.Name.Trim(); return old; }); - await uow.CompleteAsync().ConfigureAwait(false); - } + config.PermissionRole = role.Name.Trim(); + Cache.AddOrUpdate(Context.Guild.Id, new PermissionCache() + { + PermRole = config.PermissionRole, + RootPermission = Permission.GetDefaultRoot(), + Verbose = config.VerbosePermissions + }, (id, old) => { old.PermRole = role.Name.Trim(); return old; }); + await uow.CompleteAsync().ConfigureAwait(false); } - await Context.Channel.SendConfirmAsync($"Users now require **{role.Name}** role in order to edit permissions.").ConfigureAwait(false); + await ReplyConfirmLocalized("permrole_changed", Format.Bold(role.Name)).ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -105,12 +109,18 @@ namespace NadekoBot.Modules.Permissions { if (page < 1 || page > 4) return; - string toSend = ""; + string toSend; using (var uow = DbHandler.UnitOfWork()) { var perms = uow.GuildConfigs.PermissionsFor(Context.Guild.Id).RootPermission; var i = 1 + 20 * (page - 1); - toSend = Format.Code($"📄 Permissions page {page}") + "\n\n" + String.Join("\n", perms.AsEnumerable().Skip((page - 1) * 20).Take(20).Select(p => $"`{(i++)}.` {(p.Next == null ? Format.Bold(p.GetCommand((SocketGuild)Context.Guild) + " [uneditable]") : (p.GetCommand((SocketGuild)Context.Guild)))}")); + toSend = Format.Bold(GetText("page", page)) + "\n\n" + string.Join("\n", + perms.AsEnumerable() + .Skip((page - 1) * 20) + .Take(20) + .Select( + p => + $"`{(i++)}.` {(p.Next == null ? Format.Bold(p.GetCommand((SocketGuild) Context.Guild) + $" [{GetText("uneditable")}]") : (p.GetCommand((SocketGuild) Context.Guild)))}")); } await Context.Channel.SendMessageAsync(toSend).ConfigureAwait(false); @@ -132,7 +142,7 @@ namespace NadekoBot.Modules.Permissions { return; } - else if (index == 0) + if (index == 0) { p = perms; config.RootPermission = perms.Next; @@ -155,12 +165,13 @@ namespace NadekoBot.Modules.Permissions uow2._context.Remove(p); uow2._context.SaveChanges(); } - - await Context.Channel.SendConfirmAsync($"✅ {Context.User.Mention} removed permission **{p.GetCommand((SocketGuild)Context.Guild)}** from position #{index + 1}.").ConfigureAwait(false); + await ReplyConfirmLocalized("removed", + index+1, + Format.Code(p.GetCommand((SocketGuild)Context.Guild))).ConfigureAwait(false); } - catch (ArgumentOutOfRangeException) + catch (IndexOutOfRangeException) { - await Context.Channel.SendErrorAsync("❗️`No command on that index found.`").ConfigureAwait(false); + await ReplyErrorLocalized("perm_out_of_range").ConfigureAwait(false); } } @@ -180,7 +191,6 @@ namespace NadekoBot.Modules.Permissions { var config = uow.GuildConfigs.PermissionsFor(Context.Guild.Id); var perms = config.RootPermission; - var root = perms; var index = 0; var fromFound = false; var toFound = false; @@ -207,13 +217,13 @@ namespace NadekoBot.Modules.Permissions { if (!fromFound) { - await Context.Channel.SendErrorAsync($"Can't find permission at index `#{++from}`").ConfigureAwait(false); + await ReplyErrorLocalized("not_found", ++from).ConfigureAwait(false); return; } if (!toFound) { - await Context.Channel.SendErrorAsync($"Can't find permission at index `#{++to}`").ConfigureAwait(false); + await ReplyErrorLocalized("not_found", ++to).ConfigureAwait(false); return; } } @@ -230,7 +240,6 @@ namespace NadekoBot.Modules.Permissions next.Previous = pre; if (from == 0) { - root = next; } await uow.CompleteAsync().ConfigureAwait(false); //Inserting @@ -263,14 +272,18 @@ namespace NadekoBot.Modules.Permissions }, (id, old) => { old.RootPermission = config.RootPermission; return old; }); await uow.CompleteAsync().ConfigureAwait(false); } - await Context.Channel.SendConfirmAsync($"`Moved permission:` \"{fromPerm.GetCommand((SocketGuild)Context.Guild)}\" `from #{++from} to #{++to}.`").ConfigureAwait(false); + await ReplyConfirmLocalized("moved_permission", + Format.Code(fromPerm.GetCommand((SocketGuild) Context.Guild)), + ++from, + ++to) + .ConfigureAwait(false); return; } catch (Exception e) when (e is ArgumentOutOfRangeException || e is IndexOutOfRangeException) { } } - await Context.Channel.SendErrorAsync("`Invalid index(es) specified.`").ConfigureAwait(false); + await ReplyErrorLocalized("perm_out_of_range").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -297,7 +310,19 @@ namespace NadekoBot.Modules.Permissions await uow.CompleteAsync().ConfigureAwait(false); } - await Context.Channel.SendConfirmAsync($"{(action.Value ? "✅ Allowed" : "🆗 Denied")} usage of `{command.Aliases.First()}` command on this server.").ConfigureAwait(false); + + if (action.Value) + { + await ReplyConfirmLocalized("sx_enable", + Format.Code(command.Aliases.First()), + GetText("of_command")).ConfigureAwait(false); + } + else + { + await ReplyConfirmLocalized("sx_disable", + Format.Code(command.Aliases.First()), + GetText("of_command")).ConfigureAwait(false); + } } [NadekoCommand, Usage, Description, Aliases] @@ -323,7 +348,19 @@ namespace NadekoBot.Modules.Permissions }, (id, old) => { old.RootPermission = config.RootPermission; return old; }); await uow.CompleteAsync().ConfigureAwait(false); } - await Context.Channel.SendConfirmAsync($"{(action.Value ? "✅ Allowed" : "🆗 Denied")} usage of **`{module.Name}`** module on this server.").ConfigureAwait(false); + + if (action.Value) + { + await ReplyConfirmLocalized("sx_enable", + Format.Code(module.Name), + GetText("of_module")).ConfigureAwait(false); + } + else + { + await ReplyConfirmLocalized("sx_disable", + Format.Code(module.Name), + GetText("of_module")).ConfigureAwait(false); + } } [NadekoCommand, Usage, Description, Aliases] @@ -349,7 +386,21 @@ namespace NadekoBot.Modules.Permissions }, (id, old) => { old.RootPermission = config.RootPermission; return old; }); await uow.CompleteAsync().ConfigureAwait(false); } - await Context.Channel.SendConfirmAsync($"{(action.Value ? "✅ Allowed" : "🆗 Denied")} usage of `{command.Aliases.First()}` command for `{user}` user.").ConfigureAwait(false); + + if (action.Value) + { + await ReplyConfirmLocalized("ux_enable", + Format.Code(command.Aliases.First()), + GetText("of_command"), + Format.Code(user.ToString())).ConfigureAwait(false); + } + else + { + await ReplyConfirmLocalized("ux_disable", + Format.Code(command.Aliases.First()), + GetText("of_command"), + Format.Code(user.ToString())).ConfigureAwait(false); + } } [NadekoCommand, Usage, Description, Aliases] @@ -375,7 +426,21 @@ namespace NadekoBot.Modules.Permissions }, (id, old) => { old.RootPermission = config.RootPermission; return old; }); await uow.CompleteAsync().ConfigureAwait(false); } - await Context.Channel.SendConfirmAsync($"{(action.Value ? "✅ Allowed" : "🆗 Denied")} usage of `{module.Name}` module for `{user}` user.").ConfigureAwait(false); + + if (action.Value) + { + await ReplyConfirmLocalized("ux_enable", + Format.Code(module.Name), + GetText("of_module"), + Format.Code(user.ToString())).ConfigureAwait(false); + } + else + { + await ReplyConfirmLocalized("ux_disable", + Format.Code(module.Name), + GetText("of_module"), + Format.Code(user.ToString())).ConfigureAwait(false); + } } [NadekoCommand, Usage, Description, Aliases] @@ -404,7 +469,21 @@ namespace NadekoBot.Modules.Permissions }, (id, old) => { old.RootPermission = config.RootPermission; return old; }); await uow.CompleteAsync().ConfigureAwait(false); } - await Context.Channel.SendConfirmAsync($"{(action.Value ? "✅ Allowed" : "🆗 Denied")} usage of `{command.Aliases.First()}` command for `{role}` role.").ConfigureAwait(false); + + if (action.Value) + { + await ReplyConfirmLocalized("rx_enable", + Format.Code(command.Aliases.First()), + GetText("of_command"), + Format.Code(role.Name)).ConfigureAwait(false); + } + else + { + await ReplyConfirmLocalized("rx_disable", + Format.Code(command.Aliases.First()), + GetText("of_command"), + Format.Code(role.Name)).ConfigureAwait(false); + } } [NadekoCommand, Usage, Description, Aliases] @@ -433,39 +512,62 @@ namespace NadekoBot.Modules.Permissions }, (id, old) => { old.RootPermission = config.RootPermission; return old; }); await uow.CompleteAsync().ConfigureAwait(false); } - await Context.Channel.SendConfirmAsync($"{(action.Value ? "✅ Allowed" : "🆗 Denied")} usage of `{module.Name}` module for `{role}` role.").ConfigureAwait(false); + + + if (action.Value) + { + await ReplyConfirmLocalized("rx_enable", + Format.Code(module.Name), + GetText("of_module"), + Format.Code(role.Name)).ConfigureAwait(false); + } + else + { + await ReplyConfirmLocalized("rx_disable", + Format.Code(module.Name), + GetText("of_module"), + Format.Code(role.Name)).ConfigureAwait(false); + } } [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] public async Task ChnlCmd(CommandInfo command, PermissionAction action, [Remainder] ITextChannel chnl) { - try + using (var uow = DbHandler.UnitOfWork()) { - using (var uow = DbHandler.UnitOfWork()) + var newPerm = new Permission { - var newPerm = new Permission - { - PrimaryTarget = PrimaryPermissionType.Channel, - PrimaryTargetId = chnl.Id, - SecondaryTarget = SecondaryPermissionType.Command, - SecondaryTargetName = command.Aliases.First().ToLowerInvariant(), - State = action.Value, - }; - var config = uow.GuildConfigs.SetNewRootPermission(Context.Guild.Id, newPerm); - Cache.AddOrUpdate(Context.Guild.Id, new PermissionCache() - { - PermRole = config.PermissionRole, - RootPermission = config.RootPermission, - Verbose = config.VerbosePermissions - }, (id, old) => { old.RootPermission = config.RootPermission; return old; }); - await uow.CompleteAsync().ConfigureAwait(false); - } + PrimaryTarget = PrimaryPermissionType.Channel, + PrimaryTargetId = chnl.Id, + SecondaryTarget = SecondaryPermissionType.Command, + SecondaryTargetName = command.Aliases.First().ToLowerInvariant(), + State = action.Value, + }; + var config = uow.GuildConfigs.SetNewRootPermission(Context.Guild.Id, newPerm); + Cache.AddOrUpdate(Context.Guild.Id, new PermissionCache() + { + PermRole = config.PermissionRole, + RootPermission = config.RootPermission, + Verbose = config.VerbosePermissions + }, (id, old) => { old.RootPermission = config.RootPermission; return old; }); + await uow.CompleteAsync().ConfigureAwait(false); } - catch (Exception ex) { - _log.Error(ex); + + if (action.Value) + { + await ReplyConfirmLocalized("cx_enable", + Format.Code(command.Aliases.First()), + GetText("of_command"), + Format.Code(chnl.Name)).ConfigureAwait(false); + } + else + { + await ReplyConfirmLocalized("cx_disable", + Format.Code(command.Aliases.First()), + GetText("of_command"), + Format.Code(chnl.Name)).ConfigureAwait(false); } - await Context.Channel.SendConfirmAsync($"{(action.Value ? "✅ Allowed" : "🆗 Denied")} usage of `{command.Aliases.First()}` command for `{chnl}` channel.").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -491,7 +593,21 @@ namespace NadekoBot.Modules.Permissions }, (id, old) => { old.RootPermission = config.RootPermission; return old; }); await uow.CompleteAsync().ConfigureAwait(false); } - await Context.Channel.SendConfirmAsync($"{(action.Value ? "✅ Allowed" : "🆗 Denied")} usage of `{module.Name}` module for `{chnl}` channel.").ConfigureAwait(false); + + if (action.Value) + { + await ReplyConfirmLocalized("cx_enable", + Format.Code(module.Name), + GetText("of_module"), + Format.Code(chnl.Name)).ConfigureAwait(false); + } + else + { + await ReplyConfirmLocalized("cx_disable", + Format.Code(module.Name), + GetText("of_module"), + Format.Code(chnl.Name)).ConfigureAwait(false); + } } [NadekoCommand, Usage, Description, Aliases] @@ -517,7 +633,17 @@ namespace NadekoBot.Modules.Permissions }, (id, old) => { old.RootPermission = config.RootPermission; return old; }); await uow.CompleteAsync().ConfigureAwait(false); } - await Context.Channel.SendConfirmAsync($"{(action.Value ? "✅ Allowed" : "🆗 Denied")} usage of `ALL MODULES` for `{chnl}` channel.").ConfigureAwait(false); + + if (action.Value) + { + await ReplyConfirmLocalized("acm_enable", + Format.Code(chnl.Name)).ConfigureAwait(false); + } + else + { + await ReplyConfirmLocalized("acm_disable", + Format.Code(chnl.Name)).ConfigureAwait(false); + } } [NadekoCommand, Usage, Description, Aliases] @@ -546,7 +672,17 @@ namespace NadekoBot.Modules.Permissions }, (id, old) => { old.RootPermission = config.RootPermission; return old; }); await uow.CompleteAsync().ConfigureAwait(false); } - await Context.Channel.SendConfirmAsync($"{(action.Value ? "✅ Allowed" : "🆗 Denied")} usage of `ALL MODULES` for `{role}` role.").ConfigureAwait(false); + + if (action.Value) + { + await ReplyConfirmLocalized("arm_enable", + Format.Code(role.Name)).ConfigureAwait(false); + } + else + { + await ReplyConfirmLocalized("arm_disable", + Format.Code(role.Name)).ConfigureAwait(false); + } } [NadekoCommand, Usage, Description, Aliases] @@ -572,7 +708,17 @@ namespace NadekoBot.Modules.Permissions }, (id, old) => { old.RootPermission = config.RootPermission; return old; }); await uow.CompleteAsync().ConfigureAwait(false); } - await Context.Channel.SendConfirmAsync($"{(action.Value ? "✅ Allowed" : "🆗 Denied")} usage of `ALL MODULES` for `{user}` user.").ConfigureAwait(false); + + if (action.Value) + { + await ReplyConfirmLocalized("aum_enable", + Format.Code(user.ToString())).ConfigureAwait(false); + } + else + { + await ReplyConfirmLocalized("aum_disable", + Format.Code(user.ToString())).ConfigureAwait(false); + } } [NadekoCommand, Usage, Description, Aliases] @@ -609,7 +755,15 @@ namespace NadekoBot.Modules.Permissions }, (id, old) => { old.RootPermission = config.RootPermission; return old; }); await uow.CompleteAsync().ConfigureAwait(false); } - await Context.Channel.SendConfirmAsync($"{(action.Value ? "✅ Allowed" : "🆗 Denied")} usage of `ALL MODULES` on this server.").ConfigureAwait(false); + + if (action.Value) + { + await ReplyConfirmLocalized("asm_enable").ConfigureAwait(false); + } + else + { + await ReplyConfirmLocalized("asm_disable").ConfigureAwait(false); + } } } } diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index b93554ab..f0c48b9d 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -3425,6 +3425,456 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Disabled usage of ALL MODULES on {0} channel.. + /// + public static string permissions_acm_disable { + get { + return ResourceManager.GetString("permissions_acm_disable", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Enabled usage of ALL MODULES on {0} channel.. + /// + public static string permissions_acm_enable { + get { + return ResourceManager.GetString("permissions_acm_enable", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Allowed. + /// + public static string permissions_allowed { + get { + return ResourceManager.GetString("permissions_allowed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Disabled usage of ALL MODULES for {0} role.. + /// + public static string permissions_arm_disable { + get { + return ResourceManager.GetString("permissions_arm_disable", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Enabled usage of ALL MODULES for {0} role.. + /// + public static string permissions_arm_enable { + get { + return ResourceManager.GetString("permissions_arm_enable", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Disabled usage of ALL MODULES on this server.. + /// + public static string permissions_asm_disable { + get { + return ResourceManager.GetString("permissions_asm_disable", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Enabled usage of ALL MODULES on this server.. + /// + public static string permissions_asm_enable { + get { + return ResourceManager.GetString("permissions_asm_enable", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Disabled usage of ALL MODULES for {0} user.. + /// + public static string permissions_aum_disable { + get { + return ResourceManager.GetString("permissions_aum_disable", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Enabled usage of ALL MODULES for {0} user.. + /// + public static string permissions_aum_enable { + get { + return ResourceManager.GetString("permissions_aum_enable", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Blacklisted {0} with ID {1}. + /// + public static string permissions_blacklisted { + get { + return ResourceManager.GetString("permissions_blacklisted", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Command {0} now has a {1}s cooldown.. + /// + public static string permissions_cmdcd_add { + get { + return ResourceManager.GetString("permissions_cmdcd_add", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Command {0} has no coooldown now and all existing cooldowns have been cleared.. + /// + public static string permissions_cmdcd_cleared { + get { + return ResourceManager.GetString("permissions_cmdcd_cleared", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No command cooldowns set.. + /// + public static string permissions_cmdcd_none { + get { + return ResourceManager.GetString("permissions_cmdcd_none", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Command Costs. + /// + public static string permissions_command_costs { + get { + return ResourceManager.GetString("permissions_command_costs", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Disabled usage of {0} {1} on {2} channel.. + /// + public static string permissions_cx_disable { + get { + return ResourceManager.GetString("permissions_cx_disable", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Enabled usage of {0} {1} on {2} channel.. + /// + public static string permissions_cx_enable { + get { + return ResourceManager.GetString("permissions_cx_enable", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Denied. + /// + public static string permissions_denied { + get { + return ResourceManager.GetString("permissions_denied", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Added word {0} to the list of filtered words.. + /// + public static string permissions_filter_word_add { + get { + return ResourceManager.GetString("permissions_filter_word_add", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to List Of Filtered Words. + /// + public static string permissions_filter_word_list { + get { + return ResourceManager.GetString("permissions_filter_word_list", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Removed word {0} from the list of filtered words.. + /// + public static string permissions_filter_word_remove { + get { + return ResourceManager.GetString("permissions_filter_word_remove", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Invalid second parameter.(Must be a number between {0} and {1}). + /// + public static string permissions_invalid_second_param_between { + get { + return ResourceManager.GetString("permissions_invalid_second_param_between", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Invite filtering disabled on this channel.. + /// + public static string permissions_invite_filter_channel_off { + get { + return ResourceManager.GetString("permissions_invite_filter_channel_off", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Invite filtering enabled on this channel.. + /// + public static string permissions_invite_filter_channel_on { + get { + return ResourceManager.GetString("permissions_invite_filter_channel_on", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Invite filtering disabled on this server.. + /// + public static string permissions_invite_filter_server_off { + get { + return ResourceManager.GetString("permissions_invite_filter_server_off", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Invite filtering enabled on this server.. + /// + public static string permissions_invite_filter_server_on { + get { + return ResourceManager.GetString("permissions_invite_filter_server_on", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Moved permission {0} from #{1} to #{2}. + /// + public static string permissions_moved_permission { + get { + return ResourceManager.GetString("permissions_moved_permission", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No costs set.. + /// + public static string permissions_no_costs { + get { + return ResourceManager.GetString("permissions_no_costs", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Can't find permission at index #{0}. + /// + public static string permissions_not_found { + get { + return ResourceManager.GetString("permissions_not_found", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to command. + /// + public static string permissions_of_command { + get { + return ResourceManager.GetString("permissions_of_command", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to module. + /// + public static string permissions_of_module { + get { + return ResourceManager.GetString("permissions_of_module", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Permissions page {0}. + /// + public static string permissions_page { + get { + return ResourceManager.GetString("permissions_page", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No permission found on that index.. + /// + public static string permissions_perm_out_of_range { + get { + return ResourceManager.GetString("permissions_perm_out_of_range", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Current permissions role is {0}.. + /// + public static string permissions_permrole { + get { + return ResourceManager.GetString("permissions_permrole", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Users now require {0} role in order to edit permissions.. + /// + public static string permissions_permrole_changed { + get { + return ResourceManager.GetString("permissions_permrole_changed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to removed permission #{0} - {1}. + /// + public static string permissions_removed { + get { + return ResourceManager.GetString("permissions_removed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Disabled usage of {0} {1} for {2} role.. + /// + public static string permissions_rx_disable { + get { + return ResourceManager.GetString("permissions_rx_disable", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Enabled usage of {0} {1} for {2} role.. + /// + public static string permissions_rx_enable { + get { + return ResourceManager.GetString("permissions_rx_enable", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to sec.. + /// + public static string permissions_sec { + get { + return ResourceManager.GetString("permissions_sec", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Disabled usage of {0} {1} on this server.. + /// + public static string permissions_sx_disable { + get { + return ResourceManager.GetString("permissions_sx_disable", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Enabled usage of {0} {1} on this server.. + /// + public static string permissions_sx_enable { + get { + return ResourceManager.GetString("permissions_sx_enable", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Unblacklisted {0} with ID {1}. + /// + public static string permissions_unblacklisted { + get { + return ResourceManager.GetString("permissions_unblacklisted", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to uneditable. + /// + public static string permissions_uneditable { + get { + return ResourceManager.GetString("permissions_uneditable", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Disabled usage of {0} {1} for {2} user.. + /// + public static string permissions_ux_disable { + get { + return ResourceManager.GetString("permissions_ux_disable", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Enabled usage of {0} {1} for {2} user.. + /// + public static string permissions_ux_enable { + get { + return ResourceManager.GetString("permissions_ux_enable", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to I will no longer show permission warnings.. + /// + public static string permissions_verbose_false { + get { + return ResourceManager.GetString("permissions_verbose_false", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to I will now show permission warnings.. + /// + public static string permissions_verbose_true { + get { + return ResourceManager.GetString("permissions_verbose_true", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Word filtering disabled on this channel.. + /// + public static string permissions_word_filter_channel_off { + get { + return ResourceManager.GetString("permissions_word_filter_channel_off", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Word filtering enabled on this channel.. + /// + public static string permissions_word_filter_channel_on { + get { + return ResourceManager.GetString("permissions_word_filter_channel_on", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Word filtering disabled on this server.. + /// + public static string permissions_word_filter_server_off { + get { + return ResourceManager.GetString("permissions_word_filter_server_off", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Word filtering enabled on this server.. + /// + public static string permissions_word_filter_server_on { + get { + return ResourceManager.GetString("permissions_word_filter_server_on", resourceCulture); + } + } + /// /// Looks up a localized string similar to {0} has already fainted.. /// diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index f8208dca..d365b08c 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -1332,6 +1332,159 @@ Don't forget to leave your discord name or id in the message. {0} vs {1} + + Disabled usage of ALL MODULES on {0} channel. + + + Enabled usage of ALL MODULES on {0} channel. + + + Allowed + + + Disabled usage of ALL MODULES for {0} role. + + + Enabled usage of ALL MODULES for {0} role. + + + Disabled usage of ALL MODULES on this server. + + + Enabled usage of ALL MODULES on this server. + + + Disabled usage of ALL MODULES for {0} user. + + + Enabled usage of ALL MODULES for {0} user. + + + Blacklisted {0} with ID {1} + + + Command {0} now has a {1}s cooldown. + + + Command {0} has no coooldown now and all existing cooldowns have been cleared. + + + No command cooldowns set. + + + Command Costs + + + Disabled usage of {0} {1} on {2} channel. + + + Enabled usage of {0} {1} on {2} channel. + + + Denied + + + Added word {0} to the list of filtered words. + + + List Of Filtered Words + + + Removed word {0} from the list of filtered words. + + + Invalid second parameter.(Must be a number between {0} and {1}) + + + Invite filtering disabled on this channel. + + + Invite filtering enabled on this channel. + + + Invite filtering disabled on this server. + + + Invite filtering enabled on this server. + + + Moved permission {0} from #{1} to #{2} + + + Can't find permission at index #{0} + + + No costs set. + + + command + Gen (of command) + + + module + Gen. (of module) + + + Permissions page {0} + + + Current permissions role is {0}. + + + Users now require {0} role in order to edit permissions. + + + No permission found on that index. + + + removed permission #{0} - {1} + + + Disabled usage of {0} {1} for {2} role. + + + Enabled usage of {0} {1} for {2} role. + + + sec. + Short of seconds. + + + Disabled usage of {0} {1} on this server. + + + Enabled usage of {0} {1} on this server. + + + Unblacklisted {0} with ID {1} + + + uneditable + + + Disabled usage of {0} {1} for {2} user. + + + Enabled usage of {0} {1} for {2} user. + + + I will no longer show permission warnings. + + + I will now show permission warnings. + + + Word filtering disabled on this channel. + + + Word filtering enabled on this channel. + + + Word filtering disabled on this server. + + + Word filtering enabled on this server. + Joined From 1bfa8becb37e89798740eaa871abc647d3369360 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 24 Feb 2017 17:10:44 +0100 Subject: [PATCH 077/496] searches localizable o.o --- src/NadekoBot/Modules/NSFW/NSFW.cs | 39 +- .../Searches/Commands/AnimeSearchCommands.cs | 48 +- .../Searches/Commands/GoogleTranslator.cs | 10 +- .../Modules/Searches/Commands/JokeCommands.cs | 9 +- .../Modules/Searches/Commands/LoLCommands.cs | 15 +- .../Searches/Commands/MemegenCommands.cs | 104 ++- .../Modules/Searches/Commands/OsuCommands.cs | 70 +- .../Searches/Commands/OverwatchCommands.cs | 45 +- .../Searches/Commands/PlaceCommands.cs | 10 +- .../Commands/PokemonSearchCommands.cs | 18 +- .../Commands/StreamNotificationCommands.cs | 97 +- .../Modules/Searches/Commands/Translator.cs | 46 +- .../Modules/Searches/Commands/XkcdCommands.cs | 19 +- src/NadekoBot/Modules/Searches/Searches.cs | 314 +++---- src/NadekoBot/NadekoBot.xproj.DotSettings | 1 + .../Resources/ResponseStrings.Designer.cs | 846 ++++++++++++++++++ src/NadekoBot/Resources/ResponseStrings.resx | 283 ++++++ 17 files changed, 1542 insertions(+), 432 deletions(-) diff --git a/src/NadekoBot/Modules/NSFW/NSFW.cs b/src/NadekoBot/Modules/NSFW/NSFW.cs index 53a3f3bb..6e72aefc 100644 --- a/src/NadekoBot/Modules/NSFW/NSFW.cs +++ b/src/NadekoBot/Modules/NSFW/NSFW.cs @@ -7,8 +7,6 @@ using System.Linq; using System.Threading.Tasks; using NadekoBot.Services; using System.Net.Http; -using System.Text.RegularExpressions; -using System.Xml.Linq; using NadekoBot.Extensions; using System.Xml; using System.Threading; @@ -20,8 +18,8 @@ namespace NadekoBot.Modules.NSFW public class NSFW : NadekoTopLevelModule { - private static readonly ConcurrentDictionary AutoHentaiTimers = new ConcurrentDictionary(); - private static readonly ConcurrentHashSet HentaiBombBlacklist = new ConcurrentHashSet(); + private static readonly ConcurrentDictionary _autoHentaiTimers = new ConcurrentDictionary(); + private static readonly ConcurrentHashSet _hentaiBombBlacklist = new ConcurrentHashSet(); private async Task InternalHentai(IMessageChannel channel, string tag, bool noError) { @@ -72,7 +70,7 @@ namespace NadekoBot.Modules.NSFW if (interval == 0) { - if (!AutoHentaiTimers.TryRemove(Context.Channel.Id, out t)) return; + if (!_autoHentaiTimers.TryRemove(Context.Channel.Id, out t)) return; t.Change(Timeout.Infinite, Timeout.Infinite); //proper way to disable the timer await ReplyConfirmLocalized("autohentai_stopped").ConfigureAwait(false); @@ -99,7 +97,7 @@ namespace NadekoBot.Modules.NSFW } }, null, interval * 1000, interval * 1000); - AutoHentaiTimers.AddOrUpdate(Context.Channel.Id, t, (key, old) => + _autoHentaiTimers.AddOrUpdate(Context.Channel.Id, t, (key, old) => { old.Change(Timeout.Infinite, Timeout.Infinite); return t; @@ -114,7 +112,7 @@ namespace NadekoBot.Modules.NSFW [NadekoCommand, Usage, Description, Aliases] public async Task HentaiBomb([Remainder] string tag = null) { - if (!HentaiBombBlacklist.Add(Context.User.Id)) + if (!_hentaiBombBlacklist.Add(Context.User.Id)) return; try { @@ -138,17 +136,17 @@ namespace NadekoBot.Modules.NSFW finally { await Task.Delay(5000).ConfigureAwait(false); - HentaiBombBlacklist.TryRemove(Context.User.Id); + _hentaiBombBlacklist.TryRemove(Context.User.Id); } } #endif [NadekoCommand, Usage, Description, Aliases] public Task Yandere([Remainder] string tag = null) - => Searches.Searches.InternalDapiCommand(Context.Message, tag, Searches.Searches.DapiSearchType.Yandere); + => InternalDapiCommand(Context.Message, tag, Searches.Searches.DapiSearchType.Yandere); [NadekoCommand, Usage, Description, Aliases] public Task Konachan([Remainder] string tag = null) - => Searches.Searches.InternalDapiCommand(Context.Message, tag, Searches.Searches.DapiSearchType.Konachan); + => InternalDapiCommand(Context.Message, tag, Searches.Searches.DapiSearchType.Konachan); [NadekoCommand, Usage, Description, Aliases] public async Task E621([Remainder] string tag = null) @@ -169,7 +167,7 @@ namespace NadekoBot.Modules.NSFW [NadekoCommand, Usage, Description, Aliases] public Task Rule34([Remainder] string tag = null) - => Searches.Searches.InternalDapiCommand(Context.Message, tag, Searches.Searches.DapiSearchType.Rule34); + => InternalDapiCommand(Context.Message, tag, Searches.Searches.DapiSearchType.Rule34); [NadekoCommand, Usage, Description, Aliases] public async Task Danbooru([Remainder] string tag = null) @@ -212,7 +210,7 @@ namespace NadekoBot.Modules.NSFW [NadekoCommand, Usage, Description, Aliases] public Task Gelbooru([Remainder] string tag = null) - => Searches.Searches.InternalDapiCommand(Context.Message, tag, Searches.Searches.DapiSearchType.Gelbooru); + => InternalDapiCommand(Context.Message, tag, Searches.Searches.DapiSearchType.Gelbooru); [NadekoCommand, Usage, Description, Aliases] public async Task Cp() @@ -289,5 +287,22 @@ namespace NadekoBot.Modules.NSFW public static Task GetGelbooruImageLink(string tag) => Searches.Searches.InternalDapiSearch(tag, Searches.Searches.DapiSearchType.Gelbooru); + + public async Task InternalDapiCommand(IUserMessage umsg, string tag, Searches.Searches.DapiSearchType type) + { + var channel = umsg.Channel; + + tag = tag?.Trim() ?? ""; + + var url = await Searches.Searches.InternalDapiSearch(tag, type).ConfigureAwait(false); + + if (url == null) + await channel.SendErrorAsync(umsg.Author.Mention + " " + GetText("no_results")); + else + await channel.EmbedAsync(new EmbedBuilder().WithOkColor() + .WithDescription(umsg.Author.Mention + " " + tag) + .WithImageUrl(url) + .WithFooter(efb => efb.WithText(type.ToString()))).ConfigureAwait(false); + } } } \ No newline at end of file diff --git a/src/NadekoBot/Modules/Searches/Commands/AnimeSearchCommands.cs b/src/NadekoBot/Modules/Searches/Commands/AnimeSearchCommands.cs index bf05f0ac..9fdf07f0 100644 --- a/src/NadekoBot/Modules/Searches/Commands/AnimeSearchCommands.cs +++ b/src/NadekoBot/Modules/Searches/Commands/AnimeSearchCommands.cs @@ -1,6 +1,5 @@ using AngleSharp; using AngleSharp.Dom.Html; -using AngleSharp.Extensions; using Discord; using Discord.Commands; using NadekoBot.Attributes; @@ -8,7 +7,6 @@ using NadekoBot.Extensions; using NadekoBot.Modules.Searches.Models; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using NLog; using System; using System.Collections.Generic; using System.Linq; @@ -21,15 +19,13 @@ namespace NadekoBot.Modules.Searches public partial class Searches { [Group] - public class AnimeSearchCommands : ModuleBase + public class AnimeSearchCommands : NadekoSubmodule { - private static Timer anilistTokenRefresher { get; } - private static Logger _log { get; } + private static readonly Timer anilistTokenRefresher; private static string anilistToken { get; set; } static AnimeSearchCommands() { - _log = LogManager.GetCurrentClassLogger(); anilistTokenRefresher = new Timer(async (state) => { try @@ -49,9 +45,9 @@ namespace NadekoBot.Modules.Searches anilistToken = JObject.Parse(stringContent)["access_token"].ToString(); } } - catch (Exception ex) + catch { - _log.Error(ex); + // ignored } }, null, TimeSpan.FromSeconds(0), TimeSpan.FromMinutes(29)); } @@ -75,7 +71,7 @@ namespace NadekoBot.Modules.Searches var favorites = document.QuerySelectorAll("div.user-favorites > div.di-tc"); - var favAnime = "No favorite anime yet"; + var favAnime = GetText("anime_no_fav"); if (favorites[0].QuerySelector("p") == null) favAnime = string.Join("\n", favorites[0].QuerySelectorAll("ul > li > div.di-tc.va-t > a") .Shuffle() @@ -106,14 +102,14 @@ namespace NadekoBot.Modules.Searches var embed = new EmbedBuilder() .WithOkColor() - .WithTitle($"{name}'s MAL profile") - .AddField(efb => efb.WithName("💚 Watching").WithValue(stats[0]).WithIsInline(true)) - .AddField(efb => efb.WithName("💙 Completed").WithValue(stats[1]).WithIsInline(true)); + .WithTitle(GetText("mal_profile", name)) + .AddField(efb => efb.WithName("💚 " + GetText("watching")).WithValue(stats[0]).WithIsInline(true)) + .AddField(efb => efb.WithName("💙 " + GetText("completed")).WithValue(stats[1]).WithIsInline(true)); if (info.Count < 3) - embed.AddField(efb => efb.WithName("💛 On-Hold").WithValue(stats[2]).WithIsInline(true)); + embed.AddField(efb => efb.WithName("💛 " + GetText("on_hold")).WithValue(stats[2]).WithIsInline(true)); embed - .AddField(efb => efb.WithName("💔 Dropped").WithValue(stats[3]).WithIsInline(true)) - .AddField(efb => efb.WithName("⚪ Plan to watch").WithValue(stats[4]).WithIsInline(true)) + .AddField(efb => efb.WithName("💔 " + GetText("dropped")).WithValue(stats[3]).WithIsInline(true)) + .AddField(efb => efb.WithName("⚪ " + GetText("plan_to_watch")).WithValue(stats[4]).WithIsInline(true)) .AddField(efb => efb.WithName("🕐 " + daysAndMean[0][0]).WithValue(daysAndMean[0][1]).WithIsInline(true)) .AddField(efb => efb.WithName("📊 " + daysAndMean[1][0]).WithValue(daysAndMean[1][1]).WithIsInline(true)) .AddField(efb => efb.WithName(MalInfoToEmoji(info[0].Item1) + " " + info[0].Item1).WithValue(info[0].Item2.TrimTo(20)).WithIsInline(true)) @@ -126,7 +122,7 @@ namespace NadekoBot.Modules.Searches .WithDescription($@" ** https://myanimelist.net/animelist/{ name } ** -**Top 3 Favorite Anime:** +**{GetText("top_3_fav_anime")}** {favAnime}" //**[Manga List](https://myanimelist.net/mangalist/{name})** @@ -176,7 +172,7 @@ namespace NadekoBot.Modules.Searches if (animeData == null) { - await Context.Channel.SendErrorAsync("Failed finding that animu.").ConfigureAwait(false); + await ReplyErrorLocalized("failed_finding_anime").ConfigureAwait(false); return; } @@ -185,10 +181,10 @@ namespace NadekoBot.Modules.Searches .WithTitle(animeData.title_english) .WithUrl(animeData.Link) .WithImageUrl(animeData.image_url_lge) - .AddField(efb => efb.WithName("Episodes").WithValue(animeData.total_episodes.ToString()).WithIsInline(true)) - .AddField(efb => efb.WithName("Status").WithValue(animeData.AiringStatus.ToString()).WithIsInline(true)) - .AddField(efb => efb.WithName("Genres").WithValue(String.Join(", ", animeData.Genres)).WithIsInline(true)) - .WithFooter(efb => efb.WithText("Score: " + animeData.average_score + " / 100")); + .AddField(efb => efb.WithName(GetText("episodes")).WithValue(animeData.total_episodes.ToString()).WithIsInline(true)) + .AddField(efb => efb.WithName(GetText("status")).WithValue(animeData.AiringStatus.ToString()).WithIsInline(true)) + .AddField(efb => efb.WithName(GetText("genres")).WithValue(String.Join(",\n", animeData.Genres)).WithIsInline(true)) + .WithFooter(efb => efb.WithText(GetText("score") + " " + animeData.average_score + " / 100")); await Context.Channel.EmbedAsync(embed).ConfigureAwait(false); } @@ -203,7 +199,7 @@ namespace NadekoBot.Modules.Searches if (mangaData == null) { - await Context.Channel.SendErrorAsync("Failed finding that mango.").ConfigureAwait(false); + await ReplyErrorLocalized("failed_finding_manga").ConfigureAwait(false); return; } @@ -212,10 +208,10 @@ namespace NadekoBot.Modules.Searches .WithTitle(mangaData.title_english) .WithUrl(mangaData.Link) .WithImageUrl(mangaData.image_url_lge) - .AddField(efb => efb.WithName("Episodes").WithValue(mangaData.total_chapters.ToString()).WithIsInline(true)) - .AddField(efb => efb.WithName("Status").WithValue(mangaData.publishing_status.ToString()).WithIsInline(true)) - .AddField(efb => efb.WithName("Genres").WithValue(String.Join(", ", mangaData.Genres)).WithIsInline(true)) - .WithFooter(efb => efb.WithText("Score: " + mangaData.average_score + " / 100")); + .AddField(efb => efb.WithName(GetText("chapters")).WithValue(mangaData.total_chapters.ToString()).WithIsInline(true)) + .AddField(efb => efb.WithName(GetText("status")).WithValue(mangaData.publishing_status.ToString()).WithIsInline(true)) + .AddField(efb => efb.WithName(GetText("genres")).WithValue(String.Join(",\n", mangaData.Genres)).WithIsInline(true)) + .WithFooter(efb => efb.WithText(GetText("score") + " " + mangaData.average_score + " / 100")); await Context.Channel.EmbedAsync(embed).ConfigureAwait(false); } diff --git a/src/NadekoBot/Modules/Searches/Commands/GoogleTranslator.cs b/src/NadekoBot/Modules/Searches/Commands/GoogleTranslator.cs index be415465..5604fdd1 100644 --- a/src/NadekoBot/Modules/Searches/Commands/GoogleTranslator.cs +++ b/src/NadekoBot/Modules/Searches/Commands/GoogleTranslator.cs @@ -13,7 +13,7 @@ namespace NadekoBot.Modules.Searches public static GoogleTranslator Instance = _instance ?? (_instance = new GoogleTranslator()); public IEnumerable Languages => _languageDictionary.Keys.OrderBy(x => x); - private Dictionary _languageDictionary; + private readonly Dictionary _languageDictionary; static GoogleTranslator() { } private GoogleTranslator() { @@ -153,13 +153,13 @@ namespace NadekoBot.Modules.Searches public async Task Translate(string sourceText, string sourceLanguage, string targetLanguage) { - string text = string.Empty; + string text; - string url = string.Format("https://translate.googleapis.com/translate_a/single?client=gtx&sl={0}&tl={1}&dt=t&q={2}", + var url = string.Format("https://translate.googleapis.com/translate_a/single?client=gtx&sl={0}&tl={1}&dt=t&q={2}", ConvertToLanguageCode(sourceLanguage), ConvertToLanguageCode(targetLanguage), WebUtility.UrlEncode(sourceText)); - using (HttpClient http = new HttpClient()) + using (var http = new HttpClient()) { http.DefaultRequestHeaders.Add("user-agent", "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36"); text = await http.GetStringAsync(url).ConfigureAwait(false); @@ -170,7 +170,7 @@ namespace NadekoBot.Modules.Searches private string ConvertToLanguageCode(string language) { - string mode = string.Empty; + string mode; _languageDictionary.TryGetValue(language, out mode); return mode; } diff --git a/src/NadekoBot/Modules/Searches/Commands/JokeCommands.cs b/src/NadekoBot/Modules/Searches/Commands/JokeCommands.cs index 1d5f3c99..a867aeb8 100644 --- a/src/NadekoBot/Modules/Searches/Commands/JokeCommands.cs +++ b/src/NadekoBot/Modules/Searches/Commands/JokeCommands.cs @@ -7,7 +7,6 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using NLog; using System.Collections.Generic; -using System.Diagnostics; using System.IO; using System.Linq; using System.Net.Http; @@ -18,11 +17,11 @@ namespace NadekoBot.Modules.Searches public partial class Searches { [Group] - public class JokeCommands : ModuleBase + public class JokeCommands : NadekoSubmodule { private static List wowJokes { get; } = new List(); private static List magicItems { get; } = new List(); - private static Logger _log { get; } + private new static readonly Logger _log; static JokeCommands() { @@ -78,7 +77,7 @@ namespace NadekoBot.Modules.Searches { if (!wowJokes.Any()) { - await Context.Channel.SendErrorAsync("Jokes not loaded.").ConfigureAwait(false); + await ReplyErrorLocalized("jokes_not_loaded").ConfigureAwait(false); return; } var joke = wowJokes[new NadekoRandom().Next(0, wowJokes.Count)]; @@ -90,7 +89,7 @@ namespace NadekoBot.Modules.Searches { if (!wowJokes.Any()) { - await Context.Channel.SendErrorAsync("MagicItems not loaded.").ConfigureAwait(false); + await ReplyErrorLocalized("magicitems_not_loaded").ConfigureAwait(false); return; } var item = magicItems[new NadekoRandom().Next(0, magicItems.Count)]; diff --git a/src/NadekoBot/Modules/Searches/Commands/LoLCommands.cs b/src/NadekoBot/Modules/Searches/Commands/LoLCommands.cs index 308ccbd2..83fe18a8 100644 --- a/src/NadekoBot/Modules/Searches/Commands/LoLCommands.cs +++ b/src/NadekoBot/Modules/Searches/Commands/LoLCommands.cs @@ -33,7 +33,7 @@ namespace NadekoBot.Modules.Searches [NadekoCommand, Usage, Description, Aliases] public async Task Lolban() { - var showCount = 8; + const int showCount = 8; //http://api.champion.gg/stats/champs/mostBanned?api_key=YOUR_API_TOKEN&page=1&limit=2 try { @@ -44,19 +44,20 @@ namespace NadekoBot.Modules.Searches $"limit={showCount}") .ConfigureAwait(false))["data"] as JArray; var dataList = data.Distinct(new ChampionNameComparer()).Take(showCount).ToList(); - var eb = new EmbedBuilder().WithOkColor().WithTitle(Format.Underline($"{dataList.Count} most banned champions")); - for (var i = 0; i < dataList.Count; i++) + var eb = new EmbedBuilder().WithOkColor().WithTitle(Format.Underline(GetText("x_most_banned_champs",dataList.Count))); + foreach (var champ in dataList) { - var champ = dataList[i]; - eb.AddField(efb => efb.WithName(champ["name"].ToString()).WithValue(champ["general"]["banRate"] + "%").WithIsInline(true)); + var champ1 = champ; + eb.AddField(efb => efb.WithName(champ1["name"].ToString()).WithValue(champ1["general"]["banRate"] + "%").WithIsInline(true)); } await Context.Channel.EmbedAsync(eb, Format.Italics(trashTalk[new NadekoRandom().Next(0, trashTalk.Length)])).ConfigureAwait(false); } } - catch (Exception) + catch (Exception ex) { - await Context.Channel.SendMessageAsync("Something went wrong.").ConfigureAwait(false); + _log.Warn(ex); + await ReplyErrorLocalized("something_went_wrong").ConfigureAwait(false); } } } diff --git a/src/NadekoBot/Modules/Searches/Commands/MemegenCommands.cs b/src/NadekoBot/Modules/Searches/Commands/MemegenCommands.cs index dcf4d0f5..0b12d343 100644 --- a/src/NadekoBot/Modules/Searches/Commands/MemegenCommands.cs +++ b/src/NadekoBot/Modules/Searches/Commands/MemegenCommands.cs @@ -1,73 +1,79 @@ using Newtonsoft.Json; using System; using System.Collections.Generic; +using System.Collections.Immutable; using System.IO; using System.Linq; using System.Threading.Tasks; using NadekoBot.Attributes; using System.Net.Http; using System.Text; +using Discord.Commands; using NadekoBot.Extensions; namespace NadekoBot.Modules.Searches { public partial class Searches { - - Dictionary map = new Dictionary(); - - public Searches() + [Group] + public class MemegenCommands : NadekoSubmodule { - map.Add('?', "~q"); - map.Add('%', "~p"); - map.Add('#', "~h"); - map.Add('/', "~s"); - map.Add(' ', "-"); - map.Add('-', "--"); - map.Add('_', "__"); - map.Add('"', "''"); - } - - [NadekoCommand, Usage, Description, Aliases] - public async Task Memelist() - { - HttpClientHandler handler = new HttpClientHandler(); - - handler.AllowAutoRedirect = false; - - using (var http = new HttpClient(handler)) + private static readonly ImmutableDictionary _map = new Dictionary() { - var rawJson = await http.GetStringAsync("https://memegen.link/api/templates/").ConfigureAwait(false); - var data = JsonConvert.DeserializeObject>(rawJson) - .Select(kvp => Path.GetFileName(kvp.Value)); + {'?', "~q"}, + {'%', "~p"}, + {'#', "~h"}, + {'/', "~s"}, + {' ', "-"}, + {'-', "--"}, + {'_', "__"}, + {'"', "''"} - await Context.Channel.SendTableAsync(data, x => $"{x,-17}", 3).ConfigureAwait(false); - } - } + }.ToImmutableDictionary(); - [NadekoCommand, Usage, Description, Aliases] - public async Task Memegen(string meme, string topText, string botText) - { - var top = Replace(topText); - var bot = Replace(botText); - await Context.Channel.SendMessageAsync($"http://memegen.link/{meme}/{top}/{bot}.jpg") - .ConfigureAwait(false); - } - - private string Replace(string input) - { - StringBuilder sb = new StringBuilder(); - string tmp; - - foreach (var c in input) + [NadekoCommand, Usage, Description, Aliases] + public async Task Memelist() { - if (map.TryGetValue(c, out tmp)) - sb.Append(tmp); - else - sb.Append(c); + var handler = new HttpClientHandler + { + AllowAutoRedirect = false + }; + + + using (var http = new HttpClient(handler)) + { + var rawJson = await http.GetStringAsync("https://memegen.link/api/templates/").ConfigureAwait(false); + var data = JsonConvert.DeserializeObject>(rawJson) + .Select(kvp => Path.GetFileName(kvp.Value)); + + await Context.Channel.SendTableAsync(data, x => $"{x,-17}", 3).ConfigureAwait(false); + } } - return sb.ToString(); + [NadekoCommand, Usage, Description, Aliases] + public async Task Memegen(string meme, string topText, string botText) + { + var top = Replace(topText); + var bot = Replace(botText); + await Context.Channel.SendMessageAsync($"http://memegen.link/{meme}/{top}/{bot}.jpg") + .ConfigureAwait(false); + } + + private static string Replace(string input) + { + var sb = new StringBuilder(); + + foreach (var c in input) + { + string tmp; + if (_map.TryGetValue(c, out tmp)) + sb.Append(tmp); + else + sb.Append(c); + } + + return sb.ToString(); + } } } -} +} \ No newline at end of file diff --git a/src/NadekoBot/Modules/Searches/Commands/OsuCommands.cs b/src/NadekoBot/Modules/Searches/Commands/OsuCommands.cs index a2760a1a..0a764fab 100644 --- a/src/NadekoBot/Modules/Searches/Commands/OsuCommands.cs +++ b/src/NadekoBot/Modules/Searches/Commands/OsuCommands.cs @@ -3,7 +3,6 @@ using Discord.Commands; using NadekoBot.Attributes; using NadekoBot.Extensions; using Newtonsoft.Json.Linq; -using NLog; using System; using System.Globalization; using System.IO; @@ -16,21 +15,15 @@ namespace NadekoBot.Modules.Searches public partial class Searches { [Group] - public class OsuCommands : ModuleBase + public class OsuCommands : NadekoSubmodule { - private static Logger _log { get; } - - static OsuCommands() - { - _log = LogManager.GetCurrentClassLogger(); - } [NadekoCommand, Usage, Description, Aliases] public async Task Osu(string usr, [Remainder] string mode = null) { if (string.IsNullOrWhiteSpace(usr)) return; - using (HttpClient http = new HttpClient()) + using (var http = new HttpClient()) { try { @@ -42,15 +35,15 @@ namespace NadekoBot.Modules.Searches http.AddFakeHeaders(); var res = await http.GetStreamAsync(new Uri($"http://lemmmy.pw/osusig/sig.php?uname={ usr }&flagshadow&xpbar&xpbarhex&pp=2&mode={m}")).ConfigureAwait(false); - MemoryStream ms = new MemoryStream(); + var ms = new MemoryStream(); res.CopyTo(ms); ms.Position = 0; - await Context.Channel.SendFileAsync(ms, $"{usr}.png", $"🎧 **Profile Link:** \n`Image provided by https://lemmmy.pw/osusig`").ConfigureAwait(false); + await Context.Channel.SendFileAsync(ms, $"{usr}.png", $"🎧 **{GetText("profile_link")}** \n`Image provided by https://lemmmy.pw/osusig`").ConfigureAwait(false); } catch (Exception ex) { - await Context.Channel.SendErrorAsync("Failed retrieving osu signature.").ConfigureAwait(false); - _log.Warn(ex, "Osu command failed"); + await ReplyErrorLocalized("osu_failed").ConfigureAwait(false); + _log.Warn(ex); } } } @@ -60,7 +53,7 @@ namespace NadekoBot.Modules.Searches { if (string.IsNullOrWhiteSpace(NadekoBot.Credentials.OsuApiKey)) { - await Context.Channel.SendErrorAsync("An osu! API key is required.").ConfigureAwait(false); + await ReplyErrorLocalized("osu_api_key").ConfigureAwait(false); return; } @@ -75,8 +68,8 @@ namespace NadekoBot.Modules.Searches var reqString = $"https://osu.ppy.sh/api/get_beatmaps?k={NadekoBot.Credentials.OsuApiKey}&{mapId}"; var obj = JArray.Parse(await http.GetStringAsync(reqString).ConfigureAwait(false))[0]; var sb = new System.Text.StringBuilder(); - var starRating = Math.Round(Double.Parse($"{obj["difficultyrating"]}", CultureInfo.InvariantCulture), 2); - var time = TimeSpan.FromSeconds(Double.Parse($"{obj["total_length"]}")).ToString(@"mm\:ss"); + var starRating = Math.Round(double.Parse($"{obj["difficultyrating"]}", CultureInfo.InvariantCulture), 2); + var time = TimeSpan.FromSeconds(double.Parse($"{obj["total_length"]}")).ToString(@"mm\:ss"); sb.AppendLine($"{obj["artist"]} - {obj["title"]}, mapped by {obj["creator"]}. https://osu.ppy.sh/s/{obj["beatmapset_id"]}"); sb.AppendLine($"{starRating} stars, {obj["bpm"]} BPM | AR{obj["diff_approach"]}, CS{obj["diff_size"]}, OD{obj["diff_overall"]} | Length: {time}"); await Context.Channel.SendMessageAsync(sb.ToString()).ConfigureAwait(false); @@ -84,8 +77,8 @@ namespace NadekoBot.Modules.Searches } catch (Exception ex) { - await Context.Channel.SendErrorAsync("Something went wrong."); - _log.Warn(ex, "Osub command failed"); + await ReplyErrorLocalized("something_went_wrong").ConfigureAwait(false); + _log.Warn(ex); } } @@ -121,54 +114,53 @@ namespace NadekoBot.Modules.Searches { var mapReqString = $"https://osu.ppy.sh/api/get_beatmaps?k={NadekoBot.Credentials.OsuApiKey}&b={item["beatmap_id"]}"; var map = JArray.Parse(await http.GetStringAsync(mapReqString).ConfigureAwait(false))[0]; - var pp = Math.Round(Double.Parse($"{item["pp"]}", CultureInfo.InvariantCulture), 2); + var pp = Math.Round(double.Parse($"{item["pp"]}", CultureInfo.InvariantCulture), 2); var acc = CalculateAcc(item, m); - var mods = ResolveMods(Int32.Parse($"{item["enabled_mods"]}")); - if (mods != "+") - sb.AppendLine($"{pp + "pp",-7} | {acc + "%",-7} | {map["artist"] + "-" + map["title"] + " (" + map["version"] + ")",-40} | **{mods,-10}** | /b/{item["beatmap_id"]}"); - else - sb.AppendLine($"{pp + "pp",-7} | {acc + "%",-7} | {map["artist"] + "-" + map["title"] + " (" + map["version"] + ")",-40} | /b/{item["beatmap_id"]}"); + var mods = ResolveMods(int.Parse($"{item["enabled_mods"]}")); + sb.AppendLine(mods != "+" + ? $"{pp + "pp",-7} | {acc + "%",-7} | {map["artist"] + "-" + map["title"] + " (" + map["version"] + ")",-40} | **{mods,-10}** | /b/{item["beatmap_id"]}" + : $"{pp + "pp",-7} | {acc + "%",-7} | {map["artist"] + "-" + map["title"] + " (" + map["version"] + ")",-40} | /b/{item["beatmap_id"]}"); } sb.Append("```"); await channel.SendMessageAsync(sb.ToString()).ConfigureAwait(false); } catch (Exception ex) { - await channel.SendErrorAsync("Something went wrong."); - _log.Warn(ex, "Osu5 command failed"); + await ReplyErrorLocalized("something_went_wrong").ConfigureAwait(false); + _log.Warn(ex); } } } //https://osu.ppy.sh/wiki/Accuracy - private static Double CalculateAcc(JToken play, int mode) + private static double CalculateAcc(JToken play, int mode) { if (mode == 0) { - var hitPoints = Double.Parse($"{play["count50"]}") * 50 + Double.Parse($"{play["count100"]}") * 100 + Double.Parse($"{play["count300"]}") * 300; - var totalHits = Double.Parse($"{play["count50"]}") + Double.Parse($"{play["count100"]}") + Double.Parse($"{play["count300"]}") + Double.Parse($"{play["countmiss"]}"); + var hitPoints = double.Parse($"{play["count50"]}") * 50 + double.Parse($"{play["count100"]}") * 100 + double.Parse($"{play["count300"]}") * 300; + var totalHits = double.Parse($"{play["count50"]}") + double.Parse($"{play["count100"]}") + double.Parse($"{play["count300"]}") + double.Parse($"{play["countmiss"]}"); totalHits *= 300; return Math.Round(hitPoints / totalHits * 100, 2); } else if (mode == 1) { - var hitPoints = Double.Parse($"{play["countmiss"]}") * 0 + Double.Parse($"{play["count100"]}") * 0.5 + Double.Parse($"{play["count300"]}") * 1; - var totalHits = Double.Parse($"{play["countmiss"]}") + Double.Parse($"{play["count100"]}") + Double.Parse($"{play["count300"]}"); + var hitPoints = double.Parse($"{play["countmiss"]}") * 0 + double.Parse($"{play["count100"]}") * 0.5 + double.Parse($"{play["count300"]}") * 1; + var totalHits = double.Parse($"{play["countmiss"]}") + double.Parse($"{play["count100"]}") + double.Parse($"{play["count300"]}"); hitPoints *= 300; totalHits *= 300; return Math.Round(hitPoints / totalHits * 100, 2); } else if (mode == 2) { - var fruitsCaught = Double.Parse($"{play["count50"]}") + Double.Parse($"{play["count100"]}") + Double.Parse($"{play["count300"]}"); - var totalFruits = Double.Parse($"{play["countmiss"]}") + Double.Parse($"{play["count50"]}") + Double.Parse($"{play["count100"]}") + Double.Parse($"{play["count300"]}") + Double.Parse($"{play["countkatu"]}"); + var fruitsCaught = double.Parse($"{play["count50"]}") + double.Parse($"{play["count100"]}") + double.Parse($"{play["count300"]}"); + var totalFruits = double.Parse($"{play["countmiss"]}") + double.Parse($"{play["count50"]}") + double.Parse($"{play["count100"]}") + double.Parse($"{play["count300"]}") + double.Parse($"{play["countkatu"]}"); return Math.Round(fruitsCaught / totalFruits * 100, 2); } else { - var hitPoints = Double.Parse($"{play["count50"]}") * 50 + Double.Parse($"{play["count100"]}") * 100 + Double.Parse($"{play["countkatu"]}") * 200 + (Double.Parse($"{play["count300"]}") + Double.Parse($"{play["countgeki"]}")) * 300; - var totalHits = Double.Parse($"{play["countmiss"]}") + Double.Parse($"{play["count50"]}") + Double.Parse($"{play["count100"]}") + Double.Parse($"{play["countkatu"]}") + Double.Parse($"{play["count300"]}") + Double.Parse($"{play["countgeki"]}"); + var hitPoints = double.Parse($"{play["count50"]}") * 50 + double.Parse($"{play["count100"]}") * 100 + double.Parse($"{play["countkatu"]}") * 200 + (double.Parse($"{play["count300"]}") + double.Parse($"{play["countgeki"]}")) * 300; + var totalHits = double.Parse($"{play["countmiss"]}") + double.Parse($"{play["count50"]}") + double.Parse($"{play["count100"]}") + double.Parse($"{play["countkatu"]}") + double.Parse($"{play["count300"]}") + double.Parse($"{play["countgeki"]}"); totalHits *= 300; return Math.Round(hitPoints / totalHits * 100, 2); } @@ -176,10 +168,10 @@ namespace NadekoBot.Modules.Searches private static string ResolveMap(string mapLink) { - Match s = new Regex(@"osu.ppy.sh\/s\/", RegexOptions.IgnoreCase).Match(mapLink); - Match b = new Regex(@"osu.ppy.sh\/b\/", RegexOptions.IgnoreCase).Match(mapLink); - Match p = new Regex(@"osu.ppy.sh\/p\/", RegexOptions.IgnoreCase).Match(mapLink); - Match m = new Regex(@"&m=", RegexOptions.IgnoreCase).Match(mapLink); + var s = new Regex(@"osu.ppy.sh\/s\/", RegexOptions.IgnoreCase).Match(mapLink); + var b = new Regex(@"osu.ppy.sh\/b\/", RegexOptions.IgnoreCase).Match(mapLink); + var p = new Regex(@"osu.ppy.sh\/p\/", RegexOptions.IgnoreCase).Match(mapLink); + var m = new Regex(@"&m=", RegexOptions.IgnoreCase).Match(mapLink); if (s.Success) { var mapId = mapLink.Substring(mapLink.IndexOf("/s/") + 3); diff --git a/src/NadekoBot/Modules/Searches/Commands/OverwatchCommands.cs b/src/NadekoBot/Modules/Searches/Commands/OverwatchCommands.cs index 77e88289..65574849 100644 --- a/src/NadekoBot/Modules/Searches/Commands/OverwatchCommands.cs +++ b/src/NadekoBot/Modules/Searches/Commands/OverwatchCommands.cs @@ -4,7 +4,6 @@ using NadekoBot.Attributes; using NadekoBot.Extensions; using NadekoBot.Modules.Searches.Models; using Newtonsoft.Json; -using NLog; using System.Net.Http; using System.Text.RegularExpressions; using System.Threading.Tasks; @@ -14,13 +13,8 @@ namespace NadekoBot.Modules.Searches public partial class Searches { [Group] - public class OverwatchCommands : ModuleBase + public class OverwatchCommands : NadekoSubmodule { - private readonly Logger _log; - public OverwatchCommands() - { - _log = LogManager.GetCurrentClassLogger(); - } [NadekoCommand, Usage, Description, Aliases] public async Task Overwatch(string region, [Remainder] string query = null) { @@ -34,9 +28,9 @@ namespace NadekoBot.Modules.Searches await Context.Channel.TriggerTypingAsync().ConfigureAwait(false); var model = await GetProfile(region, battletag); - var rankimg = $"{model.Competitive.rank_img}"; - var rank = $"{model.Competitive.rank}"; - //var competitiveplay = $"{model.Games.Competitive.played}"; + var rankimg = model.Competitive.rank_img; + var rank = model.Competitive.rank; + if (string.IsNullOrWhiteSpace(rank)) { var embed = new EmbedBuilder() @@ -44,10 +38,10 @@ namespace NadekoBot.Modules.Searches .WithUrl($"https://www.overbuff.com/players/pc/{battletag}") .WithIconUrl($"{model.avatar}")) .WithThumbnailUrl("https://cdn.discordapp.com/attachments/155726317222887425/255653487512256512/YZ4w2ey.png") - .AddField(fb => fb.WithName("**Level**").WithValue($"{model.level}").WithIsInline(true)) - .AddField(fb => fb.WithName("**Quick Wins**").WithValue($"{model.Games.Quick.wins}").WithIsInline(true)) - .AddField(fb => fb.WithName("**Competitive Rank**").WithValue("0").WithIsInline(true)) - .AddField(fb => fb.WithName("**Quick Playtime**").WithValue($"{model.Playtime.quick}").WithIsInline(true)) + .AddField(fb => fb.WithName(GetText("level")).WithValue($"{model.level}").WithIsInline(true)) + .AddField(fb => fb.WithName(GetText("quick_wins")).WithValue($"{model.Games.Quick.wins}").WithIsInline(true)) + .AddField(fb => fb.WithName(GetText("compet_rank")).WithValue("0").WithIsInline(true)) + .AddField(fb => fb.WithName(GetText("quick_playtime")).WithValue($"{model.Playtime.quick}").WithIsInline(true)) .WithOkColor(); await Context.Channel.EmbedAsync(embed).ConfigureAwait(false); } @@ -58,22 +52,21 @@ namespace NadekoBot.Modules.Searches .WithUrl($"https://www.overbuff.com/players/pc/{battletag}") .WithIconUrl($"{model.avatar}")) .WithThumbnailUrl(rankimg) - .AddField(fb => fb.WithName("**Level**").WithValue($"{model.level}").WithIsInline(true)) - .AddField(fb => fb.WithName("**Quick Wins**").WithValue($"{model.Games.Quick.wins}").WithIsInline(true)) - .AddField(fb => fb.WithName("**Competitive Wins**").WithValue($"{model.Games.Competitive.wins}").WithIsInline(true)) - .AddField(fb => fb.WithName("**Competitive Loses**").WithValue($"{model.Games.Competitive.lost}").WithIsInline(true)) - .AddField(fb => fb.WithName("**Competitive Played**").WithValue($"{model.Games.Competitive.played}").WithIsInline(true)) - .AddField(fb => fb.WithName("**Competitive Rank**").WithValue(rank).WithIsInline(true)) - .AddField(fb => fb.WithName("**Competitive Playtime**").WithValue($"{model.Playtime.competitive}").WithIsInline(true)) - .AddField(fb => fb.WithName("**Quick Playtime**").WithValue($"{model.Playtime.quick}").WithIsInline(true)) + .AddField(fb => fb.WithName(GetText("level")).WithValue($"{model.level}").WithIsInline(true)) + .AddField(fb => fb.WithName(GetText("quick_wins")).WithValue($"{model.Games.Quick.wins}").WithIsInline(true)) + .AddField(fb => fb.WithName(GetText("compet_wins")).WithValue($"{model.Games.Competitive.wins}").WithIsInline(true)) + .AddField(fb => fb.WithName(GetText("compet_losses")).WithValue($"{model.Games.Competitive.lost}").WithIsInline(true)) + .AddField(fb => fb.WithName(GetText("compet_played")).WithValue($"{model.Games.Competitive.played}").WithIsInline(true)) + .AddField(fb => fb.WithName(GetText("compet_rank")).WithValue(rank).WithIsInline(true)) + .AddField(fb => fb.WithName(GetText("compet_played")).WithValue($"{model.Playtime.competitive}").WithIsInline(true)) + .AddField(fb => fb.WithName(GetText("quick_playtime")).WithValue($"{model.Playtime.quick}").WithIsInline(true)) .WithColor(NadekoBot.OkColor); await Context.Channel.EmbedAsync(embed).ConfigureAwait(false); - return; } } catch { - await Context.Channel.SendErrorAsync("Found no user! Please check the **Region** and **BattleTag** before trying again."); + await ReplyErrorLocalized("ow_user_not_found").ConfigureAwait(false); } } public async Task GetProfile(string region, string battletag) @@ -82,8 +75,8 @@ namespace NadekoBot.Modules.Searches { using (var http = new HttpClient()) { - var Url = await http.GetStringAsync($"https://api.lootbox.eu/pc/{region.ToLower()}/{battletag}/profile"); - var model = JsonConvert.DeserializeObject(Url); + var url = await http.GetStringAsync($"https://api.lootbox.eu/pc/{region.ToLower()}/{battletag}/profile"); + var model = JsonConvert.DeserializeObject(url); return model.data; } } diff --git a/src/NadekoBot/Modules/Searches/Commands/PlaceCommands.cs b/src/NadekoBot/Modules/Searches/Commands/PlaceCommands.cs index bd22733b..b44eb97d 100644 --- a/src/NadekoBot/Modules/Searches/Commands/PlaceCommands.cs +++ b/src/NadekoBot/Modules/Searches/Commands/PlaceCommands.cs @@ -10,10 +10,9 @@ namespace NadekoBot.Modules.Searches public partial class Searches { [Group] - public class PlaceCommands : ModuleBase + public class PlaceCommands : NadekoSubmodule { - private static string typesStr { get; } = - string.Format("`List of \"{0}place\" tags:`\n", NadekoBot.ModulePrefixes[typeof(Searches).Name]) + String.Join(", ", Enum.GetNames(typeof(PlaceType))); + private static string typesStr { get; } = string.Join(", ", Enum.GetNames(typeof(PlaceType))); public enum PlaceType { @@ -30,14 +29,15 @@ namespace NadekoBot.Modules.Searches [NadekoCommand, Usage, Description, Aliases] public async Task Placelist() { - await Context.Channel.SendConfirmAsync(typesStr) + await Context.Channel.SendConfirmAsync(GetText("list_of_place_tags", NadekoBot.ModulePrefixes[typeof(Searches).Name]), + typesStr) .ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] public async Task Place(PlaceType placeType, uint width = 0, uint height = 0) { - string url = ""; + var url = ""; switch (placeType) { case PlaceType.Cage: diff --git a/src/NadekoBot/Modules/Searches/Commands/PokemonSearchCommands.cs b/src/NadekoBot/Modules/Searches/Commands/PokemonSearchCommands.cs index 5f37c3d8..b04769fa 100644 --- a/src/NadekoBot/Modules/Searches/Commands/PokemonSearchCommands.cs +++ b/src/NadekoBot/Modules/Searches/Commands/PokemonSearchCommands.cs @@ -6,7 +6,6 @@ using NadekoBot.Modules.Searches.Models; using Newtonsoft.Json; using NLog; using System.Collections.Generic; -using System.Diagnostics; using System.IO; using System.Linq; using System.Threading.Tasks; @@ -16,7 +15,7 @@ namespace NadekoBot.Modules.Searches public partial class Searches { [Group] - public class PokemonSearchCommands : ModuleBase + public class PokemonSearchCommands : NadekoSubmodule { private static Dictionary pokemons { get; } = new Dictionary(); private static Dictionary pokemonAbilities { get; } = new Dictionary(); @@ -24,7 +23,7 @@ namespace NadekoBot.Modules.Searches public const string PokemonAbilitiesFile = "data/pokemon/pokemon_abilities7.json"; public const string PokemonListFile = "data/pokemon/pokemon_list7.json"; - private static Logger _log { get; } + private new static readonly Logger _log; static PokemonSearchCommands() { @@ -57,14 +56,13 @@ namespace NadekoBot.Modules.Searches await Context.Channel.EmbedAsync(new EmbedBuilder().WithOkColor() .WithTitle(kvp.Key.ToTitleCase()) .WithDescription(p.BaseStats.ToString()) - .AddField(efb => efb.WithName("Types").WithValue(string.Join(",\n", p.Types)).WithIsInline(true)) - .AddField(efb => efb.WithName("Height/Weight").WithValue($"{p.HeightM}m/{p.WeightKg}kg").WithIsInline(true)) - .AddField(efb => efb.WithName("Abilitities").WithValue(string.Join(",\n", p.Abilities.Select(a => a.Value))).WithIsInline(true)) - ); + .AddField(efb => efb.WithName(GetText("types")).WithValue(string.Join(",\n", p.Types)).WithIsInline(true)) + .AddField(efb => efb.WithName(GetText("height_weight")).WithValue(GetText("height_weight_val", p.HeightM, p.WeightKg)).WithIsInline(true)) + .AddField(efb => efb.WithName(GetText("abilities")).WithValue(string.Join(",\n", p.Abilities.Select(a => a.Value))).WithIsInline(true))); return; } } - await Context.Channel.SendErrorAsync("No pokemon found."); + await ReplyErrorLocalized("pokemon_none").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -80,12 +78,12 @@ namespace NadekoBot.Modules.Searches await Context.Channel.EmbedAsync(new EmbedBuilder().WithOkColor() .WithTitle(kvp.Value.Name) .WithDescription(kvp.Value.Desc) - .AddField(efb => efb.WithName("Rating").WithValue(kvp.Value.Rating.ToString()).WithIsInline(true)) + .AddField(efb => efb.WithName(GetText("rating")).WithValue(kvp.Value.Rating.ToString(_cultureInfo)).WithIsInline(true)) ).ConfigureAwait(false); return; } } - await Context.Channel.SendErrorAsync("No ability found."); + await ReplyErrorLocalized("pokemon_ability_none").ConfigureAwait(false); } } } diff --git a/src/NadekoBot/Modules/Searches/Commands/StreamNotificationCommands.cs b/src/NadekoBot/Modules/Searches/Commands/StreamNotificationCommands.cs index 86411634..d122e47a 100644 --- a/src/NadekoBot/Modules/Searches/Commands/StreamNotificationCommands.cs +++ b/src/NadekoBot/Modules/Searches/Commands/StreamNotificationCommands.cs @@ -12,9 +12,7 @@ using System.Net.Http; using NadekoBot.Attributes; using Microsoft.EntityFrameworkCore; using Newtonsoft.Json; -using NLog; using NadekoBot.Extensions; -using System.Diagnostics; namespace NadekoBot.Modules.Searches { @@ -65,23 +63,19 @@ namespace NadekoBot.Modules.Searches } [Group] - public class StreamNotificationCommands : ModuleBase + public class StreamNotificationCommands : NadekoSubmodule { - private static Timer checkTimer { get; } - private static ConcurrentDictionary oldCachedStatuses = new ConcurrentDictionary(); - private static ConcurrentDictionary cachedStatuses = new ConcurrentDictionary(); - private static Logger _log { get; } + private static readonly Timer _checkTimer; + private static readonly ConcurrentDictionary _cachedStatuses = new ConcurrentDictionary(); - private static bool FirstPass { get; set; } = true; + private static bool firstPass { get; set; } = true; static StreamNotificationCommands() { - _log = LogManager.GetCurrentClassLogger(); - - checkTimer = new Timer(async (state) => + _checkTimer = new Timer(async (state) => { - oldCachedStatuses = new ConcurrentDictionary(cachedStatuses); - cachedStatuses.Clear(); + var oldCachedStatuses = new ConcurrentDictionary(_cachedStatuses); + _cachedStatuses.Clear(); IEnumerable streams; using (var uow = DbHandler.UnitOfWork()) { @@ -93,7 +87,7 @@ namespace NadekoBot.Modules.Searches try { var newStatus = await GetStreamStatus(fs).ConfigureAwait(false); - if (FirstPass) + if (firstPass) { return; } @@ -108,7 +102,7 @@ namespace NadekoBot.Modules.Searches return; try { - var msg = await channel.EmbedAsync(fs.GetEmbed(newStatus)).ConfigureAwait(false); + await channel.EmbedAsync(fs.GetEmbed(newStatus, channel.Guild.Id)).ConfigureAwait(false); } catch { @@ -122,7 +116,7 @@ namespace NadekoBot.Modules.Searches } })); - FirstPass = false; + firstPass = false; }, null, TimeSpan.Zero, TimeSpan.FromSeconds(60)); } @@ -134,7 +128,7 @@ namespace NadekoBot.Modules.Searches { case FollowedStream.FollowedStreamType.Hitbox: var hitboxUrl = $"https://api.hitbox.tv/media/status/{stream.Username.ToLowerInvariant()}"; - if (checkCache && cachedStatuses.TryGetValue(hitboxUrl, out result)) + if (checkCache && _cachedStatuses.TryGetValue(hitboxUrl, out result)) return result; using (var http = new HttpClient()) { @@ -149,11 +143,11 @@ namespace NadekoBot.Modules.Searches ApiLink = hitboxUrl, Views = hbData.Views }; - cachedStatuses.AddOrUpdate(hitboxUrl, result, (key, old) => result); + _cachedStatuses.AddOrUpdate(hitboxUrl, result, (key, old) => result); return result; case FollowedStream.FollowedStreamType.Twitch: var twitchUrl = $"https://api.twitch.tv/kraken/streams/{Uri.EscapeUriString(stream.Username.ToLowerInvariant())}?client_id=67w6z9i09xv2uoojdm9l0wsyph4hxo6"; - if (checkCache && cachedStatuses.TryGetValue(twitchUrl, out result)) + if (checkCache && _cachedStatuses.TryGetValue(twitchUrl, out result)) return result; using (var http = new HttpClient()) { @@ -170,11 +164,11 @@ namespace NadekoBot.Modules.Searches ApiLink = twitchUrl, Views = twData.Stream?.Viewers.ToString() ?? "0" }; - cachedStatuses.AddOrUpdate(twitchUrl, result, (key, old) => result); + _cachedStatuses.AddOrUpdate(twitchUrl, result, (key, old) => result); return result; case FollowedStream.FollowedStreamType.Beam: var beamUrl = $"https://beam.pro/api/v1/channels/{stream.Username.ToLowerInvariant()}"; - if (checkCache && cachedStatuses.TryGetValue(beamUrl, out result)) + if (checkCache && _cachedStatuses.TryGetValue(beamUrl, out result)) return result; using (var http = new HttpClient()) { @@ -190,7 +184,7 @@ namespace NadekoBot.Modules.Searches ApiLink = beamUrl, Views = bmData.ViewersCurrent.ToString() }; - cachedStatuses.AddOrUpdate(beamUrl, result, (key, old) => result); + _cachedStatuses.AddOrUpdate(beamUrl, result, (key, old) => result); return result; default: break; @@ -234,17 +228,21 @@ namespace NadekoBot.Modules.Searches if (!streams.Any()) { - await Context.Channel.SendConfirmAsync("You are not following any streams on this server.").ConfigureAwait(false); + await ReplyErrorLocalized("streams_none").ConfigureAwait(false); return; } var text = string.Join("\n", await Task.WhenAll(streams.Select(async snc => { var ch = await Context.Guild.GetTextChannelAsync(snc.ChannelId); - return $"`{snc.Username}`'s stream on **{(ch)?.Name}** channel. 【`{snc.Type.ToString()}`】"; + return string.Format("{0}'s stream on {1} channel. 【{2}】", + Format.Code(snc.Username), + Format.Bold(ch?.Name ?? "deleted-channel"), + Format.Code(snc.Type.ToString())); }))); - - await Context.Channel.SendConfirmAsync($"You are following **{streams.Count()}** streams on this server.\n\n" + text).ConfigureAwait(false); + + await Context.Channel.SendConfirmAsync(GetText("streams_following", streams.Count()) + "\n\n" + text) + .ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -271,10 +269,13 @@ namespace NadekoBot.Modules.Searches } if (!removed) { - await Context.Channel.SendErrorAsync("No such stream.").ConfigureAwait(false); + await ReplyErrorLocalized("stream_no").ConfigureAwait(false); return; } - await Context.Channel.SendConfirmAsync($"Removed `{username}`'s stream ({type}) from notifications.").ConfigureAwait(false); + + await ReplyConfirmLocalized("stream_removed", + Format.Code(username), + type).ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -293,20 +294,24 @@ namespace NadekoBot.Modules.Searches })); if (streamStatus.IsLive) { - await Context.Channel.SendConfirmAsync($"Streamer {username} is online with {streamStatus.Views} viewers."); + await ReplyConfirmLocalized("streamer_online", + username, + streamStatus.Views) + .ConfigureAwait(false); } else { - await Context.Channel.SendConfirmAsync($"Streamer {username} is offline."); + await ReplyConfirmLocalized("streamer_offline", + username).ConfigureAwait(false); } } catch { - await Context.Channel.SendErrorAsync("No channel found."); + await ReplyErrorLocalized("no_channel_found").ConfigureAwait(false); } } - private static async Task TrackStream(ITextChannel channel, string username, FollowedStream.FollowedStreamType type) + private async Task TrackStream(ITextChannel channel, string username, FollowedStream.FollowedStreamType type) { username = username.ToLowerInvariant().Trim(); var fs = new FollowedStream @@ -324,7 +329,7 @@ namespace NadekoBot.Modules.Searches } catch { - await channel.SendErrorAsync("Stream probably doesn't exist.").ConfigureAwait(false); + await ReplyErrorLocalized("stream_not_exist").ConfigureAwait(false); return; } @@ -335,24 +340,24 @@ namespace NadekoBot.Modules.Searches .Add(fs); await uow.CompleteAsync().ConfigureAwait(false); } - await channel.EmbedAsync(fs.GetEmbed(status), $"🆗 I will notify this channel when status changes.").ConfigureAwait(false); + await channel.EmbedAsync(fs.GetEmbed(status, Context.Guild.Id), GetText("stream_tracked")).ConfigureAwait(false); } } } public static class FollowedStreamExtensions { - public static EmbedBuilder GetEmbed(this FollowedStream fs, Searches.StreamStatus status) + public static EmbedBuilder GetEmbed(this FollowedStream fs, Searches.StreamStatus status, ulong guildId) { var embed = new EmbedBuilder().WithTitle(fs.Username) .WithUrl(fs.GetLink()) - .AddField(efb => efb.WithName("Status") + .AddField(efb => efb.WithName(fs.GetText("status")) .WithValue(status.IsLive ? "Online" : "Offline") .WithIsInline(true)) - .AddField(efb => efb.WithName("Viewers") + .AddField(efb => efb.WithName(fs.GetText("viewers")) .WithValue(status.IsLive ? status.Views : "-") .WithIsInline(true)) - .AddField(efb => efb.WithName("Platform") + .AddField(efb => efb.WithName(fs.GetText("platform")) .WithValue(fs.Type.ToString()) .WithIsInline(true)) .WithColor(status.IsLive ? NadekoBot.OkColor : NadekoBot.ErrorColor); @@ -360,15 +365,21 @@ namespace NadekoBot.Modules.Searches return embed; } - public static string GetLink(this FollowedStream fs) { + public static string GetText(this FollowedStream fs, string key, params object[] replacements) => + NadekoTopLevelModule.GetTextStatic(key, + NadekoBot.Localization.GetCultureInfo(fs.GuildId), + typeof(Searches).Name.ToLowerInvariant(), + replacements); + + public static string GetLink(this FollowedStream fs) + { if (fs.Type == FollowedStream.FollowedStreamType.Hitbox) return $"http://www.hitbox.tv/{fs.Username}/"; - else if (fs.Type == FollowedStream.FollowedStreamType.Twitch) + if (fs.Type == FollowedStream.FollowedStreamType.Twitch) return $"http://www.twitch.tv/{fs.Username}/"; - else if (fs.Type == FollowedStream.FollowedStreamType.Beam) + if (fs.Type == FollowedStream.FollowedStreamType.Beam) return $"https://beam.pro/{fs.Username}/"; - else - return "??"; + return "??"; } } } diff --git a/src/NadekoBot/Modules/Searches/Commands/Translator.cs b/src/NadekoBot/Modules/Searches/Commands/Translator.cs index 3ee67e6c..9ed33ce5 100644 --- a/src/NadekoBot/Modules/Searches/Commands/Translator.cs +++ b/src/NadekoBot/Modules/Searches/Commands/Translator.cs @@ -19,10 +19,10 @@ namespace NadekoBot.Modules.Searches } [Group] - public class TranslateCommands : ModuleBase + public class TranslateCommands : NadekoSubmodule { - private static ConcurrentDictionary TranslatedChannels { get; } = new ConcurrentDictionary(); - private static ConcurrentDictionary UserLanguages { get; } = new ConcurrentDictionary(); + private static ConcurrentDictionary translatedChannels { get; } = new ConcurrentDictionary(); + private static ConcurrentDictionary userLanguages { get; } = new ConcurrentDictionary(); static TranslateCommands() { @@ -35,7 +35,7 @@ namespace NadekoBot.Modules.Searches return; bool autoDelete; - if (!TranslatedChannels.TryGetValue(umsg.Channel.Id, out autoDelete)) + if (!translatedChannels.TryGetValue(umsg.Channel.Id, out autoDelete)) return; var key = new UserChannelPair() { @@ -44,10 +44,10 @@ namespace NadekoBot.Modules.Searches }; string langs; - if (!UserLanguages.TryGetValue(key, out langs)) + if (!userLanguages.TryGetValue(key, out langs)) return; - var text = await TranslateInternal(langs, umsg.Resolve(TagHandling.Ignore), true) + var text = await TranslateInternal(langs, umsg.Resolve(TagHandling.Ignore)) .ConfigureAwait(false); if (autoDelete) try { await umsg.DeleteAsync().ConfigureAwait(false); } catch { } @@ -64,21 +64,21 @@ namespace NadekoBot.Modules.Searches { await Context.Channel.TriggerTypingAsync().ConfigureAwait(false); var translation = await TranslateInternal(langs, text); - await Context.Channel.SendConfirmAsync("Translation " + langs, translation).ConfigureAwait(false); + await Context.Channel.SendConfirmAsync(GetText("translation") + " " + langs, translation).ConfigureAwait(false); } catch { - await Context.Channel.SendErrorAsync("Bad input format, or something went wrong...").ConfigureAwait(false); + await ReplyErrorLocalized("bad_input_format").ConfigureAwait(false); } } - private static async Task TranslateInternal(string langs, [Remainder] string text = null, bool silent = false) + private static async Task TranslateInternal(string langs, [Remainder] string text = null) { var langarr = langs.ToLowerInvariant().Split('>'); if (langarr.Length != 2) throw new ArgumentException(); - string from = langarr[0]; - string to = langarr[1]; + var from = langarr[0]; + var to = langarr[1]; text = text?.Trim(); if (string.IsNullOrWhiteSpace(text)) throw new ArgumentException(); @@ -101,20 +101,20 @@ namespace NadekoBot.Modules.Searches if (autoDelete == AutoDeleteAutoTranslate.Del) { - TranslatedChannels.AddOrUpdate(channel.Id, true, (key, val) => true); - try { await channel.SendConfirmAsync("Started automatic translation of messages on this channel. User messages will be auto-deleted.").ConfigureAwait(false); } catch { } + translatedChannels.AddOrUpdate(channel.Id, true, (key, val) => true); + await ReplyConfirmLocalized("atl_ad_started").ConfigureAwait(false); return; } bool throwaway; - if (TranslatedChannels.TryRemove(channel.Id, out throwaway)) + if (translatedChannels.TryRemove(channel.Id, out throwaway)) { - try { await channel.SendConfirmAsync("Stopped automatic translation of messages on this channel.").ConfigureAwait(false); } catch { } + await ReplyConfirmLocalized("atl_stopped").ConfigureAwait(false); return; } - else if (TranslatedChannels.TryAdd(channel.Id, autoDelete == AutoDeleteAutoTranslate.Del)) + if (translatedChannels.TryAdd(channel.Id, autoDelete == AutoDeleteAutoTranslate.Del)) { - try { await channel.SendConfirmAsync("Started automatic translation of messages on this channel.").ConfigureAwait(false); } catch { } + await ReplyConfirmLocalized("atl_started").ConfigureAwait(false); } } @@ -130,8 +130,8 @@ namespace NadekoBot.Modules.Searches if (string.IsNullOrWhiteSpace(langs)) { - if (UserLanguages.TryRemove(ucp, out langs)) - await Context.Channel.SendConfirmAsync($"{Context.User.Mention}'s auto-translate language has been removed.").ConfigureAwait(false); + if (userLanguages.TryRemove(ucp, out langs)) + await ReplyConfirmLocalized("atl_removed").ConfigureAwait(false); return; } @@ -143,20 +143,20 @@ namespace NadekoBot.Modules.Searches if (!GoogleTranslator.Instance.Languages.Contains(from) || !GoogleTranslator.Instance.Languages.Contains(to)) { - try { await Context.Channel.SendErrorAsync("Invalid source and/or target language.").ConfigureAwait(false); } catch { } + await ReplyErrorLocalized("invalid_lang").ConfigureAwait(false); return; } - UserLanguages.AddOrUpdate(ucp, langs, (key, val) => langs); + userLanguages.AddOrUpdate(ucp, langs, (key, val) => langs); - await Context.Channel.SendConfirmAsync($"Your auto-translate language has been set to {from}>{to}").ConfigureAwait(false); + await ReplyConfirmLocalized("atl_set", from, to).ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] public async Task Translangs() { - await Context.Channel.SendTableAsync(GoogleTranslator.Instance.Languages, str => $"{str,-15}", columns: 3); + await Context.Channel.SendTableAsync(GoogleTranslator.Instance.Languages, str => $"{str,-15}", 3); } } diff --git a/src/NadekoBot/Modules/Searches/Commands/XkcdCommands.cs b/src/NadekoBot/Modules/Searches/Commands/XkcdCommands.cs index a8de4c7e..b747f2bd 100644 --- a/src/NadekoBot/Modules/Searches/Commands/XkcdCommands.cs +++ b/src/NadekoBot/Modules/Searches/Commands/XkcdCommands.cs @@ -12,9 +12,9 @@ namespace NadekoBot.Modules.Searches public partial class Searches { [Group] - public class XkcdCommands : ModuleBase + public class XkcdCommands : NadekoSubmodule { - private const string xkcdUrl = "https://xkcd.com"; + private const string _xkcdUrl = "https://xkcd.com"; [NadekoCommand, Usage, Description, Aliases] [Priority(1)] @@ -24,9 +24,9 @@ namespace NadekoBot.Modules.Searches { using (var http = new HttpClient()) { - var res = await http.GetStringAsync($"{xkcdUrl}/info.0.json").ConfigureAwait(false); + var res = await http.GetStringAsync($"{_xkcdUrl}/info.0.json").ConfigureAwait(false); var comic = JsonConvert.DeserializeObject(res); - var sent = await Context.Channel.SendMessageAsync($"{Context.User.Mention} " + comic.ToString()) + var sent = await Context.Channel.SendMessageAsync($"{Context.User.Mention} " + comic) .ConfigureAwait(false); await Task.Delay(10000).ConfigureAwait(false); @@ -47,14 +47,14 @@ namespace NadekoBot.Modules.Searches using (var http = new HttpClient()) { - var res = await http.GetStringAsync($"{xkcdUrl}/{num}/info.0.json").ConfigureAwait(false); + var res = await http.GetStringAsync($"{_xkcdUrl}/{num}/info.0.json").ConfigureAwait(false); var comic = JsonConvert.DeserializeObject(res); var embed = new EmbedBuilder().WithColor(NadekoBot.OkColor) .WithImageUrl(comic.ImageLink) - .WithAuthor(eab => eab.WithName(comic.Title).WithUrl($"{xkcdUrl}/{num}").WithIconUrl("http://xkcd.com/s/919f27.ico")) - .AddField(efb => efb.WithName("Comic#").WithValue(comic.Num.ToString()).WithIsInline(true)) - .AddField(efb => efb.WithName("Date").WithValue($"{comic.Month}/{comic.Year}").WithIsInline(true)); + .WithAuthor(eab => eab.WithName(comic.Title).WithUrl($"{_xkcdUrl}/{num}").WithIconUrl("http://xkcd.com/s/919f27.ico")) + .AddField(efb => efb.WithName(GetText("comic_number")).WithValue(comic.Num.ToString()).WithIsInline(true)) + .AddField(efb => efb.WithName(GetText("date")).WithValue($"{comic.Month}/{comic.Year}").WithIsInline(true)); var sent = await Context.Channel.EmbedAsync(embed) .ConfigureAwait(false); @@ -75,9 +75,6 @@ namespace NadekoBot.Modules.Searches [JsonProperty("img")] public string ImageLink { get; set; } public string Alt { get; set; } - - public override string ToString() - => $"`Comic:` #{Num} `Title:` {Title} `Date:` {Month}/{Year}\n{ImageLink}"; } } } diff --git a/src/NadekoBot/Modules/Searches/Searches.cs b/src/NadekoBot/Modules/Searches/Searches.cs index 096a171c..28fb15bb 100644 --- a/src/NadekoBot/Modules/Searches/Searches.cs +++ b/src/NadekoBot/Modules/Searches/Searches.cs @@ -41,15 +41,15 @@ namespace NadekoBot.Modules.Searches var data = JsonConvert.DeserializeObject(response); var embed = new EmbedBuilder() - .AddField(fb => fb.WithName("🌍 **Location**").WithValue(data.name + ", " + data.sys.country).WithIsInline(true)) - .AddField(fb => fb.WithName("📏 **Lat,Long**").WithValue($"{data.coord.lat}, {data.coord.lon}").WithIsInline(true)) - .AddField(fb => fb.WithName("☁ **Condition**").WithValue(String.Join(", ", data.weather.Select(w => w.main))).WithIsInline(true)) - .AddField(fb => fb.WithName("😓 **Humidity**").WithValue($"{data.main.humidity}%").WithIsInline(true)) - .AddField(fb => fb.WithName("💨 **Wind Speed**").WithValue(data.wind.speed + " km/h").WithIsInline(true)) - .AddField(fb => fb.WithName("🌡 **Temperature**").WithValue(data.main.temp + "°C").WithIsInline(true)) - .AddField(fb => fb.WithName("🔆 **Min - Max**").WithValue($"{data.main.temp_min}°C - {data.main.temp_max}°C").WithIsInline(true)) - .AddField(fb => fb.WithName("🌄 **Sunrise (utc)**").WithValue($"{data.sys.sunrise.ToUnixTimestamp():HH:mm}").WithIsInline(true)) - .AddField(fb => fb.WithName("🌇 **Sunset (utc)**").WithValue($"{data.sys.sunset.ToUnixTimestamp():HH:mm}").WithIsInline(true)) + .AddField(fb => fb.WithName("🌍 " + GetText("location")).WithValue(data.name + ", " + data.sys.country).WithIsInline(true)) + .AddField(fb => fb.WithName("📏 " + GetText("latlong")).WithValue($"{data.coord.lat}, {data.coord.lon}").WithIsInline(true)) + .AddField(fb => fb.WithName("☁ " + GetText("condition")).WithValue(string.Join(", ", data.weather.Select(w => w.main))).WithIsInline(true)) + .AddField(fb => fb.WithName("😓 " + GetText("humidity")).WithValue($"{data.main.humidity}%").WithIsInline(true)) + .AddField(fb => fb.WithName("💨 " + GetText("wind_speed")).WithValue(data.wind.speed + " km/h").WithIsInline(true)) + .AddField(fb => fb.WithName("🌡 " + GetText("temperature")).WithValue(data.main.temp + "°C").WithIsInline(true)) + .AddField(fb => fb.WithName("🔆 " + GetText("min_max")).WithValue($"{data.main.temp_min}°C - {data.main.temp_max}°C").WithIsInline(true)) + .AddField(fb => fb.WithName("🌄 " + GetText("sunrise")).WithValue($"{data.sys.sunrise.ToUnixTimestamp():HH:mm}").WithIsInline(true)) + .AddField(fb => fb.WithName("🌇 " + GetText("sunset")).WithValue($"{data.sys.sunset.ToUnixTimestamp():HH:mm}").WithIsInline(true)) .WithOkColor() .WithFooter(efb => efb.WithText("Powered by http://openweathermap.org")); await Context.Channel.EmbedAsync(embed).ConfigureAwait(false); @@ -58,17 +58,15 @@ namespace NadekoBot.Modules.Searches [NadekoCommand, Usage, Description, Aliases] public async Task Youtube([Remainder] string query = null) { - if (!(await ValidateQuery(Context.Channel, query).ConfigureAwait(false))) return; + if (!await ValidateQuery(Context.Channel, query).ConfigureAwait(false)) return; var result = (await NadekoBot.Google.GetVideosByKeywordsAsync(query, 1)).FirstOrDefault(); if (string.IsNullOrWhiteSpace(result)) { - await Context.Channel.SendErrorAsync("No results found for that query.").ConfigureAwait(false); + await ReplyErrorLocalized("no_results").ConfigureAwait(false); return; } await Context.Channel.SendMessageAsync(result).ConfigureAwait(false); - - //await Context.Channel.EmbedAsync(new Discord.API.Embed() { Video = new Discord.API.EmbedVideo() { Url = result.Replace("watch?v=", "embed/") }, Color = NadekoBot.OkColor }).ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -80,7 +78,7 @@ namespace NadekoBot.Modules.Searches var movie = await OmdbProvider.FindMovie(query); if (movie == null) { - await Context.Channel.SendErrorAsync("Failed to find that movie.").ConfigureAwait(false); + await ReplyErrorLocalized("imdb_fail").ConfigureAwait(false); return; } await Context.Channel.EmbedAsync(movie.GetEmbed()).ConfigureAwait(false); @@ -120,7 +118,7 @@ namespace NadekoBot.Modules.Searches var res = await NadekoBot.Google.GetImageAsync(terms).ConfigureAwait(false); var embed = new EmbedBuilder() .WithOkColor() - .WithAuthor(eab => eab.WithName("Image Search For: " + terms.TrimTo(50)) + .WithAuthor(eab => eab.WithName(GetText("image_search_for") + " " + terms.TrimTo(50)) .WithUrl("https://www.google.rs/search?q=" + terms + "&source=lnms&tbm=isch") .WithIconUrl("http://i.imgur.com/G46fm8J.png")) .WithDescription(res.Link) @@ -172,7 +170,7 @@ namespace NadekoBot.Modules.Searches var res = await NadekoBot.Google.GetImageAsync(terms, new NadekoRandom().Next(0, 50)).ConfigureAwait(false); var embed = new EmbedBuilder() .WithOkColor() - .WithAuthor(eab => eab.WithName("Image Search For: " + terms.TrimTo(50)) + .WithAuthor(eab => eab.WithName(GetText("image_search_for") + " " + terms.TrimTo(50)) .WithUrl("https://www.google.rs/search?q=" + terms + "&source=lnms&tbm=isch") .WithIconUrl("http://i.imgur.com/G46fm8J.png")) .WithDescription(res.Link) @@ -203,7 +201,7 @@ namespace NadekoBot.Modules.Searches var embed = new EmbedBuilder() .WithOkColor() - .WithAuthor(eab => eab.WithName("Image Search For: " + terms.TrimTo(50)) + .WithAuthor(eab => eab.WithName(GetText("image_search_for") + " " + terms.TrimTo(50)) .WithUrl(fullQueryLink) .WithIconUrl("http://s.imgur.com/images/logo-1200-630.jpg?")) .WithDescription(source) @@ -233,13 +231,14 @@ namespace NadekoBot.Modules.Searches if (shortened == arg) { - await Context.Channel.SendErrorAsync("Failed to shorten that url.").ConfigureAwait(false); + await ReplyErrorLocalized("shorten_fail").ConfigureAwait(false); + return; } await Context.Channel.EmbedAsync(new EmbedBuilder().WithColor(NadekoBot.OkColor) - .AddField(efb => efb.WithName("Original Url") + .AddField(efb => efb.WithName(GetText("original_url")) .WithValue($"<{arg}>")) - .AddField(efb => efb.WithName("Short Url") + .AddField(efb => efb.WithName(GetText("short_url")) .WithValue($"<{shortened}>"))) .ConfigureAwait(false); } @@ -287,7 +286,7 @@ namespace NadekoBot.Modules.Searches var embed = new EmbedBuilder() .WithOkColor() - .WithAuthor(eab => eab.WithName("Search For: " + terms.TrimTo(50)) + .WithAuthor(eab => eab.WithName(GetText("search_for") + " " + terms.TrimTo(50)) .WithUrl(fullQueryLink) .WithIconUrl("http://i.imgur.com/G46fm8J.png")) .WithTitle(Context.User.ToString()) @@ -296,26 +295,22 @@ namespace NadekoBot.Modules.Searches var desc = await Task.WhenAll(results.Select(async res => $"[{Format.Bold(res?.Title)}]({(await NadekoBot.Google.ShortenUrl(res?.Link))})\n{res?.Text}\n\n")) .ConfigureAwait(false); - await Context.Channel.EmbedAsync(embed.WithDescription(String.Concat(desc))).ConfigureAwait(false); + await Context.Channel.EmbedAsync(embed.WithDescription(string.Concat(desc))).ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] - public async Task MagicTheGathering([Remainder] string name = null) + public async Task MagicTheGathering([Remainder] string name) { var arg = name; if (string.IsNullOrWhiteSpace(arg)) - { - await Context.Channel.SendErrorAsync("Please enter a card name to search for.").ConfigureAwait(false); return; - } await Context.Channel.TriggerTypingAsync().ConfigureAwait(false); - string response = ""; using (var http = new HttpClient()) { http.DefaultRequestHeaders.Clear(); - response = await http.GetStringAsync($"https://api.deckbrew.com/mtg/cards?name={Uri.EscapeUriString(arg)}") - .ConfigureAwait(false); + var response = await http.GetStringAsync($"https://api.deckbrew.com/mtg/cards?name={Uri.EscapeUriString(arg)}") + .ConfigureAwait(false); try { var items = JArray.Parse(response).ToArray(); @@ -325,50 +320,46 @@ namespace NadekoBot.Modules.Searches var storeUrl = await NadekoBot.Google.ShortenUrl(item["store_url"].ToString()); var cost = item["cost"].ToString(); var desc = item["text"].ToString(); - var types = String.Join(",\n", item["types"].ToObject()); + var types = string.Join(",\n", item["types"].ToObject()); var img = item["editions"][0]["image_url"].ToString(); var embed = new EmbedBuilder().WithOkColor() .WithTitle(item["name"].ToString()) .WithDescription(desc) .WithImageUrl(img) - .AddField(efb => efb.WithName("Store Url").WithValue(storeUrl).WithIsInline(true)) - .AddField(efb => efb.WithName("Cost").WithValue(cost).WithIsInline(true)) - .AddField(efb => efb.WithName("Types").WithValue(types).WithIsInline(true)); + .AddField(efb => efb.WithName(GetText("store_url")).WithValue(storeUrl).WithIsInline(true)) + .AddField(efb => efb.WithName(GetText("cost")).WithValue(cost).WithIsInline(true)) + .AddField(efb => efb.WithName(GetText("types")).WithValue(types).WithIsInline(true)); //.AddField(efb => efb.WithName("Store Url").WithValue(await NadekoBot.Google.ShortenUrl(items[0]["store_url"].ToString())).WithIsInline(true)); await Context.Channel.EmbedAsync(embed).ConfigureAwait(false); } catch { - await Context.Channel.SendErrorAsync($"Error could not find the card '{arg}'.").ConfigureAwait(false); + await ReplyErrorLocalized("card_not_found").ConfigureAwait(false); } } } [NadekoCommand, Usage, Description, Aliases] - public async Task Hearthstone([Remainder] string name = null) + public async Task Hearthstone([Remainder] string name) { var arg = name; if (string.IsNullOrWhiteSpace(arg)) - { - await Context.Channel.SendErrorAsync("Please enter a card name to search for.").ConfigureAwait(false); return; - } if (string.IsNullOrWhiteSpace(NadekoBot.Credentials.MashapeKey)) { - await Context.Channel.SendErrorAsync("Bot owner didn't specify MashapeApiKey. You can't use this functionality.").ConfigureAwait(false); + await ReplyErrorLocalized("mashape_api_missing").ConfigureAwait(false); return; } await Context.Channel.TriggerTypingAsync().ConfigureAwait(false); - string response = ""; using (var http = new HttpClient()) { http.DefaultRequestHeaders.Clear(); http.DefaultRequestHeaders.Add("X-Mashape-Key", NadekoBot.Credentials.MashapeKey); - response = await http.GetStringAsync($"https://omgvamp-hearthstone-v1.p.mashape.com/cards/search/{Uri.EscapeUriString(arg)}") - .ConfigureAwait(false); + var response = await http.GetStringAsync($"https://omgvamp-hearthstone-v1.p.mashape.com/cards/search/{Uri.EscapeUriString(arg)}") + .ConfigureAwait(false); try { var items = JArray.Parse(response).Shuffle().ToList(); @@ -391,7 +382,7 @@ namespace NadekoBot.Modules.Searches string msg = null; if (items.Count > 4) { - msg = "⚠ Found over 4 images. Showing random 4."; + msg = GetText("hs_over_x", 4); } var ms = new MemoryStream(); await Task.Run(() => images.AsEnumerable().Merge().Save(ms)); @@ -400,8 +391,8 @@ namespace NadekoBot.Modules.Searches } catch (Exception ex) { - await Context.Channel.SendErrorAsync($"Error occured.").ConfigureAwait(false); _log.Error(ex); + await ReplyErrorLocalized("error_occured").ConfigureAwait(false); } } } @@ -411,23 +402,20 @@ namespace NadekoBot.Modules.Searches { if (string.IsNullOrWhiteSpace(NadekoBot.Credentials.MashapeKey)) { - await Context.Channel.SendErrorAsync("Bot owner didn't specify MashapeApiKey. You can't use this functionality.").ConfigureAwait(false); + await ReplyErrorLocalized("mashape_api_missing").ConfigureAwait(false); return; } - var arg = query; - if (string.IsNullOrWhiteSpace(arg)) - { - await Context.Channel.SendErrorAsync("Please enter a sentence.").ConfigureAwait(false); + if (string.IsNullOrWhiteSpace(query)) return; - } + await Context.Channel.TriggerTypingAsync().ConfigureAwait(false); using (var http = new HttpClient()) { http.DefaultRequestHeaders.Clear(); http.DefaultRequestHeaders.Add("X-Mashape-Key", NadekoBot.Credentials.MashapeKey); http.DefaultRequestHeaders.Add("Accept", "text/plain"); - var res = await http.GetStringAsync($"https://yoda.p.mashape.com/yoda?sentence={Uri.EscapeUriString(arg)}").ConfigureAwait(false); + var res = await http.GetStringAsync($"https://yoda.p.mashape.com/yoda?sentence={Uri.EscapeUriString(query)}").ConfigureAwait(false); try { var embed = new EmbedBuilder() @@ -439,7 +427,7 @@ namespace NadekoBot.Modules.Searches } catch { - await Context.Channel.SendErrorAsync("Failed to yodify your sentence.").ConfigureAwait(false); + await ReplyErrorLocalized("yodify_error").ConfigureAwait(false); } } } @@ -449,22 +437,19 @@ namespace NadekoBot.Modules.Searches { if (string.IsNullOrWhiteSpace(NadekoBot.Credentials.MashapeKey)) { - await Context.Channel.SendErrorAsync("Bot owner didn't specify MashapeApiKey. You can't use this functionality.").ConfigureAwait(false); + await ReplyErrorLocalized("mashape_api_missing").ConfigureAwait(false); return; } - var arg = query; - if (string.IsNullOrWhiteSpace(arg)) - { - await Context.Channel.SendErrorAsync("Please enter a search term.").ConfigureAwait(false); + if (string.IsNullOrWhiteSpace(query)) return; - } + await Context.Channel.TriggerTypingAsync().ConfigureAwait(false); using (var http = new HttpClient()) { http.DefaultRequestHeaders.Clear(); http.DefaultRequestHeaders.Add("Accept", "application/json"); - var res = await http.GetStringAsync($"http://api.urbandictionary.com/v0/define?term={Uri.EscapeUriString(arg)}").ConfigureAwait(false); + var res = await http.GetStringAsync($"http://api.urbandictionary.com/v0/define?term={Uri.EscapeUriString(query)}").ConfigureAwait(false); try { var items = JObject.Parse(res); @@ -480,7 +465,7 @@ namespace NadekoBot.Modules.Searches } catch { - await Context.Channel.SendErrorAsync("Failed finding a definition for that term.").ConfigureAwait(false); + await ReplyErrorLocalized("ud_error").ConfigureAwait(false); } } } @@ -507,39 +492,36 @@ namespace NadekoBot.Modules.Searches definition = ((JArray)JToken.Parse(sense.Definition.ToString())).First.ToString(); var embed = new EmbedBuilder().WithOkColor() - .WithTitle("Define: " + word) + .WithTitle(GetText("define") + " " + word) .WithDescription(definition) .WithFooter(efb => efb.WithText(sense.Gramatical_info?.type)); if (sense.Examples != null) - embed.AddField(efb => efb.WithName("Example").WithValue(sense.Examples.First().text)); + embed.AddField(efb => efb.WithName(GetText("example")).WithValue(sense.Examples.First().text)); await Context.Channel.EmbedAsync(embed).ConfigureAwait(false); } } [NadekoCommand, Usage, Description, Aliases] - public async Task Hashtag([Remainder] string query = null) + public async Task Hashtag([Remainder] string query) { - var arg = query; - if (string.IsNullOrWhiteSpace(arg)) - { - await Context.Channel.SendErrorAsync("Please enter a search term.").ConfigureAwait(false); + if (string.IsNullOrWhiteSpace(query)) return; - } + if (string.IsNullOrWhiteSpace(NadekoBot.Credentials.MashapeKey)) { - await Context.Channel.SendErrorAsync("Bot owner didn't specify MashapeApiKey. You can't use this functionality.").ConfigureAwait(false); + await ReplyErrorLocalized("mashape_api_missing").ConfigureAwait(false); return; } await Context.Channel.TriggerTypingAsync().ConfigureAwait(false); - var res = ""; + string res; using (var http = new HttpClient()) { http.DefaultRequestHeaders.Clear(); http.DefaultRequestHeaders.Add("X-Mashape-Key", NadekoBot.Credentials.MashapeKey); - res = await http.GetStringAsync($"https://tagdef.p.mashape.com/one.{Uri.EscapeUriString(arg)}.json").ConfigureAwait(false); + res = await http.GetStringAsync($"https://tagdef.p.mashape.com/one.{Uri.EscapeUriString(query)}.json").ConfigureAwait(false); } try @@ -558,7 +540,7 @@ namespace NadekoBot.Modules.Searches } catch { - await Context.Channel.SendErrorAsync("Failed finding a definition for that tag.").ConfigureAwait(false); + await ReplyErrorLocalized("hashtag_error").ConfigureAwait(false); } } @@ -572,7 +554,7 @@ namespace NadekoBot.Modules.Searches return; var fact = JObject.Parse(response)["facts"][0].ToString(); - await Context.Channel.SendConfirmAsync("🐈fact", fact).ConfigureAwait(false); + await Context.Channel.SendConfirmAsync("🐈" + GetText("catfact"), fact).ConfigureAwait(false); } } @@ -609,7 +591,7 @@ namespace NadekoBot.Modules.Searches var result = await http.GetStringAsync("https://en.wikipedia.org//w/api.php?action=query&format=json&prop=info&redirects=1&formatversion=2&inprop=url&titles=" + Uri.EscapeDataString(query)); var data = JsonConvert.DeserializeObject(result); if (data.Query.Pages[0].Missing) - await Context.Channel.SendErrorAsync("That page could not be found.").ConfigureAwait(false); + await ReplyErrorLocalized("wiki_page_not_found").ConfigureAwait(false); else await Context.Channel.SendMessageAsync(data.Query.Pages[0].FullUrl).ConfigureAwait(false); } @@ -625,26 +607,19 @@ namespace NadekoBot.Modules.Searches img.ApplyProcessor(new BackgroundColorProcessor(ImageSharp.Color.FromHex(color)), img.Bounds); - await Context.Channel.SendFileAsync(img.ToStream(), $"{color}.png").ConfigureAwait(false); ; + await Context.Channel.SendFileAsync(img.ToStream(), $"{color}.png").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] public async Task Videocall([Remainder] params IUser[] users) { - try + var allUsrs = users.Append(Context.User); + var allUsrsArray = allUsrs.ToArray(); + var str = allUsrsArray.Aggregate("http://appear.in/", (current, usr) => current + Uri.EscapeUriString(usr.Username[0].ToString())); + str += new NadekoRandom().Next(); + foreach (var usr in allUsrsArray) { - var allUsrs = users.Append(Context.User); - var allUsrsArray = allUsrs.ToArray(); - var str = allUsrsArray.Aggregate("http://appear.in/", (current, usr) => current + Uri.EscapeUriString(usr.Username[0].ToString())); - str += new NadekoRandom().Next(); - foreach (var usr in allUsrsArray) - { - await (await (usr as IGuildUser).CreateDMChannelAsync()).SendConfirmAsync(str).ConfigureAwait(false); - } - } - catch (Exception ex) - { - _log.Error(ex); + await (await usr.CreateDMChannelAsync()).SendConfirmAsync(str).ConfigureAwait(false); } } @@ -664,11 +639,11 @@ namespace NadekoBot.Modules.Searches } [NadekoCommand, Usage, Description, Aliases] - public async Task Wikia(string target, [Remainder] string query = null) + public async Task Wikia(string target, [Remainder] string query) { if (string.IsNullOrWhiteSpace(target) || string.IsNullOrWhiteSpace(query)) { - await Context.Channel.SendErrorAsync("Please enter a target wikia, followed by search query.").ConfigureAwait(false); + await ReplyErrorLocalized("wikia_input_error").ConfigureAwait(false); return; } await Context.Channel.TriggerTypingAsync().ConfigureAwait(false); @@ -680,90 +655,87 @@ namespace NadekoBot.Modules.Searches var res = await http.GetStringAsync($"http://www.{Uri.EscapeUriString(target)}.wikia.com/api/v1/Search/List?query={Uri.EscapeUriString(query)}&limit=25&minArticleQuality=10&batch=1&namespaces=0%2C14").ConfigureAwait(false); var items = JObject.Parse(res); var found = items["items"][0]; - var response = $@"`Title:` {found["title"].ToString()} -`Quality:` {found["quality"]} -`URL:` {await NadekoBot.Google.ShortenUrl(found["url"].ToString()).ConfigureAwait(false)}"; + var response = $@"`{GetText("title")}` {found["title"]} +`{GetText("quality")}` {found["quality"]} +`{GetText("url")}:` {await NadekoBot.Google.ShortenUrl(found["url"].ToString()).ConfigureAwait(false)}"; await Context.Channel.SendMessageAsync(response).ConfigureAwait(false); } catch { - await Context.Channel.SendErrorAsync($"Failed finding `{query}`.").ConfigureAwait(false); + await ReplyErrorLocalized("wikia_error").ConfigureAwait(false); } } } - [NadekoCommand, Usage, Description, Aliases] - public async Task MCPing([Remainder] string query = null) - { - var arg = query; - if (string.IsNullOrWhiteSpace(arg)) - { - await Context.Channel.SendErrorAsync("💢 Please enter a `ip:port`.").ConfigureAwait(false); - return; - } - await Context.Channel.TriggerTypingAsync().ConfigureAwait(false); - using (var http = new HttpClient()) - { - http.DefaultRequestHeaders.Clear(); - string ip = arg.Split(':')[0]; - string port = arg.Split(':')[1]; - var res = await http.GetStringAsync($"https://api.minetools.eu/ping/{Uri.EscapeUriString(ip)}/{Uri.EscapeUriString(port)}").ConfigureAwait(false); - try - { - var items = JObject.Parse(res); - var sb = new StringBuilder(); - int ping = (int)Math.Ceiling(Double.Parse(items["latency"].ToString())); - sb.AppendLine($"`Server:` {arg}"); - sb.AppendLine($"`Version:` {items["version"]["name"].ToString()} / Protocol {items["version"]["protocol"].ToString()}"); - sb.AppendLine($"`Description:` {items["description"].ToString()}"); - sb.AppendLine($"`Online Players:` {items["players"]["online"].ToString()}/{items["players"]["max"].ToString()}"); - sb.Append($"`Latency:` {ping}"); - await Context.Channel.SendMessageAsync(sb.ToString()); - } - catch - { - await Context.Channel.SendErrorAsync($"Failed finding `{arg}`.").ConfigureAwait(false); - } - } - } + //[NadekoCommand, Usage, Description, Aliases] + //public async Task MCPing([Remainder] string query2 = null) + //{ + // var query = query2; + // if (string.IsNullOrWhiteSpace(query)) + // return; + // await Context.Channel.TriggerTypingAsync().ConfigureAwait(false); + // using (var http = new HttpClient()) + // { + // http.DefaultRequestHeaders.Clear(); + // var ip = query.Split(':')[0]; + // var port = query.Split(':')[1]; + // var res = await http.GetStringAsync($"https://api.minetools.eu/ping/{Uri.EscapeUriString(ip)}/{Uri.EscapeUriString(port)}").ConfigureAwait(false); + // try + // { + // var items = JObject.Parse(res); + // var sb = new StringBuilder(); + // var ping = (int)Math.Ceiling(double.Parse(items["latency"].ToString())); + // sb.AppendLine($"`Server:` {query}"); + // sb.AppendLine($"`Version:` {items["version"]["name"]} / Protocol {items["version"]["protocol"]}"); + // sb.AppendLine($"`Description:` {items["description"]}"); + // sb.AppendLine($"`Online Players:` {items["players"]["online"]}/{items["players"]["max"]}"); + // sb.Append($"`Latency:` {ping}"); + // await Context.Channel.SendMessageAsync(sb.ToString()); + // } + // catch + // { + // await Context.Channel.SendErrorAsync($"Failed finding `{query}`.").ConfigureAwait(false); + // } + // } + //} - [NadekoCommand, Usage, Description, Aliases] - public async Task MCQ([Remainder] string query = null) - { - var arg = query; - if (string.IsNullOrWhiteSpace(arg)) - { - await Context.Channel.SendErrorAsync("Please enter `ip:port`.").ConfigureAwait(false); - return; - } - await Context.Channel.TriggerTypingAsync().ConfigureAwait(false); - using (var http = new HttpClient()) - { - http.DefaultRequestHeaders.Clear(); - try - { - string ip = arg.Split(':')[0]; - string port = arg.Split(':')[1]; - var res = await http.GetStringAsync($"https://api.minetools.eu/query/{Uri.EscapeUriString(ip)}/{Uri.EscapeUriString(port)}").ConfigureAwait(false); - var items = JObject.Parse(res); - var sb = new StringBuilder(); - sb.AppendLine($"`Server:` {arg.ToString()} 〘Status: {items["status"]}〙"); - sb.AppendLine($"`Player List (First 5):`"); - foreach (var item in items["Playerlist"].Take(5)) - { - sb.AppendLine($"〔:rosette: {item}〕"); - } - sb.AppendLine($"`Online Players:` {items["Players"]} / {items["MaxPlayers"]}"); - sb.AppendLine($"`Plugins:` {items["Plugins"]}"); - sb.Append($"`Version:` {items["Version"]}"); - await Context.Channel.SendMessageAsync(sb.ToString()); - } - catch - { - await Context.Channel.SendErrorAsync($"Failed finding server `{arg}`.").ConfigureAwait(false); - } - } - } + //[NadekoCommand, Usage, Description, Aliases] + //public async Task MCQ([Remainder] string query = null) + //{ + // var arg = query; + // if (string.IsNullOrWhiteSpace(arg)) + // { + // await Context.Channel.SendErrorAsync("Please enter `ip:port`.").ConfigureAwait(false); + // return; + // } + // await Context.Channel.TriggerTypingAsync().ConfigureAwait(false); + // using (var http = new HttpClient()) + // { + // http.DefaultRequestHeaders.Clear(); + // try + // { + // var ip = arg.Split(':')[0]; + // var port = arg.Split(':')[1]; + // var res = await http.GetStringAsync($"https://api.minetools.eu/query/{Uri.EscapeUriString(ip)}/{Uri.EscapeUriString(port)}").ConfigureAwait(false); + // var items = JObject.Parse(res); + // var sb = new StringBuilder(); + // sb.AppendLine($"`Server:` {arg} 〘Status: {items["status"]}〙"); + // sb.AppendLine("`Player List (First 5):`"); + // foreach (var item in items["Playerlist"].Take(5)) + // { + // sb.AppendLine($"〔:rosette: {item}〕"); + // } + // sb.AppendLine($"`Online Players:` {items["Players"]} / {items["MaxPlayers"]}"); + // sb.AppendLine($"`Plugins:` {items["Plugins"]}"); + // sb.Append($"`Version:` {items["Version"]}"); + // await Context.Channel.SendMessageAsync(sb.ToString()); + // } + // catch + // { + // await Context.Channel.SendErrorAsync($"Failed finding server `{arg}`.").ConfigureAwait(false); + // } + // } + //} public enum DapiSearchType { @@ -774,7 +746,7 @@ namespace NadekoBot.Modules.Searches Yandere } - public static async Task InternalDapiCommand(IUserMessage umsg, string tag, DapiSearchType type) + public async Task InternalDapiCommand(IUserMessage umsg, string tag, DapiSearchType type) { var channel = umsg.Channel; @@ -783,7 +755,7 @@ namespace NadekoBot.Modules.Searches var url = await InternalDapiSearch(tag, type).ConfigureAwait(false); if (url == null) - await channel.SendErrorAsync(umsg.Author.Mention + " No results."); + await channel.SendErrorAsync(umsg.Author.Mention + " " + GetText("no_results")); else await channel.EmbedAsync(new EmbedBuilder().WithOkColor() .WithDescription(umsg.Author.Mention + " " + tag) @@ -794,7 +766,7 @@ namespace NadekoBot.Modules.Searches public static async Task InternalDapiSearch(string tag, DapiSearchType type) { tag = tag?.Replace(" ", "_"); - string website = ""; + var website = ""; switch (type) { case DapiSearchType.Safebooru: @@ -839,10 +811,10 @@ namespace NadekoBot.Modules.Searches return null; } } - public static async Task ValidateQuery(IMessageChannel ch, string query) + public async Task ValidateQuery(IMessageChannel ch, string query) { - if (!string.IsNullOrEmpty(query.Trim())) return true; - await ch.SendErrorAsync("Please specify search parameters.").ConfigureAwait(false); + if (!string.IsNullOrWhiteSpace(query)) return true; + await ch.SendErrorAsync(GetText("specify_search_params")).ConfigureAwait(false); return false; } } diff --git a/src/NadekoBot/NadekoBot.xproj.DotSettings b/src/NadekoBot/NadekoBot.xproj.DotSettings index e418daea..c5dd7773 100644 --- a/src/NadekoBot/NadekoBot.xproj.DotSettings +++ b/src/NadekoBot/NadekoBot.xproj.DotSettings @@ -3,4 +3,5 @@ True True True + True True \ No newline at end of file diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index f0c48b9d..2eaf5acf 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -4073,6 +4073,852 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Abilities. + /// + public static string searches_abilities { + get { + return ResourceManager.GetString("searches_abilities", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No favorite anime yet. + /// + public static string searches_anime_no_fav { + get { + return ResourceManager.GetString("searches_anime_no_fav", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Started automatic translation of messages on this channel. User messages will be auto-deleted.. + /// + public static string searches_atl_ad_started { + get { + return ResourceManager.GetString("searches_atl_ad_started", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to your auto-translate language has been removed.. + /// + public static string searches_atl_removed { + get { + return ResourceManager.GetString("searches_atl_removed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Your auto-translate language has been set to {from}>{to}. + /// + public static string searches_atl_set { + get { + return ResourceManager.GetString("searches_atl_set", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Started automatic translation of messages on this channel.. + /// + public static string searches_atl_started { + get { + return ResourceManager.GetString("searches_atl_started", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Stopped automatic translation of messages on this channel.. + /// + public static string searches_atl_stopped { + get { + return ResourceManager.GetString("searches_atl_stopped", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Bad input format, or something went wrong.. + /// + public static string searches_bad_input_format { + get { + return ResourceManager.GetString("searches_bad_input_format", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Couldn't find that card.. + /// + public static string searches_card_not_found { + get { + return ResourceManager.GetString("searches_card_not_found", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to fact. + /// + public static string searches_catfact { + get { + return ResourceManager.GetString("searches_catfact", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Chapters. + /// + public static string searches_chapters { + get { + return ResourceManager.GetString("searches_chapters", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Comic #. + /// + public static string searches_comic_number { + get { + return ResourceManager.GetString("searches_comic_number", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Competitive Loses. + /// + public static string searches_compet_loses { + get { + return ResourceManager.GetString("searches_compet_loses", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Competitive Played. + /// + public static string searches_compet_played { + get { + return ResourceManager.GetString("searches_compet_played", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Competitive Rank. + /// + public static string searches_compet_rank { + get { + return ResourceManager.GetString("searches_compet_rank", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Competitive Wins. + /// + public static string searches_compet_wins { + get { + return ResourceManager.GetString("searches_compet_wins", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Completed. + /// + public static string searches_completed { + get { + return ResourceManager.GetString("searches_completed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Condition. + /// + public static string searches_condition { + get { + return ResourceManager.GetString("searches_condition", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Cost. + /// + public static string searches_cost { + get { + return ResourceManager.GetString("searches_cost", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Date. + /// + public static string searches_date { + get { + return ResourceManager.GetString("searches_date", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Define:. + /// + public static string searches_define { + get { + return ResourceManager.GetString("searches_define", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Dropped. + /// + public static string searches_dropped { + get { + return ResourceManager.GetString("searches_dropped", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Episodes. + /// + public static string searches_episodes { + get { + return ResourceManager.GetString("searches_episodes", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Error occured.. + /// + public static string searches_error_occured { + get { + return ResourceManager.GetString("searches_error_occured", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Example. + /// + public static string searches_example { + get { + return ResourceManager.GetString("searches_example", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Failed finding that animu.. + /// + public static string searches_failed_finding_anime { + get { + return ResourceManager.GetString("searches_failed_finding_anime", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Failed finding that mango.. + /// + public static string searches_failed_finding_manga { + get { + return ResourceManager.GetString("searches_failed_finding_manga", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Genres. + /// + public static string searches_genres { + get { + return ResourceManager.GetString("searches_genres", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Failed finding a definition for that tag.. + /// + public static string searches_hashtag_error { + get { + return ResourceManager.GetString("searches_hashtag_error", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Height/Weight. + /// + public static string searches_height_weight { + get { + return ResourceManager.GetString("searches_height_weight", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0}m/{1}kg. + /// + public static string searches_height_weight_val { + get { + return ResourceManager.GetString("searches_height_weight_val", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Humidity. + /// + public static string searches_humidity { + get { + return ResourceManager.GetString("searches_humidity", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Image Search For:. + /// + public static string searches_image_search_for { + get { + return ResourceManager.GetString("searches_image_search_for", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Failed to find that movie.. + /// + public static string searches_imdb_fail { + get { + return ResourceManager.GetString("searches_imdb_fail", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Invalid source or target language.. + /// + public static string searches_invalid_lang { + get { + return ResourceManager.GetString("searches_invalid_lang", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Joes not loaded.. + /// + public static string searches_jokes_not_loaded { + get { + return ResourceManager.GetString("searches_jokes_not_loaded", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Lat/Long. + /// + public static string searches_latlong { + get { + return ResourceManager.GetString("searches_latlong", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Level. + /// + public static string searches_level { + get { + return ResourceManager.GetString("searches_level", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Lsit of {0}place tags. + /// + public static string searches_list_of_place_tags { + get { + return ResourceManager.GetString("searches_list_of_place_tags", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Location. + /// + public static string searches_location { + get { + return ResourceManager.GetString("searches_location", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Magic Items not loaded.. + /// + public static string searches_magicitems_not_loaded { + get { + return ResourceManager.GetString("searches_magicitems_not_loaded", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0}'s MAL profile. + /// + public static string searches_mal_profile { + get { + return ResourceManager.GetString("searches_mal_profile", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Bot owner didn't specify MashapeApiKey. You can't use this functionality.. + /// + public static string searches_mashape_api_missing { + get { + return ResourceManager.GetString("searches_mashape_api_missing", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Min/Max. + /// + public static string searches_min_max { + get { + return ResourceManager.GetString("searches_min_max", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No channel found.. + /// + public static string searches_no_channel_found { + get { + return ResourceManager.GetString("searches_no_channel_found", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No results found.. + /// + public static string searches_no_results { + get { + return ResourceManager.GetString("searches_no_results", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to On-Hold. + /// + public static string searches_on_hold { + get { + return ResourceManager.GetString("searches_on_hold", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Original Url. + /// + public static string searches_original_url { + get { + return ResourceManager.GetString("searches_original_url", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to An osu! API key is required.. + /// + public static string searches_osu_api_key { + get { + return ResourceManager.GetString("searches_osu_api_key", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Failed retreiving osu signature.. + /// + public static string searches_osu_failed { + get { + return ResourceManager.GetString("searches_osu_failed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Found over {0} images. Showing random {0}.. + /// + public static string searches_over_x { + get { + return ResourceManager.GetString("searches_over_x", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to User not found! Please check the Region and BattleTag before trying again.. + /// + public static string searches_ow_user_not_found { + get { + return ResourceManager.GetString("searches_ow_user_not_found", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Plan to watch. + /// + public static string searches_plan_to_watch { + get { + return ResourceManager.GetString("searches_plan_to_watch", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Platform. + /// + public static string searches_platform { + get { + return ResourceManager.GetString("searches_platform", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No ability found.. + /// + public static string searches_pokemon_ability_none { + get { + return ResourceManager.GetString("searches_pokemon_ability_none", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No pokemon found.. + /// + public static string searches_pokemon_none { + get { + return ResourceManager.GetString("searches_pokemon_none", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Profile Link:. + /// + public static string searches_profile_link { + get { + return ResourceManager.GetString("searches_profile_link", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Quality:. + /// + public static string searches_quality { + get { + return ResourceManager.GetString("searches_quality", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Quick Playtime. + /// + public static string searches_quick_playtime { + get { + return ResourceManager.GetString("searches_quick_playtime", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Quick Wins. + /// + public static string searches_quick_wins { + get { + return ResourceManager.GetString("searches_quick_wins", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Rating. + /// + public static string searches_rating { + get { + return ResourceManager.GetString("searches_rating", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Score:. + /// + public static string searches_score { + get { + return ResourceManager.GetString("searches_score", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Search For:. + /// + public static string searches_search_for { + get { + return ResourceManager.GetString("searches_search_for", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Short Url. + /// + public static string searches_short_url { + get { + return ResourceManager.GetString("searches_short_url", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Failed to shorten that url.. + /// + public static string searches_shorten_fail { + get { + return ResourceManager.GetString("searches_shorten_fail", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Something went wrong.. + /// + public static string searches_something_went_wrong { + get { + return ResourceManager.GetString("searches_something_went_wrong", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Please specify search parameters.. + /// + public static string searches_specify_search_params { + get { + return ResourceManager.GetString("searches_specify_search_params", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Status. + /// + public static string searches_status { + get { + return ResourceManager.GetString("searches_status", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Store Url. + /// + public static string searches_store_url { + get { + return ResourceManager.GetString("searches_store_url", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No such stream.. + /// + public static string searches_stream_no { + get { + return ResourceManager.GetString("searches_stream_no", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Stream probably doesn't exist.. + /// + public static string searches_stream_not_exist { + get { + return ResourceManager.GetString("searches_stream_not_exist", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Removed {0}'s stream ({1}) from notifications.. + /// + public static string searches_stream_removed { + get { + return ResourceManager.GetString("searches_stream_removed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to I will notify this channel when status changes.. + /// + public static string searches_stream_tracked { + get { + return ResourceManager.GetString("searches_stream_tracked", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Streamer {0} is offline.. + /// + public static string searches_streamer_offline { + get { + return ResourceManager.GetString("searches_streamer_offline", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Streamer {0} is online with {1} viewers.. + /// + public static string searches_streamer_online { + get { + return ResourceManager.GetString("searches_streamer_online", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to You are following {0} streams on this server.. + /// + public static string searches_streams_following { + get { + return ResourceManager.GetString("searches_streams_following", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to You are not following any streams on this server.. + /// + public static string searches_streams_none { + get { + return ResourceManager.GetString("searches_streams_none", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Sunrise. + /// + public static string searches_sunrise { + get { + return ResourceManager.GetString("searches_sunrise", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Sunset. + /// + public static string searches_sunset { + get { + return ResourceManager.GetString("searches_sunset", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Temperature. + /// + public static string searches_temperature { + get { + return ResourceManager.GetString("searches_temperature", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Title:. + /// + public static string searches_title { + get { + return ResourceManager.GetString("searches_title", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Top 3 favorite anime:. + /// + public static string searches_top_3_fav_anime { + get { + return ResourceManager.GetString("searches_top_3_fav_anime", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Translation:. + /// + public static string searches_translation { + get { + return ResourceManager.GetString("searches_translation", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Types. + /// + public static string searches_types { + get { + return ResourceManager.GetString("searches_types", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Failed finding definition for that term.. + /// + public static string searches_ud_error { + get { + return ResourceManager.GetString("searches_ud_error", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Url. + /// + public static string searches_url { + get { + return ResourceManager.GetString("searches_url", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Viewers. + /// + public static string searches_viewers { + get { + return ResourceManager.GetString("searches_viewers", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Watching. + /// + public static string searches_watching { + get { + return ResourceManager.GetString("searches_watching", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Page not found.. + /// + public static string searches_wiki_page_not_found { + get { + return ResourceManager.GetString("searches_wiki_page_not_found", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Failed finding that term on the specified wikia.. + /// + public static string searches_wikia_error { + get { + return ResourceManager.GetString("searches_wikia_error", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Please enter a target wikia, followed by search query.. + /// + public static string searches_wikia_input_error { + get { + return ResourceManager.GetString("searches_wikia_input_error", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Wind Speed. + /// + public static string searches_wind_speed { + get { + return ResourceManager.GetString("searches_wind_speed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The {0} most banned champions. + /// + public static string searches_x_most_banned_champs { + get { + return ResourceManager.GetString("searches_x_most_banned_champs", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Failed to yodify your sentence.. + /// + public static string searches_yodify_error { + get { + return ResourceManager.GetString("searches_yodify_error", resourceCulture); + } + } + /// /// Looks up a localized string similar to Joined. /// diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index d365b08c..5030e3bd 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -1485,6 +1485,289 @@ Don't forget to leave your discord name or id in the message. Word filtering enabled on this server. + + Abilities + + + No favorite anime yet + + + Started automatic translation of messages on this channel. User messages will be auto-deleted. + + + your auto-translate language has been removed. + + + Your auto-translate language has been set to {from}>{to} + + + Started automatic translation of messages on this channel. + + + Stopped automatic translation of messages on this channel. + + + Bad input format, or something went wrong. + + + Couldn't find that card. + + + fact + + + Chapters + + + Comic # + + + Competitive Loses + + + Competitive Played + + + Competitive Rank + + + Competitive Wins + + + Completed + + + Condition + + + Cost + + + Date + + + Define: + + + Dropped + + + Episodes + + + Error occured. + + + Example + + + Failed finding that animu. + + + Failed finding that mango. + + + Genres + + + Failed finding a definition for that tag. + + + Height/Weight + + + {0}m/{1}kg + + + Humidity + + + Image Search For: + + + Failed to find that movie. + + + Invalid source or target language. + + + Joes not loaded. + + + Lat/Long + + + Level + + + Lsit of {0}place tags + Don't translate {0}place + + + Location + + + Magic Items not loaded. + + + {0}'s MAL profile + + + Bot owner didn't specify MashapeApiKey. You can't use this functionality. + + + Min/Max + + + No channel found. + + + No results found. + + + On-Hold + + + Original Url + + + An osu! API key is required. + + + Failed retreiving osu signature. + + + Found over {0} images. Showing random {0}. + + + User not found! Please check the Region and BattleTag before trying again. + + + Plan to watch + + + Platform + + + No ability found. + + + No pokemon found. + + + Profile Link: + + + Quality: + + + Quick Playtime + + + Quick Wins + + + Rating + + + Score: + + + Search For: + + + Failed to shorten that url. + + + Short Url + + + Something went wrong. + + + Please specify search parameters. + + + Status + + + Store Url + + + Streamer {0} is offline. + + + Streamer {0} is online with {1} viewers. + + + You are following {0} streams on this server. + + + You are not following any streams on this server. + + + No such stream. + + + Stream probably doesn't exist. + + + Removed {0}'s stream ({1}) from notifications. + + + I will notify this channel when status changes. + + + Sunrise + + + Sunset + + + Temperature + + + Title: + + + Top 3 favorite anime: + + + Translation: + + + Types + + + Failed finding definition for that term. + + + Url + + + Viewers + + + Watching + + + Failed finding that term on the specified wikia. + + + Please enter a target wikia, followed by search query. + + + Page not found. + + + Wind Speed + + + The {0} most banned champions + + + Failed to yodify your sentence. + Joined From 466ec12de0b8a3eaec1e8d74299c1e89d954619b Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 24 Feb 2017 17:15:52 +0100 Subject: [PATCH 078/496] >ttt string fix, thx devedux --- src/NadekoBot/Modules/Games/Commands/TicTacToe.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Games/Commands/TicTacToe.cs b/src/NadekoBot/Modules/Games/Commands/TicTacToe.cs index 5769e2e5..d4293e03 100644 --- a/src/NadekoBot/Modules/Games/Commands/TicTacToe.cs +++ b/src/NadekoBot/Modules/Games/Commands/TicTacToe.cs @@ -135,7 +135,7 @@ namespace NadekoBot.Modules.Games if (_phase == Phase.Ended) embed.WithFooter(efb => efb.WithText(GetText("ttt_no_moves"))); else - embed.WithFooter(efb => efb.WithText(GetText("users_move", _users[_curUserIndex]))); + embed.WithFooter(efb => efb.WithText(GetText("ttt_users_move", _users[_curUserIndex]))); } else embed.WithFooter(efb => efb.WithText(GetText("ttt_has_won", _winner))); From 22f961a093cbe947e3bf643b4cbb356f50861df7 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 25 Feb 2017 02:04:32 +0100 Subject: [PATCH 079/496] localization complete, or nearly complete if I missed something --- .../Modules/Games/Commands/TicTacToe.cs | 4 +- src/NadekoBot/Modules/Music/Classes/Song.cs | 2 +- src/NadekoBot/Modules/Music/Music.cs | 212 ++++---- .../Resources/ResponseStrings.Designer.cs | 477 ++++++++++++++++++ src/NadekoBot/Resources/ResponseStrings.resx | 160 ++++++ src/NadekoBot/Services/Impl/StatsService.cs | 4 +- 6 files changed, 761 insertions(+), 98 deletions(-) diff --git a/src/NadekoBot/Modules/Games/Commands/TicTacToe.cs b/src/NadekoBot/Modules/Games/Commands/TicTacToe.cs index d4293e03..918a1592 100644 --- a/src/NadekoBot/Modules/Games/Commands/TicTacToe.cs +++ b/src/NadekoBot/Modules/Games/Commands/TicTacToe.cs @@ -65,7 +65,6 @@ namespace NadekoBot.Modules.Games } private readonly ITextChannel _channel; - private readonly Logger _log; private readonly IGuildUser[] _users; private readonly int?[,] _state; private Phase _phase; @@ -90,8 +89,7 @@ namespace NadekoBot.Modules.Games { null, null, null }, { null, null, null }, }; - - _log = LogManager.GetCurrentClassLogger(); + _phase = Phase.Starting; _moveLock = new SemaphoreSlim(1, 1); } diff --git a/src/NadekoBot/Modules/Music/Classes/Song.cs b/src/NadekoBot/Modules/Music/Classes/Song.cs index 8a69ec6f..d088bfde 100644 --- a/src/NadekoBot/Modules/Music/Classes/Song.cs +++ b/src/NadekoBot/Modules/Music/Classes/Song.cs @@ -40,7 +40,7 @@ namespace NadekoBot.Modules.Music.Classes //pwetty public string PrettyProvider => - $"{(SongInfo.Provider ?? "No Provider")}"; + $"{(SongInfo.Provider ?? "???")}"; public string PrettyFullTime => PrettyCurrentTime + " / " + PrettyTotalTime; diff --git a/src/NadekoBot/Modules/Music/Music.cs b/src/NadekoBot/Modules/Music/Music.cs index a7b46269..5d685bbc 100644 --- a/src/NadekoBot/Modules/Music/Music.cs +++ b/src/NadekoBot/Modules/Music/Music.cs @@ -20,7 +20,7 @@ namespace NadekoBot.Modules.Music { [NadekoModule("Music", "!!")] [DontAutoLoad] - public partial class Music : NadekoTopLevelModule + public class Music : NadekoTopLevelModule { public static ConcurrentDictionary MusicPlayers { get; } = new ConcurrentDictionary(); @@ -155,7 +155,14 @@ namespace NadekoBot.Modules.Music return; var val = musicPlayer.FairPlay = !musicPlayer.FairPlay; - await channel.SendConfirmAsync("Fair play " + (val ? "enabled" : "disabled") + ".").ConfigureAwait(false); + if (val) + { + await ReplyConfirmLocalized("fp_enabled").ConfigureAwait(false); + } + else + { + await ReplyConfirmLocalized("fp_disabled").ConfigureAwait(false); + } } [NadekoCommand, Usage, Description, Aliases] @@ -184,34 +191,31 @@ namespace NadekoBot.Modules.Music [RequireContext(ContextType.Guild)] public async Task ListQueue(int page = 1) { - + Song currentSong; MusicPlayer musicPlayer; - if (!MusicPlayers.TryGetValue(Context.Guild.Id, out musicPlayer)) + if (!MusicPlayers.TryGetValue(Context.Guild.Id, out musicPlayer) || + (currentSong = musicPlayer?.CurrentSong) == null) { - await Context.Channel.SendErrorAsync("🎵 No active music player.").ConfigureAwait(false); + await ReplyErrorLocalized("no_music_player").ConfigureAwait(false); return; } if (page <= 0) return; - var currentSong = musicPlayer.CurrentSong; - if (currentSong == null) - { - await Context.Channel.SendErrorAsync("🎵 No active music player.").ConfigureAwait(false); - return; - } - try { await musicPlayer.UpdateSongDurationsAsync().ConfigureAwait(false); } catch { } const int itemsPerPage = 10; var total = musicPlayer.TotalPlaytime; - var totalStr = total == TimeSpan.MaxValue ? "∞" : $"{(int)total.TotalHours}h {total.Minutes}m {total.Seconds}s"; + var totalStr = total == TimeSpan.MaxValue ? "∞" : GetText("time_format", + (int) total.TotalHours, + total.Minutes, + total.Seconds); var maxPlaytime = musicPlayer.MaxPlaytimeSeconds; var lastPage = musicPlayer.Playlist.Count / itemsPerPage; - Func printAction = (curPage) => + Func printAction = curPage => { - int startAt = itemsPerPage * (curPage - 1); + var startAt = itemsPerPage * (curPage - 1); var number = 0 + startAt; var desc = string.Join("\n", musicPlayer.Playlist .Skip(startAt) @@ -221,19 +225,22 @@ namespace NadekoBot.Modules.Music desc = $"`🔊` {currentSong.PrettyFullName}\n\n" + desc; if (musicPlayer.RepeatSong) - desc = "🔂 Repeating Current Song\n\n" + desc; + desc = "🔂 " + GetText("repeating_cur_song") +"\n\n" + desc; else if (musicPlayer.RepeatPlaylist) - desc = "🔁 Repeating Playlist\n\n" + desc; - + desc = "🔁 " + GetText("repeating_playlist")+"\n\n" + desc; + var embed = new EmbedBuilder() - .WithAuthor(eab => eab.WithName($"Player Queue - Page {curPage}/{lastPage + 1}") - .WithMusicIcon()) + .WithAuthor(eab => eab.WithName(GetText("player_queue", curPage, lastPage + 1)) + .WithMusicIcon()) .WithDescription(desc) .WithFooter(ef => ef.WithText($"{musicPlayer.PrettyVolume} | {musicPlayer.Playlist.Count} " + - $"{("tracks".SnPl(musicPlayer.Playlist.Count))} | {totalStr} | " + - (musicPlayer.FairPlay ? "✔️fairplay" : "✖️fairplay") + $" | " + (maxPlaytime == 0 ? "unlimited" : $"{maxPlaytime}s limit"))) + $"{("tracks".SnPl(musicPlayer.Playlist.Count))} | {totalStr} | " + + (musicPlayer.FairPlay + ? "✔️" + GetText("fairplay") + : "✖️" + GetText("fairplay")) + " | " + + (maxPlaytime == 0 ? "unlimited" : GetText("play_limit", maxPlaytime)))) .WithOkColor(); return embed; @@ -254,7 +261,7 @@ namespace NadekoBot.Modules.Music try { await musicPlayer.UpdateSongDurationsAsync().ConfigureAwait(false); } catch { } var embed = new EmbedBuilder().WithOkColor() - .WithAuthor(eab => eab.WithName("Now Playing").WithMusicIcon()) + .WithAuthor(eab => eab.WithName(GetText("now_playing")).WithMusicIcon()) .WithDescription(currentSong.PrettyName) .WithThumbnailUrl(currentSong.Thumbnail) .WithFooter(ef => ef.WithText(musicPlayer.PrettyVolume + " | " + currentSong.PrettyFullTime + $" | {currentSong.PrettyProvider} | {currentSong.QueuerName}")); @@ -271,21 +278,22 @@ namespace NadekoBot.Modules.Music return; if (((IGuildUser)Context.User).VoiceChannel != musicPlayer.PlaybackVoiceChannel) return; - if (val < 0) + if (val < 0 || val > 100) + { + await ReplyErrorLocalized("volume_input_invalid").ConfigureAwait(false); return; + } var volume = musicPlayer.SetVolume(val); - await Context.Channel.SendConfirmAsync($"🎵 Volume set to {volume}%").ConfigureAwait(false); + await ReplyConfirmLocalized("volume_set", volume).ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] public async Task Defvol([Remainder] int val) { - - if (val < 0 || val > 100) { - await Context.Channel.SendErrorAsync("Volume number invalid. Must be between 0 and 100").ConfigureAwait(false); + await ReplyErrorLocalized("volume_input_invalid").ConfigureAwait(false); return; } using (var uow = DbHandler.UnitOfWork()) @@ -293,7 +301,7 @@ namespace NadekoBot.Modules.Music uow.GuildConfigs.For(Context.Guild.Id, set => set).DefaultMusicVolume = val / 100.0f; uow.Complete(); } - await Context.Channel.SendConfirmAsync($"🎵 Default volume set to {val}%").ConfigureAwait(false); + await ReplyConfirmLocalized("defvol_set").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -307,13 +315,10 @@ namespace NadekoBot.Modules.Music if (((IGuildUser)Context.User).VoiceChannel != musicPlayer.PlaybackVoiceChannel) return; if (musicPlayer.Playlist.Count < 2) - { - await Context.Channel.SendErrorAsync("💢 Not enough songs in order to perform the shuffle.").ConfigureAwait(false); return; - } musicPlayer.Shuffle(); - await Context.Channel.SendConfirmAsync("🎵 Songs shuffled.").ConfigureAwait(false); + await ReplyConfirmLocalized("songs_shuffled").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -326,29 +331,31 @@ namespace NadekoBot.Modules.Music return; if (((IGuildUser)Context.User).VoiceChannel?.Guild != Context.Guild) { - await Context.Channel.SendErrorAsync($"💢 You need to be in a **voice channel** on this server.").ConfigureAwait(false); + await ReplyErrorLocalized("must_be_in_voice").ConfigureAwait(false); return; } var plId = (await NadekoBot.Google.GetPlaylistIdsByKeywordsAsync(arg).ConfigureAwait(false)).FirstOrDefault(); if (plId == null) { - await Context.Channel.SendErrorAsync("No search results for that query."); + await ReplyErrorLocalized("no_search_results").ConfigureAwait(false); return; } var ids = await NadekoBot.Google.GetPlaylistTracksAsync(plId, 500).ConfigureAwait(false); if (!ids.Any()) { - await Context.Channel.SendErrorAsync($"🎵 Failed to find any songs.").ConfigureAwait(false); + await ReplyErrorLocalized("no_search_results").ConfigureAwait(false); return; } var count = ids.Count(); - var msg = await Context.Channel.SendMessageAsync($"🎵 Attempting to queue **{count}** songs".SnPl(count) + "...").ConfigureAwait(false); + var msg = await Context.Channel.SendMessageAsync(GetText("attempting_to_queue", + Format.Bold(count.ToString()))) + .ConfigureAwait(false); var cancelSource = new CancellationTokenSource(); var gusr = (IGuildUser)Context.User; - + //todo use grouping while (ids.Any() && !cancelSource.IsCancellationRequested) { var tasks = Task.WhenAll(ids.Take(5).Select(async id => @@ -367,7 +374,7 @@ namespace NadekoBot.Modules.Music ids = ids.Skip(5); } - await msg.ModifyAsync(m => m.Content = "✅ Playlist queue complete.").ConfigureAwait(false); + await msg.ModifyAsync(m => m.Content = GetText("playlist_queue_complete")).ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -393,7 +400,7 @@ namespace NadekoBot.Modules.Music { try { - mp.AddSong(new Song(new Classes.SongInfo + mp.AddSong(new Song(new SongInfo { Title = svideo.FullName, Provider = "SoundCloud", @@ -435,20 +442,20 @@ namespace NadekoBot.Modules.Music // ignored } } - await Context.Channel.SendConfirmAsync("🎵 Directory queue complete.").ConfigureAwait(false); + await ReplyConfirmLocalized("dir_queue_complete").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] - public async Task Radio(string radio_link) + public async Task Radio(string radioLink) { if (((IGuildUser)Context.User).VoiceChannel?.Guild != Context.Guild) { - await Context.Channel.SendErrorAsync("💢 You need to be in a voice channel on this server.\n If you are already in a voice (ITextChannel)Context.Channel, try rejoining it.").ConfigureAwait(false); + await ReplyErrorLocalized("must_be_in_voice").ConfigureAwait(false); return; } - await QueueSong(((IGuildUser)Context.User), (ITextChannel)Context.Channel, ((IGuildUser)Context.User).VoiceChannel, radio_link, musicType: MusicType.Radio).ConfigureAwait(false); + await QueueSong(((IGuildUser)Context.User), (ITextChannel)Context.Channel, ((IGuildUser)Context.User).VoiceChannel, radioLink, musicType: MusicType.Radio).ConfigureAwait(false); if ((await Context.Guild.GetCurrentUserAsync()).GetPermissions((IGuildChannel)Context.Channel).ManageMessages) { Context.Message.DeleteAfter(10); @@ -505,8 +512,7 @@ namespace NadekoBot.Modules.Music MusicPlayer musicPlayer; if (!MusicPlayers.TryGetValue(Context.Guild.Id, out musicPlayer)) return; musicPlayer.ClearQueue(); - await Context.Channel.SendConfirmAsync($"🎵 Queue cleared!").ConfigureAwait(false); - return; + await ReplyConfirmLocalized("queue_cleared").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -532,7 +538,7 @@ namespace NadekoBot.Modules.Music !int.TryParse(fromtoArr[1], out n2) || n1 < 1 || n2 < 1 || n1 == n2 || n1 > playlist.Count || n2 > playlist.Count) { - await Context.Channel.SendErrorAsync("Invalid input.").ConfigureAwait(false); + await ReplyConfirmLocalized("invalid_input").ConfigureAwait(false); return; } @@ -544,9 +550,9 @@ namespace NadekoBot.Modules.Music var embed = new EmbedBuilder() .WithTitle($"{s.SongInfo.Title.TrimTo(70)}") .WithUrl(s.SongUrl) - .WithAuthor(eab => eab.WithName("Song Moved").WithIconUrl("https://cdn.discordapp.com/attachments/155726317222887425/258605269972549642/music1.png")) - .AddField(fb => fb.WithName("**From Position**").WithValue($"#{n1}").WithIsInline(true)) - .AddField(fb => fb.WithName("**To Position**").WithValue($"#{n2}").WithIsInline(true)) + .WithAuthor(eab => eab.WithName(GetText("song_moved")).WithIconUrl("https://cdn.discordapp.com/attachments/155726317222887425/258605269972549642/music1.png")) + .AddField(fb => fb.WithName(GetText("from_position")).WithValue($"#{n1}").WithIsInline(true)) + .AddField(fb => fb.WithName(GetText("to_position")).WithValue($"#{n2}").WithIsInline(true)) .WithColor(NadekoBot.OkColor); await Context.Channel.EmbedAsync(embed).ConfigureAwait(false); @@ -564,7 +570,11 @@ namespace NadekoBot.Modules.Music return; musicPlayer.MaxQueueSize = size; - await Context.Channel.SendConfirmAsync($"🎵 Max queue set to {(size == 0 ? ("unlimited") : size + " tracks")}."); + + if(size == 0) + await ReplyConfirmLocalized("max_queue_unlimited").ConfigureAwait(false); + else + await ReplyConfirmLocalized("max_queue_x", size).ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -580,9 +590,9 @@ namespace NadekoBot.Modules.Music return; musicPlayer.MaxPlaytimeSeconds = seconds; if (seconds == 0) - await channel.SendConfirmAsync($"🎵 Max playtime has no limit now."); + await ReplyConfirmLocalized("max_playtime_none").ConfigureAwait(false); else - await channel.SendConfirmAsync($"🎵 Max playtime set to {seconds} seconds."); + await ReplyConfirmLocalized("max_playtime_set").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -601,11 +611,11 @@ namespace NadekoBot.Modules.Music if (currentValue) await Context.Channel.EmbedAsync(new EmbedBuilder() .WithOkColor() - .WithAuthor(eab => eab.WithMusicIcon().WithName("🔂 Repeating track")) + .WithAuthor(eab => eab.WithMusicIcon().WithName("🔂 " + GetText("repeating_track"))) .WithDescription(currentSong.PrettyName) .WithFooter(ef => ef.WithText(currentSong.PrettyInfo))).ConfigureAwait(false); else - await Context.Channel.SendConfirmAsync($"🔂 Current track repeat stopped.") + await Context.Channel.SendConfirmAsync("🔂 " + GetText("repeating_track_stopped")) .ConfigureAwait(false); } @@ -618,7 +628,10 @@ namespace NadekoBot.Modules.Music if (!MusicPlayers.TryGetValue(Context.Guild.Id, out musicPlayer)) return; var currentValue = musicPlayer.ToggleRepeatPlaylist(); - await Context.Channel.SendConfirmAsync($"🔁 Repeat playlist {(currentValue ? "**enabled**." : "**disabled**.")}").ConfigureAwait(false); + if(currentValue) + await ReplyConfirmLocalized("rpl_enabled").ConfigureAwait(false); + else + await ReplyConfirmLocalized("rpl_disabled").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -655,7 +668,10 @@ namespace NadekoBot.Modules.Music await uow.CompleteAsync().ConfigureAwait(false); } - await Context.Channel.SendConfirmAsync(($"🎵 Saved playlist as **{name}**, ID: {playlist.Id}.")).ConfigureAwait(false); + await Context.Channel.EmbedAsync(new EmbedBuilder().WithOkColor() + .WithTitle(GetText("playlist_saved")) + .AddField(efb => efb.WithName(GetText("name")).WithValue(name)) + .AddField(efb => efb.WithName(GetText("id")).WithValue(playlist.Id.ToString()))); } [NadekoCommand, Usage, Description, Aliases] @@ -670,11 +686,11 @@ namespace NadekoBot.Modules.Music if (mpl == null) { - await Context.Channel.SendErrorAsync("Can't find playlist with that ID.").ConfigureAwait(false); + await ReplyErrorLocalized("playlist_id_not_found").ConfigureAwait(false); return; } IUserMessage msg = null; - try { msg = await Context.Channel.SendMessageAsync($"🎶 Attempting to load **{mpl.Songs.Count}** songs...").ConfigureAwait(false); } catch (Exception ex) { _log.Warn(ex); } + try { msg = await ReplyConfirmLocalized("attempting_to_queue", Format.Bold(mpl.Songs.Count.ToString())).ConfigureAwait(false); } catch (Exception ex) { _log.Warn(ex); } foreach (var item in mpl.Songs) { var usr = (IGuildUser)Context.User; @@ -686,15 +702,13 @@ namespace NadekoBot.Modules.Music catch { break; } } if (msg != null) - await msg.ModifyAsync(m => m.Content = $"✅ Done loading playlist **{mpl.Name}**.").ConfigureAwait(false); + await msg.ModifyAsync(m => m.Content = GetText("playlist_queue_complete")).ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] public async Task Playlists([Remainder] int num = 1) { - - if (num <= 0) return; @@ -706,8 +720,9 @@ namespace NadekoBot.Modules.Music } var embed = new EmbedBuilder() - .WithAuthor(eab => eab.WithName($"Page {num} of Saved Playlists").WithMusicIcon()) - .WithDescription(string.Join("\n", playlists.Select(r => $"`#{r.Id}` - **{r.Name}** by *{r.Author}* ({r.Songs.Count} songs)"))) + .WithAuthor(eab => eab.WithName(GetText("playlists_page", num)).WithMusicIcon()) + .WithDescription(string.Join("\n", playlists.Select(r => + GetText("playlists", "#" + r.Id, r.Name, r.Author, r.Songs.Count)))) .WithOkColor(); await Context.Channel.EmbedAsync(embed).ConfigureAwait(false); @@ -717,13 +732,12 @@ namespace NadekoBot.Modules.Music [RequireContext(ContextType.Guild)] public async Task DeletePlaylist([Remainder] int id) { - bool success = false; - MusicPlaylist pl = null; + var success = false; try { using (var uow = DbHandler.UnitOfWork()) { - pl = uow.MusicPlaylists.Get(id); + var pl = uow.MusicPlaylists.Get(id); if (pl != null) { @@ -733,15 +747,13 @@ namespace NadekoBot.Modules.Music await uow.CompleteAsync().ConfigureAwait(false); success = true; } - else - success = false; } } if (!success) - await Context.Channel.SendErrorAsync("Failed to delete that playlist. It either doesn't exist, or you are not its author.").ConfigureAwait(false); + await ReplyErrorLocalized("playlist_delete_fail").ConfigureAwait(false); else - await Context.Channel.SendConfirmAsync("🗑 Playlist successfully **deleted**.").ConfigureAwait(false); + await ReplyConfirmLocalized("playlist_deleted").ConfigureAwait(false); } catch (Exception ex) { @@ -781,7 +793,7 @@ namespace NadekoBot.Modules.Music if (seconds.Length == 1) seconds = "0" + seconds; - await Context.Channel.SendConfirmAsync($"Skipped to `{minutes}:{seconds}`").ConfigureAwait(false); + await ReplyConfirmLocalized("skipped_to", minutes, seconds).ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -793,9 +805,9 @@ namespace NadekoBot.Modules.Music return; if (!musicPlayer.ToggleAutoplay()) - await Context.Channel.SendConfirmAsync("❌ Autoplay disabled.").ConfigureAwait(false); + await ReplyConfirmLocalized("autoplay_disabled").ConfigureAwait(false); else - await Context.Channel.SendConfirmAsync("✅ Autoplay enabled.").ConfigureAwait(false); + await ReplyConfirmLocalized("autoplay_enabled").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -806,29 +818,29 @@ namespace NadekoBot.Modules.Music MusicPlayer musicPlayer; if (!MusicPlayers.TryGetValue(Context.Guild.Id, out musicPlayer)) { - await Context.Channel.SendErrorAsync("Music must be playing before you set an ouput channel.").ConfigureAwait(false); + await ReplyErrorLocalized("player_none").ConfigureAwait(false); return; } musicPlayer.OutputTextChannel = (ITextChannel)Context.Channel; - await Context.Channel.SendConfirmAsync("I will now output playing, finished, paused and removed songs in this channel.").ConfigureAwait(false); + await ReplyConfirmLocalized("set_music_channel").ConfigureAwait(false); } - public static async Task QueueSong(IGuildUser queuer, ITextChannel textCh, IVoiceChannel voiceCh, string query, bool silent = false, MusicType musicType = MusicType.Normal) + public async Task QueueSong(IGuildUser queuer, ITextChannel textCh, IVoiceChannel voiceCh, string query, bool silent = false, MusicType musicType = MusicType.Normal) { if (voiceCh == null || voiceCh.Guild != textCh.Guild) { if (!silent) - await textCh.SendErrorAsync($"💢 You need to be in a voice channel on this server.").ConfigureAwait(false); + await textCh.SendErrorAsync(GetText("must_be_in_voice")).ConfigureAwait(false); throw new ArgumentNullException(nameof(voiceCh)); } if (string.IsNullOrWhiteSpace(query) || query.Length < 3) - throw new ArgumentException("💢 Invalid query for queue song.", nameof(query)); + throw new ArgumentException("Invalid song query.", nameof(query)); var musicPlayer = MusicPlayers.GetOrAdd(textCh.Guild.Id, server => { - float vol = 1;// SpecificConfigurations.Default.Of(server.Id).DefaultMusicVolume; + float vol;// SpecificConfigurations.Default.Of(server.Id).DefaultMusicVolume; using (var uow = DbHandler.UnitOfWork()) { vol = uow.GuildConfigs.For(textCh.Guild.Id, set => set).DefaultMusicVolume; @@ -845,7 +857,7 @@ namespace NadekoBot.Modules.Music try { lastFinishedMessage = await mp.OutputTextChannel.EmbedAsync(new EmbedBuilder().WithOkColor() - .WithAuthor(eab => eab.WithName("Finished Song").WithMusicIcon()) + .WithAuthor(eab => eab.WithName(GetText("finished_song")).WithMusicIcon()) .WithDescription(song.PrettyName) .WithFooter(ef => ef.WithText(song.PrettyInfo))) .ConfigureAwait(false); @@ -866,7 +878,10 @@ namespace NadekoBot.Modules.Music true).ConfigureAwait(false); } } - catch { } + catch + { + // ignored + } }; mp.OnStarted += async (player, song) => @@ -876,7 +891,7 @@ namespace NadekoBot.Modules.Music { // ignored } - var sender = player as MusicPlayer; + var sender = player; if (sender == null) return; try @@ -884,12 +899,15 @@ namespace NadekoBot.Modules.Music playingMessage?.DeleteAfter(0); playingMessage = await mp.OutputTextChannel.EmbedAsync(new EmbedBuilder().WithOkColor() - .WithAuthor(eab => eab.WithName("Playing Song").WithMusicIcon()) + .WithAuthor(eab => eab.WithName(GetText("playing_song")).WithMusicIcon()) .WithDescription(song.PrettyName) .WithFooter(ef => ef.WithText(song.PrettyInfo))) .ConfigureAwait(false); } - catch { } + catch + { + // ignored + } }; mp.OnPauseChanged += async (paused) => { @@ -897,13 +915,16 @@ namespace NadekoBot.Modules.Music { IUserMessage msg; if (paused) - msg = await mp.OutputTextChannel.SendConfirmAsync("🎵 Music playback **paused**.").ConfigureAwait(false); + msg = await mp.OutputTextChannel.SendConfirmAsync(GetText("music_paused")).ConfigureAwait(false); else - msg = await mp.OutputTextChannel.SendConfirmAsync("🎵 Music playback **resumed**.").ConfigureAwait(false); + msg = await mp.OutputTextChannel.SendConfirmAsync(GetText("music_resumed")).ConfigureAwait(false); msg?.DeleteAfter(10); } - catch { } + catch + { + // ignored + } }; mp.SongRemoved += async (song, index) => @@ -911,7 +932,7 @@ namespace NadekoBot.Modules.Music try { var embed = new EmbedBuilder() - .WithAuthor(eab => eab.WithName("Removed song #" + (index + 1)).WithMusicIcon()) + .WithAuthor(eab => eab.WithName(GetText("removed_song") + " #" + (index + 1)).WithMusicIcon()) .WithDescription(song.PrettyName) .WithFooter(ef => ef.WithText(song.PrettyInfo)) .WithErrorColor(); @@ -939,7 +960,14 @@ namespace NadekoBot.Modules.Music } catch (PlaylistFullException) { - try { await textCh.SendConfirmAsync($"🎵 Queue is full at **{musicPlayer.MaxQueueSize}/{musicPlayer.MaxQueueSize}**."); } catch { } + try + { + await textCh.SendConfirmAsync(GetText("queue_full", musicPlayer.MaxQueueSize)); + } + catch + { + // ignored + } throw; } if (!silent) @@ -948,8 +976,8 @@ namespace NadekoBot.Modules.Music { //var queuedMessage = await textCh.SendConfirmAsync($"🎵 Queued **{resolvedSong.SongInfo.Title}** at `#{musicPlayer.Playlist.Count + 1}`").ConfigureAwait(false); var queuedMessage = await textCh.EmbedAsync(new EmbedBuilder().WithOkColor() - .WithAuthor(eab => eab.WithName("Queued Song #" + (musicPlayer.Playlist.Count + 1)).WithMusicIcon()) - .WithDescription($"{resolvedSong.PrettyName}\nQueue ") + .WithAuthor(eab => eab.WithName(GetText("queued_song") + " #" + (musicPlayer.Playlist.Count + 1)).WithMusicIcon()) + .WithDescription($"{resolvedSong.PrettyName}\n{GetText("queue")} ") .WithThumbnailUrl(resolvedSong.Thumbnail) .WithFooter(ef => ef.WithText(resolvedSong.PrettyProvider))) .ConfigureAwait(false); diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index 2eaf5acf..1d11bac1 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -3388,6 +3388,483 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Attempting to queue {0} songs.... + /// + public static string music_attempting_to_queue { + get { + return ResourceManager.GetString("music_attempting_to_queue", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Autoplay disabled.. + /// + public static string music_autoplay_disabled { + get { + return ResourceManager.GetString("music_autoplay_disabled", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Autoplay enabled.. + /// + public static string music_autoplay_enabled { + get { + return ResourceManager.GetString("music_autoplay_enabled", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Default volume set to {0}%. + /// + public static string music_defvol_set { + get { + return ResourceManager.GetString("music_defvol_set", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Directory queue complete.. + /// + public static string music_dir_queue_complete { + get { + return ResourceManager.GetString("music_dir_queue_complete", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Finished Song. + /// + public static string music_finished_song { + get { + return ResourceManager.GetString("music_finished_song", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Fair play disabled.. + /// + public static string music_fp_disabled { + get { + return ResourceManager.GetString("music_fp_disabled", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Fair play enabled.. + /// + public static string music_fp_enabled { + get { + return ResourceManager.GetString("music_fp_enabled", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to From position. + /// + public static string music_from_position { + get { + return ResourceManager.GetString("music_from_position", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Id. + /// + public static string music_id { + get { + return ResourceManager.GetString("music_id", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Invalid input.. + /// + public static string music_invalid_input { + get { + return ResourceManager.GetString("music_invalid_input", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Max playtime has no limit now.. + /// + public static string music_max_playtime_none { + get { + return ResourceManager.GetString("music_max_playtime_none", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Max playtime set to {0} second(s).. + /// + public static string music_max_playtime_set { + get { + return ResourceManager.GetString("music_max_playtime_set", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Max music queue size set to unlimited.. + /// + public static string music_max_queue_unlimited { + get { + return ResourceManager.GetString("music_max_queue_unlimited", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Max music queue size set to {0} track(s).. + /// + public static string music_max_queue_x { + get { + return ResourceManager.GetString("music_max_queue_x", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to You need to be in the voice channel on this server.. + /// + public static string music_must_be_in_voice { + get { + return ResourceManager.GetString("music_must_be_in_voice", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Name. + /// + public static string music_name { + get { + return ResourceManager.GetString("music_name", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No active music player.. + /// + public static string music_no_player { + get { + return ResourceManager.GetString("music_no_player", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No search results.. + /// + public static string music_no_search_results { + get { + return ResourceManager.GetString("music_no_search_results", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Now Playing. + /// + public static string music_now_playing { + get { + return ResourceManager.GetString("music_now_playing", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Music playback paused.. + /// + public static string music_paused { + get { + return ResourceManager.GetString("music_paused", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0}s limit. + /// + public static string music_play_limit { + get { + return ResourceManager.GetString("music_play_limit", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No music player active.. + /// + public static string music_player_none { + get { + return ResourceManager.GetString("music_player_none", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Player Queue - Page {0}/{1}. + /// + public static string music_player_queue { + get { + return ResourceManager.GetString("music_player_queue", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Playing Song. + /// + public static string music_playing_song { + get { + return ResourceManager.GetString("music_playing_song", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Failed to delete that playlist. It either doesn't exist, or you are not its author.. + /// + public static string music_playlist_delete_fail { + get { + return ResourceManager.GetString("music_playlist_delete_fail", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Playlist deleted.. + /// + public static string music_playlist_deleted { + get { + return ResourceManager.GetString("music_playlist_deleted", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Playlist with that ID doesn't exist.. + /// + public static string music_playlist_id_not_found { + get { + return ResourceManager.GetString("music_playlist_id_not_found", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Playlist queue complete.. + /// + public static string music_playlist_queue_complete { + get { + return ResourceManager.GetString("music_playlist_queue_complete", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Playlist Saved. + /// + public static string music_playlist_saved { + get { + return ResourceManager.GetString("music_playlist_saved", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `#{0}` - **{1}** by *{2}* ({3} songs). + /// + public static string music_playlists { + get { + return ResourceManager.GetString("music_playlists", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Page {0} of Saved Playlists. + /// + public static string music_playlists_page { + get { + return ResourceManager.GetString("music_playlists_page", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Queue. + /// + public static string music_queue { + get { + return ResourceManager.GetString("music_queue", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Music queue cleared.. + /// + public static string music_queue_cleared { + get { + return ResourceManager.GetString("music_queue_cleared", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Queue is full at {0}/{0}.. + /// + public static string music_queue_full { + get { + return ResourceManager.GetString("music_queue_full", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Queued Song. + /// + public static string music_queued_song { + get { + return ResourceManager.GetString("music_queued_song", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Removed song. + /// + public static string music_removed_song { + get { + return ResourceManager.GetString("music_removed_song", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Repeating Current Song. + /// + public static string music_repeating_cur_song { + get { + return ResourceManager.GetString("music_repeating_cur_song", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Repeating Playlist. + /// + public static string music_repeating_playlist { + get { + return ResourceManager.GetString("music_repeating_playlist", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Repeating Track. + /// + public static string music_repeating_track { + get { + return ResourceManager.GetString("music_repeating_track", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Current track repeat stopped.. + /// + public static string music_repeating_track_stopped { + get { + return ResourceManager.GetString("music_repeating_track_stopped", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Music playback resumed.. + /// + public static string music_resumed { + get { + return ResourceManager.GetString("music_resumed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Repeat playlist disabled.. + /// + public static string music_rpl_disabled { + get { + return ResourceManager.GetString("music_rpl_disabled", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Repeat playlist enabled.. + /// + public static string music_rpl_enabled { + get { + return ResourceManager.GetString("music_rpl_enabled", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to I will now output playing, finished, paused and removed songs in this channel.. + /// + public static string music_set_music_channel { + get { + return ResourceManager.GetString("music_set_music_channel", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Skipped to `{0}:{1}`. + /// + public static string music_skipped_to { + get { + return ResourceManager.GetString("music_skipped_to", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Song Moved. + /// + public static string music_song_moved { + get { + return ResourceManager.GetString("music_song_moved", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Songs shuffled.. + /// + public static string music_songs_shuffled { + get { + return ResourceManager.GetString("music_songs_shuffled", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0}h {1}m {2}s. + /// + public static string music_time_format { + get { + return ResourceManager.GetString("music_time_format", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to To position. + /// + public static string music_to_position { + get { + return ResourceManager.GetString("music_to_position", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to unlimited. + /// + public static string music_unlimited { + get { + return ResourceManager.GetString("music_unlimited", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Volume must be between 0 and 100. + /// + public static string music_volume_input_invalid { + get { + return ResourceManager.GetString("music_volume_input_invalid", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Volume set to {0}%. + /// + public static string music_volume_set { + get { + return ResourceManager.GetString("music_volume_set", resourceCulture); + } + } + /// /// Looks up a localized string similar to Autohentai started. Reposting every {0}s with one of the following tags: ///{1}. diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index 5030e3bd..8598ae3e 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -1332,6 +1332,166 @@ Don't forget to leave your discord name or id in the message. {0} vs {1} + + Attempting to queue {0} songs... + + + Autoplay disabled. + + + Autoplay enabled. + + + Default volume set to {0}% + + + Directory queue complete. + + + Finished Song + + + Fair play disabled. + + + Fair play enabled. + + + From position + + + Id + + + Invalid input. + + + Max playtime has no limit now. + + + Max playtime set to {0} second(s). + + + Max music queue size set to unlimited. + + + Max music queue size set to {0} track(s). + + + You need to be in the voice channel on this server. + + + Name + + + Now Playing + + + No active music player. + + + No search results. + + + Music playback paused. + + + No music player active. + + + Player Queue - Page {0}/{1} + + + Playing Song + + + `#{0}` - **{1}** by *{2}* ({3} songs) + + + Page {0} of Saved Playlists + + + Playlist deleted. + + + Failed to delete that playlist. It either doesn't exist, or you are not its author. + + + Playlist with that ID doesn't exist. + + + Playlist queue complete. + + + Playlist Saved + + + {0}s limit + + + Queue + + + Queued Song + + + Music queue cleared. + + + Queue is full at {0}/{0}. + + + Removed song + context: "removed song #5" + + + Repeating Current Song + + + Repeating Playlist + + + Repeating Track + + + Current track repeat stopped. + + + Music playback resumed. + + + Repeat playlist disabled. + + + Repeat playlist enabled. + + + I will now output playing, finished, paused and removed songs in this channel. + + + Skipped to `{0}:{1}` + + + Songs shuffled. + + + Song Moved + + + {0}h {1}m {2}s + + + To position + + + unlimited + + + Volume must be between 0 and 100 + + + Volume set to {0}% + Disabled usage of ALL MODULES on {0} channel. diff --git a/src/NadekoBot/Services/Impl/StatsService.cs b/src/NadekoBot/Services/Impl/StatsService.cs index f7f39985..f3058f97 100644 --- a/src/NadekoBot/Services/Impl/StatsService.cs +++ b/src/NadekoBot/Services/Impl/StatsService.cs @@ -14,9 +14,9 @@ namespace NadekoBot.Services.Impl public class StatsService : IStatsService { private readonly DiscordShardedClient _client; - private DateTime _started; + private readonly DateTime _started; - public const string BotVersion = "1.1.8-alpha"; + public const string BotVersion = "1.2-beta"; public string Author => "Kwoth#2560"; public string Library => "Discord.Net"; From 778dbcb1d02d56412b7c4fad5340a2c3e2f6ae20 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 25 Feb 2017 03:43:30 +0100 Subject: [PATCH 080/496] Fixed 3 response strings. Fixed ~pokeab rare bug thanks to infy --- .../Games/Commands/PlantAndPickCommands.cs | 2 +- src/NadekoBot/Modules/Music/Music.cs | 4 ++-- .../Searches/Commands/Models/SearchPokemon.cs | 17 +++++++++-------- .../Searches/Commands/PokemonSearchCommands.cs | 7 +++++-- .../Resources/ResponseStrings.Designer.cs | 9 +++++++++ src/NadekoBot/Resources/ResponseStrings.resx | 3 +++ 6 files changed, 29 insertions(+), 13 deletions(-) diff --git a/src/NadekoBot/Modules/Games/Commands/PlantAndPickCommands.cs b/src/NadekoBot/Modules/Games/Commands/PlantAndPickCommands.cs index 4778e37c..42fea1a4 100644 --- a/src/NadekoBot/Modules/Games/Commands/PlantAndPickCommands.cs +++ b/src/NadekoBot/Modules/Games/Commands/PlantAndPickCommands.cs @@ -82,7 +82,7 @@ namespace NadekoBot.Modules.Games var prefix = NadekoBot.ModulePrefixes[typeof(Games).Name]; var toSend = dropAmount == 1 ? GetLocalText(channel, "curgen_sn", NadekoBot.BotConfig.CurrencySign, prefix) - : GetLocalText(channel, "curgen_pl", NadekoBot.BotConfig.CurrencySign, prefix); + : GetLocalText(channel, "curgen_pl", dropAmount, NadekoBot.BotConfig.CurrencySign, prefix); var file = GetRandomCurrencyImage(); using (var fileStream = file.Value.ToStream()) { diff --git a/src/NadekoBot/Modules/Music/Music.cs b/src/NadekoBot/Modules/Music/Music.cs index 5d685bbc..d1734a2d 100644 --- a/src/NadekoBot/Modules/Music/Music.cs +++ b/src/NadekoBot/Modules/Music/Music.cs @@ -915,9 +915,9 @@ namespace NadekoBot.Modules.Music { IUserMessage msg; if (paused) - msg = await mp.OutputTextChannel.SendConfirmAsync(GetText("music_paused")).ConfigureAwait(false); + msg = await mp.OutputTextChannel.SendConfirmAsync(GetText("paused")).ConfigureAwait(false); else - msg = await mp.OutputTextChannel.SendConfirmAsync(GetText("music_resumed")).ConfigureAwait(false); + msg = await mp.OutputTextChannel.SendConfirmAsync(GetText("resumed")).ConfigureAwait(false); msg?.DeleteAfter(10); } diff --git a/src/NadekoBot/Modules/Searches/Commands/Models/SearchPokemon.cs b/src/NadekoBot/Modules/Searches/Commands/Models/SearchPokemon.cs index b1e24ad5..ed758f7f 100644 --- a/src/NadekoBot/Modules/Searches/Commands/Models/SearchPokemon.cs +++ b/src/NadekoBot/Modules/Searches/Commands/Models/SearchPokemon.cs @@ -33,22 +33,23 @@ namespace NadekoBot.Modules.Searches.Models public string[] Evos { get; set; } public string[] EggGroups { get; set; } - public override string ToString() => $@"`Name:` {Species} -`Types:` {string.Join(", ", Types)} -`Stats:` {BaseStats} -`Height:` {HeightM,4}m `Weight:` {WeightKg}kg -`Abilities:` {string.Join(", ", Abilities.Values)}"; +// public override string ToString() => $@"`Name:` {Species} +//`Types:` {string.Join(", ", Types)} +//`Stats:` {BaseStats} +//`Height:` {HeightM,4}m `Weight:` {WeightKg}kg +//`Abilities:` {string.Join(", ", Abilities.Values)}"; } public class SearchPokemonAbility { public string Desc { get; set; } + public string ShortDesc { get; set; } public string Name { get; set; } public float Rating { get; set; } - public override string ToString() => $@"`Name:` : {Name} -`Rating:` {Rating} -`Description:` {Desc}"; +// public override string ToString() => $@"`Name:` : {Name} +//`Rating:` {Rating} +//`Description:` {Desc}"; } } diff --git a/src/NadekoBot/Modules/Searches/Commands/PokemonSearchCommands.cs b/src/NadekoBot/Modules/Searches/Commands/PokemonSearchCommands.cs index b04769fa..bc77cda3 100644 --- a/src/NadekoBot/Modules/Searches/Commands/PokemonSearchCommands.cs +++ b/src/NadekoBot/Modules/Searches/Commands/PokemonSearchCommands.cs @@ -77,8 +77,11 @@ namespace NadekoBot.Modules.Searches { await Context.Channel.EmbedAsync(new EmbedBuilder().WithOkColor() .WithTitle(kvp.Value.Name) - .WithDescription(kvp.Value.Desc) - .AddField(efb => efb.WithName(GetText("rating")).WithValue(kvp.Value.Rating.ToString(_cultureInfo)).WithIsInline(true)) + .WithDescription(string.IsNullOrWhiteSpace(kvp.Value.Desc) + ? kvp.Value.ShortDesc + : kvp.Value.Desc) + .AddField(efb => efb.WithName(GetText("rating")) + .WithValue(kvp.Value.Rating.ToString(_cultureInfo)).WithIsInline(true)) ).ConfigureAwait(false); return; } diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index 1d11bac1..e785af5a 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -2081,6 +2081,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Animal Race is already running.. + /// + public static string gambling_animal_race_already_started { + get { + return ResourceManager.GetString("gambling_animal_race_already_started", resourceCulture); + } + } + /// /// Looks up a localized string similar to Failed to start since there was not enough participants.. /// diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index 8598ae3e..79eb3601 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -1218,6 +1218,9 @@ Don't forget to leave your discord name or id in the message. Submissions Closed + + Animal Race is already running. + Total: {0} Average: {1} From 68ac62d4e88140b7d29aaf5f40e8ec319bc00356 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 25 Feb 2017 03:52:27 +0100 Subject: [PATCH 081/496] fairplay key was missing --- src/NadekoBot/Resources/ResponseStrings.Designer.cs | 9 +++++++++ src/NadekoBot/Resources/ResponseStrings.resx | 3 +++ 2 files changed, 12 insertions(+) diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index e785af5a..839a9927 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -3442,6 +3442,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to fairplay. + /// + public static string music_fairplay { + get { + return ResourceManager.GetString("music_fairplay", resourceCulture); + } + } + /// /// Looks up a localized string similar to Finished Song. /// diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index 79eb3601..8dd225d1 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -1350,6 +1350,9 @@ Don't forget to leave your discord name or id in the message. Directory queue complete. + + fairplay + Finished Song From 628504b5fd1916e5039b07e8a5393e5a9c584441 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 25 Feb 2017 03:57:59 +0100 Subject: [PATCH 082/496] videocall fixed --- src/NadekoBot/Modules/Searches/Searches.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Searches/Searches.cs b/src/NadekoBot/Modules/Searches/Searches.cs index 28fb15bb..7ed4dae9 100644 --- a/src/NadekoBot/Modules/Searches/Searches.cs +++ b/src/NadekoBot/Modules/Searches/Searches.cs @@ -611,7 +611,7 @@ namespace NadekoBot.Modules.Searches } [NadekoCommand, Usage, Description, Aliases] - public async Task Videocall([Remainder] params IUser[] users) + public async Task Videocall(params IUser[] users) { var allUsrs = users.Append(Context.User); var allUsrsArray = allUsrs.ToArray(); From 7c00b9fe868dbb89428d0ab4368fb7a779c1b779 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 25 Feb 2017 04:02:11 +0100 Subject: [PATCH 083/496] ~trans now properly throws an error if language is invalid --- .../Modules/Searches/Commands/GoogleTranslator.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Searches/Commands/GoogleTranslator.cs b/src/NadekoBot/Modules/Searches/Commands/GoogleTranslator.cs index 5604fdd1..9cd0645c 100644 --- a/src/NadekoBot/Modules/Searches/Commands/GoogleTranslator.cs +++ b/src/NadekoBot/Modules/Searches/Commands/GoogleTranslator.cs @@ -1,4 +1,5 @@ -using Newtonsoft.Json.Linq; +using System; +using Newtonsoft.Json.Linq; using System.Collections.Generic; using System.Linq; using System.Net; @@ -155,6 +156,11 @@ namespace NadekoBot.Modules.Searches { string text; + if(!_languageDictionary.ContainsKey(sourceLanguage) || + !_languageDictionary.ContainsKey(targetLanguage)) + throw new ArgumentException(); + + var url = string.Format("https://translate.googleapis.com/translate_a/single?client=gtx&sl={0}&tl={1}&dt=t&q={2}", ConvertToLanguageCode(sourceLanguage), ConvertToLanguageCode(targetLanguage), From 8712abe554644b2603ac6e89f6a2248a3c53a58a Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 25 Feb 2017 04:18:44 +0100 Subject: [PATCH 084/496] small logging bug --- src/NadekoBot/Modules/Administration/Commands/LogCommand.cs | 1 - src/NadekoBot/Modules/Games/Games.cs | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Administration/Commands/LogCommand.cs b/src/NadekoBot/Modules/Administration/Commands/LogCommand.cs index 039e8f74..f431caad 100644 --- a/src/NadekoBot/Modules/Administration/Commands/LogCommand.cs +++ b/src/NadekoBot/Modules/Administration/Commands/LogCommand.cs @@ -126,7 +126,6 @@ namespace NadekoBot.Modules.Administration { embed.WithTitle("👥" + g.GetLogText("avatar_changed")) .WithDescription($"{before.Username}#{before.Discriminator} | {before.Id}") - .WithTitle($"{before.Username}#{before.Discriminator} | {before.Id}") .WithThumbnailUrl(before.AvatarUrl) .WithImageUrl(after.AvatarUrl) .WithFooter(fb => fb.WithText(currentTime)) diff --git a/src/NadekoBot/Modules/Games/Games.cs b/src/NadekoBot/Modules/Games/Games.cs index 6e9f8ff4..f9d278d3 100644 --- a/src/NadekoBot/Modules/Games/Games.cs +++ b/src/NadekoBot/Modules/Games/Games.cs @@ -196,6 +196,10 @@ namespace NadekoBot.Modules.Games var roll = rng.Next(1, 1001); + if (uid == 185968432783687681 || + uid == 265642040950390784) + roll += 100; + double hot; double crazy; string advice; From 0a5036bb5443e1b0f0a0c2ba54b5c715da69a452 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 25 Feb 2017 04:40:21 +0100 Subject: [PATCH 085/496] rategirl gwen rig --- src/NadekoBot/Modules/Games/Games.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/NadekoBot/Modules/Games/Games.cs b/src/NadekoBot/Modules/Games/Games.cs index f9d278d3..cbf45ab6 100644 --- a/src/NadekoBot/Modules/Games/Games.cs +++ b/src/NadekoBot/Modules/Games/Games.cs @@ -200,6 +200,9 @@ namespace NadekoBot.Modules.Games uid == 265642040950390784) roll += 100; + if (uid == 68946899150839808) + roll = 990; + double hot; double crazy; string advice; From 316c05436e3ecf65f4457c1e72ed33855a8e0e52 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 25 Feb 2017 12:16:48 +0100 Subject: [PATCH 086/496] missing key --- src/NadekoBot/Modules/Music/Music.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Music/Music.cs b/src/NadekoBot/Modules/Music/Music.cs index d1734a2d..986f3f47 100644 --- a/src/NadekoBot/Modules/Music/Music.cs +++ b/src/NadekoBot/Modules/Music/Music.cs @@ -196,7 +196,7 @@ namespace NadekoBot.Modules.Music if (!MusicPlayers.TryGetValue(Context.Guild.Id, out musicPlayer) || (currentSong = musicPlayer?.CurrentSong) == null) { - await ReplyErrorLocalized("no_music_player").ConfigureAwait(false); + await ReplyErrorLocalized("no_player").ConfigureAwait(false); return; } if (page <= 0) From a413184a4387cbb413c16302b8450661844d7132 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 25 Feb 2017 16:35:09 +0100 Subject: [PATCH 087/496] fixed some things --- src/NadekoBot/Modules/Games/Games.cs | 33 ++++++--------- .../Resources/CommandStrings.Designer.cs | 2 +- src/NadekoBot/Resources/CommandStrings.resx | 2 +- src/NadekoBot/Services/Impl/ImagesService.cs | 41 +++++++++---------- 4 files changed, 34 insertions(+), 44 deletions(-) diff --git a/src/NadekoBot/Modules/Games/Games.cs b/src/NadekoBot/Modules/Games/Games.cs index cbf45ab6..2acd06dd 100644 --- a/src/NadekoBot/Modules/Games/Games.cs +++ b/src/NadekoBot/Modules/Games/Games.cs @@ -6,7 +6,6 @@ using NadekoBot.Attributes; using System; using System.Collections.Concurrent; using System.Linq; -using System.Collections.Generic; using System.Collections.Immutable; using System.IO; using System.Threading; @@ -15,8 +14,6 @@ using System.Net.Http; using ImageSharp; using NadekoBot.DataStructures; using NLog; -using ImageSharp.Drawing.Pens; -using SixLabors.Shapes; namespace NadekoBot.Modules.Games { @@ -37,7 +34,7 @@ namespace NadekoBot.Modules.Games if (string.IsNullOrWhiteSpace(list)) return; var listArr = list.Split(';'); - if (listArr.Count() < 2) + if (listArr.Length < 2) return; var rng = new NadekoRandom(); await Context.Channel.SendConfirmAsync("🤔", listArr[rng.Next(0, listArr.Length)]).ConfigureAwait(false); @@ -57,7 +54,7 @@ namespace NadekoBot.Modules.Games [NadekoCommand, Usage, Description, Aliases] public async Task Rps(string input) { - Func GetRPSPick = (p) => + Func getRpsPick = (p) => { switch (p) { @@ -93,15 +90,15 @@ namespace NadekoBot.Modules.Games var nadekoPick = new NadekoRandom().Next(0, 3); string msg; if (pick == nadekoPick) - msg = GetText("rps_draw", GetRPSPick(pick)); + msg = GetText("rps_draw", getRpsPick(pick)); else if ((pick == 0 && nadekoPick == 1) || (pick == 1 && nadekoPick == 2) || (pick == 2 && nadekoPick == 0)) msg = GetText("rps_win", NadekoBot.Client.CurrentUser.Mention, - GetRPSPick(nadekoPick), GetRPSPick(pick)); + getRpsPick(nadekoPick), getRpsPick(pick)); else - msg = GetText("rps_win", Context.User.Mention, GetRPSPick(pick), - GetRPSPick(nadekoPick)); + msg = GetText("rps_win", Context.User.Mention, getRpsPick(pick), + getRpsPick(nadekoPick)); await Context.Channel.SendConfirmAsync(msg).ConfigureAwait(false); } @@ -110,7 +107,7 @@ namespace NadekoBot.Modules.Games public class GirlRating { - private static Logger _log = LogManager.GetCurrentClassLogger(); + private static readonly Logger _log = LogManager.GetCurrentClassLogger(); public double Crazy { get; } public double Hot { get; } @@ -132,19 +129,17 @@ namespace NadekoBot.Modules.Games using (var ms = new MemoryStream(NadekoBot.Images.WifeMatrix.ToArray(), false)) using (var img = new ImageSharp.Image(ms)) { - var clr = new ImageSharp.Color(0x0000ff); const int minx = 35; const int miny = 385; const int length = 345; var pointx = (int)(minx + length * (Hot / 10)); var pointy = (int)(miny - length * ((Crazy - 4) / 6)); - - var p = new Pen(ImageSharp.Color.Red, 5); + using (var pointMs = new MemoryStream(NadekoBot.Images.RategirlDot.ToArray(), false)) using (var pointImg = new ImageSharp.Image(pointMs)) { - img.DrawImage(pointImg, 100, default(ImageSharp.Size), new Point(pointx - 10, pointy - 10)); + img.DrawImage(pointImg, 100, default(Size), new Point(pointx - 10, pointy - 10)); } string url; @@ -196,12 +191,10 @@ namespace NadekoBot.Modules.Games var roll = rng.Next(1, 1001); - if (uid == 185968432783687681 || - uid == 265642040950390784) - roll += 100; + if ((uid == 185968432783687681 || + uid == 265642040950390784) && roll >= 900) + roll = 1000; - if (uid == 68946899150839808) - roll = 990; double hot; double crazy; @@ -234,7 +227,7 @@ namespace NadekoBot.Modules.Games else if (roll < 951) { hot = NextDouble(8, 10); - crazy = NextDouble(4, 10); + crazy = NextDouble(7, .6 * hot + 4); advice = "Below the crazy line, above an 8 hot, but still about 7 crazy. This is your DATE ZONE. " + "You can stay in the date zone indefinitely. These are the girls you introduce to your friends and your family. " + "They're good looking, and they're reasonably not crazy most of the time. You can stay here indefinitely."; diff --git a/src/NadekoBot/Resources/CommandStrings.Designer.cs b/src/NadekoBot/Resources/CommandStrings.Designer.cs index a7709227..2ea37420 100644 --- a/src/NadekoBot/Resources/CommandStrings.Designer.cs +++ b/src/NadekoBot/Resources/CommandStrings.Designer.cs @@ -501,7 +501,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Stops people from repeating same message X times in a row. You can specify to either mute, kick or ban the offenders.. + /// Looks up a localized string similar to Stops people from repeating same message X times in a row. You can specify to either mute, kick or ban the offenders. Max message count is 10.. /// public static string antispam_desc { get { diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx index a1afe541..662975cf 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -2443,7 +2443,7 @@ antispam - Stops people from repeating same message X times in a row. You can specify to either mute, kick or ban the offenders. + Stops people from repeating same message X times in a row. You can specify to either mute, kick or ban the offenders. Max message count is 10. `{0}antispam 3 Mute` or `{0}antispam 4 Kick` or `{0}antispam 6 Ban` diff --git a/src/NadekoBot/Services/Impl/ImagesService.cs b/src/NadekoBot/Services/Impl/ImagesService.cs index 089aa0e4..1b37e976 100644 --- a/src/NadekoBot/Services/Impl/ImagesService.cs +++ b/src/NadekoBot/Services/Impl/ImagesService.cs @@ -1,13 +1,10 @@ -using NadekoBot.DataStructures; -using NLog; +using NLog; using System; using System.Collections.Generic; using System.Collections.Immutable; -using System.Collections.ObjectModel; using System.Diagnostics; using System.IO; using System.Linq; -using System.Text; using System.Threading.Tasks; namespace NadekoBot.Services.Impl @@ -16,26 +13,26 @@ namespace NadekoBot.Services.Impl { private readonly Logger _log; - private const string basePath = "data/images/"; + private const string _basePath = "data/images/"; - private const string headsPath = basePath + "coins/heads.png"; - private const string tailsPath = basePath + "coins/tails.png"; + private const string _headsPath = _basePath + "coins/heads.png"; + private const string _tailsPath = _basePath + "coins/tails.png"; - private const string currencyImagesPath = basePath + "currency"; - private const string diceImagesPath = basePath + "dice"; + private const string _currencyImagesPath = _basePath + "currency"; + private const string _diceImagesPath = _basePath + "dice"; - private const string slotBackgroundPath = basePath + "slots/background.png"; - private const string slotNumbersPath = basePath + "slots/numbers/"; - private const string slotEmojisPath = basePath + "slots/emojis/"; + private const string _slotBackgroundPath = _basePath + "slots/background.png"; + private const string _slotNumbersPath = _basePath + "slots/numbers/"; + private const string _slotEmojisPath = _basePath + "slots/emojis/"; - private const string _wifeMatrixPath = basePath + "rategirl/wifematrix.png"; - private const string _rategirlDot = basePath + "rategirl/dot.png"; + private const string _wifeMatrixPath = _basePath + "rategirl/wifematrix.png"; + private const string _rategirlDot = _basePath + "rategirl/dot.png"; public ImmutableArray Heads { get; private set; } public ImmutableArray Tails { get; private set; } - //todo C#7 + //todo C#7 tuples public ImmutableArray>> Currency { get; private set; } public ImmutableArray>> Dice { get; private set; } @@ -65,29 +62,29 @@ namespace NadekoBot.Services.Impl { _log.Info("Loading images..."); var sw = Stopwatch.StartNew(); - Heads = File.ReadAllBytes(headsPath).ToImmutableArray(); - Tails = File.ReadAllBytes(tailsPath).ToImmutableArray(); + Heads = File.ReadAllBytes(_headsPath).ToImmutableArray(); + Tails = File.ReadAllBytes(_tailsPath).ToImmutableArray(); - Currency = Directory.GetFiles(currencyImagesPath) + Currency = Directory.GetFiles(_currencyImagesPath) .Select(x => new KeyValuePair>( Path.GetFileName(x), File.ReadAllBytes(x).ToImmutableArray())) .ToImmutableArray(); - Dice = Directory.GetFiles(diceImagesPath) + Dice = Directory.GetFiles(_diceImagesPath) .OrderBy(x => int.Parse(Path.GetFileNameWithoutExtension(x))) .Select(x => new KeyValuePair>(x, File.ReadAllBytes(x).ToImmutableArray())) .ToImmutableArray(); - SlotBackground = File.ReadAllBytes(slotBackgroundPath).ToImmutableArray(); + SlotBackground = File.ReadAllBytes(_slotBackgroundPath).ToImmutableArray(); - SlotNumbers = Directory.GetFiles(slotNumbersPath) + SlotNumbers = Directory.GetFiles(_slotNumbersPath) .OrderBy(f => int.Parse(Path.GetFileNameWithoutExtension(f))) .Select(x => File.ReadAllBytes(x).ToImmutableArray()) .ToImmutableArray(); - SlotEmojis = Directory.GetFiles(slotEmojisPath) + SlotEmojis = Directory.GetFiles(_slotEmojisPath) .OrderBy(f => int.Parse(Path.GetFileNameWithoutExtension(f))) .Select(x => File.ReadAllBytes(x).ToImmutableArray()) .ToImmutableArray(); From 1f09ad67e3825b57b0ae4b2e20c5a929adbdc07f Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sun, 26 Feb 2017 22:05:17 +0100 Subject: [PATCH 088/496] some random changes, and fixed ,cw help, thx infy --- .../Modules/ClashOfClans/ClashOfClans.cs | 4 +-- src/NadekoBot/Services/CommandHandler.cs | 32 +++++++++---------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/src/NadekoBot/Modules/ClashOfClans/ClashOfClans.cs b/src/NadekoBot/Modules/ClashOfClans/ClashOfClans.cs index 043a12b2..ca56acef 100644 --- a/src/NadekoBot/Modules/ClashOfClans/ClashOfClans.cs +++ b/src/NadekoBot/Modules/ClashOfClans/ClashOfClans.cs @@ -82,11 +82,9 @@ namespace NadekoBot.Modules.ClashOfClans [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] + [RequireUserPermission(GuildPermission.ManageMessages)] public async Task CreateWar(int size, [Remainder] string enemyClan = null) { - if (!(Context.User as IGuildUser).GuildPermissions.ManageChannels) - return; - if (string.IsNullOrWhiteSpace(enemyClan)) return; diff --git a/src/NadekoBot/Services/CommandHandler.cs b/src/NadekoBot/Services/CommandHandler.cs index 336e976c..0f4cf950 100644 --- a/src/NadekoBot/Services/CommandHandler.cs +++ b/src/NadekoBot/Services/CommandHandler.cs @@ -5,9 +5,7 @@ using System.Linq; using System.Threading.Tasks; using Discord; using NLog; -using System.Diagnostics; using Discord.Commands; -using NadekoBot.Services.Database.Models; using NadekoBot.Modules.Permissions; using Discord.Net; using NadekoBot.Extensions; @@ -22,7 +20,7 @@ using NadekoBot.DataStructures; namespace NadekoBot.Services { - public class IGuildUserComparer : IEqualityComparer + public class GuildUserComparer : IEqualityComparer { public bool Equals(IGuildUser x, IGuildUser y) => x.Id == y.Id; @@ -48,7 +46,7 @@ namespace NadekoBot.Services public ConcurrentDictionary UserMessagesSent { get; } = new ConcurrentDictionary(); public ConcurrentHashSet UsersOnShortCooldown { get; } = new ConcurrentHashSet(); - private Timer clearUsersOnShortCooldown { get; } + private readonly Timer _clearUsersOnShortCooldown; public CommandHandler(DiscordShardedClient client, CommandService commandService) { @@ -56,7 +54,7 @@ namespace NadekoBot.Services _commandService = commandService; _log = LogManager.GetCurrentClassLogger(); - clearUsersOnShortCooldown = new Timer((_) => + _clearUsersOnShortCooldown = new Timer(_ => { UsersOnShortCooldown.Clear(); }, null, GlobalCommandsCooldown, GlobalCommandsCooldown); @@ -68,7 +66,7 @@ namespace NadekoBot.Services await Task.Delay(5000).ConfigureAwait(false); ownerChannels = (await Task.WhenAll(_client.GetGuilds().SelectMany(g => g.Users) .Where(u => NadekoBot.Credentials.OwnerIds.Contains(u.Id)) - .Distinct(new IGuildUserComparer()) + .Distinct(new GuildUserComparer()) .Select(async u => { try @@ -141,7 +139,7 @@ namespace NadekoBot.Services BlacklistCommands.BlacklistedChannels.Contains(usrMsg.Channel.Id) || BlacklistCommands.BlacklistedUsers.Contains(usrMsg.Author.Id); - const float oneThousandth = 1.0f / 1000; + private const float _oneThousandth = 1.0f / 1000; private Task LogSuccessfulExecution(SocketUserMessage usrMsg, ExecuteCommandResult exec, SocketTextChannel channel, int exec1, int exec2, int exec3, int total) { _log.Info("Command Executed after {4}/{5}/{6}/{7}s\n\t" + @@ -153,10 +151,10 @@ namespace NadekoBot.Services (channel == null ? "PRIVATE" : channel.Guild.Name + " [" + channel.Guild.Id + "]"), // {1} (channel == null ? "PRIVATE" : channel.Name + " [" + channel.Id + "]"), // {2} usrMsg.Content, // {3} - exec1 * oneThousandth, // {4} - exec2 * oneThousandth, // {5} - exec3 * oneThousandth, // {6} - total * oneThousandth // {7} + exec1 * _oneThousandth, // {4} + exec2 * _oneThousandth, // {5} + exec3 * _oneThousandth, // {6} + total * _oneThousandth // {7} ); return Task.CompletedTask; } @@ -174,10 +172,10 @@ namespace NadekoBot.Services (channel == null ? "PRIVATE" : channel.Name + " [" + channel.Id + "]"), // {2} usrMsg.Content,// {3} exec.Result.ErrorReason, // {4} - exec1 * oneThousandth, // {5} - exec2 * oneThousandth, // {6} - exec3 * oneThousandth, // {7} - total * oneThousandth // {8} + exec1 * _oneThousandth, // {5} + exec2 * _oneThousandth, // {6} + exec3 * _oneThousandth, // {7} + total * _oneThousandth // {8} ); } @@ -429,10 +427,10 @@ namespace NadekoBot.Services // Bot will ignore commands which are ran more often than what specified by // GlobalCommandsCooldown constant (miliseconds) if (!UsersOnShortCooldown.Add(context.Message.Author.Id)) - return new ExecuteCommandResult(cmd, null, SearchResult.FromError(CommandError.Exception, $"You are on a global cooldown.")); + return new ExecuteCommandResult(cmd, null, SearchResult.FromError(CommandError.Exception, "You are on a global cooldown.")); if (CmdCdsCommands.HasCooldown(cmd, context.Guild, context.User)) - return new ExecuteCommandResult(cmd, null, SearchResult.FromError(CommandError.Exception, $"That command is on a cooldown for you.")); + return new ExecuteCommandResult(cmd, null, SearchResult.FromError(CommandError.Exception, "That command is on a cooldown for you.")); return new ExecuteCommandResult(cmd, null, await commands[i].ExecuteAsync(context, parseResult, dependencyMap)); } From 8160408f9a9e97a0a3867539de7a7e0203b8d36c Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sun, 26 Feb 2017 22:56:24 +0100 Subject: [PATCH 089/496] fixed guess and defvol keys --- src/NadekoBot/Modules/ClashOfClans/ClashOfClans.cs | 4 +--- src/NadekoBot/Modules/Games/Commands/Trivia/TriviaGame.cs | 2 +- src/NadekoBot/Modules/Music/Music.cs | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/NadekoBot/Modules/ClashOfClans/ClashOfClans.cs b/src/NadekoBot/Modules/ClashOfClans/ClashOfClans.cs index ca56acef..53380a86 100644 --- a/src/NadekoBot/Modules/ClashOfClans/ClashOfClans.cs +++ b/src/NadekoBot/Modules/ClashOfClans/ClashOfClans.cs @@ -11,15 +11,13 @@ using NadekoBot.Services.Database.Models; using System.Linq; using NadekoBot.Extensions; using System.Threading; -using System.Diagnostics; -using NLog; namespace NadekoBot.Modules.ClashOfClans { [NadekoModule("ClashOfClans", ",")] public class ClashOfClans : NadekoTopLevelModule { - public static ConcurrentDictionary> ClashWars { get; set; } = new ConcurrentDictionary>(); + public static ConcurrentDictionary> ClashWars { get; set; } private static Timer checkWarTimer { get; } diff --git a/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaGame.cs b/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaGame.cs index 0862290f..18e46fa5 100644 --- a/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaGame.cs +++ b/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaGame.cs @@ -201,7 +201,7 @@ namespace NadekoBot.Modules.Games.Trivia return; } await Channel.SendConfirmAsync(GetText("trivia_game"), - GetText("guess", guildUser.Mention, Format.Bold(CurrentQuestion.Answer))).ConfigureAwait(false); + GetText("trivia_guess", guildUser.Mention, Format.Bold(CurrentQuestion.Answer))).ConfigureAwait(false); } catch (Exception ex) { _log.Warn(ex); } diff --git a/src/NadekoBot/Modules/Music/Music.cs b/src/NadekoBot/Modules/Music/Music.cs index 986f3f47..5baa7c6e 100644 --- a/src/NadekoBot/Modules/Music/Music.cs +++ b/src/NadekoBot/Modules/Music/Music.cs @@ -301,7 +301,7 @@ namespace NadekoBot.Modules.Music uow.GuildConfigs.For(Context.Guild.Id, set => set).DefaultMusicVolume = val / 100.0f; uow.Complete(); } - await ReplyConfirmLocalized("defvol_set").ConfigureAwait(false); + await ReplyConfirmLocalized("defvol_set", val).ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] From f7cd98194d66b2486a32619ec830bc703b346eb2 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 27 Feb 2017 13:23:48 +0100 Subject: [PATCH 090/496] fixed a missing string --- .../Modules/Games/Commands/Acropobia.cs | 2 +- .../Utility/Commands/MessageRepeater.cs | 48 +++++++++++-------- 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/src/NadekoBot/Modules/Games/Commands/Acropobia.cs b/src/NadekoBot/Modules/Games/Commands/Acropobia.cs index ddaf3e98..f90f946b 100644 --- a/src/NadekoBot/Modules/Games/Commands/Acropobia.cs +++ b/src/NadekoBot/Modules/Games/Commands/Acropobia.cs @@ -276,7 +276,7 @@ $@"-- { if (!_votes.Any()) { - await _channel.SendErrorAsync(GetText("acrophobia"), GetText("no_votes_cast")).ConfigureAwait(false); + await _channel.SendErrorAsync(GetText("acrophobia"), GetText("acro_no_votes_cast")).ConfigureAwait(false); return; } var table = _votes.OrderByDescending(v => v.Value); diff --git a/src/NadekoBot/Modules/Utility/Commands/MessageRepeater.cs b/src/NadekoBot/Modules/Utility/Commands/MessageRepeater.cs index 7cddce2c..d371330c 100644 --- a/src/NadekoBot/Modules/Utility/Commands/MessageRepeater.cs +++ b/src/NadekoBot/Modules/Utility/Commands/MessageRepeater.cs @@ -9,11 +9,11 @@ using NadekoBot.Services.Database.Models; using NLog; using System; using System.Collections.Concurrent; -using System.Diagnostics; using System.Linq; using System.Text; using System.Threading; using System.Threading.Tasks; +using Discord.WebSocket; namespace NadekoBot.Modules.Utility { @@ -34,23 +34,16 @@ namespace NadekoBot.Modules.Utility private CancellationTokenSource source { get; set; } private CancellationToken token { get; set; } public Repeater Repeater { get; } - public ITextChannel Channel { get; } + public SocketGuild Guild { get; } + public ITextChannel Channel { get; private set; } public RepeatRunner(Repeater repeater, ITextChannel channel = null) { _log = LogManager.GetCurrentClassLogger(); Repeater = repeater; - //if (channel == null) - //{ - // var guild = NadekoBot.Client.GetGuild(repeater.GuildId); - // Channel = guild.GetTextChannel(repeater.ChannelId); - //} - //else - // Channel = channel; + Channel = channel; - Channel = channel ?? NadekoBot.Client.GetGuild(repeater.GuildId)?.GetTextChannel(repeater.ChannelId); - if (Channel == null) - return; + Guild = NadekoBot.Client.GetGuild(repeater.GuildId); Task.Run(Run); } @@ -72,10 +65,21 @@ namespace NadekoBot.Modules.Utility // continue; if (oldMsg != null) - try { await oldMsg.DeleteAsync(); } catch { } + try + { + await oldMsg.DeleteAsync(); + } + catch + { + // ignored + } try { - oldMsg = await Channel.SendMessageAsync(toSend).ConfigureAwait(false); + if (Channel == null) + Channel = Guild.GetTextChannel(Repeater.ChannelId); + + if (Channel != null) + oldMsg = await Channel.SendMessageAsync(toSend).ConfigureAwait(false); } catch (HttpException ex) when (ex.HttpCode == System.Net.HttpStatusCode.Forbidden) { @@ -93,7 +97,9 @@ namespace NadekoBot.Modules.Utility } } } - catch (OperationCanceledException) { } + catch (OperationCanceledException) + { + } } public void Reset() @@ -109,7 +115,8 @@ namespace NadekoBot.Modules.Utility public override string ToString() { - return $"{Channel.Mention} | {(int)Repeater.Interval.TotalHours}:{Repeater.Interval:mm} | {Repeater.Message.TrimTo(33)}"; + return + $"{Channel.Mention} | {(int) Repeater.Interval.TotalHours}:{Repeater.Interval:mm} | {Repeater.Message.TrimTo(33)}"; } } @@ -120,8 +127,7 @@ namespace NadekoBot.Modules.Utility await Task.Delay(5000).ConfigureAwait(false); Repeaters = new ConcurrentDictionary>(NadekoBot.AllGuildConfigs .ToDictionary(gc => gc.GuildId, - gc => new ConcurrentQueue(gc.GuildRepeaters.Select(gr => new RepeatRunner(gr)) - .Where(gr => gr.Channel != null)))); + gc => new ConcurrentQueue(gc.GuildRepeaters.Select(gr => new RepeatRunner(gr))))); _ready = true; }); } @@ -192,7 +198,7 @@ namespace NadekoBot.Modules.Utility if (Repeaters.TryUpdate(Context.Guild.Id, new ConcurrentQueue(repeaterList), rep)) await Context.Channel.SendConfirmAsync(GetText("message_repeater"), - GetText("repeater_stopped" , index + 1) + $"\n\n{repeater}").ConfigureAwait(false); + GetText("repeater_stopped", index + 1) + $"\n\n{repeater}").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -228,9 +234,9 @@ namespace NadekoBot.Modules.Utility await uow.CompleteAsync().ConfigureAwait(false); } - var rep = new RepeatRunner(toAdd, (ITextChannel)Context.Channel); + var rep = new RepeatRunner(toAdd, (ITextChannel) Context.Channel); - Repeaters.AddOrUpdate(Context.Guild.Id, new ConcurrentQueue(new[] { rep }), (key, old) => + Repeaters.AddOrUpdate(Context.Guild.Id, new ConcurrentQueue(new[] {rep}), (key, old) => { old.Enqueue(rep); return old; From 6ef76125a2f5711cec0e522516b9a2ae8ec0c76f Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 27 Feb 2017 14:54:32 +0100 Subject: [PATCH 091/496] fixed $draw --- src/NadekoBot/Modules/Music/Classes/Song.cs | 5 ----- src/NadekoBot/project.json | 13 ++++++------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/NadekoBot/Modules/Music/Classes/Song.cs b/src/NadekoBot/Modules/Music/Classes/Song.cs index d088bfde..c7e933eb 100644 --- a/src/NadekoBot/Modules/Music/Classes/Song.cs +++ b/src/NadekoBot/Modules/Music/Classes/Song.cs @@ -270,11 +270,6 @@ namespace NadekoBot.Modules.Music.Classes //aidiakapi ftw public static unsafe byte[] AdjustVolume(byte[] audioSamples, float volume) { - Contract.Requires(audioSamples != null); - Contract.Requires(audioSamples.Length % 2 == 0); - Contract.Requires(volume >= 0f && volume <= 1f); - Contract.Assert(BitConverter.IsLittleEndian); - if (Math.Abs(volume - 1f) < 0.0001f) return audioSamples; // 16-bit precision for the multiplication diff --git a/src/NadekoBot/project.json b/src/NadekoBot/project.json index d6b8ad6c..cd69d074 100644 --- a/src/NadekoBot/project.json +++ b/src/NadekoBot/project.json @@ -23,12 +23,12 @@ "Google.Apis.Urlshortener.v1": "1.19.0.138", "Google.Apis.YouTube.v3": "1.20.0.701", "Google.Apis.Customsearch.v1": "1.20.0.466", - "ImageSharp": "1.0.0-alpha2-00090", - "ImageSharp.Processing": "1.0.0-alpha2-00078", - "ImageSharp.Formats.Png": "1.0.0-alpha2-00086", - "ImageSharp.Drawing": "1.0.0-alpha2-00090", - "ImageSharp.Drawing.Paths": "1.0.0-alpha2-00040", - //"ImageSharp.Formats.Jpeg": "1.0.0-alpha2-00090", + "ImageSharp": "1.0.0-alpha2-*", + "ImageSharp.Processing": "1.0.0-alpha2-*", + "ImageSharp.Formats.Png": "1.0.0-alpha2-*", + "ImageSharp.Formats.Jpeg": "1.0.0-alpha2-*", + "ImageSharp.Drawing": "1.0.0-alpha2-*", + "ImageSharp.Drawing.Paths": "1.0.0-alpha2-*", "Microsoft.EntityFrameworkCore": "1.1.0", "Microsoft.EntityFrameworkCore.Design": "1.1.0", "Microsoft.EntityFrameworkCore.Sqlite": "1.1.0", @@ -44,7 +44,6 @@ }, "Newtonsoft.Json": "9.0.2-beta1", "NLog": "5.0.0-beta03", - "System.Diagnostics.Contracts": "4.3.0", "System.Xml.XPath": "4.3.0", "Discord.Net.Commands": { "target": "project", From 1fbe7a034e888ca4a622cccc29b791f95e5bde82 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 27 Feb 2017 22:44:10 +0100 Subject: [PATCH 092/496] fixes --- src/NadekoBot/Modules/Music/Music.cs | 2 +- src/NadekoBot/Modules/Utility/Commands/MessageRepeater.cs | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/NadekoBot/Modules/Music/Music.cs b/src/NadekoBot/Modules/Music/Music.cs index 5baa7c6e..02bf9993 100644 --- a/src/NadekoBot/Modules/Music/Music.cs +++ b/src/NadekoBot/Modules/Music/Music.cs @@ -690,7 +690,7 @@ namespace NadekoBot.Modules.Music return; } IUserMessage msg = null; - try { msg = await ReplyConfirmLocalized("attempting_to_queue", Format.Bold(mpl.Songs.Count.ToString())).ConfigureAwait(false); } catch (Exception ex) { _log.Warn(ex); } + try { msg = await Context.Channel.SendMessageAsync(GetText("attempting_to_queue", Format.Bold(mpl.Songs.Count.ToString()))).ConfigureAwait(false); } catch (Exception ex) { _log.Warn(ex); } foreach (var item in mpl.Songs) { var usr = (IGuildUser)Context.User; diff --git a/src/NadekoBot/Modules/Utility/Commands/MessageRepeater.cs b/src/NadekoBot/Modules/Utility/Commands/MessageRepeater.cs index d371330c..c615ef1e 100644 --- a/src/NadekoBot/Modules/Utility/Commands/MessageRepeater.cs +++ b/src/NadekoBot/Modules/Utility/Commands/MessageRepeater.cs @@ -44,7 +44,8 @@ namespace NadekoBot.Modules.Utility Channel = channel; Guild = NadekoBot.Client.GetGuild(repeater.GuildId); - Task.Run(Run); + if(Guild!=null) + Task.Run(Run); } @@ -127,7 +128,9 @@ namespace NadekoBot.Modules.Utility await Task.Delay(5000).ConfigureAwait(false); Repeaters = new ConcurrentDictionary>(NadekoBot.AllGuildConfigs .ToDictionary(gc => gc.GuildId, - gc => new ConcurrentQueue(gc.GuildRepeaters.Select(gr => new RepeatRunner(gr))))); + gc => new ConcurrentQueue(gc.GuildRepeaters + .Select(gr => new RepeatRunner(gr)) + .Where(x => x.Guild != null)))); _ready = true; }); } From 81adc259d923305a67f2bba404adbaa7e858288e Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 28 Feb 2017 03:22:46 +0100 Subject: [PATCH 093/496] french translation added for responses, Some string fixes --- .../Commands/LocalizationCommands.cs | 10 +- src/NadekoBot/Modules/Music/Music.cs | 2 +- .../Resources/ResponseStrings.Designer.cs | 13 +- .../Resources/ResponseStrings.fr-fr.resx | 2202 +++++++++++++++++ src/NadekoBot/Resources/ResponseStrings.resx | 7 +- 5 files changed, 2213 insertions(+), 21 deletions(-) create mode 100644 src/NadekoBot/Resources/ResponseStrings.fr-fr.resx diff --git a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs index 3b3467f6..8250bfde 100644 --- a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs +++ b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs @@ -19,7 +19,8 @@ namespace NadekoBot.Modules.Administration private ImmutableDictionary supportedLocales { get; } = new Dictionary() { {"en-US", "English, United States" }, - {"sr-cyrl-rs", "Serbian, Cyrillic" } + {"fr-FR", "French, France" } + //{"sr-cyrl-rs", "Serbian, Cyrillic" } }.ToImmutableDictionary(); [NadekoCommand, Usage, Description, Aliases] @@ -94,9 +95,10 @@ namespace NadekoBot.Modules.Administration [OwnerOnly] public async Task LanguagesList() { - await ReplyConfirmLocalized("lang_list", - string.Join("\n", supportedLocales.Select(x => $"{Format.Code(x.Key)} => {x.Value}"))) - .ConfigureAwait(false); + await Context.Channel.EmbedAsync(new EmbedBuilder().WithOkColor() + .WithTitle(GetText("lang_list", "")) + .WithDescription(string.Join("\n", + supportedLocales.Select(x => $"{Format.Code(x.Key), -10} => {x.Value}")))); } } } diff --git a/src/NadekoBot/Modules/Music/Music.cs b/src/NadekoBot/Modules/Music/Music.cs index 02bf9993..79dd3d42 100644 --- a/src/NadekoBot/Modules/Music/Music.cs +++ b/src/NadekoBot/Modules/Music/Music.cs @@ -818,7 +818,7 @@ namespace NadekoBot.Modules.Music MusicPlayer musicPlayer; if (!MusicPlayers.TryGetValue(Context.Guild.Id, out musicPlayer)) { - await ReplyErrorLocalized("player_none").ConfigureAwait(false); + await ReplyErrorLocalized("no_player").ConfigureAwait(false); return; } diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index 839a9927..3d80c3c9 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -1443,7 +1443,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Text Channel Destroyed . + /// Looks up a localized string similar to Text Channel Created. /// public static string administration_text_chan_created { get { @@ -3604,15 +3604,6 @@ namespace NadekoBot.Resources { } } - /// - /// Looks up a localized string similar to No music player active.. - /// - public static string music_player_none { - get { - return ResourceManager.GetString("music_player_none", resourceCulture); - } - } - /// /// Looks up a localized string similar to Player Queue - Page {0}/{1}. /// @@ -4884,7 +4875,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Joes not loaded.. + /// Looks up a localized string similar to Jokes not loaded.. /// public static string searches_jokes_not_loaded { get { diff --git a/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx b/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx new file mode 100644 index 00000000..68602a62 --- /dev/null +++ b/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx @@ -0,0 +1,2202 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Cette base a déjà été revendiquée ou détruite + + + Cette base est déjà détruite. + + + Cette base n'est pas revendiquée. + + + Base #{0} **DETRUITE** dans une guerre contre {1} + + + {0} a *ABANDONNÉ* la base #{1} dans une guerre contre {2} + + + {0} a revendiqué une base #{1} dans une guerre contre {2} + + + @{0} Vous avez déjà revendiqué la base {1}. Vous ne pouvez pas en revendiquer une nouvelle. + + + La demande de la part de @{0} pour une guerre contre {1} a expiré. + + + Ennemi + + + Informations concernant la guerre contre {0} + + + Numéro de base invalide. + + + La taille de la guerre n'est pas valide. + + + Liste des guerres en cours. + + + Non réclamé. + + + Vous ne participez pas a cette guerre. + + + @{0} Vous ne pouvez pas participer a cette guerre ou la base a déjà été détruite. + + + Aucune guerre en cours. + + + Taille + + + La guerre contre {0} a déjà commencé! + + + La guerre contre {0} commence! + + + La guerre contre {0} a fini. + + + Cette guerre n'existe pas. + + + La guerre contre {0} a éclaté ! + + + Statistiques de réactions personnalisées effacées. + + + Réaction personnalisée supprimée + + + Permissions insuffisantes. Nécessite d'être le propriétaire du Bot pour avoir les réactions personnalisées globales, et Administrateur pour les réactions personnalisées du serveur. + + + Liste de toutes les réactions personnalisées. + + + + Réactions personnalisées + + + Nouvelle réaction personnalisée + + + Aucune réaction personnalisé trouvée. + + + Aucune réaction personnalisée ne correspond à cet ID. + + + Réponse + + + Statistiques des Réactions Personnalisées + + + Statistiques effacées pour {0} réaction personnalisée. + + + Pas de statistiques pour ce déclencheur trouvées, aucune action effectuée. + + + Déclencheur + + + Autohentai arrêté. + + + Aucun résultat trouvé. + + + {0} est déjà inconscient. + + + {0} a toute sa vie. + + + Votre type est déjà {0} + + + Vous avez utilisé {0}{1} sur {2}{3} pour {4} dégâts. + Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage. + + + Vous ne pouvez pas attaquer de nouveau sans représailles ! + + + Vous ne pouvez pas vous attaquer vous-même. + + + {0} s'est évanoui. + + + Vous avez soigné {0} avec un {1} + + + {0} a {1} points de vie restants. + + + Vous ne pouvez pas utiliser {0}. Ecrivez `{1}ml` pour voir la liste de toutes les actions que vous pouvez effectuer. + + + Liste des attaques pour le type {0} + + + Ce n'est pas très efficace. + + + Vous n'avez pas assez de {0} + + + Vous avez ressuscité {0} avec un {1} + + + Vous vous êtes ressuscité avec un {0}. + + + Votre type a bien été modifié de {0} à {1} + + + C'est légèrement efficace. + + + C'est très efficace ! + + + Vous avez utilisé trop de mouvement d'affilé, donc ne pouvez plus bouger ! + + + Le type de {0} est {1} + + + Utilisateur non trouvé. + + + Vous vous êtes évanoui, vous n'êtes donc pas capable de bouger! + + + **L'affectation automatique du rôle** à l'arrivé d'un nouvel utilisateur est désormais **désactivée**. + + + **L'affectation automatique du rôle** à l'arrivé d'un nouvel utilisateur est désormais **activée**. + + + Liens + + + Avatar modifié + + + Vous avez été banni du serveur {0}. +Raison : {1} + + + banni + PLURAL + + + Utilisateur banni + + + Le nom du Bot a changé pour {0} + + + Le statut du Bot a changé pour {0} + + + La suppression automatique des annonces de départ a été désactivée. + + + Les annonces de départ seront supprimées après {0} secondes. + + + Annonce de départ actuelle : {0} + + + Activez les annonces de départ en entrant {0} + + + Nouvelle annonce de départ définie. + + + Annonce de départ désactivée. + + + Annonce de départ activée sur ce salon. + + + Nom du salon modifié + + + Ancien nom + + + Sujet du salon modifié + + + Nettoyé. + + + Contenu + + + Rôle {0} créé avec succès + + + Salon textuel {0} créé. + + + Salon vocal {0} créé. + + + Mise en sourdine effectuée. + + + Serveur {0} supprimé + + + Suppression automatique des commandes effectuées avec succès, désactivée. + + + Suppression automatique des commandes effectuées avec succès, activée. + + + Le salon textuel {0} a été supprimé. + + + Le salon vocal {0} a été supprimé. + + + MP de + + + Nouveau donateur ajouté avec succès. Montant total des dons de cet utilisateur : {0} 👑 + + + Merci aux personnes ci-dessous pour avoir permis à ce projet d'exister. + + + Je transmettrai désormais les MPs à tous les propriétaires. + + + Je transmettrai désormais les MPs seulement au propriétaire principal. + + + Je vous transmettrai désormais les MPs. + + + Je ne vous transmettrez désormais plus les MPs. + + + Suppression automatique des messages d'accueil a été désactivé. + + + Les messages d'accueil seront supprimés après {0} secondes. + + + Message privé de bienvenue actuel: {0} + + + Activez les messages de bienvenue privés en écrivant {0} + + + Nouveau message de bienvenue privé en service. + + + Messages de bienvenue privés désactivés. + + + Messages de bienvenue privés activés. + + + Message de bienvenue actuel: {0} + + + Activez les messages de bienvenue en écrivant {0} + + + Nouveau message de bienvenue en service. + + + Messages de bienvenue désactivés. + + + Messages de bienvenue activés sur ce salon. + + + Vous ne pouvez pas utiliser cette commande sur les utilisateurs dont le rôle est supérieur ou égal au vôtre dans la hiérarchie. + + + Images chargées après {0} secondes! + + + Format d'entrée invalide. + + + Paramètres invalides. + + + {0} a rejoint {1} + + + Vous avez été expulsé du serveur {0}. +Raison : {1} + + + Utilisateur expulsé + + + Listes des langages +{0} + + + La langue du serveur est désormais {0} - {1} + + + La langue par défaut du bot est désormais {0} - {1} + + + La langue du bot a été changée pour {0} - {1} + + + Échec dans la tentative de changement de langue. Réessayer avec l'aide pour cette commande. + + + La langue de ce serveur est {0} - {0} + + + {0} a quitté {1} + + + Serveur {0} quitté + + + Enregistrement de {0} événements dans ce salon. + + + Enregistrement de tous les événements dans ce salon. + + + Enregistrement désactivé. + + + Événements enregistrés que vous pouvez suivre : + + + L'enregistrement ignorera désormais {0} + + + L'enregistrement n'ignorera pas {0} + + + L’événement {0} ne sera plus enregistré. + + + {0} a émis une notification pour les rôles suivants + + + Message de {0} `[Bot Owner]` : + + + Message envoyé. + + + {0} déplacé de {1} à {2} + L'utilisateur n'a pas forcément été déplacé de son plein gré. S'est déplacé - déplacé + + + Message supprimé dans #{0} + + + Mise à jour du message dans #{0} + + + Tous les utilisateurs ont été mis en sourdine. + PLURAL (users have been muted) + + + L'utilisateur à été mis en sourdine. + singular "User muted." + + + Il semblerait que vous n'ayez pas la permission nécessaire pour effectuer cela. + + + Nouveau rôle de mise en sourdine crée. + + + J'ai besoin de la permission d'**Administrateur** pour effectuer cela. + + + Nouveau message + + + Nouveau pseudonyme + + + Nouveau sujet + + + Pseudonyme changé + + + Impossible de trouver ce serveur + + + Aucun shard avec cet ID trouvé. + Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. + + + Ancien message + + + Ancien pseudonyme + + + Ancien sujet + + + Erreur. Je ne dois sûrement pas posséder les permissions suffisantes. + + + Les permissions pour ce serveur ont été réinitialisées. + + + Protections actives + + + {0} a été **désactivé** sur ce serveur. + + + {0} activé + + + Erreur. J'ai besoin de la permission Gérer les rôles + + + Aucune protection activée. + + + Le seuil pour cet utilisateur doit être entre {0} et {1} + + + Si {0} ou plus d'utilisateurs rejoignent dans les {1} secondes suivantes, je les {2}. + + + Le temps doit être compris entre {0} et {1} secondes. + + + Vous avez retirés tout les rôles de l'utilisateur {0} avec succès + + + Impossible de retirer des rôles. Je n'ai pas les permissions suffisantes. + + + La couleur du rôle {0} a été modifiée. + + + Ce rôle n'existe pas. + + + Le paramètre spécifié est invalide. + + + Erreur due à un manque de permissions ou à une couleur invalide. + + + L'utilisateur {1} n'appartient plus au rôle {0}. + + + Impossible de supprimer ce rôle. Je ne possède pas les permissions suffisantes. + + + Rôle renommé. + + + Impossible de renommer ce rôle. Je ne possède pas les permissions suffisantes. + + + Vous ne pouvez pas modifier les rôles supérieurs au votre. + + + La répétition du message suivant a été désactivé: {0} + + + Le rôle {0} a été ajouté à la liste. + + + {0} introuvable. Nettoyé. + + + Le rôle {0} est déjà présent dans la liste. + + + Ajouté. + + + Rotation du statut de jeu désactivée. + + + Rotation du statut de jeu activée. + + + Voici une liste des rotations de statuts : +{0} + + + Aucune rotation de statuts en place. + + + Vous avez déjà le rôle {0}. + + + Vous avez déjà {0} rôles exclusifs auto-affectés. + + + Rôles auto-affectés désormais exclusifs. + + + Il y a {0} rôles auto-affectés. + + + Ce rôle ne peux pas vous être attribué par vous même. + + + Vous ne possédez pas le rôle {0}. + + + L'affection automatique des rôles n'est désormais plus exclusive! + + + Je suis incapable de vous ajouter ce rôle. `Je ne peux pas ajouter de rôles aux propriétaires et aux autres rôles plus haut que le mien dans la hiérarchie.` + + + {0} a été supprimé de la liste des affectations automatiques de rôle. + + + Vous n'avez plus le rôle {0}. + + + Vous avez désormais le rôle {0}. + + + L'ajout du rôle {0} pour l'utilisateur {1} a été réalisé avec succès. + + + Impossible d'ajouter un rôle. Je ne possède pas les permissions suffisantes. + + + Nouvel avatar défini. + + + Nouveau nom de Salon défini avec succès. + + + Nouveau jeu en service! + + + Nouvelle diffusion en service! + + + Nouveau sujet du salon en service. + + + Shard {0} reconnecté. + Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. + + + Shard {0} se reconnecte. + Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. + + + Arrêt en cours. + + + Les utilisateurs ne peuvent pas envoyer plus de {0} messages toutes les {1} secondes. + + + Mode ralenti désactivé. + + + Mode ralenti activé + + + expulsion + PLURAL + + + {0} ignorera ce Salon. + + + {0} n'ignorera plus ce Salon. + + + Si un utilisateur poste {0} le même message à la suite, je le {1}. + __SalonsIgnorés__: {2} + + + Salon textuel crée. + + + Salon textuel détruit. + + + Son activé avec succès. + + + Micro activé + singular + + + Nom d'utilisateur. + + + Nom d'utilisateur modifié. + + + Utilisateurs + + + Utilisateur banni + + + {0} a été **mis en sourdine** sur le tchat. + + + **La parole a été rétablie** sur le tchat pour {0} + + + L'utilisateur a rejoins + + + L'utilisateur a quité + + + {0} a été **mis en sourdine** à la fois sur le salon textuel et vocal. + + + Rôle ajouté à l'utilisateur + + + Rôle enlevé de l'utilisateur + + + {0} est maintenant {1} + + + {0} n'est **plus en sourdine** des salons textuels et vocaux. + + + {0} a rejoint le salon vocal {1}. + + + {0} a quitté le salon vocal {1}. + + + {0} est allé du salon vocal {1} au {2}. + + + {0} a été **mis en sourdine**. + + + {0} a été **retiré de la sourdine** + + + Salon vocal crée. + + + Salon vocal détruit. + + + Fonctionnalités vocales et textuelles désactivées. + + + Fonctionnalités vocales et textuelles activées. + + + Je n'ai pas la permission **Gérer les rôles** et/ou **Gérer les salons**, je ne peux donc pas utiliser `voice+text` sur le serveur {0}. + + + Vous activez/désactivez cette fonctionnalité et **je n'ai pas les permissions ADMINISTRATEURS**. Cela pourrait causer des dysfonctionnements, et vous devrez nettoyer les salons textuels vous-même après ça. + + + Je nécessite au moins les permissions **Gérer les rôles** et **Gérer les salons** pour activer cette fonctionnalité. (permissions administateurs préférées) + + + Utilisateur {0} depuis un salon textuel. + + + Utilisateur {0} depuis salon textuel et vocal. + + + Utilisateur {0} depuis un salon vocal. + + + Vous avez été expulsé du serveur {0}. +Raison: {1} + + + Utilisateur débanni + + + Migration effectué! + + + Erreur lors de la migration, veuillez consulter la console pour plus d'informations. + + + Présences mises à jour. + + + Utilisateur expulsé. + + + a récompensé {0} pour {1} + + + Pari à pile ou face + + + Vous aurez plus de chance la prochaine fois ^_^ + + + Félicitations! Vous avez gagné {0} pour avoir lancé au dessus de {1} + + + Deck remélangé + + + Renversé {0} + User flipped tails. + + + Vous l'avez deviné! Vous avez gagné {0} + + + Nombre spécifié invalide. Vous pouvez lancer 1 à {0} pièces. + + + Ajoute {0} réaction à ce message pour avoir {1} + + + Cet événement est actif pendant {0} heures. + + + L'événement "réactions fleuries" a démaré! + + + a donné {0} à {1} + X has gifted 15 flowers to Y + + + {0} a {1} + X has Y flowers + + + Face + + + Classement + + + {1} utilisateurs du rôle {2} ont été récompensé de {0} + + + Vous ne pouvez pas miser plus de {0} + + + Vous ne pouvez pas parier moins de {0} + + + Vous n'avez pas assez de {0} + + + Plus de carte dans le deck. + + + Utilisateur tiré au sort + + + Vous êtes tombé {0} + + + Pari + + + WOAAHHHHHH!!! Félicitations!!! x{0} + + + Une simple {0}, x{1} + + + Wow! Quelle chance! Trois du même style! x{0} + + + Bon travail! Deux {0} - bet x{1} + + + Gagné + + + Les utilisateurs doivent écrire un code secret pour avoir {0}. Dure {1} secondes. Ne le dite à personne. Shhh. + + + L’événement "jeu sournois" s'est fini. {0} utilisateurs ont reçu la récompense. + + + L'événement "jeu sournois" a démarré + + + Pile + + + Vous avez pris {0} de {1} avec succès + + + Impossible de prendre {0} de {1} car l'utilisateur n'a pas assez de {2}! + + + Retour à la table des matières + + + Propriétaire du Bot seulement + + + Nécessite {0} permissions du salon + + + Vous pouvez supporter ce projet sur Patreon: <{0}> ou via Paypal <{1}> + + + Commandes et alias + + + Liste des commandes rafraîchie. + + + Écrivez `{0}h NomDeLaCommande` pour voir l'aide spécifique à cette commande. Ex: `{0}h >8ball` + + + Impossible de trouver cette commande. Veuillez vérifier qu'elle existe avant de réessayer. + + + Description + + + Vous pouvez supporter le projet NadekoBot +sur Patreon <{0}> +par Paypal <{1}> +N'oubliez pas de mettre votre nom discord ou ID dans le message. + +**Merci** ♥️ + + + **Liste des Commandes**: <{0}> +**La liste des guides et tous les documents peuvent être trouvés ici**: <{1}> + + + Liste Des Commandes + + + Liste Des Modules + + + Entrez `{0}cmds ModuleName` pour avoir la liste des commandes de ce module. ex `{0}cmds games` + + + Ce module n'existe pas. + + + Permission serveur {0} requise. + + + Table Des Matières + + + Usage + + + Autohentai commencé. Publie toutes les {0}s avec l'un des tags suivants : +{1} + + + Tag + + + Race Animale + + + Pas assez de participants pour commencer. + + + Suffisamment de participants ! La course commence. + + + {0} a rejoint sous la forme d'un {1} + + + {0} a rejoint sous la forme d'un {1} et mise sur {2} ! + + + Entrez {0}jr pour rejoindre la course. + + + Début dans 20 secondes ou quand le nombre maximum de participants est atteint. + + + Début avec {0} participants. + + + {0} sous la forme d'un {1} a gagné la course ! + + + {0} sous la forme d'un {1} a gagné la course et {2}! + + + Nombre spécifié invalide. Vous pouvez lancer de {0} à {1} dés à la fois. + + + tiré au sort {0} + Someone rolled 35 + + + Dé tiré au sort: {0} + Dice Rolled: 5 + + + Le lancement de la course a échoué. Une autre course doit probablement être en cours. + + + Aucune course existe sur ce serveur. + + + Le deuxième nombre doit être plus grand que le premier. + + + Changements de Coeur + + + Revendiquée par + + + Divorces + + + Aime + + + Prix + + + Aucune waifu n'a été revendiquée pour l'instant. + + + Top Waifus + + + votre affinité est déjà liée à ce waifu ou vous êtes en train de retirer votre affinité avec quelqu'un avec qui vous n'en posséder pas. + + + Affinités changées de de {0} à {1}. + +*C'est moralement questionnable* 🤔 + Make sure to get the formatting right, and leave the thinking emoji + + + Vous devez attendre {0} heures et {1} minutes avant de pouvoir changer de nouveau votre affinité. + + + Votre affinité a été réinitialisée. Vous n'avez désormais plus la personne que vous aimez. + + + veut être le waifu de {0}. Aww <3 + + + a revendiqué {0} comme son waifu pour {1} + + + Vous avez divorcé avec un waifu qui vous aimais. Monstre sans cœur. {0} a reçu {1} en guise de compensation. + + + vous ne pouvez pas vous lier d'affinité avec vous-même, espèce d'égocentrique. + + + 🎉Leur amour est comblé !🎉 +La nouvelle valeur de {0} est {1} ! + + + Aucune waifu n'est à ce prix. Tu dois payer au moins {0} pour avoir une waifu, même si sa vraie valeur est inférieure. + + + Tu dois payer {0} ou plus pour avoir cette waifu ! + + + Cette waifu ne t'appartient pas. + + + Tu ne peux pas t'acquérir toi-même. + + + Vous avez récemment divorcé. Vous devez attendre {0} heures et {1} minutes pour divorcer à nouveau. + + + Personne + + + Vous avez divorcé d'une waifu qui ne vous aimé pas. Vous recevez {0} en retour. + + + 8ball + + + Acrophobie + + + Le jeu a pris fin sans soumissions. + + + Personne n'a voté : la partie se termine sans vainqueur. + + + L'acronyme était {0}. + + + Une partie d'Acrophobia est déjà en cours sur ce salon. + + + La partie commence. Créez une phrase avec l'acronyme suivant : {0}. + + + Vous avez {0} secondes pour faire une soumission. + + + {0} a soumit sa phrase. ({1} au total) + + + Votez en entrant le numéro d'une soumission. + + + {0} a voté! + + + Le gagnant est {0} avec {1} points! + + + {0} est le gagnant pour être le seul utilisateur à avoir fait une soumission! + + + Question + + + Egalité ! Vous avez choisi {0}. + + + {0} a gagné ! {1} bat {2}. + + + Inscriptions terminées. + + + Une Course Animale est déjà en cours. + + + Total : {0} Moyenne : {1} + + + Catégorie + + + Cleverbot désactivé sur ce serveur. + + + Cleverbot activé sur ce serveur. + + + La génération actuelle a été désactivée sur ce salon. + + + La génération actuelle a été désactivée sur ce salon. + + + {0} {1} aléatoires sont apparus ! Attrapez-les en entrant `{2}pick` + plural + + + Un {1} aléatoire est apparu ! Attrapez-le en entrant `{1}pick` + + + Impossible de charger une question. + + + Jeu commencé. + + + Partie de pendu commencée. + + + Une partie de pendu est déjà en cours sur ce channel. + + + Initialisation du pendu erronée. + + + Liste des "{0}hangman" types de termes : + + + Classement + + + Vous n'avez pas assez de {0} + + + Pas de résultats + + + choisi {0} + Kwoth picked 5* + + + {0} a planté {1} + Kwoth planted 5* + + + Une partie de Trivia est déjà en cours sur ce serveur. + + + Partie de Trivia + + + {0} a deviné! La réponse était: {1} + + + Aucune partie de trivia en cours sur ce serveur. + + + {0} a {1} points + + + Le jeu s'arrêtera après cette question. + + + Le temps a expiré! La réponse était {0} + + + {0} a deviné la réponse et gagne la partie! La réponse était: {1} + + + Vous ne pouvez pas jouer contre vous-même. + + + Une partie de Morpion est déjà en cours sur ce salon. + + + Égalité! + + + a crée une partie de Morpion. + + + {0} a gagné ! + + + Trois alignés. + + + Aucun mouvement restant ! + + + Le temps a expiré ! + + + Tour de {0}. + + + {0} contre {1} + + + Tentative d'ajouter {0} à la file d'attente... + + + Lecture automatique désactivée + + + Lecture automatique activée + + + Volume de base mis à {0}% + + + File d'attente complète. + + + a tour de rôle + + + Musique finie + + + Système de tour de rôle désactivé. + + + Système de tour de rôle activé. + + + De la position + + + Id + + + Entrée invalide + + + Le temps maximum de lecture n'a désormais plus de limite. + + + Le temps de lecture maximum a été mis à {0} seconde(s). + + + La taille de la file d'attente est désormais illmitée. + + + La taille de la file d'attente est désormais de {0} piste(s). + + + Vous avez besoin d'être dans un salon vocal sur ce serveur. + + + Nom + + + Vous écoutez + + + Aucun lecteur de musique actif. + + + Pas de résultat + + + Musique mise sur pause. + + + Aucun lecteur de musique actif. + + + Liste d'attente - Page {0}/{1} + + + Lecture du son + + + #{0}` - **{1}** par *{2}* ({3} morceaux) + + + Page {0} des playlists sauvegardées + + + Playlist supprimée + + + Impossible de supprimer cette playlist. Soit elle n'existe pas, soit vous n'en êtes pas le créateur. + + + Aucune playlist avec cet ID existe. + + + File d'attente des playlists complète. + + + Playlist sauvegardée + + + Limite à {0}s + + + Liste d'attente + + + Musique ajoutée à la file d'attente + + + Liste d'attente effacée. + + + Liste d'attente complète ({0}/{0}) + + + Musique retirée + context: "removed song #5" + + + Répétition de la musique en cours + + + Playlist en boucle + + + Piste en boucle + + + La piste ne sera lue qu'une fois. + + + Reprise de la lecture. + + + Lecture en boucle désactivée. + + + Lecture en boucle activée. + + + Je vais désormais afficher les musiques en cours, en pause, terminées et supprimées sur ce salon. + + + Saut à `{0}:{1}` + + + Musiques mélangées. + + + Musiques déplacées. + + + {0}h {1}m {2}s + + + En position + + + Illimité + + + Le volume doit être compris entre 0 et 100 + + + Volume réglé sur {0}% + + + Désactivation de l'usage de TOUT LES MODULES pour le salon {0}. + + + Activation de l'usage de TOUT LES MODULES pour le salon {0}. + + + Permis + + + Désactivation de l'usage de TOUT LES MODULES pour le rôle {0}. + + + Activation de l'usage de TOUT LES MODULES pour le rôle {0}. + + + Désactivation de l'usage de TOUT LES MODULES sur ce serveur. + + + Activation de l'usage de TOUT LES MODULES sur ce serveur. + + + Désactivation de l'usage de TOUT LES MODULES pour l'utilisateur {0}. + + + Activation de l'usage de TOUT LES MODULES pour l'utilisateur {0}. + + + Banni {0} avec l'ID {1} + + + La commande {0} a désormais {1}s de temps de recharge. + + + La commande {0} n'a pas de temps de recharge et tout les temps de recharge ont été réinitialisés. + + + Aucune commande n'a de temps de recharge. + + + Coût de la commande : + + + Usage de {0} {1} désactivé sur le salon {2}. + + + Usage de {0} {1} activé sur le salon {2}. + + + Refusé + + + Ajout du mot {0} à la liste des mots filtrés. + + + Liste Des Mots Filtrés + + + Suppression du mot {0} à la liste des mots filtrés. + + + Second paramètre invalide. (nécessite un nombre entre {0} et {1}) + + + Filtrage des invitations désactivé sur ce salon. + + + Filtrage des invitations activé sur ce salon. + + + Filtrage des invitations désactivé sur le serveur. + + + Filtrage des invitations activé sur le serveur. + + + Permission {0} déplacée de #{1} à #{2} + + + Impossible de trouver la permission à l'index #{0} + + + Aucun coût défini. + + + Commande + Gen (of command) + + + Module + Gen. (of module) + + + Page {0} des permissions + + + Le rôle des permissions actuelles est {0}. + + + Il faut maintenant avoir le rôle {0} pour modifier les permissions. + + + Aucune permission trouvée à cet index. + + + Supression des permissions #{0} - {1} + + + Usage de {0} {1} désactivé pour le rôle {2}. + + + Usage de {0} {1} activé pour le rôle {2}. + + + sec. + Short of seconds. + + + Usage de {0} {1} désactivé pour le serveur. + + + Usage de {0} {1} activé pour le serveur. + + + Débanni {0} avec l'ID {1} + + + Non modifiable + + + Usage de {0} {1} désactivé pour l'utilisateur {2}. + + + Usage de {0} {1} activé pour l'utilisateur {2}. + + + Je n'afficherais plus les avertissements des permissions. + + + J'afficherais désormais les avertissements des permissions. + + + Filtrage des mots désactivé sur ce salon. + + + Filtrage des mots activé sur ce salon. + + + Filtrage des mots désactivé sur le serveur. + + + Filtrage des mots activé sur le serveur. + + + Capacités + + + Pas encore d'anime préféré + + + Traduction automatique des messages activée sur ce salon. Les messages utilisateurs vont désormais être supprimés. + + + Votre langue de traduction à été supprimée. + + + Votre langue de traduction a été changée de {from} à {to} + + + Traduction automatique des messages commencée sur ce salon. + + + Traduction automatique des messages arrêtée sur ce salon. + + + Le format est invalide ou une erreur s'est produite. + + + Impossible de trouver cette carte. + + + fait + + + Chapitre + + + Comic # + + + Parties compétitives perdues + + + Parties compétitives jouées + + + Rang en compétitif + + + Parties compétitives gagnées + + + Complété + + + Condition + + + Coût + + + Date + + + Defini: + + + En baisse + + + Episodes + + + Une erreur s'est produite. + + + Exemple + + + Impossible de trouver cet anime + + + Impossible de trouver ce manga + + + Genres + + + Impossible de trouver une définition pour cette citation. + + + Taille/Poid + + + {0}m/{1}kg + + + Humidité + + + Recherche d'images pour: + + + Impossible de trouver ce film. + + + Langue d'origine ou de destination invalide + + + Blagues non chargées. + + + Lat/Long + + + Niveau + + + Liste de {0} tags placés. + Don't translate {0}place + + + Emplacement + + + Les objets magiques ne sont pas chargés. + + + Profil MAL de {0} + + + Le propriétaire du Bot n'a pas spécifié de clé MashapeApi. Fonctionnalité non disponible + + + Min/Max + + + Aucun salon trouvé. + + + Aucun résultat trouvé. + + + En attente + + + Url original + + + Une clé osu!API est nécessaire + + + Impossible de récupérer la signature osu. + + + Trouvé dans {0} images. Affichage de {0} aléatoires. + + + Utilisateur non trouvé! Veuillez vérifier la région and le BattleTag avant de réessayer. + + + Prévision de lecture + + + Plateforme + + + Attaque non trouvée + + + Pokémon non trouvé. + + + Lien du profil : + + + Qualité + + + Durée en Jeux Rapides + + + Victoires Rapides + + + Évaluation + + + Score: + + + Chercher pour: + + + Impossible de réduire cette Url + + + Url réduite + + + Une erreur s'est produite. + + + Veuillez spécifier les paramètres de recherche. + + + Statut + + + Url stockée + + + Le streamer {0} est hors ligne. + + + Le streamer {0} est en ligne avec {1} spectateurs. + + + Vous suivez {0} streams sur ce serveur. + + + Vous ne suivez aucun stream sur ce serveur. + + + Aucune diffusion de ce nom. + + + Cette diffusion n'existe probablement pas. + + + Diffusion de {0} ({1}) retirée des notifications. + + + Je préviendrais ce salon lors d'un changement de statut. + + + Aube + + + Crépuscule + + + Température + + + Titre: + + + Top 3 anime favoris + + + Traduction: + + + Types + + + Impossible de trouver une définition pour ce terme. + + + Url + + + Spectateurs + + + Regardant + + + Impossible de trouver ce terme sur le wikia spécifié. + + + Entrez un wikia cible, suivi d'une requête de recherche + + + Page non trouvée + + + Vitesse du vent + + + Les {0} champions les plus bannis + + + Impossible de yodifier votre phrase. + + + Rejoint + + + `{0}.` {1} [{2:F2}/s] - {3} total + /s and total need to be localized to fit the context - +`1.` + + + Page d'Activité #{0} + + + {0} utilisateurs en total. + + + Créateur + + + ID du Bot + + + Liste des fonctions pour la commande {0}calc + + + {0} de ce salon est {1} + + + Sujet du salon + + + Commandes éxécutées + + + {0} {1} est équivalent à {2} {3} + + + Unités pouvant être converties : + + + Impossible de convertir {0} en {1}: unités non trouvées + + + Impossible de convertire {0} en {1} : les types des unités ne sont pas compatibles. + + + Créé le + + + Salon inter-serveur rejoint. + + + Salon inter-serveur quitté. + + + Voici votre jeton CSC + + + Emojis personnalisées + + + Erreur + + + Fonctionnalités + + + ID + + + Index hors limites. + + + Voici une liste des utilisateurs dans ces rôles : + + + Vous ne pouvez pas utiliser cette commande sur un rôle avec beaucoup d'utilisateurs afin d'éviter les abus. + + + Valeur {0} invalide. + Invalid months value/ Invalid hours value + + + Discord rejoint + + + Serveur rejoint + + + ID: {0} +Membres: {1} +OwnerID: {2} + + + Aucun serveur trouvée sur cette page. + + + Listes des rappels + + + Membres + + + Mémoire + + + Messages + + + Message de rappel + + + Nom + + + Pseudonyme + + + Personne ne joue à ce jeu. + + + Aucun rappel actif. + + + Aucun rôle sur cette page. + + + Aucun shard sur cette page. + Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. + + + Aucun sujet choisi. + + + Propriétaire + + + ID des propriétaires + + + Présence + + + {0} Serveurs +{1} Salons Textuels +{2} Salons Vocaux + + + Toutes les citations possédant le mot-clé {0} ont été supprimées + + + Page {0} des citations + + + Aucune citation sur cette page. + + + Aucune citation que vous puissiez supprimer n'a été trouvé. + + + Citation ajoutée + + + Une citation aléatoire a été supprimée. + + + Région + + + Inscrit sur + + + Je vais vous rappeler {0} pour {1} dans {2} `({3:d.M.yyyy} à {4:HH:mm})` + + + Format de date non valide. Regardez la liste des commandes. + + + Nouveau modèle de rappel en service. + + + Répétition de {0} chaque {1} jour(s), {2} heure(s) et {3} minute(s) + + + Liste des Rappels + + + Aucun rappel actif sur ce serveur. + + + #{0} arrêté. + + + Pas de message de rappel trouvé sur ce serveur. + + + Résultat + + + Rôles + + + Page #{0} de tout les rôles sur ce serveur. + + + Page #{0} des rôles pour {1} + + + Aucunes couleurs sont dans le format correct. Utilisez `#00ff00` par exemple. + + + Couleurs alternées pour le rôle {0} activées. + + + Couleurs alternées pour le rôle {0} arrêtées + + + {0} de ce serveur est {1} + + + Info du serveur + + + Shard + Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. + + + Statistique de Shard + Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. + + + Le shard **#{0}** est en {1} état avec {2} serveurs + Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. + + + **Nom:** {0} **Lien:** {1} + + + Pas d'emojis spéciaux trouvés. + + + Joue actuellement {0} musiques, {1} en attente. + + + Salons textuels + + + Voici le lien pour votre chambre: + + + Durée de fonctionnement + + + {0} de l'utilisateur {1} est {2} + Id of the user kwoth#1234 is 123123123123 + + + Utilisateurs + + + Salons vocaux + + + \ No newline at end of file diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index 8dd225d1..5485e9ef 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -755,7 +755,7 @@ Reason: {1} __IgnoredChannels__: {2} - Text Channel Destroyed + Text Channel Created Text Channel Destroyed @@ -1401,9 +1401,6 @@ Don't forget to leave your discord name or id in the message. Music playback paused. - - No music player active. - Player Queue - Page {0}/{1} @@ -1757,7 +1754,7 @@ Don't forget to leave your discord name or id in the message. Invalid source or target language. - Joes not loaded. + Jokes not loaded. Lat/Long From 500e128d425a80b99062c1224d4ec16eaed8fc04 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 28 Feb 2017 10:35:36 +0100 Subject: [PATCH 094/496] voicepresence fix --- src/NadekoBot/Modules/Administration/Commands/LogCommand.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Administration/Commands/LogCommand.cs b/src/NadekoBot/Modules/Administration/Commands/LogCommand.cs index f431caad..f061f045 100644 --- a/src/NadekoBot/Modules/Administration/Commands/LogCommand.cs +++ b/src/NadekoBot/Modules/Administration/Commands/LogCommand.cs @@ -529,7 +529,7 @@ namespace NadekoBot.Modules.Administration else if (afterVch == null) { str = "🎙" + Format.Code(prettyCurrentTime) + logChannel.Guild.GetLogText("user_vleft", - "👤" + Format.Code(prettyCurrentTime), "👤" + Format.Bold(usr.Username + "#" + usr.Discriminator), + "👤" + Format.Bold(usr.Username + "#" + usr.Discriminator), Format.Bold(beforeVch.Name ?? "")); } if (str != null) From 868c5e648732cec23145d8a8377d1a92c0538194 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 28 Feb 2017 14:13:50 +0100 Subject: [PATCH 095/496] Update ResponseStrings.fr-fr.resx (POEditor.com) --- .../Resources/ResponseStrings.fr-fr.resx | 407 +++++++++--------- 1 file changed, 202 insertions(+), 205 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx b/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx index 68602a62..5f7a188e 100644 --- a/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx +++ b/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx @@ -1,121 +1,121 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Cette base a déjà été revendiquée ou détruite @@ -136,7 +136,7 @@ {0} a revendiqué une base #{1} dans une guerre contre {2} - @{0} Vous avez déjà revendiqué la base {1}. Vous ne pouvez pas en revendiquer une nouvelle. + @{0} Vous avez déjà revendiqué la base #{1}. Vous ne pouvez pas en revendiquer une nouvelle. La demande de la part de @{0} pour une guerre contre {1} a expiré. @@ -178,7 +178,7 @@ La guerre contre {0} commence! - La guerre contre {0} a fini. + La guerre contre {0} est terminée. Cette guerre n'existe pas. @@ -252,7 +252,7 @@ Vous ne pouvez pas vous attaquer vous-même. - {0} s'est évanoui. + {0} s'est évanoui! Vous avez soigné {0} avec un {1} @@ -261,7 +261,7 @@ {0} a {1} points de vie restants. - Vous ne pouvez pas utiliser {0}. Ecrivez `{1}ml` pour voir la liste de toutes les actions que vous pouvez effectuer. + Vous ne pouvez pas utiliser {0}. Ecrivez `{1}ml` pour voir la liste des actions que vous pouvez effectuer. Liste des attaques pour le type {0} @@ -313,7 +313,7 @@ Vous avez été banni du serveur {0}. -Raison : {1} +Raison: {1} banni @@ -398,7 +398,7 @@ Raison : {1} Nouveau donateur ajouté avec succès. Montant total des dons de cet utilisateur : {0} 👑 - Merci aux personnes ci-dessous pour avoir permis à ce projet d'exister. + Merci aux personnes ci-dessous pour avoir permis à ce projet d'exister! Je transmettrai désormais les MPs à tous les propriétaires. @@ -407,31 +407,31 @@ Raison : {1} Je transmettrai désormais les MPs seulement au propriétaire principal. - Je vous transmettrai désormais les MPs. + Je transmettrai désormais les MPs. - Je ne vous transmettrez désormais plus les MPs. + Je ne transmettrai désormais plus les MPs. - Suppression automatique des messages d'accueil a été désactivé. + La suppression automatique des messages d'accueil a été désactivé. Les messages d'accueil seront supprimés après {0} secondes. - Message privé de bienvenue actuel: {0} + MP de bienvenue actuel: {0} - Activez les messages de bienvenue privés en écrivant {0} + Activez les MPs de bienvenue en écrivant {0} - Nouveau message de bienvenue privé en service. + Nouveau MP de bienvenue en service. - Messages de bienvenue privés désactivés. + MPs de bienvenue désactivés. - Messages de bienvenue privés activés. + MPs de bienvenue activés. Message de bienvenue actuel: {0} @@ -544,7 +544,7 @@ Raison : {1} singular "User muted." - Il semblerait que vous n'ayez pas la permission nécessaire pour effectuer cela. + Il semblerait que je n'ai pas la permission nécessaire pour effectuer cela. Nouveau rôle de mise en sourdine crée. @@ -611,7 +611,7 @@ Raison : {1} Le temps doit être compris entre {0} et {1} secondes. - Vous avez retirés tout les rôles de l'utilisateur {0} avec succès + Vous avez retirés tous les rôles de l'utilisateur {0} avec succès Impossible de retirer des rôles. Je n'ai pas les permissions suffisantes. @@ -690,7 +690,7 @@ Raison : {1} Vous ne possédez pas le rôle {0}. - L'affection automatique des rôles n'est désormais plus exclusive! + L'affectation automatique des rôles n'est désormais plus exclusive! Je suis incapable de vous ajouter ce rôle. `Je ne peux pas ajouter de rôles aux propriétaires et aux autres rôles plus haut que le mien dans la hiérarchie.` @@ -711,7 +711,7 @@ Raison : {1} Impossible d'ajouter un rôle. Je ne possède pas les permissions suffisantes. - Nouvel avatar défini. + Nouvel avatar défini! Nouveau nom de Salon défini avec succès. @@ -746,7 +746,7 @@ Raison : {1} Mode ralenti activé - expulsion + expulsés (kick) PLURAL @@ -785,25 +785,25 @@ Raison : {1} Utilisateur banni - {0} a été **mis en sourdine** sur le tchat. + {0} a été **mis en sourdine** sur le chat. - **La parole a été rétablie** sur le tchat pour {0} + **La parole a été rétablie** sur le chat pour {0} - L'utilisateur a rejoins + L'utilisateur a rejoint - L'utilisateur a quité + L'utilisateur a quitté - {0} a été **mis en sourdine** à la fois sur le salon textuel et vocal. + {0} a été **mis en sourdine** à la fois sur le salon textuel et vocal. Rôle ajouté à l'utilisateur - Rôle enlevé de l'utilisateur + Rôle retiré de l'utilisateur {0} est maintenant {1} @@ -876,13 +876,13 @@ Raison: {1} Utilisateur expulsé. - a récompensé {0} pour {1} + a récompensé {0} à {1} Pari à pile ou face - Vous aurez plus de chance la prochaine fois ^_^ + Meilleure chance la prochaine fois ^_^ Félicitations! Vous avez gagné {0} pour avoir lancé au dessus de {1} @@ -891,7 +891,7 @@ Raison: {1} Deck remélangé - Renversé {0} + Lancé {0} User flipped tails. @@ -942,10 +942,10 @@ Raison: {1} Utilisateur tiré au sort - Vous êtes tombé {0} + Vous avez roulé un {0} - Pari + Mise WOAAHHHHHH!!! Félicitations!!! x{0} @@ -954,10 +954,10 @@ Raison: {1} Une simple {0}, x{1} - Wow! Quelle chance! Trois du même style! x{0} + Wow! Quelle chance! Trois du même genre! x{0} - Bon travail! Deux {0} - bet x{1} + Bon travail! Deux {0} - mise x{1} Gagné @@ -1026,7 +1026,7 @@ N'oubliez pas de mettre votre nom discord ou ID dans le message. Liste Des Modules - Entrez `{0}cmds ModuleName` pour avoir la liste des commandes de ce module. ex `{0}cmds games` + Entrez `{0}cmds NomDuModule` pour avoir la liste des commandes de ce module. ex `{0}cmds games` Ce module n'existe pas. @@ -1048,7 +1048,7 @@ N'oubliez pas de mettre votre nom discord ou ID dans le message. Tag - Race Animale + Course d'animaux Pas assez de participants pour commencer. @@ -1092,7 +1092,7 @@ N'oubliez pas de mettre votre nom discord ou ID dans le message. Le lancement de la course a échoué. Une autre course doit probablement être en cours. - Aucune course existe sur ce serveur. + Aucune course n'existe sur ce serveur. Le deuxième nombre doit être plus grand que le premier. @@ -1119,7 +1119,7 @@ N'oubliez pas de mettre votre nom discord ou ID dans le message. Top Waifus - votre affinité est déjà liée à ce waifu ou vous êtes en train de retirer votre affinité avec quelqu'un avec qui vous n'en posséder pas. + votre affinité est déjà liée à cette waifu ou vous êtes en train de retirer votre affinité avec quelqu'un avec qui vous n'en posséder pas. Affinités changées de de {0} à {1}. @@ -1134,13 +1134,13 @@ N'oubliez pas de mettre votre nom discord ou ID dans le message. Votre affinité a été réinitialisée. Vous n'avez désormais plus la personne que vous aimez. - veut être le waifu de {0}. Aww <3 + veut être la waifu de {0}. Aww <3 - a revendiqué {0} comme son waifu pour {1} + a revendiqué {0} comme sa waifu pour {1} - Vous avez divorcé avec un waifu qui vous aimais. Monstre sans cœur. {0} a reçu {1} en guise de compensation. + Vous avez divorcé avec une waifu qui vous aimais. Monstre sans cœur. {0} a reçu {1} en guise de compensation. vous ne pouvez pas vous lier d'affinité avec vous-même, espèce d'égocentrique. @@ -1168,7 +1168,7 @@ La nouvelle valeur de {0} est {1} ! Personne - Vous avez divorcé d'une waifu qui ne vous aimé pas. Vous recevez {0} en retour. + Vous avez divorcé d'une waifu qui ne vous aimait pas. Vous recevez {0} en retour. 8ball @@ -1222,7 +1222,7 @@ La nouvelle valeur de {0} est {1} ! Inscriptions terminées. - Une Course Animale est déjà en cours. + Une Course d'animaux est déjà en cours. Total : {0} Moyenne : {1} @@ -1259,7 +1259,7 @@ La nouvelle valeur de {0} est {1} ! Partie de pendu commencée. - Une partie de pendu est déjà en cours sur ce channel. + Une partie de pendu est déjà en cours sur ce canal Initialisation du pendu erronée. @@ -1348,16 +1348,16 @@ La nouvelle valeur de {0} est {1} ! Lecture automatique activée - Volume de base mis à {0}% + Volume de base défini à {0}% File d'attente complète. - a tour de rôle + à tour de rôle - Musique finie + Musique terminée Système de tour de rôle désactivé. @@ -1404,9 +1404,6 @@ La nouvelle valeur de {0} est {1} ! Musique mise sur pause. - - Aucun lecteur de musique actif. - Liste d'attente - Page {0}/{1} @@ -1417,22 +1414,22 @@ La nouvelle valeur de {0} est {1} ! #{0}` - **{1}** par *{2}* ({3} morceaux) - Page {0} des playlists sauvegardées + Page {0} des listes de lecture sauvegardées - Playlist supprimée + Liste de lecture supprimée - Impossible de supprimer cette playlist. Soit elle n'existe pas, soit vous n'en êtes pas le créateur. + Impossible de supprimer cette liste de lecture. Soit elle n'existe pas, soit vous n'en êtes pas le créateur. - Aucune playlist avec cet ID existe. + Aucune liste de lecture avec cet ID existe. - File d'attente des playlists complète. + File d'attente de la liste complétée. - Playlist sauvegardée + Liste de lecture sauvegardée Limite à {0}s @@ -1457,7 +1454,7 @@ La nouvelle valeur de {0} est {1} ! Répétition de la musique en cours - Playlist en boucle + Liste de lecture en boucle Piste en boucle @@ -1484,7 +1481,7 @@ La nouvelle valeur de {0} est {1} ! Musiques mélangées. - Musiques déplacées. + Musique déplacée. {0}h {1}m {2}s @@ -1502,31 +1499,31 @@ La nouvelle valeur de {0} est {1} ! Volume réglé sur {0}% - Désactivation de l'usage de TOUT LES MODULES pour le salon {0}. + Désactivation de l'usage de TOUS LES MODULES pour le salon {0}. - Activation de l'usage de TOUT LES MODULES pour le salon {0}. + Activation de l'usage de TOUS LES MODULES pour le salon {0}. Permis - Désactivation de l'usage de TOUT LES MODULES pour le rôle {0}. + Désactivation de l'usage de TOUS LES MODULES pour le rôle {0}. - Activation de l'usage de TOUT LES MODULES pour le rôle {0}. + Activation de l'usage de TOUS LES MODULES pour le rôle {0}. - Désactivation de l'usage de TOUT LES MODULES sur ce serveur. + Désactivation de l'usage de TOUS LES MODULES sur ce serveur. - Activation de l'usage de TOUT LES MODULES sur ce serveur. + Activation de l'usage de TOUS LES MODULES sur ce serveur. - Désactivation de l'usage de TOUT LES MODULES pour l'utilisateur {0}. + Désactivation de l'usage de TOUS LES MODULES pour l'utilisateur {0}. - Activation de l'usage de TOUT LES MODULES pour l'utilisateur {0}. + Activation de l'usage de TOUS LES MODULES pour l'utilisateur {0}. Banni {0} avec l'ID {1} @@ -1559,7 +1556,7 @@ La nouvelle valeur de {0} est {1} ! Liste Des Mots Filtrés - Suppression du mot {0} à la liste des mots filtrés. + Suppression du mot {0} de la liste des mots filtrés. Second paramètre invalide. (nécessite un nombre entre {0} et {1}) @@ -1637,10 +1634,10 @@ La nouvelle valeur de {0} est {1} ! Usage de {0} {1} activé pour l'utilisateur {2}. - Je n'afficherais plus les avertissements des permissions. + Je n'afficherai plus les avertissements des permissions. - J'afficherais désormais les avertissements des permissions. + J'afficherai désormais les avertissements des permissions. Filtrage des mots désactivé sur ce salon. @@ -1685,10 +1682,10 @@ La nouvelle valeur de {0} est {1} ! fait - Chapitre + Chapitres - Comic # + Bande dessinée # Parties compétitives perdues @@ -1715,7 +1712,7 @@ La nouvelle valeur de {0} est {1} ! Date - Defini: + Définis: En baisse @@ -1739,7 +1736,7 @@ La nouvelle valeur de {0} est {1} ! Genres - Impossible de trouver une définition pour cette citation. + Impossible de trouver une définition pour ce hashtag. Taille/Poid @@ -1797,7 +1794,7 @@ La nouvelle valeur de {0} est {1} ! En attente - Url original + Url originale Une clé osu!API est nécessaire @@ -1809,7 +1806,7 @@ La nouvelle valeur de {0} est {1} ! Trouvé dans {0} images. Affichage de {0} aléatoires. - Utilisateur non trouvé! Veuillez vérifier la région and le BattleTag avant de réessayer. + Utilisateur non trouvé! Veuillez vérifier la région ainsi que le BattleTag avant de réessayer. Prévision de lecture @@ -1875,13 +1872,13 @@ La nouvelle valeur de {0} est {1} ! Vous ne suivez aucun stream sur ce serveur. - Aucune diffusion de ce nom. + Aucun stream de ce nom. - Cette diffusion n'existe probablement pas. + Ce stream n'existe probablement pas. - Diffusion de {0} ({1}) retirée des notifications. + Stream de {0} ({1}) retirée des notifications. Je préviendrais ce salon lors d'un changement de statut. @@ -1967,7 +1964,7 @@ La nouvelle valeur de {0} est {1} ! Sujet du salon - Commandes éxécutées + Commandes exécutées {0} {1} est équivalent à {2} {3} @@ -1979,7 +1976,7 @@ La nouvelle valeur de {0} est {1} ! Impossible de convertir {0} en {1}: unités non trouvées - Impossible de convertire {0} en {1} : les types des unités ne sont pas compatibles. + Impossible de convertir {0} en {1} : les types des unités ne sont pas compatibles. Créé le @@ -2000,7 +1997,7 @@ La nouvelle valeur de {0} est {1} ! Erreur - Fonctionnalités + Fonctionnalités ID @@ -2012,7 +2009,7 @@ La nouvelle valeur de {0} est {1} ! Voici une liste des utilisateurs dans ces rôles : - Vous ne pouvez pas utiliser cette commande sur un rôle avec beaucoup d'utilisateurs afin d'éviter les abus. + Vous ne pouvez pas utiliser cette commande sur un rôle incluant beaucoup d'utilisateurs afin d'éviter les abus. Valeur {0} invalide. @@ -2033,7 +2030,7 @@ OwnerID: {2} Aucun serveur trouvée sur cette page. - Listes des rappels + Liste des messages répétés Membres @@ -2045,7 +2042,7 @@ OwnerID: {2} Messages - Message de rappel + Répéteur de messages Nom @@ -2057,7 +2054,7 @@ OwnerID: {2} Personne ne joue à ce jeu. - Aucun rappel actif. + Aucune répétition active. Aucun rôle sur cette page. @@ -2120,16 +2117,16 @@ OwnerID: {2} Répétition de {0} chaque {1} jour(s), {2} heure(s) et {3} minute(s) - Liste des Rappels + Liste des répétitions - Aucun rappel actif sur ce serveur. + Aucune répétition active sur ce serveur. #{0} arrêté. - Pas de message de rappel trouvé sur ce serveur. + Pas de message répété trouvé sur ce serveur. Résultat @@ -2144,7 +2141,7 @@ OwnerID: {2} Page #{0} des rôles pour {1} - Aucunes couleurs sont dans le format correct. Utilisez `#00ff00` par exemple. + Aucunes couleurs ne sont dans le format correct. Utilisez `#00ff00` par exemple. Couleurs alternées pour le rôle {0} activées. @@ -2183,7 +2180,7 @@ OwnerID: {2} Salons textuels - Voici le lien pour votre chambre: + Voici le lien pour votre salon: Durée de fonctionnement From 98484b84e5cb79cc716da9e47756aba5daffb54f Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 28 Feb 2017 14:25:57 +0100 Subject: [PATCH 096/496] Update ResponseStrings.fr-fr.resx (POEditor.com) From d58ebd100f8b74802ee3cf6db292dde86c0c5067 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 28 Feb 2017 14:42:26 +0100 Subject: [PATCH 097/496] Fixed ~ani and ~mang, searches might be off for some time --- .../Searches/Commands/AnimeSearchCommands.cs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/NadekoBot/Modules/Searches/Commands/AnimeSearchCommands.cs b/src/NadekoBot/Modules/Searches/Commands/AnimeSearchCommands.cs index 9fdf07f0..3fcfb654 100644 --- a/src/NadekoBot/Modules/Searches/Commands/AnimeSearchCommands.cs +++ b/src/NadekoBot/Modules/Searches/Commands/AnimeSearchCommands.cs @@ -30,17 +30,19 @@ namespace NadekoBot.Modules.Searches { try { - var headers = new Dictionary { - {"grant_type", "client_credentials"}, - {"client_id", "kwoth-w0ki9"}, - {"client_secret", "Qd6j4FIAi1ZK6Pc7N7V4Z"}, - }; + var headers = new Dictionary + { + {"grant_type", "client_credentials"}, + {"client_id", "kwoth-w0ki9"}, + {"client_secret", "Qd6j4FIAi1ZK6Pc7N7V4Z"}, + }; using (var http = new HttpClient()) { - http.AddFakeHeaders(); + //http.AddFakeHeaders(); + http.DefaultRequestHeaders.Clear(); var formContent = new FormUrlEncodedContent(headers); - var response = await http.PostAsync("http://anilist.co/api/auth/access_token", formContent).ConfigureAwait(false); + var response = await http.PostAsync("https://anilist.co/api/auth/access_token", formContent).ConfigureAwait(false); var stringContent = await response.Content.ReadAsStringAsync().ConfigureAwait(false); anilistToken = JObject.Parse(stringContent)["access_token"].ToString(); } From f3e019ca6cac9eeddbab23c413adde012ff23e06 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 28 Feb 2017 21:43:56 +0100 Subject: [PATCH 098/496] Added german, fixed some strings --- .../Resources/ResponseStrings.Designer.cs | 14 +- .../Resources/ResponseStrings.de-DE.resx | 2190 +++++++++++++++++ src/NadekoBot/Resources/ResponseStrings.resx | 14 +- 3 files changed, 2204 insertions(+), 14 deletions(-) create mode 100644 src/NadekoBot/Resources/ResponseStrings.de-DE.resx diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index 3d80c3c9..49072329 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -594,7 +594,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Bot's language is set to {0} - {0}. + /// Looks up a localized string similar to Bot's language is set to {0} - {1}. /// public static string administration_lang_set_bot_show { get { @@ -612,7 +612,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to This server's language is set to {0} - {0}. + /// Looks up a localized string similar to This server's language is set to {0} - {1}. /// public static string administration_lang_set_show { get { @@ -1650,7 +1650,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Voice Channel Destroyed. + /// Looks up a localized string similar to Voice Channel Created. /// public static string administration_voice_chan_created { get { @@ -2235,7 +2235,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Invalid number specified. You can roll up to {0}-{1} dice at a time.. + /// Looks up a localized string similar to Invalid number specified. You can roll {0}-{1} dice at once.. /// public static string gambling_dice_invalid_number { get { @@ -4902,7 +4902,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Lsit of {0}place tags. + /// Looks up a localized string similar to List of {0}place tags. /// public static string searches_list_of_place_tags { get { @@ -5001,7 +5001,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Failed retreiving osu signature.. + /// Looks up a localized string similar to Failed retrieving osu! signature.. /// public static string searches_osu_failed { get { @@ -5995,7 +5995,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Page #{0} of roels for {1}. + /// Looks up a localized string similar to Page #{0} of roles for {1}. /// public static string utility_roles_page { get { diff --git a/src/NadekoBot/Resources/ResponseStrings.de-DE.resx b/src/NadekoBot/Resources/ResponseStrings.de-DE.resx new file mode 100644 index 00000000..9aac2f85 --- /dev/null +++ b/src/NadekoBot/Resources/ResponseStrings.de-DE.resx @@ -0,0 +1,2190 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Diese Basis wurde bereits beansprucht oder zerstört. + + + Diese Basis ist bereits zertört. + + + Diese Basis ist nicht beansprucht. + + + Basis #{0} im Krieg gegen {1} **ZERSTÖRT** + + + {0} hat die Basis #{1} **UNBEANSPRUCHT** im Krieg gegen {2} + + + {0} hat die Basis #{1} beansprucht im Krieg gegen {2} + + + @{0} sie haben die Basis #{1} bereits beansprucht. Sie können keine weitere beanspruchen. + + + Einnahme von @{0} für den Krieg gegen {1} ist abgelaufen. + + + Gegner + + + informationen über den Krieg mit {0} + + + Ungültige Basisnummer. + + + Keine gültige Kriegsgröße. + + + Liste der aktiven Kriege + + + nicht beansprucht + + + Sie nehmen nicht an diesem Krieg teil. + + + @{0} Sie nehmen nicht an diesem Krieg teil, oder diese Basis ist bereits zerstört. + + + Keine aktiven Kriege. + + + Größe + + + Krieg gegen {0} wurde schon gestartet. + + + Krieg gegen {0} erstellt. + + + Krieg gegen {0} ist beendet. + + + Dieser Krieg existiert nicht. + + + Krieg gegen {0} gestartet! + + + Reaktionsstatistiken gelöscht. + + + Benutzerdefinierte Reaktion gelöscht. + + + Unzureichende Rechte. Dies erfordert das sie den Bot besitzen für globale Reaktionen, und Administratorrechte für serverseitige Reaktionen. + + + Liste aller benutzerdefinierten Reaktionen. + + + Benutzerdefinierte Reaktionen + + + Neue benutzerdefinierte Reaktion + + + Keine benutzerdefinierten Reaktionen gefunden. + + + Keine benutzerdefinierte Reaktion mit dieser ID gefunden. + + + Antwort + + + Reaktionsstatistiken + + + Statistiken für die Reaktion {0} gelöscht. + + + Keine Statistiken für diesen Auslöser gefunden, keine Aktion unternommen. + + + Auslöser + + + Autohentai angehalten. + + + Keine Ergebnisse gefunden. + + + {0} ist bereits ohnmächtig. + + + {0} hat bereits volle LP. + + + Dein Typ ist bereits {0} + + + benutzt {0}{1} auf {2}{3} für {4} Schaden. + Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage. + + + Sie können ohne Gegenangriff nicht erneut angreifen! + + + Sie können sich nicht selber angreifen. + + + {0} wurde ohnmächtig! + + + heilte {0} mit einem {0} + + + {0} hat {1} LP übrig. + + + Sie können {0} nicht benutzen. Schreibe `{1}ml` um eine Liste deiner verfügbaren Angriffe zu sehen. + + + Angriffsliste für den Typ {0} + + + Das ist nicht sehr effektiv. + + + Sie haben nicht genug {0} + + + belebte {0} wieder mit einem {1} + + + Sie haben sich selbst wiederbelebt mit einem {0} + + + Dein Typ wurde verändert von {0} mit einem {1} + + + Das ist effektiv. + + + Das ist sehr effektiv! + + + Sie haben zu viele Angriffe hintereinander eingesetzt, sodass sie sich nicht bewegen können! + + + Typ von {0} ist {1} + + + Benutzer nicht gefunden. + + + Sie sind ohnmächtig, daher können sie sich nicht bewegen! + + + **Automatische Rollenzuteilung** wenn ein Benutzer beitritt ist nun **deaktiviert**. + + + **Automatische Rollenzuteilung** wenn ein Benutzer beitritt ist nun **aktiviert**. + + + Anhänge + + + Avatar varändert + + + Sie wurden vom Server {0} gebannt. +Grund: {1} + + + gebannt + PLURAL + + + Benutzer gebannt + + + Name des Bots geändert zu {0} + + + Status des Bots geändert zu {0} + + + Automatisches Löschen von Abschiedsnachrichten ist nun deaktiviert. + + + Abschiedsnachrichten werden nun nach {0} Sekunden gelöscht. + + + Aktuelle Abschiedsnachricht: {0} + + + Schalte Abschiedsnachrichten ein durch schreiben von {0} + + + Neues Abschiedsnachrichtenset. + + + Abschiedsnachrichten deaktiviert. + + + Abschiedsnachrichten eingeschaltet in diesem Kanal. + + + Kanalname geändert + + + Alter Name + + + Kanalthema geändert + + + Aufgeräumt. + + + Inhalt + + + Rolle {0} erfolgreich erstellt + + + Textkanal {0} erstellt. + + + Sprachkanal {0} erstellt. + + + Taubschaltung erfolgreich. + + + Server {0} gelöscht + + + Automatisches Löschen von erfolgreichen Befehlsausführungen gestoppt. + + + Automatisches Löschen von erfolgreichen Befehlsausführungen gestartet. + + + Textkanal {0} gelöscht. + + + Sprachkanal {0} gelöscht. + + + DN von + + + Erfolgreich einen neuen Spender hinzugefügt. Gesamte Spendenmenge von diesem Benutzer: {0} 👑 + + + Danke für die untenstehenden Leute die dieses Projekt möglich gemacht haben! + + + Ich werde DNs zu allen Besitzern weiterleiten. + + + Ich werde DNs zum ersten Besitzer weiterleiten. + + + Ich werde nun DNs weiterleiten. + + + Ich werde aufhören DNs weiterzuleiten. + + + Automatisches löschen der Begrüßungsnachrichten wurde deaktiviert. + + + Begrüßungsnachrichten werden gelöscht nach {0} sekunden. + + + Aktuelle DN Begrüßungsnachricht: {0} + + + Aktiviere DN Begrüßungsnachrichten durch schreiben von: {0} + + + Neue DN Begrüßungsnachricht wurde gesetzt. + + + Begrüßungsankündigungen wurden deaktiviert. + + + DN Begrüßungsankündigungen wurden aktiviert. + + + Aktuelle Begrüßungsnachricht: {0} + + + Aktiviere Begrüßungsnachrichten durch schreiben von: {0} + + + Neue Begrüßungsnachricht wurde gesetzt. + + + Begrüßungsankündigungen wurden deaktiviert. + + + Begrüßungsankündigungen wurden für diesen Kanal aktiviert. + + + Sie können diesen befehl nicht an Benutzern mit einer Rolle über oder gleich zu ihrer in der Rangordnung benutzen. + + + Bilder wurden geladen nach {0} sekunden! + + + Ungültiges Eingabeformat. + + + Ungültige Übergabevariable. + + + {0} ist {1} beigetreten + + + Sie haben {0} von dem Server gekickt. +Grund: {1} + + + Benutzer wurde gekickt + + + Liste der Sprachen +{0} + + + Ihr Servers Sprachumgebung ist jetzt {1} - {1} + + + Der Bots standard Sprachumgebung ist jetzt {0} - {1} + + + Die Sprache des Bots ist {0} - {1} + + + Setzen der Sprachumgebung fehlgeschlagen. Greifen sie auf diesen Befehls hilfe erneut auf. + + + Dieser Servers Sprache wurde zu {0} - {1} gesetzt + + + {0} verließ {1} + + + Server {0} wurde verlassen + + + Ereignis {0} wird in diesem Kanal aufgezeichnet. + + + Alle Ereignise wird in diesem Kanal aufgezeichnet. + + + Aufzeichnungen wurden deaktiviert. + + + Aufzeichnungs Ereignise die sie abonnieren können: + + + Aufzeichnungen werden {0} ignorieren + + + Aufzeichnungen werden {0} nicht ignorieren + + + Aufzeichnung von Ereignis {0} gestoppt. + + + {0} hat eine Erwähnung von den folgended Rollen aufgerufen + + + nachricht von {0} `[Besitzer des Bots]`: + + + Nachricht gesendet. + + + {0} wurde von {1} zu {2} verschoben + + + Nachricht in #{0} gelöscht + + + Nachricht in #{0} aktualisiert + + + wurden Stumm geschalten + PLURAL (users have been muted) + + + wurde Stumm geschalten + singular "User muted." + + + Ich habe wahrscheinlich die benötigten Rechte für dies nicht. + + + Neue Stumme Rolle gesetzt. + + + Ich brauche **Administrations** rechte um dies tun zu können. + + + Neue Nachricht + + + Neuer Nickname + + + Neues Thema + + + Nickname wurde geändert + + + Konnte den Server nicht finden + + + Kein Shard mit dieser ID gefunden. + + + Alte Nachricht + + + Alter Nickname + + + Altes Thema + + + Fehler. Ich habe wahrscheinlich nicht ausreichend Rechte. + + + Rechte für diesen Server zurückgesetzt. + + + Aktive Schutzmechanismen + + + {0} wurde auf diesem Server **deaktiviert**. + + + {0} aktiviert + + + Fehler. Ich benötige die Berechtigung RollenVerwalten + + + Keine Schutzmechanismen aktiviert. + + + Benutzerschwelle muss zwischen {0} und {1} sein. + + + Wenn {0} oder mehr Benutzer innerhalb von {1} Sekunden beitreten werde ich sie {2}. + + + Zeit muss zwischen {0} und {1} sekunden sein. + + + Erfolgreich alle Rollen vom Benutzer {0} entfernt + + + Rollen konnten nicht entfernt werden. Ich habe nicht die erforderlichen Rechte. + + + Farbe der Rolle {0} wurde geändert. + + + Diese Rolle existiert nicht. + + + Die angegebenen Parameter sind ungültig. + + + Fehler ist aufgetreten aufgrund von einer ungültigen Farbe oder fehlenden Rechten. + + + Erfolgreich die Rolle {0} vom Benutzer {1} entfernt + + + Entfernen der Rolle fehlgeschlagen. Ich habe nicht die erforderlichen Rechte. + + + Rolle umbenannt. + + + Umbenennen der Rolle fehlgeschlagen. Ich habe nicht die erforderlichen Rechte. + + + Sie kännen keine Rollen bearbeiten die höher als ihre eigenen sind. + + + Die Abspielnachricht wurde entfernt: {0} + + + Die Rolle {0} wurde zur Liste hinzugefügt. + + + {0} nicht gefunden. Aufgeräumt. + + + Die Rolle {0} ist bereits in der Liste. + + + Hinzugefügt. + + + Rotation des Spielstatus deaktiviert. + + + Rotation des Spielstatus aktiviert. + + + Hier ist die Liste der rotierenden Status: +{0} + + + Keine rotierenden Status gesetzt. + + + Sie haben bereits die Rolle {0}. + + + Sie haben bereits die exklusive, selbstzugewiesene Rolle {0}. + + + Selbstzuweisbare Rollen sind nun exklusiv! + + + Es gibt {0} selbstzuweisbare Rollen + + + Diese Rolle ist nicht selbstzuweisbar. + + + Sie haben die Rolle {0} nicht. + + + Selbstzuweisbare Rollen sind nicht länger exklusiv! + + + Ich kann dir diese Rolle nicht zuweisen. `Ich kann keine Rollen zu Besitzern oder andere Rollen die höher als meine in der Rangordnung sind hinzufügen.` + + + {0} wurde von der Liste der selbstzuweisbaren Rollen entfernt. + + + Sie haben nicht länger die Rolle {0}. + + + Sie haben nun die Rolle {0}. + + + Erfolgreich die Rolle {0} zum Benutzer {1} hinzugefügt + + + Fehlgeschlagen die Rolle hinzuzufügen. Ich habe nicht die erforderlichen Rechte. + + + Neuer Avatar gesetzt! + + + Neuer Kanalname gesetzt. + + + Neues Spiel gesetzt! + + + Neuer Stream gesetzt! + + + Neues Kanalthema gesetzt. + + + Verbindung zu Shard {0} wiederhergestellt. + + + Verbindung zu Shard {0} wird wiederhergestellt. + + + Fahre herunter + + + Benutzer können nicht mehr als {0} Nachrichten alle {1} Sekunden senden. + + + Slow mode deaktiviert. + + + Slow mode eingeleitet + + + soft-banned (gekickt) + PLURAL + + + {0} wird diesen Kanal ignorieren. + + + {0} wird diesen Kanal nicht mehr ignorieren. + + + Wenn ein Benutzer {0} gleiche Nachrichten sendet werde ich ihn {1}. +__ignoredChannels__: {2} + + + Textkanal erstellt + + + Textkanal zerstört + + + Taubschaltung aufgehoben. + + + Stummschaltung aufgehoben + singular + + + Benutzername + + + Benutzername geändert + + + Benutzer + + + Benutzer gebannt + + + {0} wurde **stummgeschaltet** im Chat. + + + {0} ist nicht länger **stummgeschaltet** im Chat. + + + Benutzer ist beigetreten + + + Benutzer ist gegangen + + + {0} wurde **stummgeschaltet** im Text- und Sprachchat. + + + Benutzerrolle hinzugefügt + + + Benutzerrolle entfernt + + + {0} ist nun {1} + + + {0} ist nicht länger **stummgeschaltet** im Text- und Sprachchat. + + + {0} ist dem Sprachkanal {1} beigetreten. + + + {0} hat den Sprachkanal {1} verlassen. + + + {0} ging vom Sprachkanal {1} zu {2}. + + + {0} wurde **stummgeschaltet** im Sprachchat. + + + {0} ist nicht länger **stummgeschaltet** im Sprachchat. + + + Sprachkanal erstellt + Should say "Voice Channel Created" + + + Sprachkanal zerstört + + + Text- und Sprachfunktion deaktiviert. + + + Text- und Sprachfunktion aktiviert. + + + Ich habe keine **Rollenmanagement**- und/oder **Kanalmanagement**-Rechte, sodass ich `voice+text` auf dem Server {0} nicht ausführen kann. + + + Sie schalten diese Funktion ein bzw. aus und **ich habe keine ADMINISTRATORRECHTE**. Dies könnte einige Probleme hervorrufen, sodass sie ihre Textkanäle eventuell selber aufräumen musst. + + + Ich benötige zumindest **Rollenmanagement**- und **Kanalmanagement**-Rechte um diese Funktion einzuschalten. (Bevorzugt Administratorrechte) + + + Benutzer {0} vom Textchat + + + Benutzer {0} vom Text- und Sprachchat + + + Benutzer {0} vom Sprachchat + + + Sie wurden vom Server {0} gekickt. +Grund: {1} + + + Benutzer entbannt + + + Migration fertig! + + + Fehler beim migrieren von Daten. Prüfe die Konsole des Bots für mehr Informationen. + + + Anwesenheits Änderungen + + + Nutzer wurde gekickt + + + verleiht {1} {0} + + + Münzwurf-Glücksspiel + + + Hoffentlich haben sie beim nächsten Mal mehr Glück ^_^ + + + Glückwunsch! Sie haben {0} gewonnen, weil sie über {1} gewürfelt haben + + + Deck neu gemischt. + + + Münzwurfergebnis: {0}. + User flipped tails. + + + Sie haben es erraten! Sie haben {0} gewonnen + + + Ungültige Anzahl angegeben. Sie können 1 bis {0} Münzen werfen. + + + Füge die {0} Reaktion zu dieser Nachricht hinzu um {1} zu erhalten + + + Dieses Ereignis ist aktiv für bis zu {0} Stunden. + + + Blumen-Reaktions-Ereignis gestartet + + + hat {0} an {1} verschenkt + X has gifted 15 flowers to Y + + + {0} hat eine {1} + X has Y flowers + + + Kopf + + + Bestenliste + + + {0} zu {1} Benutzern der Rolle {2} verliehen. + + + Sie können nicht mehr als {0} wetten + + + Sie können nicht weniger als {0} wetten + + + Sie haben nicht genug {0} + + + Keine Karten mehr im Deck. + + + Ausgewählter Benutzer + + + Sie haben eine {0} gewürfelt. + + + Wette + + + WOAAHHHHHH!!! Glückwunsch!!! x{0} + + + Eine einzelne {0}, x{1} + + + Wow! Glückspilz! Ein Drilling! x{0} + + + Gut gemacht! Zwei {0} - Einsatz x{1} + + + Gewonnen + + + Benutzer müssen einen geheimen Code schreiben um {0} zu erhalten. Gültig für {1} Sekunden. Erzähls niemanden. Pshhh. + + + Das SneakyGame-Event ist beendet. {0} Nutzer haben die Belohnung erhalten + + + SneakyGameStatus-Event wurde gestartet + + + Zahl + + + hat erfolgreich {0} von {1} genommen + + + war es nicht möglich {0} von {1} zu nehmen, da der Benutzer nicht so viele {2} besitzt! + + + Zurück zu ToC + + + Nur Bot-Besitzer + + + Benötigt Kanalrecht {0}. + + + Sie können das Projekt auf Patreon: <{0}> oder Paypal: <{1}> unterstützen. + + + Befehle und Alias + + + Befehlsliste neu generiert. + + + Gebe `{0}h NameDesBefehls` ein, um die Hilfestellung für diesen Befehl zu sehen. Z.B. `{0}h >8ball` + + + Ich konnte diesen Befehl nicht finden. Bitte stelle sicher das dieser Befehl existiert bevor sie es erneut versuchen. + + + Beschreibung + + + Sie können das NadekoBot-Projekt über +Patreon <{0}> oder +PayPal <{1}> unterstützen. +Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu hinterlassen. + +**Vielen Dank**♥️ + + + **Liste der Befehle**: <{0}> +**Hosting Anleitungen und Dokumentationen können hier gefunden werden**: <{1}> + + + Lister der Befehle + + + Liste der Module + + + Schreibe `{0}cmds ModuleName` um eine Liste aller Befehle dieses Moduls zu erhalten. z.B. `{0}cmds games` + + + Dieses Modul existiert nicht. + + + Benötigt Serverrecht {0}. + + + Inhaltsverzeichnis + + + Nutzung + + + Autohentai wurde gestartet. Es wird alle {0} Sekunden etwas mit einem der folgenden Stichwörtern gepostet: {1} + + + Stichwort + + + Tierrennen + + + Das Rennen konnte nicht gestartet werden, da es nicht genügend Teilnehmer gibt. + + + Rennen ist voll! Startet sofort. + + + {0} tritt als {1} bei + + + {0} tritt als {1} bei und wettete {2}! + + + Schreibe {0}jr um dem Rennen beizutreten. + + + Starte in 20 Sekunden oder wenn der Raum voll ist. + + + Starte mit {0} Teilnehmern. + + + {0} hat als {1} das Rennen gewonnen! + + + {0} hat als {1} das Rennen und {2} gewonnen! + + + Ungültige Anzahl angegeben. Sie können {0}-{1} Würfel gleichzeitig Rollen. + + + würfelte {0} + Someone rolled 35 + + + Würfel gerollt: {0} + Dice Rolled: 5 + + + Das Rennen konnte nicht gestartet werden. Ein anderes Rennen läuft wahrscheinlich. + + + Es gibt kein Rennen auf diesem Server + + + Die zweite Zahl muss größer als die erste sein. + + + Sinneswandel + + + Beansprucht von + + + Scheidungen + + + Positive Bewertungen + + + Preis + + + Keine Waifus wurden bisher beansprucht. + + + Top Waifus + + + Ihre Neigung ist bereits zu dieser Waifu gesetzt oder sie versuchsen ihre Neigung zu entfernen während sie keine gesetzt haben. + + + hat seine Neigung von {0} zu {1} geändert. + +*Das ist moralisch nicht vertretbar.*🤔 + Make sure to get the formatting right, and leave the thinking emoji + + + Sie müssen {0} Stunden und {1} Minuten warten bevor sie ihre Neigung ändern können. + + + Ihre Neigung wurde zurückgesetzt. Sie haben keine Person mehr die sie mögen. + + + will {0}s Waifu sein. Aww <3 + + + hat {0} als seine/ihre Waifu für {1} beansprucht! + + + Sie haben sich von ihrer Waifu die sie mochte scheiden lassen. Du herzloses Monster. {0} hat {1} als Kompensation erhalten. + + + Sie können deine Neigung nicht zu ihnen selbst setzen, sie egomanische Person. + + + 🎉 Ihre Liebe ist besiegelt! 🎉 +{0}'s neuer Wert ist {1}! + + + Keine Waifu ist so billig. Sie müssen wenigstens {0} bezahlen um diese Waifu zu beanspruchen, selbst wenn ihr tatsächlicher Wert geringer ist. + + + Sie müssen {0} oder mehr bezahlen um diese Waifu zu beanspruchen! + + + Diese Waifu gehört nicht dir. + + + Sie können sich nicht selbst beanspruchen. + + + Sie haben sich vor kurzem scheiden lassen. Sie müssen {0} Stunden und {1} Minuten warten bevor sie sich erneut scheiden lassen können. + + + Niemand + + + Sie haben sich von einer Waifu scheiden lassen die sie nicht mochte, Du erhältst {0} zurück. + + + 8ball + + + Acrophobie + + + Spiel wurde beendet ohne Einsendungen. + + + Keine Stimmen abgegeben. Spiel endete ohne Gewinner. + + + Das Acronym war {0}. + + + Akrophobia läuft bereits in diesem Kanal. + + + Spiel gestartet. Erstelle einen Satz aus dem folgenden Akronym. + + + Sie haben {0} Sekunden für ihre Einsendung. + + + {0} hat seinen Satz eingereicht. ({1} insgesamt) + + + Stimme ab indem du die Nummer der Einsendung eingibst + + + {0} hat seine/ihre Stimme abgegeben! + + + Der Gewinner ist {0} mit {1} Punkten. + + + {0} gewinnt, weil dieser Benutzer die einzigste Einsendung hat! + + + Frage + + + Unentschieden! Beide haben {0} gewählt + + + {0} hat gewonnen! {1} schlägt {2} + + + Einsendungen geschlossen + + + Tierrennen läuft bereits. + + + Insgesamt: {0} Durchschnitt: {1} + + + Kategorie + + + Cleverbot auf diesem Server deaktiviert. + + + Cleverbot auf diesem Server aktiviert. + + + Währungsgeneration in diesem Kanal deaktiviert. + + + Währungsgeneration in diesem Kanal aktiviert. + + + {0} zufällige {1} sind erschienen! Sammle sie indem sie `{2}pick` schreiben. + plural + + + Eine zufällige {0} ist erschienen! Sammle sie indem sie `{1}pick` schreiben. + + + Laden einer Frage fehlgeschlagen. + + + Spiel gestartet + + + Hangman-Spiel gestartet + + + Hangman-Spiel läuft bereits in diesem Kanal. + + + Starten von Hangman hat einen Fehler ausgelöst. + + + Liste der "{0}hangman" Worttypen: + + + Bestenliste + + + Sie haben nicht genug {0} + + + Keine Ergebnisse + + + {0} aufgehoben + Kwoth picked 5* + + + {0} pflanzte {1} + Kwoth planted 5* + + + Ein Trivia Spiel läuft schon auf diesem Server + + + Trivia Spiel + + + {0} erriet es! Die Antwort war: {1} + + + Kein aktives Trivia Spiel auf diesem Server. + + + {0} hat {1} punkte + + + Wird beendet after dieser Frage. + + + Die Zeit is um! Die richtige Antwort war {0} + + + {0} erriet es und hat das spiel GEWONNEN! Die Antwort war: {1} + + + Sie können nicht gegen sich selber spielen. + + + Ein TicTacToe Spiel läuft schon in diesem Kanal. + + + Unentschieden! + + + hat ein TicTacToe Spiel erstellt. + + + {0} hat gewonnen! + + + Drei in einer Reihe + + + Keine Züge übrig + + + Zeit abgelaufen + + + {0}'s Zug + + + {0} gegen {1} + + + Versuche {0} Songs einzureihen... + + + Autoplay deaktiviert. + + + Autoplay aktiviert. + + + Standard-Lautstärke auf {0}% gesetzt + + + Ordner-Einreihung fertig. + + + fairer Modus + + + Song beendet + + + Fairer Modus deaktiviert. + + + Fairer Modus aktiviert. + + + Von Position + + + ID + + + Ungültige Eingabe. + + + Maximale Spielzeit hat kein Limit mehr + + + Maximale Spielzeit ist nun {0} Sekunden + + + Maximale Musik-Warteschlangengröße ist nun unbegrenzt. + + + Maximale Musik-Warteschlangengröße ist nun {0} Songs. + + + Sie müssen sich in einem Sprachkanal auf diesem Server befinden. + + + Name + + + Aktueller Song: + + + Kein aktiver Musikspieler. + + + Keine Suchergebnisse. + + + Musikwiedergabe pausiert. + + + Musik-Warteschlange - Seite {0}/{1} + + + Spiele Song + + + `#{0}` - **{1}** by *{2}* ({3} Songs) + + + Seite {0} der gespeicherten Playlists + + + Playlist gelöscht. + + + Playlist konnte nicht gelöscht werden. Entweder sie existiert nicht oder sie gehört nicht dir. + + + Es gibt keine Playlist mit dieser ID. + + + Playlist wurde an die Warteschlange angehängt. + + + Playlist gespeichert + + + {0}'s Limit + + + Warteschlange + + + Eingereihter Song + + + Musik-Warteschlange geleert + + + Warteschlange ist voll bei {0}/{1} + + + Song entfernt + context: "removed song #5" + + + Aktueller Song wird wiederholt + + + Playlist wird wiederholt + + + Song wird wiederholt + + + Aktueller Song wird nicht mehr wiederholt. + + + Musikwiedergabe wiederaufgenommen + + + Playlist-Wiederholung deaktiviert. + + + Playlist-Wiederholung aktiviert. + + + Ich werde nun spielende, beendete, pausierte und entfernte Songs in diesen Channel ausgeben. + + + Gesprungen zu `{0}:{1}` + + + Song gemischt + + + Song bewegt + + + {0}h {1}m {2}s + + + Zu Position + + + unbegrenzt + + + Lautstärke muss zwischen 0 und 100 sein + + + Lautstärke auf {0}% gesetzt + + + Benutzung ALLER MODULE für Kanal {0} verboten. + + + Benutzung ALLER MODULE für Kanal {0} erlaubt. + + + Erlaubt + + + Benutzung ALLER MODULE für die Rolle {0} verboten. + + + Benutzung ALLER MODULE für die Rolle {0} erlaubt. + + + Benutzung ALLER MODULE für diesen Server verboten. + + + Benutzung ALLER MODULE für diesen Server erlaubt. + + + Benutzung ALLER MODULE für den Benutzer {0} verboten. + + + Benutzung ALLER MODULE für den Benutzer {0} erlaubt. + + + {0} mit ID {1} wurde zur Sperrliste hinzugefügt + + + Befehl {0} hat nun {1}s Abklingzeit + + + Befehl {0} hat keine Abklingzeit mehr und alle laufenden Abklingzeiten wurden entfernt. + + + Keine Befehls Abklingzeiten gesetzt. + + + Preis für Befehle + + + Benutzung von {0} {1} wurde für Kanal {2} verboten. + + + Benutzung von {0} {1} wurde für Kanal {2} erlaubt. + + + Verweigert + + + Wort {0} zu der Liste der gefilterten Wörter hinzugefügt. + + + Liste der gefilterten Wörter + + + Wort {0} von der Liste der gefilterten Wörter entfernt. + + + Ungültiger zweiter Parameter. (Muss eine Nummer zwischen {0} und {1} sein) + + + Filterung von Einladungen auf diesem Kanal deaktiviert. + + + Filterung von Einladungen auf diesem Kanal aktiviert. + + + Filterung von Einladungen auf diesem Server deaktiviert. + + + Filterung von Einladungen auf diesem Server aktiviert. + + + Berechtigung {0} von #{1} zu #{2} gesetzt + + + Konnte Berechting an Index #{0} nicht finden + + + Kein Preis gesetzt. + + + Befehl + Gen (of command) + + + Modul + Gen. (of module) + + + Berechtigungen Seite {0} + + + Aktuelle Berechtigungsrolle ist {0}. + + + Benutzer brauchen nun Rolle {0} um die Berechtigungen zu editieren. + + + Keine Berechtigung für diesen Index gefunden + + + Berechtigung #{0} - {1} entfernt + + + Benutzung von {0} {1} wurde für Rolle {2} verboten. + + + Benutzung von {0} {1} wurde für Rolle {2} erlaubt. + + + sek. + Short of seconds. + + + Benutzung von {0} {1} wurde für diesen Server verboten + + + Benutzung von {0} {1} wurde für diesen Server erlaubt. + + + {0} mit ID {1} von Sperrliste entfernt + + + Nicht Bearbeitbar + + + Benutzung von {0} {1} wurde für Benutzer {2} verboten. + + + Benutzung von {0} {1} wurde für Benutzer {2} erlaubt. + + + Ich werde nicht mehr Warnungen für Rechte anzeigen. + + + Ich werde jetzt Warnungen für Rechte anzeigen. + + + Filterung für Wörter in diesem Kanal deaktiviert. + + + Filterung für Wörter in diesem Kanal aktiviert. + + + Filterung für Wörter auf diesem Server deaktiviert. + + + Filterung für Wörter auf diesem Server aktiviert. + + + Fähigkeiten + + + Keine favoritisierten anime + + + Startete die Automatische Übersetzung der Nachrichten auf diesem kanal. Nachrichten von Benutzern werden automatisch gelöscht. + + + Ihre Automatische-Übersetzungs Sprache wurde entfernt. + + + Ihre Automatische-Übersetzungs Sprache wurde zu {from}>{to} gesetzt. + + + Automatische Übersetzung der Nachrichten wurde auf diesem kanal gestartet. + + + Automatische Übersetzung der Nachrichten wurde auf diesem kanal gestoppt. + + + Schlechter Eingabeformat, oder etwas lief schief. + + + Konnte diese Karte nicht finden + + + fakt + + + Kapitel + + + Comic # + + + Verlorene Competitives + + + Gespielte Competitives + + + Competitive Rang + + + Gewonnene Competitives + + + Beendet + + + Kondition + + + Kosten + + + Datum + + + Definiere: + + + Abgebrochen + + + Episoden + + + Ein fehler ist aufgetreten. + + + Beispiel + + + Konnte diesen animu nicht finden. + + + Konnte diesen mango nicht finden. + + + Genres + + + Konnte keine definition für dieses Stichwort finden. + + + Höhe/Gewicht + + + {0}m/{1]kg + + + Feuchtigkeit + + + Bildersuche für: + + + Konnte diesen Film nicht finden. + + + Ungültige Quell- oder Zielsprache, + + + Witze nicht geladen. + + + Lat/long + + + Level + + + Liste der "{0}place" Stichwörtern + Don't translate {0}place + + + Standort + + + Magic Items nicht geladen. + + + {0}s MAL Profil + + + Der Besitzer des Bots hat keinen MashapeApi-Schlüssel angegeben. Sie können diese Funktion nicht benutzen. + + + Min/Max + + + Keine Kanäle gefunden. + + + Keine Ergebnisse gefunden. + + + Pausierte + + + Ursprüngliche Url + + + Ein osu! API-Schlüssel wird benötigt. + + + osu! Signatur konnte nicht geholt werden. + + + Über {0} Bilder gefunden. Zeige zufälliges {0}. + + + Benutzer nicht gefunden! Bitte überprüfe die Region und den BattleTag before erneuten versuchen. + + + Vermerkte + + + Platform + + + Keine Fähigkeit gefunden. + + + Kein pokemon gefunden. + + + Profil Link: + + + Qualität + + + Quick Spielzeit + + + Gewonnene Quicks + + + Bewertung + + + Punktzahl: + + + Suche nach: + + + Url konnte nicht gekürzt werden + + + Kurze Url + + + Etwas lief schief. + + + Bitte spezifizieren sie die Such Parameter. + + + Status + + + Geschäfts Url + + + Streamer {0} ist jetzt offline. + + + Streamer {0} ist online mit {1} Zuschauern. + + + Sie folgen {0} Streamer auf diesem Server. + + + Sie folgen keinem Streamer auf diesem Server. + + + Diesen Stream gibt es nicht. + + + Stream existiert wahrscheinlich nicht. + + + {0}s Stream ({1}) von den Benachrichtigungen entfernt. + + + Ich werde diesen Kanal benachrichtigen wenn der Status sich verändert. + + + Sonnenaufgang + + + Sonnenuntergang + + + Temperature + + + Titel: + + + Top 3 Lieblingsanime: + + + Übersetzung: + + + Typen + + + Die definition für den Begriff konnte nicht gefunden werden. + + + Url + + + Zuschauer + + + Am schauen + + + Der Begriff konnte auf dem spezifizierten wikia nicht gefunden werden. + + + Bitte geben sie ein Ziel wikia ein, gefolgt bei der Suchanfrage. + + + Seite konnte nicht gefunden werden. + + + Wind Geschwindigkeit + + + Die {0} meist gebannten Champions + + + Ihre Nachricht konnte nicht yodifiziert werden. + + + Beigetreten + + + `{0}.` {1} [{2:F2}/s] - {3} total + /s and total need to be localized to fit the context - +`1.` + + + Aktivitäten Liste #{0} + + + {0} totale Benutzer. + + + Autor(in) + + + ID des Bots + + + Liste der Funktionen im {0}calc Befehl + + + {0} dieses Kanals ist {1} + + + Thema des Kanals + + + Befehl ausgeführt + + + {0} {1} ist gleich zu {2} {3} + + + Einhetein die von dem Konvertierer benutzt werden können + + + Kann {0} nicht zu {1} konvertieren: Einheiten nicht gefunden + + + Kann {0} nicht zu {1} konvertieren: Einheiten sind nicht gleich + + + Erstellt am + + + Betritt Multi-Server-Kanal. + + + Verließ Multi-Server-Kanal. + + + Dies ist ihr MSK token + + + Benutzerdefinierte Emojis + + + Fehler + + + Funktionalitäten + + + ID + + + Index außer Reichweite. + + + Hier ist eine Liste mit Nutzern in diesen Rollen: + + + Sie haben keine Berechtigung diesen Befehl auf Rollen mit vielen Nutzern zu benutzen um Missbrauch zu verhindern. + + + Ungültiger {0} Wert. + Invalid months value/ Invalid hours value + + + Discord beigetreten + + + Server beigetreten + + + ID: {0} +Mitglieder: {1} +ID des Besitzers: {2} + + + Keine Server auf dieser Seite gefunden. + + + Liste der Wiederholer + + + Mitglieder + + + Speicher + + + Nachrichten + + + Nachrichten Wiederholer + + + Name + + + Nickname + + + Niemand spielt dieses Spiel. + + + Keine aktiven Wiederholer + + + Keine Rollen auf dieser Seite. + + + Keine Shards auf dieser Seite. + + + Kein Thema gesetzt. + + + Besitzer + + + IDs der Besitzer + + + Anwesenheit + + + {0} Server +{1} Text Kanäle +{2} Sprach Kanäle + + + Alle Zitate mit dem Stichwort {0} wurden gelöscht. + + + Seite {0} der Zitate + + + Keine Zitate auf dieser Seite. + + + Kein Zitat das sie entfernen können gefunden. + + + Zitat hinzugefügt + + + Zufälliger Zitat wurde gelöscht. + + + Region + + + Registriert an + + + Ich werde {0} erinnern {1} in {2} `({3:d.M.yyyy.} um {4:HH:mm})` zu tun. + + + Kein gültiges Zeitformat. Überprüfe die Befehlsliste. + + + Neue Erinnerungs Vorlage wurde gesetzt. + + + {0} wird jede {1} Tag(e), {2}stunde(n) und {3} minute(n) wiederholt. + + + Liste der Wiederholungen + + + Auf diesem Server laufen keine Wiederholer. + + + #{0} wurde gestoppt. + + + Auf diesem Server wurden keine wiederholende Nachrichten gefunden. + + + Resultat + + + Rollen + + + Seite #{0} aller Rollen für diesen Server: + + + Seite #{0} der Rollen für {1} + + + Keine Farben sind in dem Richtigen Format. Benutze zum Beispiel `#00ff00`. + + + Startete die Farbrotation für Rolle {0} + + + Stoppte die Farbrotation für Rolle {0} + + + {0} dieses Servers ist {1} + + + Server Info + + + Shard + + + Shard Statistiken + + + Shard **#{0}** ist im {1} status mit {2} Servern + + + **Name:** {0} **Link:** {1} + + + Keine speziellen emoji gefunden. + + + Wiedergabe von {0} Liedern, {1} in der Musikliste. + + + Text Kanäle + + + Hier ist ihr Raum link + + + Betriebszeit + + + {0} von Benutzer {1} ist {2} + Id of the user kwoth#1234 is 123123123123 + + + Benutzer + + + Sprach Kanäle + + + \ No newline at end of file diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index 5485e9ef..3dfd8571 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -480,13 +480,13 @@ Reason: {1} Bot's default locale is now {0} - {1} - Bot's language is set to {0} - {0} + Bot's language is set to {0} - {1} Failed setting locale. Revisit this command's help. - This server's language is set to {0} - {0} + This server's language is set to {0} - {1} {0} has left {1} @@ -822,7 +822,7 @@ Reason: {1} {0} has been **voice unmuted**. - Voice Channel Destroyed + Voice Channel Created Voice Channel Destroyed @@ -1074,7 +1074,7 @@ Don't forget to leave your discord name or id in the message. {0} as {1} Won the race and {2}! - Invalid number specified. You can roll up to {0}-{1} dice at a time. + Invalid number specified. You can roll {0}-{1} dice at once. rolled {0} @@ -1763,7 +1763,7 @@ Don't forget to leave your discord name or id in the message. Level - Lsit of {0}place tags + List of {0}place tags Don't translate {0}place @@ -1797,7 +1797,7 @@ Don't forget to leave your discord name or id in the message. An osu! API key is required. - Failed retreiving osu signature. + Failed retrieving osu! signature. Found over {0} images. Showing random {0}. @@ -2134,7 +2134,7 @@ OwnerID: {2} Page #{0} of all roles on this server: - Page #{0} of roels for {1} + Page #{0} of roles for {1} No colors are in the correct format. Use `#00ff00` for example. From 31974baa13dffd9c5ae206d0a343c9db6903de26 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 28 Feb 2017 21:46:06 +0100 Subject: [PATCH 099/496] added russian --- .../Resources/ResponseStrings.ru-RU.resx | 2195 +++++++++++++++++ 1 file changed, 2195 insertions(+) create mode 100644 src/NadekoBot/Resources/ResponseStrings.ru-RU.resx diff --git a/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx b/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx new file mode 100644 index 00000000..f6729bb5 --- /dev/null +++ b/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx @@ -0,0 +1,2195 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + Враг + + + Информация о войне против {0} + + + + + + + + + Список активных войн + + + + + + + + + + + + + + + Размер + + + + + + Война против {0} была создана. + Fuzzy + + + Закончилась война против {0}. + + + Эта война не существует. + + + + + + Вся статистика настраиваемых реакций стёрта. + + + Настраиваемая реакция удалена. + Fuzzy + + + Недостаточно прав. Необходимо владеть Бот-ом для глобальных настраиваемых реакций или быть Администратором для реакций по серверу. + Fuzzy + + + Список всех настраиваемых реакций. + Fuzzy + + + Настроить реакции. + Fuzzy + + + Создана новая реакция. + Fuzzy + + + + + + + + + Ответ + + + + + + + + + + + + Активатор + + + Авто-хентай остановлен :( + + + Запрос не найден. + + + {0} уже потерял сознание. + + + {0} уже имеет полное здоровье. + + + Ваш тип уже {0} + + + использовал {0}{1} против {2}{3} и нанёс {4} урона. + Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage. + + + Нельзя атаковать два раза подряд. + + + Нельзя атаковать самого себя. + + + {0} потерял сознание! + + + вылечил {0}, использовав {1} + + + У {0} осталось {1} здоровья. + + + Вы не можете использовать {0}. Напишите '{1}ml', чтобы увидеть список доступных Вам приёмов. + + + Список приёмов {0} типа + + + Эта атака не эффективна. + + + У вас не достаточно {0} + + + воскресил {0}, использовав один {1} + + + Вы воскресили себя, использовав один {0} + + + Ваш тип изменён с {0} на {1} + + + Эта атака немного эффективна. + + + Эта атака очень эффективна! + + + Вы использовали слишком много приёмов подряд и не можете двигаться! + + + Тип {0} — {1} + + + Пользователь не найден. + + + Вы не можете использовать приёмы потому-что ваш покемон потерял сознание! + + + ***Авто выдача роли*** каждому новому пользователю **отключена** + + + ***Авто выдача роли*** каждому новому пользователю **включена** + + + Приложения + + + Аватар изменён + + + Вас забанили с сервера {0}. Причина бана: {1}. + + + забанены + PLURAL + + + Пользователь забанен. + + + Имя Бот-а сменено на {0} + + + Статус Бот-а сменён на {0} + + + Автоматическое удаление прощальных сообщений отключено. + + + Прощальные сообщения будут удаляться через {0} секунд. + + + Текущее прощальное сообщение: {0} + + + Чтобы включить прощальные сообщения введите {0} + + + Установлено новое прощальное сообщение. + + + Прощальные сообщения выключены. + + + Прощальные сообщения включены на этом канале. + + + Имя канал изменено. + + + Старое имя. + + + Тема канала сменена. + + + + + + + + + Успешно создана роль {0}. + + + Создан текстовый канал {0}. + + + Создан голосовой канал {0}. + + + Успешное оглушение. + Fuzzy + + + Сервер {0} удален. + + + Отключено автоматическое удаление успешно выполненных команд. + + + Включено автоматическое удаление успешно выполненных команд. + + + Удалён текстовый канал {0}. + + + Удален голосовой канал {0}. + + + ПМ от + + + Успешно добавлен новый донатор. Общее количество пожертвований от этого пользователя: {0} 👑 + Fuzzy + + + Спасибо всем, указанным ниже, что помогли этому проекту! + + + Я буду перенаправлять личные сообщения всем владельцам. + + + Я буду перенаправлять личные сообщения только первому владельцу. + + + Я буду перенаправлять личные сообщения. + + + Я прекращаю перенаправление личных сообщений. + + + Автоматическое удаление приветственных сообщений выключено. + + + Приветственные сообщения будут удаляться через {0} секунд. + + + Приветствие, используемое в настоящий момент: {0} + + + Чтобы включить приветствия, напишите {0} + + + Новое приветствие установлено. + + + Приветствия в личных сообщениях отключены. + + + Приветствия в личных сообщениях включены. + + + Текущее привественное сообщение: {0} + + + Чтобы включить привественные сообщения введите {0} + + + Установлено новое приветствие. + + + Привественные сообщения выключены. + + + Привественные сообщения включены на этом канале. + + + Вы не можете использовать эту команду на пользователях равным или более высоким в иерархии ролей. + + + Картинки загружены за {0} секунд! + + + Неправильный формат ввода. + + + Неправильные параметры. + + + {0} присоединился к {1} + + + Вы были выгнаны с сервера {0}. +По причине: {1} + + + Пользователь выгнан + + + Список языков +{0} + + + Язык вашего сервера теперь {0} - {1} + + + Язык Бот-а по умолчанию теперь {0} - {1} + + + Язык Бот-а теперь установлен как {0} - {1} + + + Не удалось выставить язык. Проверьте справку к этой команде. + + + Язык этого сервера теперь установлен как {00} - {1} + + + {0} покинул {1} + + + Покинул сервер {0} + + + В этом канале регистрируется событие {0}. + + + В этом канале регистрируются все события. + + + Регистрация событий отключена. + + + Регистрируйте события, на которые Вы можете подписаться: + + + Регистрация будет пропускать {0}. + + + Регистрация не будет пропускать {0}. + + + Прекращена регистрация события {0}. + + + {0} вызвал оповещение для следующих ролей + + + Сообщение от {0} '[Владелец бота]': + + + Сообщение отправлено. + + + {0} перемещён из {1} в {2} + + + Сообщение удалено в #{0} + + + Сообщение изменено в #{0} + + + Заглушёны + PLURAL (users have been muted) + + + Заглушён + singular "User muted." + + + Скорее всего, у меня нет необходимых прав. + + + Новая немая роль установлена. + Fuzzy + + + Мне нужно право **Администратор**, чтобы это сделать. + Fuzzy + + + Новое сообщение + + + Новое имя + + + Новый заголовок + + + Имя изменено + + + Сервер не найден + + + Не найдено Shard-а с таким ID. + + + Старое сообщение + + + Старое имя + + + Старый заголовок + + + Ошибка. Скорее всего мне не хватает прав. + + + Права для этого сервера + + + + + + {0} был **отключён** на этом сервере. + + + {0} влючён + + + Ошибка. Требуется право на управление ролями. + + + + + + Порог пользователей должен лежать между {0} и {1}. + + + Если {0} или больше пользователей присоединяются в течение {1} секунд, Я {2} их. + + + Время должно быть между {0} и {1} секунд. + + + Успешно убраны все роли пользователя {0}. + + + Не удалось убрать роли. Отсутвуют требуемые разрешения. + + + Цвет роли {0} был изменён. + + + Данная роль не существует. + + + Заданные параметры недействительны. + + + Возникла ошибка из-за недействительного цвета или недостаточных разрешений. + + + Успешно убрана роль {0} пользователя {1}. + + + Не удалось убрать роль. Отсутвуют требуемые разрешения. + + + Роль переименована. + + + Не получилось переименовать роль. У меня недостаточно прав. + + + Вы не можете редактировать роли, находящиеся выше чем ваша роль. + + + + + + Роль {0} добавлена в лист. + + + + + + Роль {0} уже есть в списке. + + + Добавлено. + + + + + + + + + + + + + + + У вас уже есть роль {0} + + + У Вас уже есть исключающая самоназначенная роль {0}. + + + Самоназначенные роли теперь взаимоисключающие! + + + Существует {0} самоназначенных ролей + + + Эта роль не является самоназначаемой. + + + У вас отсуствует роль {0} + + + Самоназначенные роли теперь не взаимоисключающие! + + + Не удалось добавить Вам эту роль. 'Нельзя добавлять роли владельцам или другим ролям, находящимся выше моей роли в ролевой иерархии' + + + {0} убрана из списка самоназначенных ролей. + + + У вас больше нету роли {0} + + + Теперь у вас есть роль {0} + + + Успешно добавлена роль {0} пользователю {1} + + + Не удалось добавить роль. Нет достаточных разрешений. + + + Новый аватар установлен! + + + Новое имя канала установлено. + + + Новая игра установлена! + + + Новый стрим установлен! + + + Новая тема канала установлена. + + + Shard {0} переподключён. + + + Shard {0} переподключается. + + + Выключение + + + Пользователи не могут посылать более {0} сообщений в {1} секунд. + + + Медленный режим выключен. + + + Медленный режим включен. + + + + PLURAL + + + {0} будет игнорировать данный канал. + + + {0} не будет игнорировать данный канал. + + + Если пользователь пишет {0} одинаковых сообщений подряд, я {} их. __Игнорируемые каналы__: {2} + + + Создан текстовый канал + + + Уничтожен текстовый канал. + + + Отключено заглушение. + + + + singular + + + Имя + + + Имя изменено + + + Пользователи + + + Пользователь заблокирован + + + + + + + + + Пользователь присоединился + + + Пользователь вышел + + + + + + Добавлена роль пользователя + + + Удалена роль пользователя + + + {0} теперь {1} + + + + + + {0} присоединился к голосовому каналу {1}. + + + {0} покинул голосовой канал {1}. + + + {0} переместил {1} в голосовой канал {2}. + + + + + + + + + Голосовой канал удалён + Fuzzy + + + Голосовой канал удалён + + + + + + + + + Нет разрешений **Управление ролями** и/или **Управление каналами**, поэтому нельзя использовать команду 'voice+text' на сервере {0}. + + + Вы пытаетесь включить/отключить это свойство и **отсутвует разрешение АДМИНИСТРАТОР**. Это может вызвать ошибки, и Вам придётся удалять текст в текстовых каналах самостоятельно. + + + Для этого свойства требуются как минимум разрешения **управление ролями** и **управление каналами**. (Рекомендуется разрешение Администратор) + + + Пользователь {0} в текстовом чате + + + Пользователь {0} в текстовом и голосовом чатах + + + Пользовать {0} в голосовом чате + + + Вас забанили на сервере {0}. Причина: {1} + + + Пользователь разбанен. + + + Перемещение закончено! + + + Ошибка при переносе файлов, проверьте консоль бота для получения дальнейшей информации. + + + + + + + + + наградил {0} пользователю {1} + + + + + + В следующий раз повезёт ^_^ + + + Поздравляем! Вы выиграли {0}, так как выбросили больше {1} + + + Колода перетасована. + + + подброшено {0} + User flipped tails. + + + Вы угадали! Вы выиграли {0} + + + Указано неверное число. Вы можете подбросить от 1 до {0} монет. + + + Добавьте {0}, как реакцию к этому сообщению, чтобы получить {1}␣ + + + Это событие активно в течение не более {0} часов. + + + Событие получения цветов началось! + + + подарил {0} {1} + X has gifted 15 flowers to Y + + + У {0} есть {1} + X has Y flowers + + + Орёл + + + Таблица рекордов + + + {1} пользователей c ролью {2} награждены {0}. + + + Вы не можете поставить больше {0} + + + Вы не можете поставить меньше {0} + + + У Вас недостаточно {0} + + + В колоде закончились карты. + + + + + + + + + + + + НИЧЕГО СЕБЕ!!! Поздраляем!!! x{0} + + + Один {0}, x{1} + + + Вот это повезло! Тройка! x{0} + + + Молодец! Две {} - ставка x{1} + + + Выиграл + + + Пользователи могут ввести секретный код, чтобы получить {0}. Длится {1} секунд. Никому не говори! + + + Закончилось событие SneakyGame. {0} пользователей получили награду. + + + Началось событие SneakyGameStatus + + + Решка + + + успешно забрал {0} у {1} + + + не смог забрать {0} у {1}, поскольку у пользователя нет столько {2}! + + + Вернуться к содержанию + + + Только для владельца бота + + + Требуется разрешение канала {0}. + + + Вы можете поддержать проект в patreon: <{0}> или через paypal: <{1}> + + + Команды и альтернативные имена команд + + + Список команд создан. + + + Напишите '{0}h ИмяКоманды', чтобы получить справку для этой команды. Например, '{0}h >8ball' + + + Эта команда не найдена. Пожалуйста, убедитесь, что команда существует. + + + Описание + + + Вы можете поддержать проект NadekoBot в +Patreon <{0}> или +Paypal <{1}> +Не забудьте оставить ваше имя в Discord или id в Вашем сообщении. + +**Спасибо** ♥️ + + + **Список команд**: <{0}> +**Руководства по установке и документы можно найти здесь**: <{1}> + + + Список команд + + + Список модулей + + + Напишите '{0}cmds ИмяМодуля', чтобы получить список команд в этом модуле. Например, '{0}cmds games' + + + Этот модуль не существует + + + Требуются серверное право {0} + + + Содержание + + + Использование + + + + + + Тэг + + + Гонка зверей + + + Не удалось начать гонку, так как не хватает участников. + + + В гонке не осталось мест! Гонка начинается. + + + {0} присоединился в роли {1} + + + {0} присоединился в роли {1} и сделал ставку {2}! + + + Напишите {0}jr, чтобы присоединиться к гонке. + + + Гонка начнётся через 20 секунд или когда все места будут заняты. + + + Гонка началась с {0} участниками. + + + {0} в роли {1} победил в гонке! + + + {0} в роли {1} победил в гонке и получил {2}! + + + Задано неправильное число. Можно бросить {0}-{1} костей одновременно. + + + + Someone rolled 35 + + + Брошено {0} костей. + Dice Rolled: 5 + + + Не удалось начать гонку. Другая гонка уже идёт. + + + На данном сервере не идёт гонка. + + + Второе число должно быть больше первого. + + + + + + + + + Разводы + + + Нравится + + + Цена + + + Ни одной вайфу ещё не забрали + + + Рейтинг вайфу + + + Ваша предрасположенность уже установлена для этой вайфу или Вы пытаесь убрать предрасположенность к вайфу, которой нет. + + + сменил свою предрасположенность с {0} на {1}. + +*Это сомнительно с точки зрения морали* :thinking: + Make sure to get the formatting right, and leave the thinking emoji + + + Вам нужно подождать {0} часов и {1} минут перед тем, как опять менять Вашу предрасположенность. + + + Ваша предрасположенность сброшена. У Вас больше нет человека, который Вам нравится. + + + хочет быть вайфу {0}. Как мило <3 + + + объявил {0} своей вайфу за {1}! + + + Вы развелись с вайфу, которой Вы нравитесь. Вы бессердечный прохиндей! {0} получил {1} в качестве компенсации. + + + Вы не можете установить предрасположенность к самому себе, это чересчур эгоистичсно. + + + 🎉Их любовь нашла взаимность!🎉 +Новое значение {0} — {1}. + + + Не бывает таких дешёвых вайфу. Вам нужно заплатить как минимум {0}, чтобы получить вайфу, даже если их фактическая стоимость ниже этого значения. + + + Вам нужно заплатить {0} или больше, чтобы получить эту вайфу! + + + Эта вайфу — не Ваша. + + + Вы не можете потребовать себя в вайфу. + + + Вы недавно развелись. Нужно подождать {0} часов и {1} минут, если хотите снова развестись. + + + Никто + + + Вы развелись с вайфу, которой Вы не нравились. Вам вернули {0}. + + + + + + Акрофобия. + + + Игра закончилась без ответов. + + + Никто не проголосовал. Игра закончилась без победителся. + + + Акроним был {0}. + + + В этом канале уже идёт игра Акрофобии. + + + Игра начинается. Составьте предложение со следующим акронимом: {0}. + + + У Вас есть {0} секунд, чтобы предложить ответ. + + + {0} предложил своё предложение. ({1} в общей сложности) + + + Чтобы проголосовать, напишите номер ответа. + + + {0} проголосовал! + + + Победитель — {0} с {1} очками. + + + {0} — победитель, так как только он привёл ответ! + + + Вопрос + + + Ничья! Оба игрока выбрали {0} + + + {0} выиграл! {1} побеждает {2} + + + Приём ответов закончен. + + + Гонка зверей уже идёт. + + + Итого: {0} Среднее: {1} + + + Категория + + + На этом сервере отключён cleverbot. + + + На этом сервере включён cleverbot. + + + В этом канале отключено появление валюты. + + + В этом канале включено появление валюты. + + + {0} случайных {1} появились! Напишите '{2}pick', чтобы собрать их. + plural + + + Случайный {0} появился! Напишите '{1}pick', чтобы собрать его. + + + Не удалось загрузить вопрос. + + + Игра началась + + + Игра в Виселицу началась + + + Игра в Виселицу уже идёт в этом канале. + + + Не удалось начать игру в Виселицу. + + + Список типов слов для "{0}hangman": + + + Таблица рекордов + + + У вас не хватает {0} + + + Нет результатов + + + собрал {0} + Kwoth picked 5* + + + {0} посадил {1} + Kwoth planted 5* + + + Викторина уже идёт на этом сервере. + + + Викторина + + + {0} угадал! Ответ: {1} + + + На этом сервере не идёт викторина. + + + У {0} {1} очков. + + + Игра закончится после этого вопроса. + + + Время вышло! Правильный ответ — {0} + + + {0} угадал и ВЫИГРАЛ в игре! Ответ: {0} + + + Вы не можете играть против самого себя. + + + В этом канале уже идёт игра в крестики-нолики. + + + Ничья! + + + создал игру в крестики-нолики. + + + {0} выиграл! + + + Выстроил 3 в ряд + + + Ходов не осталось! + + + Время вышло! + + + Ход {0} + + + {0} против {1} + + + Пытаюсь добавить {0} песен в очередь... + + + Автовоспроизведение отключено. + + + Автовоспроизведение включено. + + + Громкость по умолчанию выставлена на {0}% + + + Папка успешно добавлена в очередь воспроизведения. + + + + + + Песня завершилась. + + + + + + + + + С момента + + + Имя + + + Неправильный ввод. + + + Максимальное время воспроизведения теперь неограничено. + + + Максимальное время воспроизведения установлено на {0} секунд. + + + Максимальный размер очереди воспроизведения теперь неограничен. + + + Максимальный размер очереди воспроизведения установлен на {0} песен. + + + Вам требуется быть в голосовом канале на этом сервере. + + + Название + + + Сейчас играет + + + Нет активного музыкального проигрывателя. + + + Нет результатов поиска. + + + Проигрывание музыки приостановлено. + + + Очередь воспроизведения - Страница {0}/{1} + + + Проигрывается песня + + + '#{0}' - **{1}** *{2}* ({3} песен) + + + Страница {0} сохранённых плейлистов. + + + Плейлист удалён. + + + Не удалось удалить плейлист. Он либо не существует, либо Вы не его автор. + + + Плейлист с таким ID не существует. + + + Добавление плейлиста в очередь завершено. + + + Плейлист сохранён. + + + Ограничение {0}c + + + Очередь воспроизведения + + + Песня добавлена в очередь воспроизведения. + + + Очередь воспроизведения музыки очищена. + + + Очередь воспроизведения полна {0}/{0}. + + + Убрана песня + context: "removed song #5" + + + Повторяется текущая песня. + + + Повторяется плейлист. + + + Повторяется песня. + + + Повтор текущей песни приостановлен. + + + Воспроизведение музыки возобновлено. + + + Отключено повторение плейлиста. + + + Включено повторение плейлиста. + + + Проигрываемые, завершённые, приостановленные и удалённые песни будут выводится в этом канале. + + + Пропускаю до '{0}:{1}' + + + Песни перемешаны. + + + Песня перемещена. + + + {0}ч {1}м {2}с + + + К моменту + + + неограничено + + + Уровень громкости должен быть от 0 до 100 + + + Уровень громкости установлен на {0}% + + + Отключено использование ВСЕХ МОДУЛЕЙ в канале {0}. + + + Включено использование ВСЕХ МОДУЛЕЙ в канале {0}. + + + Разрешено + + + Отключено использование ВСЕХ МОДУЛЕЙ для роли {0}. + + + Включено использование ВСЕХ МОДУЛЕЙ для роли {0}. + + + Отключено использование ВСЕХ МОДУЛЕЙ на этом сервере. + + + Включено использование ВСЕХ МОДУЛЕЙ на этом сервере. + + + Отключено использование ВСЕХ МОДУЛЕЙ для пользователя {0}. + + + Включено использование ВСЕХ МОДУЛЕЙ для пользователя {0}. + + + Добавлено {0} в чёрный список c ID {1} + + + У команды {0} теперь есть время перезарядки {1}c + + + У команды {0} больше нет времени перезарядки и все существующие времена перезадки были сброшены. + + + У команды не установлено время перезарядки. + + + Стоимость команды + + + Отключено использование {0} {1} в канале {2} + + + Включено использование {0} {1} в канале {2} + + + Отказано + + + Слово {0} добавлено в список фильтруемых слов. + + + Список фильтруемых слов + + + Слово {0} убрано из списка фильтруемых слов. + + + Неправильный второй параметр. (Должно быть числом от {0} до {1}) + + + Отключена фильтрация приглашений в этом канале. + + + Включена фильтрация приглашений в этом канале. + + + Отключена фильтрация приглашений в этом сервере. + + + Включена фильтрация приглашений в этом сервере. + + + Передано право {0} с #{1} to #{2} + + + Не найдено право с номером #{0} + + + Стоимостой не установлено + + + команда + Gen (of command) + + + модуль + Gen. (of module) + + + Страница прав {0} + + + Текущая роль прав — {0} + + + Пользователям требуется роль {0} для редактирования прав. + + + Не найдено прав с таким номером. + + + Удалены права #{0} - {1} + + + Отключено использование {0} {1} для роли {2}. + + + Включено использование {0} {1} для роли {2}. + + + сек. + Short of seconds. + + + Отключено использование {0} {1} для данного сервера. + + + Включено использование {0} {1} для данного сервера. + + + {0} с ID {1} убраны из черного списка. + + + нередактируемое + + + Отключено использование {0} {1} для пользователя {2}. + + + Включено использование {0} {1} для пользователя {2}. + + + Оповещения о правах больше не будут показываться в чате. + + + Оповещения о правах будут показываться в чате. + + + В данном канале отключена фильтрация слов. + + + В данном канале включена фильтрация слов. + + + На данном сервере оключена фильтрация слов. + + + На данном сервере включена фильтрация слов. + + + Способности + + + Нет любимого аниме + + + Начинается автоматический перевод сообщений в этом канале. Сообщения пользователей будут автоматически удаляться. + + + Ваш язык автоперевода был удалён. + + + Ваш язык автоперевода изменён с {from} на {to} + + + Начинается автоматический перевод сообщений в этом канале. + + + Остановлен автоматический перевод сообщений в этом канале. + + + Неправильный формат ввода, что-то пошло не так. + + + Эта карта не найдена. + + + факт + + + Главы + + + Комикс # + + + Поражения в соревновательном режиме + + + Матчи в соревновательном режиме + + + Соревновательный ранг + + + Победы в соревновательном режиме + + + Завершено + + + Условие + + + Стоимость + + + Дата + + + Определить: + + + + + + Эпизоды + + + Произошла ошибка + + + Образец + + + Не удалось найти это аниму. + + + Не удалось найти это манго. + + + Жанры + + + Не удалось найти определение для этого тэга. + + + Высота/Вес + + + {0}м/{1}кг + + + Влажность + + + Поиск изображений: + + + Не удалос найти этот фильм. + + + Неправильный источник или целевой язык. + + + Шутки не были загружены. + + + Шир/Долг + + + Уровень + + + Список тэгов для команды {0}place + Don't translate {0}place + + + Местоположение + + + Волшебные предметы не были загружены. + + + Профиль в MAL {0} + + + Владелец бота не задал MashapeApiKey. Вы не можете использовать эту функцию. + + + Мин/Макс + + + Каналов не найдено. + + + Результаты не найдены. + + + Ожидание + + + Оригинальный URL + + + Требуется ключ osu! API. + + + Не удалось получить подпись osu! + + + Найдено больше {0} изображений. Показывается случайные {0} изображений. + + + Пользователь не найден! Проверьте регион и BattleTag и попробуйте ещё раз. + + + Планирует смотреть + + + Платформа + + + Способность не найдена + + + Покемон не найден + + + Ссылка на профиль: + + + Качество: + + + + Is this supposed to be Overwatch Quick Play stats? + + + + + + Рейтинг: + + + Отметка: + + + Искать: + + + Не удалось укоротить эту ссылку. + + + Короткая ссылка + + + Что-то пошло не так. + + + Пожалуйста, задайте параметры поиска. + + + Состояние + + + + + + Стример {0} в оффлане. + + + Стример {0} в онлайне с {1} зрителями. + + + Вы подписаны на {0} стримов на этом сервере. + + + Вы не подписаны ни на один стрим на этом сервере. + + + Такого стрима не существует. + + + Скорее всего, этот стрим не существует. + + + Стрим {0} ({1}) убран из оповещений. + + + + + + Рассвет + + + Закат + + + Температура + + + Название: + + + 3 любимых аниме: + + + Перевод: + + + Типы: + + + Не удалось найти определение для этого запроса. + + + Url + + + Зрители + + + Смотрят + + + Не удалось найти этот термин на указаной вики. + + + Укажите целевую вики и после этого поисковый запрос. + + + Страница не найдена. + + + Скорость ветра. + + + {0} наиболее часто забаненных чемпионов. + + + Предложение, как у Йоды, не получилось сделать. + + + Присоединился + + + '{0}.' {1} [{2:F2}/с] - {3} всего + /s and total need to be localized to fit the context - +`1.` + + + + + + Всего {0} пользователей. + + + Автор + + + ID бота + + + Список функций команды {0}calc + + + {0} этого канала — {1} + + + Тема канала + + + Команд запущено + + + {0} {1} равно {2} {3} + + + Единицы, которые можно использовать в конвертировании + + + Нельзя перевести {0} в {1}: единицы измерения не найдены + + + Нельзя перевести {0} в {1}: единицы измерения не эквивалентны. + + + Создано + + + Присоедился к межсерверному каналу. + + + Покинул межсерверный канал. + + + Ваш CSC токен: + + + Серверные emoji + + + Ошибка + + + Признаки + + + Имя + + + Указатель вышел за пределы диапазона. + + + Список пользователей с этими ролями: + + + Вам запрещено использовать эту комманду в отношении ролей с большим числом пользователей для предотвращения + + + + Invalid months value/ Invalid hours value + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {0} Серверов +{1} Текстовых каналов +{2} Голосовых каналов + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Id of the user kwoth#1234 is 123123123123 + + + + + + + + + \ No newline at end of file From 5f8982d4fb643d73b66d1c732c4f0697d02d5a4e Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 28 Feb 2017 21:47:50 +0100 Subject: [PATCH 100/496] Added german and russian to list of supported languages, russian is unfinished atm btw --- .../Modules/Administration/Commands/LocalizationCommands.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs index 8250bfde..641f90e8 100644 --- a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs +++ b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs @@ -18,8 +18,10 @@ namespace NadekoBot.Modules.Administration { private ImmutableDictionary supportedLocales { get; } = new Dictionary() { - {"en-US", "English, United States" }, - {"fr-FR", "French, France" } + {"en-US", "English, United States"}, + {"fr-FR", "French, France"}, + {"ru-RU", "Russian, Russia"}, + {"de-DE", "German, Germany"} //{"sr-cyrl-rs", "Serbian, Cyrillic" } }.ToImmutableDictionary(); From 9485d94a83eb2af501a2bb4008ff34117d90e79e Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 28 Feb 2017 21:50:34 +0100 Subject: [PATCH 101/496] Update ResponseStrings.fr-fr.resx (POEditor.com) --- .../Resources/ResponseStrings.fr-fr.resx | 105 ++++++++++-------- 1 file changed, 56 insertions(+), 49 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx b/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx index 5f7a188e..dbce49d8 100644 --- a/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx +++ b/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx @@ -163,7 +163,7 @@ Vous ne participez pas a cette guerre. - @{0} Vous ne pouvez pas participer a cette guerre ou la base a déjà été détruite. + @{0} Vous ne participez pas à cette guerre ou la base a déjà été détruite. Aucune guerre en cours. @@ -206,7 +206,7 @@ Nouvelle réaction personnalisée - Aucune réaction personnalisé trouvée. + Aucune réaction personnalisée trouvée. Aucune réaction personnalisée ne correspond à cet ID. @@ -288,7 +288,7 @@ C'est très efficace ! - Vous avez utilisé trop de mouvement d'affilé, donc ne pouvez plus bouger ! + Vous avez utilisé trop de mouvements d'affilée, vous ne pouvez donc plus bouger! Le type de {0} est {1} @@ -300,10 +300,10 @@ Vous vous êtes évanoui, vous n'êtes donc pas capable de bouger! - **L'affectation automatique du rôle** à l'arrivé d'un nouvel utilisateur est désormais **désactivée**. + **L'affectation automatique de rôle** à l'arrivé d'un nouvel utilisateur est désormais **désactivée**. - **L'affectation automatique du rôle** à l'arrivé d'un nouvel utilisateur est désormais **activée**. + **L'affectation automatique de rôle** à l'arrivé d'un nouvel utilisateur est désormais **activée**. Liens @@ -425,7 +425,7 @@ Raison: {1} Activez les MPs de bienvenue en écrivant {0} - Nouveau MP de bienvenue en service. + Nouveau MP de bienvenue défini. MPs de bienvenue désactivés. @@ -440,7 +440,7 @@ Raison: {1} Activez les messages de bienvenue en écrivant {0} - Nouveau message de bienvenue en service. + Nouveau message de bienvenue défini. Messages de bienvenue désactivés. @@ -471,7 +471,7 @@ Raison : {1} Utilisateur expulsé - Listes des langages + Listes des langues {0} @@ -487,7 +487,7 @@ Raison : {1} Échec dans la tentative de changement de langue. Réessayer avec l'aide pour cette commande. - La langue de ce serveur est {0} - {0} + La langue de ce serveur est {0} - {1} {0} a quitté {1} @@ -568,7 +568,7 @@ Raison : {1} Impossible de trouver ce serveur - Aucun shard avec cet ID trouvé. + Aucune partition pour cet ID trouvée. Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. @@ -602,7 +602,7 @@ Raison : {1} Aucune protection activée. - Le seuil pour cet utilisateur doit être entre {0} et {1} + Le seuil d'utilisateurs doit être entre {0} et {1} Si {0} ou plus d'utilisateurs rejoignent dans les {1} secondes suivantes, je les {2}. @@ -684,13 +684,14 @@ Raison : {1} Il y a {0} rôles auto-affectés. - Ce rôle ne peux pas vous être attribué par vous même. + Ce rôle ne peux pas vous être attribué par vous-même. Vous ne possédez pas le rôle {0}. - L'affectation automatique des rôles n'est désormais plus exclusive! + Les rôles auto-attribuables ne sont désormais plus exclusifs! + Je ne pense pas que ce soit la bonne traduction.. self-assignable role serait plutôt rôle auto-attribuable Je suis incapable de vous ajouter ce rôle. `Je ne peux pas ajouter de rôles aux propriétaires et aux autres rôles plus haut que le mien dans la hiérarchie.` @@ -717,20 +718,21 @@ Raison : {1} Nouveau nom de Salon défini avec succès. - Nouveau jeu en service! + Nouveau jeu défini! + Pour "set", je pense que défini irait mieux que "en service" - Nouvelle diffusion en service! + Nouveau stream défini! - Nouveau sujet du salon en service. + Nouveau sujet du salon défini. - Shard {0} reconnecté. + Partition {0} reconnectée. Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. - Shard {0} se reconnecte. + Partition {0} en reconnection. Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. @@ -864,7 +866,7 @@ Raison: {1} Utilisateur débanni - Migration effectué! + Migration effectuée! Erreur lors de la migration, veuillez consulter la console pour plus d'informations. @@ -990,7 +992,7 @@ Raison: {1} Nécessite {0} permissions du salon - Vous pouvez supporter ce projet sur Patreon: <{0}> ou via Paypal <{1}> + Vous pouvez supporter ce projet sur Patreon <{0}> ou via Paypal <{1}> Commandes et alias @@ -1119,7 +1121,7 @@ N'oubliez pas de mettre votre nom discord ou ID dans le message. Top Waifus - votre affinité est déjà liée à cette waifu ou vous êtes en train de retirer votre affinité avec quelqu'un avec qui vous n'en posséder pas. + votre affinité est déjà liée à cette waifu ou vous êtes en train de retirer votre affinité avec quelqu'un alors que vous n'en possédez pas. Affinités changées de de {0} à {1}. @@ -1237,10 +1239,11 @@ La nouvelle valeur de {0} est {1} ! Cleverbot activé sur ce serveur. - La génération actuelle a été désactivée sur ce salon. + La génération monétaire a été désactivée sur ce salon. + Currency =/= current !!! Il s'agit de monnaie. Par example: Euro is a currency. US Dollar also is. Sur Public Nadeko, il s'agit des fleurs :) - La génération actuelle a été désactivée sur ce salon. + La génération monétaire a été désactivée sur ce salon. {0} {1} aléatoires sont apparus ! Attrapez-les en entrant `{2}pick` @@ -1253,7 +1256,7 @@ La nouvelle valeur de {0} est {1} ! Impossible de charger une question. - Jeu commencé. + La jeu a commencé. Partie de pendu commencée. @@ -1274,7 +1277,7 @@ La nouvelle valeur de {0} est {1} ! Vous n'avez pas assez de {0} - Pas de résultats + Pas de résultat choisi {0} @@ -1357,7 +1360,7 @@ La nouvelle valeur de {0} est {1} ! à tour de rôle - Musique terminée + Lecture terminée Système de tour de rôle désactivé. @@ -1402,13 +1405,13 @@ La nouvelle valeur de {0} est {1} ! Pas de résultat - Musique mise sur pause. + Lecteur mis sur pause. Liste d'attente - Page {0}/{1} - Lecture du son + Lecture en cours: #{0}` - **{1}** par *{2}* ({3} morceaux) @@ -1423,7 +1426,7 @@ La nouvelle valeur de {0} est {1} ! Impossible de supprimer cette liste de lecture. Soit elle n'existe pas, soit vous n'en êtes pas le créateur. - Aucune liste de lecture avec cet ID existe. + Aucune liste de lecture ne correspond a cet ID. File d'attente de la liste complétée. @@ -1438,7 +1441,7 @@ La nouvelle valeur de {0} est {1} ! Liste d'attente - Musique ajoutée à la file d'attente + Son ajouté à la file d'attente Liste d'attente effacée. @@ -1447,7 +1450,7 @@ La nouvelle valeur de {0} est {1} ! Liste d'attente complète ({0}/{0}) - Musique retirée + Son retiré context: "removed song #5" @@ -1478,10 +1481,10 @@ La nouvelle valeur de {0} est {1} ! Saut à `{0}:{1}` - Musiques mélangées. + Lecture aléatoire activée. - Musique déplacée. + Musique déplacée {0}h {1}m {2}s @@ -1527,12 +1530,13 @@ La nouvelle valeur de {0} est {1} ! Banni {0} avec l'ID {1} + Il ne s'agit pas d'un ban mais d'une blacklist interdisant l'utilisateur d'utiliser le bot. La commande {0} a désormais {1}s de temps de recharge. - La commande {0} n'a pas de temps de recharge et tout les temps de recharge ont été réinitialisés. + La commande {0} n'a pas de temps de recharge et tous les temps de recharge ont été réinitialisés. Aucune commande n'a de temps de recharge. @@ -1700,7 +1704,7 @@ La nouvelle valeur de {0} est {1} ! Parties compétitives gagnées - Complété + Complétés Condition @@ -1715,7 +1719,8 @@ La nouvelle valeur de {0} est {1} ! Définis: - En baisse + Abandonnés + droppped as in, "stopped watching" referring to shows/anime Episodes @@ -1779,7 +1784,7 @@ La nouvelle valeur de {0} est {1} ! Profil MAL de {0} - Le propriétaire du Bot n'a pas spécifié de clé MashapeApi. Fonctionnalité non disponible + Le propriétaire du Bot n'a pas spécifié de clé d'API Mashape (MashapeApiKey). Fonctionnalité non disponible Min/Max @@ -1797,10 +1802,10 @@ La nouvelle valeur de {0} est {1} ! Url originale - Une clé osu!API est nécessaire + Une clé d'API osu! est nécessaire - Impossible de récupérer la signature osu. + Impossible de récupérer la signature osu! Trouvé dans {0} images. Affichage de {0} aléatoires. @@ -1810,6 +1815,7 @@ La nouvelle valeur de {0} est {1} ! Prévision de lecture + Je ne pense pas que le sens de la traduction soit le bon. Plateforme @@ -1833,13 +1839,14 @@ La nouvelle valeur de {0} est {1} ! Victoires Rapides - Évaluation + Évaluation Score: Chercher pour: + recherche plutôt non ? Impossible de réduire cette Url @@ -1863,7 +1870,7 @@ La nouvelle valeur de {0} est {1} ! Le streamer {0} est hors ligne. - Le streamer {0} est en ligne avec {1} spectateurs. + Le streamer {0} est en ligne avec {1} viewers. Vous suivez {0} streams sur ce serveur. @@ -1881,7 +1888,7 @@ La nouvelle valeur de {0} est {1} ! Stream de {0} ({1}) retirée des notifications. - Je préviendrais ce salon lors d'un changement de statut. + Je préviendrai ce salon lors d'un changement de statut. Aube @@ -1911,10 +1918,10 @@ La nouvelle valeur de {0} est {1} ! Url - Spectateurs + Viewers - Regardant + En écoute Impossible de trouver ce terme sur le wikia spécifié. @@ -2060,7 +2067,7 @@ OwnerID: {2} Aucun rôle sur cette page. - Aucun shard sur cette page. + Aucune partition sur cette page. Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. @@ -2111,7 +2118,7 @@ OwnerID: {2} Format de date non valide. Regardez la liste des commandes. - Nouveau modèle de rappel en service. + Nouveau modèle de rappel défini. Répétition de {0} chaque {1} jour(s), {2} heure(s) et {3} minute(s) @@ -2156,15 +2163,15 @@ OwnerID: {2} Info du serveur - Shard + Partition Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. - Statistique de Shard + Statistique des partitions Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. - Le shard **#{0}** est en {1} état avec {2} serveurs + La partition **#{0}** est en état {1} avec {2} serveurs. Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. From c4a248889e3e91490e2f96bc414c1820b0b9d322 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 28 Feb 2017 21:50:36 +0100 Subject: [PATCH 102/496] Update ResponseStrings.de-DE.resx (POEditor.com) --- .../Resources/ResponseStrings.de-DE.resx | 234 +++++++++--------- 1 file changed, 117 insertions(+), 117 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.de-DE.resx b/src/NadekoBot/Resources/ResponseStrings.de-DE.resx index 9aac2f85..7dd58187 100644 --- a/src/NadekoBot/Resources/ResponseStrings.de-DE.resx +++ b/src/NadekoBot/Resources/ResponseStrings.de-DE.resx @@ -1,121 +1,121 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Diese Basis wurde bereits beansprucht oder zerstört. From 172d401da7da41c356d33d0872f599b8130a2751 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 28 Feb 2017 21:50:39 +0100 Subject: [PATCH 103/496] Update ResponseStrings.ru-RU.resx (POEditor.com) --- .../Resources/ResponseStrings.ru-RU.resx | 243 +++++++++--------- 1 file changed, 122 insertions(+), 121 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx b/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx index f6729bb5..bf370873 100644 --- a/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx +++ b/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx @@ -1,121 +1,121 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -2014,17 +2014,18 @@ Paypal <{1}> Вам запрещено использовать эту комманду в отношении ролей с большим числом пользователей для предотвращения - + Неправильное значение {0}. Invalid months value/ Invalid hours value - + Присоединился к Discord - + Присоединился к серверу - + Имя: {0} + From b588edeeee88fcd148f85954b795dafa1ad8533a Mon Sep 17 00:00:00 2001 From: Kwoth Date: Wed, 1 Mar 2017 01:48:29 +0100 Subject: [PATCH 104/496] added languages in progress to the list too --- .../Commands/LocalizationCommands.cs | 7 +- .../Gambling/Commands/FlipCoinCommand.cs | 2 +- .../Resources/CommandStrings.ja-JP.resx | 3153 +++++++++++++++++ .../Resources/CommandStrings.nl-NL.resx | 3153 +++++++++++++++++ .../Resources/ResponseStrings.Designer.cs | 9 - .../Resources/ResponseStrings.pt-BR.resx | 2184 ++++++++++++ src/NadekoBot/Resources/ResponseStrings.resx | 3 - 7 files changed, 8496 insertions(+), 15 deletions(-) create mode 100644 src/NadekoBot/Resources/CommandStrings.ja-JP.resx create mode 100644 src/NadekoBot/Resources/CommandStrings.nl-NL.resx create mode 100644 src/NadekoBot/Resources/ResponseStrings.pt-BR.resx diff --git a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs index 641f90e8..4200fafb 100644 --- a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs +++ b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs @@ -21,8 +21,11 @@ namespace NadekoBot.Modules.Administration {"en-US", "English, United States"}, {"fr-FR", "French, France"}, {"ru-RU", "Russian, Russia"}, - {"de-DE", "German, Germany"} - //{"sr-cyrl-rs", "Serbian, Cyrillic" } + {"de-DE", "German, Germany"}, + {"nl-NL", "Dutch, Netherlands"}, + {"ja-JP", "Japanese, Japan"}, + {"pt-BR", "Portuguese, Brazil"}, + {"sr-cyrl-rs", "Serbian, Serbia - Cyrillic"} }.ToImmutableDictionary(); [NadekoCommand, Usage, Description, Aliases] diff --git a/src/NadekoBot/Modules/Gambling/Commands/FlipCoinCommand.cs b/src/NadekoBot/Modules/Gambling/Commands/FlipCoinCommand.cs index 40b8a735..3d58d086 100644 --- a/src/NadekoBot/Modules/Gambling/Commands/FlipCoinCommand.cs +++ b/src/NadekoBot/Modules/Gambling/Commands/FlipCoinCommand.cs @@ -110,7 +110,7 @@ namespace NadekoBot.Modules.Gambling { var toWin = (int)Math.Round(amount * NadekoBot.BotConfig.BetflipMultiplier); str = Context.User.Mention + " " + GetText("flip_guess", toWin + CurrencySign); - await CurrencyHandler.AddCurrencyAsync(Context.User, GetText("betflip_gamble"), toWin, false).ConfigureAwait(false); + await CurrencyHandler.AddCurrencyAsync(Context.User, "Betflip Gamble", toWin, false).ConfigureAwait(false); } else { diff --git a/src/NadekoBot/Resources/CommandStrings.ja-JP.resx b/src/NadekoBot/Resources/CommandStrings.ja-JP.resx new file mode 100644 index 00000000..662975cf --- /dev/null +++ b/src/NadekoBot/Resources/CommandStrings.ja-JP.resx @@ -0,0 +1,3153 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + help h + + + Either shows a help for a single command, or DMs you help link if no arguments are specified. + + + `{0}h !!q` or `{0}h` + + + hgit + + + Generates the commandlist.md file. + + + `{0}hgit` + + + donate + + + Instructions for helping the project financially. + + + `{0}donate` + + + modules mdls + + + Lists all bot modules. + + + `{0}modules` + + + commands cmds + + + List all of the bot's commands from a certain module. You can either specify full, or only first few letters of the module name. + + + `{0}commands Administration` or `{0}cmds Admin` + + + greetdel grdel + + + Sets the time it takes (in seconds) for greet messages to be auto-deleted. Set 0 to disable automatic deletion. + + + `{0}greetdel 0` or `{0}greetdel 30` + + + greet + + + Toggles anouncements on the current channel when someone joins the server. + + + `{0}greet` + + + greetmsg + + + Sets a new join announcement message which will be shown in the server's channel. Type %user% if you want to mention the new member. Using it with no message will show the current greet message. You can use embed json from <http://nadekobot.xyz/embedbuilder/> instead of a regular text, if you want the message to be embedded. + + + `{0}greetmsg Welcome, %user%.` + + + bye + + + Toggles anouncements on the current channel when someone leaves the server. + + + `{0}bye` + + + byemsg + + + Sets a new leave announcement message. Type %user% if you want to show the name the user who left. Type %id% to show id. Using this command with no message will show the current bye message. You can use embed json from <http://nadekobot.xyz/embedbuilder/> instead of a regular text, if you want the message to be embedded. + + + `{0}byemsg %user% has left.` + + + byedel + + + Sets the time it takes (in seconds) for bye messages to be auto-deleted. Set 0 to disable automatic deletion. + + + `{0}byedel 0` or `{0}byedel 30` + + + greetdm + + + Toggles whether the greet messages will be sent in a DM (This is separate from greet - you can have both, any or neither enabled). + + + `{0}greetdm` + + + logserver + + + Enables or Disables ALL log events. If enabled, all log events will log to this channel. + + + `{0}logserver enable` or `{0}logserver disable` + + + logignore + + + Toggles whether the .logserver command ignores this channel. Useful if you have hidden admin channel and public log channel. + + + `{0}logignore` + + + userpresence + + + Starts logging to this channel when someone from the server goes online/offline/idle. + + + `{0}userpresence` + + + voicepresence + + + Toggles logging to this channel whenever someone joins or leaves a voice channel you are currently in. + + + `{0}voicepresence` + + + repeatinvoke repinv + + + Immediately shows the repeat message on a certain index and restarts its timer. + + + `{0}repinv 1` + + + repeat + + + Repeat a message every X minutes in the current channel. You can have up to 5 repeating messages on the server in total. + + + `{0}repeat 5 Hello there` + + + rotateplaying ropl + + + Toggles rotation of playing status of the dynamic strings you previously specified. + + + `{0}ropl` + + + addplaying adpl + + + Adds a specified string to the list of playing strings to rotate. Supported placeholders: %servers%, %users%, %playing%, %queued%, %time%,%shardid%,%shardcount%, %shardguilds% + + + `{0}adpl` + + + listplaying lipl + + + Lists all playing statuses with their corresponding number. + + + `{0}lipl` + + + removeplaying rmpl repl + + + Removes a playing string on a given number. + + + `{0}rmpl` + + + slowmode + + + Toggles slowmode. Disable by specifying no parameters. To enable, specify a number of messages each user can send, and an interval in seconds. For example 1 message every 5 seconds. + + + `{0}slowmode 1 5` or `{0}slowmode` + + + cleanvplust cv+t + + + Deletes all text channels ending in `-voice` for which voicechannels are not found. Use at your own risk. + + + `{0}cleanv+t` + + + voice+text v+t + + + Creates a text channel for each voice channel only users in that voice channel can see.If you are server owner, keep in mind you will see them all the time regardless. + + + `{0}v+t` + + + scsc + + + Starts an instance of cross server channel. You will get a token as a DM that other people will use to tune in to the same instance. + + + `{0}scsc` + + + jcsc + + + Joins current channel to an instance of cross server channel using the token. + + + `{0}jcsc TokenHere` + + + lcsc + + + Leaves Cross server channel instance from this channel. + + + `{0}lcsc` + + + asar + + + Adds a role to the list of self-assignable roles. + + + `{0}asar Gamer` + + + rsar + + + Removes a specified role from the list of self-assignable roles. + + + `{0}rsar` + + + lsar + + + Lists all self-assignable roles. + + + `{0}lsar` + + + togglexclsar tesar + + + Toggles whether the self-assigned roles are exclusive. (So that any person can have only one of the self assignable roles) + + + `{0}tesar` + + + iam + + + Adds a role to you that you choose. Role must be on a list of self-assignable roles. + + + `{0}iam Gamer` + + + iamnot iamn + + + Removes a role to you that you choose. Role must be on a list of self-assignable roles. + + + `{0}iamn Gamer` + + + addcustreact acr + + + Add a custom reaction with a trigger and a response. Running this command in server requires Administration permission. Running this command in DM is Bot Owner only and adds a new global custom reaction. Guide here: <http://nadekobot.readthedocs.io/en/latest/Custom%20Reactions/> + + + `{0}acr "hello" Hi there %user%` + + + listcustreact lcr + + + Lists global or server custom reactions (20 commands per page). Running the command in DM will list global custom reactions, while running it in server will list that server's custom reactions. Specifying `all` argument instead of the number will DM you a text file with a list of all custom reactions. + + + `{0}lcr 1` or `{0}lcr all` + + + listcustreactg lcrg + + + Lists global or server custom reactions (20 commands per page) grouped by trigger, and show a number of responses for each. Running the command in DM will list global custom reactions, while running it in server will list that server's custom reactions. + + + `{0}lcrg 1` + + + showcustreact scr + + + Shows a custom reaction's response on a given ID. + + + `{0}scr 1` + + + delcustreact dcr + + + Deletes a custom reaction on a specific index. If ran in DM, it is bot owner only and deletes a global custom reaction. If ran in a server, it requires Administration priviledges and removes server custom reaction. + + + `{0}dcr 5` + + + autoassignrole aar + + + Automaticaly assigns a specified role to every user who joins the server. + + + `{0}aar` to disable, `{0}aar Role Name` to enable + + + leave + + + Makes Nadeko leave the server. Either name or id required. + + + `{0}leave 123123123331` + + + delmsgoncmd + + + Toggles the automatic deletion of user's successful command message to prevent chat flood. + + + `{0}delmsgoncmd` + + + restart + + + Restarts the bot. Might not work. + + + `{0}restart` + + + setrole sr + + + Sets a role for a given user. + + + `{0}sr @User Guest` + + + removerole rr + + + Removes a role from a given user. + + + `{0}rr @User Admin` + + + renamerole renr + + + Renames a role. Roles you are renaming must be lower than bot's highest role. + + + `{0}renr "First role" SecondRole` + + + removeallroles rar + + + Removes all roles from a mentioned user. + + + `{0}rar @User` + + + createrole cr + + + Creates a role with a given name. + + + `{0}cr Awesome Role` + + + rolecolor rc + + + Set a role's color to the hex or 0-255 rgb color value provided. + + + `{0}rc Admin 255 200 100` or `{0}rc Admin ffba55` + + + ban b + + + Bans a user by ID or name with an optional message. + + + `{0}b "@some Guy" Your behaviour is toxic.` + + + softban sb + + + Bans and then unbans a user by ID or name with an optional message. + + + `{0}sb "@some Guy" Your behaviour is toxic.` + + + kick k + + + Kicks a mentioned user. + + + `{0}k "@some Guy" Your behaviour is toxic.` + + + mute + + + Mutes a mentioned user both from speaking and chatting. + + + `{0}mute @Someone` + + + voiceunmute + + + Gives a previously voice-muted user a permission to speak. + + + `{0}voiceunmute @Someguy` + + + deafen deaf + + + Deafens mentioned user or users. + + + `{0}deaf "@Someguy"` or `{0}deaf "@Someguy" "@Someguy"` + + + undeafen undef + + + Undeafens mentioned user or users. + + + `{0}undef "@Someguy"` or `{0}undef "@Someguy" "@Someguy"` + + + delvoichanl dvch + + + Deletes a voice channel with a given name. + + + `{0}dvch VoiceChannelName` + + + creatvoichanl cvch + + + Creates a new voice channel with a given name. + + + `{0}cvch VoiceChannelName` + + + deltxtchanl dtch + + + Deletes a text channel with a given name. + + + `{0}dtch TextChannelName` + + + creatxtchanl ctch + + + Creates a new text channel with a given name. + + + `{0}ctch TextChannelName` + + + settopic st + + + Sets a topic on the current channel. + + + `{0}st My new topic` + + + setchanlname schn + + + Changes the name of the current channel. + + + `{0}schn NewName` + + + prune clr + + + `{0}prune` removes all nadeko's messages in the last 100 messages.`{0}prune X` removes last X messages from the channel (up to 100)`{0}prune @Someone` removes all Someone's messages in the last 100 messages.`{0}prune @Someone X` removes last X 'Someone's' messages in the channel. + + + `{0}prune` or `{0}prune 5` or `{0}prune @Someone` or `{0}prune @Someone X` + + + die + + + Shuts the bot down. + + + `{0}die` + + + setname newnm + + + Gives the bot a new name. + + + `{0}newnm BotName` + + + setavatar setav + + + Sets a new avatar image for the NadekoBot. Argument is a direct link to an image. + + + `{0}setav http://i.imgur.com/xTG3a1I.jpg` + + + setgame + + + Sets the bots game. + + + `{0}setgame with snakes` + + + send + + + Sends a message to someone on a different server through the bot. Separate server and channel/user ids with `|` and prepend channel id with `c:` and user id with `u:`. + + + `{0}send serverid|c:channelid message` or `{0}send serverid|u:userid message` + + + mentionrole menro + + + Mentions every person from the provided role or roles (separated by a ',') on this server. Requires you to have mention everyone permission. + + + `{0}menro RoleName` + + + unstuck + + + Clears the message queue. + + + `{0}unstuck` + + + donators + + + List of lovely people who donated to keep this project alive. + + + `{0}donators` + + + donadd + + + Add a donator to the database. + + + `{0}donadd Donate Amount` + + + announce + + + Sends a message to all servers' general channel bot is connected to. + + + `{0}announce Useless spam` + + + savechat + + + Saves a number of messages to a text file and sends it to you. + + + `{0}savechat 150` + + + remind + + + Sends a message to you or a channel after certain amount of time. First argument is me/here/'channelname'. Second argument is time in a descending order (mo>w>d>h>m) example: 1w5d3h10m. Third argument is a (multiword)message. + + + `{0}remind me 1d5h Do something` or `{0}remind #general 1m Start now!` + + + remindtemplate + + + Sets message for when the remind is triggered. Available placeholders are %user% - user who ran the command, %message% - Message specified in the remind, %target% - target channel of the remind. + + + `{0}remindtemplate %user%, do %message%!` + + + serverinfo sinfo + + + Shows info about the server the bot is on. If no channel is supplied, it defaults to current one. + + + `{0}sinfo Some Server` + + + channelinfo cinfo + + + Shows info about the channel. If no channel is supplied, it defaults to current one. + + + `{0}cinfo #some-channel` + + + userinfo uinfo + + + Shows info about the user. If no user is supplied, it defaults a user running the command. + + + `{0}uinfo @SomeUser` + + + whosplaying whpl + + + Shows a list of users who are playing the specified game. + + + `{0}whpl Overwatch` + + + inrole + + + Lists every person from the provided role or roles, separated with space, on this server. You can use role IDs, role names (in quotes if it has multiple words), or role mention If the list is too long for 1 message, you must have Manage Messages permission. + + + `{0}inrole Role` or `{0}inrole Role1 "Role 2" @role3` + + + checkmyperms + + + Checks your user-specific permissions on this channel. + + + `{0}checkmyperms` + + + stats + + + Shows some basic stats for Nadeko. + + + `{0}stats` + + + userid uid + + + Shows user ID. + + + `{0}uid` or `{0}uid "@SomeGuy"` + + + channelid cid + + + Shows current channel ID. + + + `{0}cid` + + + serverid sid + + + Shows current server ID. + + + `{0}sid` + + + roles + + + List roles on this server or a roles of a specific user if specified. Paginated. 20 roles per page. + + + `{0}roles 2` or `{0}roles @Someone` + + + channeltopic ct + + + Sends current channel's topic as a message. + + + `{0}ct` + + + chnlfilterinv cfi + + + Toggles automatic deleting of invites posted in the channel. Does not negate the {0}srvrfilterinv enabled setting. Does not affect Bot Owner. + + + `{0}cfi` + + + srvrfilterinv sfi + + + Toggles automatic deleting of invites posted in the server. Does not affect Bot Owner. + + + `{0}sfi` + + + chnlfilterwords cfw + + + Toggles automatic deleting of messages containing banned words on the channel. Does not negate the {0}srvrfilterwords enabled setting. Does not affect bot owner. + + + `{0}cfw` + + + fw + + + Adds or removes (if it exists) a word from the list of filtered words. Use`{0}sfw` or `{0}cfw` to toggle filtering. + + + `{0}fw poop` + + + lstfilterwords lfw + + + Shows a list of filtered words. + + + `{0}lfw` + + + srvrfilterwords sfw + + + Toggles automatic deleting of messages containing forbidden words on the server. Does not affect Bot Owner. + + + `{0}sfw` + + + permrole pr + + + Sets a role which can change permissions. Or supply no parameters to find out the current one. Default one is 'Nadeko'. + + + `{0}pr role` + + + verbose v + + + Sets whether to show when a command/module is blocked. + + + `{0}verbose true` + + + srvrmdl sm + + + Sets a module's permission at the server level. + + + `{0}sm ModuleName enable` + + + srvrcmd sc + + + Sets a command's permission at the server level. + + + `{0}sc "command name" disable` + + + rolemdl rm + + + Sets a module's permission at the role level. + + + `{0}rm ModuleName enable MyRole` + + + rolecmd rc + + + Sets a command's permission at the role level. + + + `{0}rc "command name" disable MyRole` + + + chnlmdl cm + + + Sets a module's permission at the channel level. + + + `{0}cm ModuleName enable SomeChannel` + + + chnlcmd cc + + + Sets a command's permission at the channel level. + + + `{0}cc "command name" enable SomeChannel` + + + usrmdl um + + + Sets a module's permission at the user level. + + + `{0}um ModuleName enable SomeUsername` + + + usrcmd uc + + + Sets a command's permission at the user level. + + + `{0}uc "command name" enable SomeUsername` + + + allsrvrmdls asm + + + Enable or disable all modules for your server. + + + `{0}asm [enable/disable]` + + + allchnlmdls acm + + + Enable or disable all modules in a specified channel. + + + `{0}acm enable #SomeChannel` + + + allrolemdls arm + + + Enable or disable all modules for a specific role. + + + `{0}arm [enable/disable] MyRole` + + + ubl + + + Either [add]s or [rem]oves a user specified by a mention or ID from a blacklist. + + + `{0}ubl add @SomeUser` or `{0}ubl rem 12312312313` + + + cbl + + + Either [add]s or [rem]oves a channel specified by an ID from a blacklist. + + + `{0}cbl rem 12312312312` + + + sbl + + + Either [add]s or [rem]oves a server specified by a Name or ID from a blacklist. + + + `{0}sbl add 12312321312` or `{0}sbl rem SomeTrashServer` + + + cmdcooldown cmdcd + + + Sets a cooldown per user for a command. Set to 0 to remove the cooldown. + + + `{0}cmdcd "some cmd" 5` + + + allcmdcooldowns acmdcds + + + Shows a list of all commands and their respective cooldowns. + + + `{0}acmdcds` + + + . + + + Adds a new quote with the specified name and message. + + + `{0}. sayhi Hi` + + + .. + + + Shows a random quote with a specified name. + + + `{0}.. abc` + + + qsearch + + + Shows a random quote for a keyword that contains any text specified in the search. + + + `{0}qsearch keyword text` + + + deletequote delq + + + Deletes a random quote with the specified keyword. You have to either be server Administrator or the creator of the quote to delete it. + + + `{0}delq abc` + + + draw + + + Draws a card from the deck.If you supply number X, she draws up to 5 cards from the deck. + + + `{0}draw` or `{0}draw 5` + + + shuffle sh + + + Shuffles the current playlist. + + + `{0}sh` + + + flip + + + Flips coin(s) - heads or tails, and shows an image. + + + `{0}flip` or `{0}flip 3` + + + betflip bf + + + Bet to guess will the result be heads or tails. Guessing awards you 1.95x the currency you've bet (rounded up). Multiplier can be changed by the bot owner. + + + `{0}bf 5 heads` or `{0}bf 3 t` + + + roll + + + Rolls 0-100. If you supply a number [x] it rolls up to 30 normal dice. If you split 2 numbers with letter d (xdy) it will roll x dice from 1 to y. Y can be a letter 'F' if you want to roll fate dice instead of dnd. + + + `{0}roll` or `{0}roll 7` or `{0}roll 3d5` or `{0}roll 5dF` + + + rolluo + + + Rolls X normal dice (up to 30) unordered. If you split 2 numbers with letter d (xdy) it will roll x dice from 1 to y. + + + `{0}rolluo` or `{0}rolluo 7` or `{0}rolluo 3d5` + + + nroll + + + Rolls in a given range. + + + `{0}nroll 5` (rolls 0-5) or `{0}nroll 5-15` + + + race + + + Starts a new animal race. + + + `{0}race` + + + joinrace jr + + + Joins a new race. You can specify an amount of currency for betting (optional). You will get YourBet*(participants-1) back if you win. + + + `{0}jr` or `{0}jr 5` + + + raffle + + + Prints a name and ID of a random user from the online list from the (optional) role. + + + `{0}raffle` or `{0}raffle RoleName` + + + give + + + Give someone a certain amount of currency. + + + `{0}give 1 "@SomeGuy"` + + + award + + + Awards someone a certain amount of currency. You can also specify a role name to award currency to all users in a role. + + + `{0}award 100 @person` or `{0}award 5 Role Of Gamblers` + + + take + + + Takes a certain amount of currency from someone. + + + `{0}take 1 "@someguy"` + + + betroll br + + + Bets a certain amount of currency and rolls a dice. Rolling over 66 yields x2 of your currency, over 90 - x4 and 100 x10. + + + `{0}br 5` + + + leaderboard lb + + + Displays bot currency leaderboard. + + + `{0}lb` + + + trivia t + + + Starts a game of trivia. You can add nohint to prevent hints.First player to get to 10 points wins by default. You can specify a different number. 30 seconds per question. + + + `{0}t` or `{0}t 5 nohint` + + + tl + + + Shows a current trivia leaderboard. + + + `{0}tl` + + + tq + + + Quits current trivia after current question. + + + `{0}tq` + + + typestart + + + Starts a typing contest. + + + `{0}typestart` + + + typestop + + + Stops a typing contest on the current channel. + + + `{0}typestop` + + + typeadd + + + Adds a new article to the typing contest. + + + `{0}typeadd wordswords` + + + poll + + + Creates a poll which requires users to send the number of the voting option to the bot. + + + `{0}poll Question?;Answer1;Answ 2;A_3` + + + pollend + + + Stops active poll on this server and prints the results in this channel. + + + `{0}pollend` + + + pick + + + Picks the currency planted in this channel. 60 seconds cooldown. + + + `{0}pick` + + + plant + + + Spend an amount of currency to plant it in this channel. Default is 1. (If bot is restarted or crashes, the currency will be lost) + + + `{0}plant` or `{0}plant 5` + + + gencurrency gc + + + Toggles currency generation on this channel. Every posted message will have chance to spawn currency. Chance is specified by the Bot Owner. (default is 2%) + + + `{0}gc` + + + leet + + + Converts a text to leetspeak with 6 (1-6) severity levels + + + `{0}leet 3 Hello` + + + choose + + + Chooses a thing from a list of things + + + `{0}choose Get up;Sleep;Sleep more` + + + 8ball + + + Ask the 8ball a yes/no question. + + + `{0}8ball should I do something` + + + rps + + + Play a game of rocket paperclip scissors with Nadeko. + + + `{0}rps scissors` + + + linux + + + Prints a customizable Linux interjection + + + `{0}linux Spyware Windows` + + + next n + + + Goes to the next song in the queue. You have to be in the same voice channel as the bot. You can skip multiple songs, but in that case songs will not be requeued if {0}rcs or {0}rpl is enabled. + + + `{0}n` or `{0}n 5` + + + stop s + + + Stops the music and clears the playlist. Stays in the channel. + + + `{0}s` + + + destroy d + + + Completely stops the music and unbinds the bot from the channel. (may cause weird behaviour) + + + `{0}d` + + + pause p + + + Pauses or Unpauses the song. + + + `{0}p` + + + queue q yq + + + Queue a song using keywords or a link. Bot will join your voice channel.**You must be in a voice channel**. + + + `{0}q Dream Of Venice` + + + soundcloudqueue sq + + + Queue a soundcloud song using keywords. Bot will join your voice channel.**You must be in a voice channel**. + + + `{0}sq Dream Of Venice` + + + listqueue lq + + + Lists 15 currently queued songs per page. Default page is 1. + + + `{0}lq` or `{0}lq 2` + + + nowplaying np + + + Shows the song currently playing. + + + `{0}np` + + + volume vol + + + Sets the music volume 0-100% + + + `{0}vol 50` + + + defvol dv + + + Sets the default music volume when music playback is started (0-100). Persists through restarts. + + + `{0}dv 80` + + + max + + + Sets the music volume to 100%. + + + `{0}max` + + + half + + + Sets the music volume to 50%. + + + `{0}half` + + + playlist pl + + + Queues up to 500 songs from a youtube playlist specified by a link, or keywords. + + + `{0}pl playlist link or name` + + + soundcloudpl scpl + + + Queue a soundcloud playlist using a link. + + + `{0}scpl soundcloudseturl` + + + localplaylst lopl + + + Queues all songs from a directory. + + + `{0}lopl C:/music/classical` + + + radio ra + + + Queues a radio stream from a link. It can be a direct mp3 radio stream, .m3u, .pls .asx or .xspf (Usage Video: <https://streamable.com/al54>) + + + `{0}ra radio link here` + + + local lo + + + Queues a local file by specifying a full path. + + + `{0}lo C:/music/mysong.mp3` + + + move mv + + + Moves the bot to your voice channel. (works only if music is already playing) + + + `{0}mv` + + + remove rm + + + Remove a song by its # in the queue, or 'all' to remove whole queue. + + + `{0}rm 5` + + + movesong ms + + + Moves a song from one position to another. + + + `{0}ms 5>3` + + + setmaxqueue smq + + + Sets a maximum queue size. Supply 0 or no argument to have no limit. + + + `{0}smq 50` or `{0}smq` + + + cleanup + + + Cleans up hanging voice connections. + + + `{0}cleanup` + + + reptcursong rcs + + + Toggles repeat of current song. + + + `{0}rcs` + + + rpeatplaylst rpl + + + Toggles repeat of all songs in the queue (every song that finishes is added to the end of the queue). + + + `{0}rpl` + + + save + + + Saves a playlist under a certain name. Name must be no longer than 20 characters and mustn't contain dashes. + + + `{0}save classical1` + + + load + + + Loads a saved playlist using it's ID. Use `{0}pls` to list all saved playlists and {0}save to save new ones. + + + `{0}load 5` + + + playlists pls + + + Lists all playlists. Paginated. 20 per page. Default page is 0. + + + `{0}pls 1` + + + deleteplaylist delpls + + + Deletes a saved playlist. Only if you made it or if you are the bot owner. + + + `{0}delpls animu-5` + + + goto + + + Goes to a specific time in seconds in a song. + + + `{0}goto 30` + + + autoplay ap + + + Toggles autoplay - When the song is finished, automatically queue a related youtube song. (Works only for youtube songs and when queue is empty) + + + `{0}ap` + + + lolchamp + + + Shows League Of Legends champion statistics. If there are spaces/apostrophes or in the name - omit them. Optional second parameter is a role. + + + `{0}lolchamp Riven` or `{0}lolchamp Annie sup` + + + lolban + + + Shows top banned champions ordered by ban rate. + + + `{0}lolban` + + + hitbox hb + + + Notifies this channel when a certain user starts streaming. + + + `{0}hitbox SomeStreamer` + + + twitch tw + + + Notifies this channel when a certain user starts streaming. + + + `{0}twitch SomeStreamer` + + + beam bm + + + Notifies this channel when a certain user starts streaming. + + + `{0}beam SomeStreamer` + + + removestream rms + + + Removes notifications of a certain streamer from a certain platform on this channel. + + + `{0}rms Twitch SomeGuy` or `{0}rms Beam SomeOtherGuy` + + + liststreams ls + + + Lists all streams you are following on this server. + + + `{0}ls` + + + convert + + + Convert quantities. Use `{0}convertlist` to see supported dimensions and currencies. + + + `{0}convert m km 1000` + + + convertlist + + + List of the convertible dimensions and currencies. + + + `{0}convertlist` + + + wowjoke + + + Get one of Kwoth's penultimate WoW jokes. + + + `{0}wowjoke` + + + calculate calc + + + Evaluate a mathematical expression. + + + `{0}calc 1+1` + + + osu + + + Shows osu stats for a player. + + + `{0}osu Name` or `{0}osu Name taiko` + + + osub + + + Shows information about an osu beatmap. + + + `{0}osub https://osu.ppy.sh/s/127712` + + + osu5 + + + Displays a user's top 5 plays. + + + `{0}osu5 Name` + + + pokemon poke + + + Searches for a pokemon. + + + `{0}poke Sylveon` + + + pokemonability pokeab + + + Searches for a pokemon ability. + + + `{0}pokeab overgrow` + + + memelist + + + Pulls a list of memes you can use with `{0}memegen` from http://memegen.link/templates/ + + + `{0}memelist` + + + memegen + + + Generates a meme from memelist with top and bottom text. + + + `{0}memegen biw "gets iced coffee" "in the winter"` + + + weather we + + + Shows weather data for a specified city. You can also specify a country after a comma. + + + `{0}we Moscow, RU` + + + youtube yt + + + Searches youtubes and shows the first result + + + `{0}yt query` + + + anime ani aq + + + Queries anilist for an anime and shows the first result. + + + `{0}ani aquarion evol` + + + imdb omdb + + + Queries omdb for movies or series, show first result. + + + `{0}imdb Batman vs Superman` + + + manga mang mq + + + Queries anilist for a manga and shows the first result. + + + `{0}mq Shingeki no kyojin` + + + randomcat meow + + + Shows a random cat image. + + + `{0}meow` + + + randomdog woof + + + Shows a random dog image. + + + `{0}woof` + + + image img + + + Pulls the first image found using a search parameter. Use {0}rimg for different results. + + + `{0}img cute kitten` + + + randomimage rimg + + + Pulls a random image using a search parameter. + + + `{0}rimg cute kitten` + + + lmgtfy + + + Google something for an idiot. + + + `{0}lmgtfy query` + + + google g + + + Get a google search link for some terms. + + + `{0}google query` + + + hearthstone hs + + + Searches for a Hearthstone card and shows its image. Takes a while to complete. + + + `{0}hs Ysera` + + + urbandict ud + + + Searches Urban Dictionary for a word. + + + `{0}ud Pineapple` + + + # + + + Searches Tagdef.com for a hashtag. + + + `{0}# ff` + + + catfact + + + Shows a random catfact from <http://catfacts-api.appspot.com/api/facts> + + + `{0}catfact` + + + yomama ym + + + Shows a random joke from <http://api.yomomma.info/> + + + `{0}ym` + + + randjoke rj + + + Shows a random joke from <http://tambal.azurewebsites.net/joke/random> + + + `{0}rj` + + + chucknorris cn + + + Shows a random chucknorris joke from <http://tambal.azurewebsites.net/joke/random> + + + `{0}cn` + + + magicitem mi + + + Shows a random magicitem from <https://1d4chan.org/wiki/List_of_/tg/%27s_magic_items> + + + `{0}mi` + + + revav + + + Returns a google reverse image search for someone's avatar. + + + `{0}revav "@SomeGuy"` + + + revimg + + + Returns a google reverse image search for an image from a link. + + + `{0}revimg Image link` + + + safebooru + + + Shows a random image from safebooru with a given tag. Tag is optional but preferred. (multiple tags are appended with +) + + + `{0}safebooru yuri+kissing` + + + wikipedia wiki + + + Gives you back a wikipedia link + + + `{0}wiki query` + + + color clr + + + Shows you what color corresponds to that hex. + + + `{0}clr 00ff00` + + + videocall + + + Creates a private <http://www.appear.in> video call link for you and other mentioned people. The link is sent to mentioned people via a private message. + + + `{0}videocall "@SomeGuy"` + + + avatar av + + + Shows a mentioned person's avatar. + + + `{0}av "@SomeGuy"` + + + hentai + + + Shows a hentai image from a random website (gelbooru or danbooru or konachan or atfbooru or yandere) with a given tag. Tag is optional but preferred. Only 1 tag allowed. + + + `{0}hentai yuri` + + + danbooru + + + Shows a random hentai image from danbooru with a given tag. Tag is optional but preferred. (multiple tags are appended with +) + + + `{0}danbooru yuri+kissing` + + + atfbooru atf + + + Shows a random hentai image from atfbooru with a given tag. Tag is optional but preferred. + + + `{0}atfbooru yuri+kissing` + + + gelbooru + + + Shows a random hentai image from gelbooru with a given tag. Tag is optional but preferred. (multiple tags are appended with +) + + + `{0}gelbooru yuri+kissing` + + + rule34 + + + Shows a random image from rule34.xx with a given tag. Tag is optional but preferred. (multiple tags are appended with +) + + + `{0}rule34 yuri+kissing` + + + e621 + + + Shows a random hentai image from e621.net with a given tag. Tag is optional but preferred. Use spaces for multiple tags. + + + `{0}e621 yuri kissing` + + + cp + + + We all know where this will lead you to. + + + `{0}cp` + + + boobs + + + Real adult content. + + + `{0}boobs` + + + butts ass butt + + + Real adult content. + + + `{0}butts` or `{0}ass` + + + createwar cw + + + Creates a new war by specifying a size (>10 and multiple of 5) and enemy clan name. + + + `{0}cw 15 The Enemy Clan` + + + startwar sw + + + Starts a war with a given number. + + + `{0}sw 15` + + + listwar lw + + + Shows the active war claims by a number. Shows all wars in a short way if no number is specified. + + + `{0}lw [war_number] or {0}lw` + + + claim call c + + + Claims a certain base from a certain war. You can supply a name in the third optional argument to claim in someone else's place. + + + `{0}call [war_number] [base_number] [optional_other_name]` + + + claimfinish cf + + + Finish your claim with 3 stars if you destroyed a base. First argument is the war number, optional second argument is a base number if you want to finish for someone else. + + + `{0}cf 1` or `{0}cf 1 5` + + + claimfinish2 cf2 + + + Finish your claim with 2 stars if you destroyed a base. First argument is the war number, optional second argument is a base number if you want to finish for someone else. + + + `{0}cf2 1` or `{0}cf2 1 5` + + + claimfinish1 cf1 + + + Finish your claim with 1 star if you destroyed a base. First argument is the war number, optional second argument is a base number if you want to finish for someone else. + + + `{0}cf1 1` or `{0}cf1 1 5` + + + unclaim ucall uc + + + Removes your claim from a certain war. Optional second argument denotes a person in whose place to unclaim + + + `{0}uc [war_number] [optional_other_name]` + + + endwar ew + + + Ends the war with a given index. + + + `{0}ew [war_number]` + + + translate trans + + + Translates from>to text. From the given language to the destination language. + + + `{0}trans en>fr Hello` + + + translangs + + + Lists the valid languages for translation. + + + `{0}translangs` + + + Sends a readme and a guide links to the channel. + + + `{0}readme` or `{0}guide` + + + readme guide + + + Shows all available operations in {0}calc command + + + `{0}calcops` + + + calcops + + + Deletes all quotes on a specified keyword. + + + `{0}delallq kek` + + + delallq daq + + + greetdmmsg + + + `{0}greetdmmsg Welcome to the server, %user%`. + + + Sets a new join announcement message which will be sent to the user who joined. Type %user% if you want to mention the new member. Using it with no message will show the current DM greet message. You can use embed json from <http://nadekobot.xyz/embedbuilder/> instead of a regular text, if you want the message to be embedded. + + + Check how much currency a person has. (Defaults to yourself) + + + `{0}$$` or `{0}$$ @SomeGuy` + + + cash $$ + + + Lists whole permission chain with their indexes. You can specify an optional page number if there are a lot of permissions. + + + `{0}lp` or `{0}lp 3` + + + listperms lp + + + Enable or disable all modules for a specific user. + + + `{0}aum enable @someone` + + + allusrmdls aum + + + Moves permission from one position to another in Permissions list. + + + `{0}mp 2 4` + + + moveperm mp + + + Removes a permission from a given position in Permissions list. + + + `{0}rp 1` + + + removeperm rp + + + Migrate data from old bot configuration + + + `{0}migratedata` + + + migratedata + + + Checks if a user is online on a certain streaming platform. + + + `{0}cs twitch MyFavStreamer` + + + checkstream cs + + + showemojis se + + + Shows a name and a link to every SPECIAL emoji in the message. + + + `{0}se A message full of SPECIAL emojis` + + + shuffle sh + + + Reshuffles all cards back into the deck. + + + `{0}sh` + + + fwmsgs + + + Toggles forwarding of non-command messages sent to bot's DM to the bot owners + + + `{0}fwmsgs` + + + fwtoall + + + Toggles whether messages will be forwarded to all bot owners or only to the first one specified in the credentials.json + + + `{0}fwtoall` + + + resetperms + + + Resets BOT's permissions module on this server to the default value. + + + `{0}resetperms` + + + antiraid + + + Sets an anti-raid protection on the server. First argument is number of people which will trigger the protection. Second one is a time interval in which that number of people needs to join in order to trigger the protection, and third argument is punishment for those people (Kick, Ban, Mute) + + + `{0}antiraid 5 20 Kick` + + + antispam + + + Stops people from repeating same message X times in a row. You can specify to either mute, kick or ban the offenders. Max message count is 10. + + + `{0}antispam 3 Mute` or `{0}antispam 4 Kick` or `{0}antispam 6 Ban` + + + chatmute + + + Prevents a mentioned user from chatting in text channels. + + + `{0}chatmute @Someone` + + + voicemute + + + Prevents a mentioned user from speaking in voice channels. + + + `{0}voicemute @Someone` + + + konachan + + + Shows a random hentai image from konachan with a given tag. Tag is optional but preferred. + + + `{0}konachan yuri` + + + setmuterole + + + Sets a name of the role which will be assigned to people who should be muted. Default is nadeko-mute. + + + `{0}setmuterole Silenced` + + + adsarm + + + Toggles the automatic deletion of confirmations for {0}iam and {0}iamn commands. + + + `{0}adsarm` + + + setstream + + + Sets the bots stream. First argument is the twitch link, second argument is stream name. + + + `{0}setstream TWITCHLINK Hello` + + + chatunmute + + + Removes a mute role previously set on a mentioned user with `{0}chatmute` which prevented him from chatting in text channels. + + + `{0}chatunmute @Someone` + + + unmute + + + Unmutes a mentioned user previously muted with `{0}mute` command. + + + `{0}unmute @Someone` + + + xkcd + + + Shows a XKCD comic. No arguments will retrieve random one. Number argument will retrieve a specific comic, and "latest" will get the latest one. + + + `{0}xkcd` or `{0}xkcd 1400` or `{0}xkcd latest` + + + placelist + + + Shows the list of available tags for the `{0}place` command. + + + `{0}placelist` + + + place + + + Shows a placeholder image of a given tag. Use `{0}placelist` to see all available tags. You can specify the width and height of the image as the last two optional arguments. + + + `{0}place Cage` or `{0}place steven 500 400` + + + togethertube totube + + + Creates a new room on <https://togethertube.com> and shows the link in the chat. + + + `{0}totube` + + + publicpoll ppoll + + + Creates a public poll which requires users to type a number of the voting option in the channel command is ran in. + + + `{0}ppoll Question?;Answer1;Answ 2;A_3` + + + autotranslang atl + + + Sets your source and target language to be used with `{0}at`. Specify no arguments to remove previously set value. + + + `{0}atl en>fr` + + + autotrans at + + + Starts automatic translation of all messages by users who set their `{0}atl` in this channel. You can set "del" argument to automatically delete all translated user messages. + + + `{0}at` or `{0}at del` + + + listquotes liqu + + + `{0}liqu` or `{0}liqu 3` + + + Lists all quotes on the server ordered alphabetically. 15 Per page. + + + typedel + + + Deletes a typing article given the ID. + + + `{0}typedel 3` + + + typelist + + + Lists added typing articles with their IDs. 15 per page. + + + `{0}typelist` or `{0}typelist 3` + + + listservers + + + Lists servers the bot is on with some basic info. 15 per page. + + + `{0}listservers 3` + + + hentaibomb + + + Shows a total 5 images (from gelbooru, danbooru, konachan, yandere and atfbooru). Tag is optional but preferred. + + + `{0}hentaibomb yuri` + + + cleverbot + + + Toggles cleverbot session. When enabled, the bot will reply to messages starting with bot mention in the server. Custom reactions starting with %mention% won't work if cleverbot is enabled. + + + `{0}cleverbot` + + + shorten + + + Attempts to shorten an URL, if it fails, returns the input URL. + + + `{0}shorten https://google.com` + + + minecraftping mcping + + + Pings a minecraft server. + + + `{0}mcping 127.0.0.1:25565` + + + minecraftquery mcq + + + Finds information about a minecraft server. + + + `{0}mcq server:ip` + + + wikia + + + Gives you back a wikia link + + + `{0}wikia mtg Vigilance` or `{0}wikia mlp Dashy` + + + yandere + + + Shows a random image from yandere with a given tag. Tag is optional but preferred. (multiple tags are appended with +) + + + `{0}yandere tag1+tag2` + + + magicthegathering mtg + + + Searches for a Magic The Gathering card. + + + `{0}magicthegathering about face` or `{0}mtg about face` + + + yodify yoda + + + Translates your normal sentences into Yoda styled sentences! + + + `{0}yoda my feelings hurt` + + + attack + + + Attacks a target with the given move. Use `{0}movelist` to see a list of moves your type can use. + + + `{0}attack "vine whip" @someguy` + + + heal + + + Heals someone. Revives those who fainted. Costs a NadekoFlower + + + `{0}heal @someone` + + + movelist ml + + + Lists the moves you are able to use + + + `{0}ml` + + + settype + + + Set your poketype. Costs a NadekoFlower. Provide no arguments to see a list of available types. + + + `{0}settype fire` or `{0}settype` + + + type + + + Get the poketype of the target. + + + `{0}type @someone` + + + hangmanlist + + + Shows a list of hangman term types. + + + `{0} hangmanlist` + + + hangman + + + Starts a game of hangman in the channel. Use `{0}hangmanlist` to see a list of available term types. Defaults to 'all'. + + + `{0}hangman` or `{0}hangman movies` + + + crstatsclear + + + Resets the counters on `{0}crstats`. You can specify a trigger to clear stats only for that trigger. + + + `{0}crstatsclear` or `{0}crstatsclear rng` + + + crstats + + + Shows a list of custom reactions and the number of times they have been executed. Paginated with 10 per page. Use `{0}crstatsclear` to reset the counters. + + + `{0}crstats` or `{0}crstats 3` + + + overwatch ow + + + Show's basic stats on a player (competitive rank, playtime, level etc) Region codes are: `eu` `us` `cn` `kr` + + + `{0}ow us Battletag#1337` or `{0}overwatch eu Battletag#2016` + + + acrophobia acro + + + Starts an Acrophobia game. Second argment is optional round length in seconds. (default is 60) + + + `{0}acro` or `{0}acro 30` + + + logevents + + + Shows a list of all events you can subscribe to with `{0}log` + + + `{0}logevents` + + + log + + + Toggles logging event. Disables it if it's active anywhere on the server. Enables if it's not active. Use `{0}logevents` to see a list of all events you can subscribe to. + + + `{0}log userpresence` or `{0}log userbanned` + + + fairplay fp + + + Toggles fairplay. While enabled, music player will prioritize songs from users who didn't have their song recently played instead of the song's position in the queue. + + + `{0}fp` + + + define def + + + Finds a definition of a word. + + + `{0}def heresy` + + + setmaxplaytime smp + + + Sets a maximum number of seconds (>14) a song can run before being skipped automatically. Set 0 to have no limit. + + + `{0}smp 0` or `{0}smp 270` + + + activity + + + Checks for spammers. + + + `{0}activity` + + + autohentai + + + Posts a hentai every X seconds with a random tag from the provided tags. Use `|` to separate tags. 20 seconds minimum. Provide no arguments to disable. + + + `{0}autohentai 30 yuri|tail|long_hair` or `{0}autohentai` + + + setstatus + + + Sets the bot's status. (Online/Idle/Dnd/Invisible) + + + `{0}setstatus Idle` + + + rotaterolecolor rrc + + + Rotates a roles color on an interval with a list of supplied colors. First argument is interval in seconds (Minimum 60). Second argument is a role, followed by a space-separated list of colors in hex. Provide a rolename with a 0 interval to disable. + + + `{0}rrc 60 MyLsdRole #ff0000 #00ff00 #0000ff` or `{0}rrc 0 MyLsdRole` + + + createinvite crinv + + + Creates a new invite which has infinite max uses and never expires. + + + `{0}crinv` + + + pollstats + + + Shows the poll results without stopping the poll on this server. + + + `{0}pollstats` + + + repeatlist replst + + + Shows currently repeating messages and their indexes. + + + `{0}repeatlist` + + + repeatremove reprm + + + Removes a repeating message on a specified index. Use `{0}repeatlist` to see indexes. + + + `{0}reprm 2` + + + antilist antilst + + + Shows currently enabled protection features. + + + `{0}antilist` + + + antispamignore + + + Toggles whether antispam ignores current channel. Antispam must be enabled. + + + `{0}antispamignore` + + + cmdcosts + + + Shows a list of command costs. Paginated with 9 command per page. + + + `{0}cmdcosts` or `{0}cmdcosts 2` + + + commandcost cmdcost + + + Sets a price for a command. Running that command will take currency from users. Set 0 to remove the price. + + + `{0}cmdcost 0 !!q` or `{0}cmdcost 1 >8ball` + + + startevent + + + Starts one of the events seen on public nadeko. + + + `{0}startevent flowerreaction` + + + slotstats + + + Shows the total stats of the slot command for this bot's session. + + + `{0}slotstats` + + + slottest + + + Tests to see how much slots payout for X number of plays. + + + `{0}slottest 1000` + + + slot + + + Play Nadeko slots. Max bet is 999. 3 seconds cooldown per user. + + + `{0}slot 5` + + + affinity + + + Sets your affinity towards someone you want to be claimed by. Setting affinity will reduce their `{0}claim` on you by 20%. You can leave second argument empty to clear your affinity. 30 minutes cooldown. + + + `{0}affinity @MyHusband` or `{0}affinity` + + + claimwaifu claim + + + Claim a waifu for yourself by spending currency. You must spend atleast 10% more than her current value unless she set `{0}affinity` towards you. + + + `{0}claim 50 @Himesama` + + + waifus waifulb + + + Shows top 9 waifus. + + + `{0}waifus` + + + divorce + + + Releases your claim on a specific waifu. You will get some of the money you've spent back unless that waifu has an affinity towards you. 6 hours cooldown. + + + `{0}divorce @CheatingSloot` + + + waifuinfo waifustats + + + Shows waifu stats for a target person. Defaults to you if no user is provided. + + + `{0}waifuinfo @MyCrush` or `{0}waifuinfo` + + + mal + + + Shows basic info from myanimelist profile. + + + `{0}mal straysocks` + + + setmusicchannel smch + + + Sets the current channel as the default music output channel. This will output playing, finished, paused and removed songs to that channel instead of the channel where the first song was queued in. + + + `{0}smch` + + + reloadimages + + + Reloads images bot is using. Safe to use even when bot is being used heavily. + + + `{0}reloadimages` + + + shardstats + + + Stats for shards. Paginated with 25 shards per page. + + + `{0}shardstats` or `{0}shardstats 2` + + + connectshard + + + Try (re)connecting a shard with a certain shardid when it dies. No one knows will it work. Keep an eye on the console for errors. + + + `{0}connectshard 2` + + + shardid + + + Shows which shard is a certain guild on, by guildid. + + + `{0}shardid 117523346618318850` + + + tictactoe ttt + + + Starts a game of tic tac toe. Another user must run the command in the same channel in order to accept the challenge. Use numbers 1-9 to play. 15 seconds per move. + + + >ttt + + + timezones + + + List of all timezones available on the system to be used with `{0}timezone`. + + + `{0}timezones` + + + timezone + + + Sets this guilds timezone. This affects bot's time output in this server (logs, etc..) + + + `{0}timezone` + + + langsetdefault langsetd + + + 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. + + + `{0}langsetd en-US` or `{0}langsetd default` + + + languageset langset + + + 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. + + + `{0}langset de-DE ` or `{0}langset default` + + + languageslist langli + + + List of languages for which translation (or part of it) exist atm. + + + `{0}langli` + + + rategirl + + + Use the universal hot-crazy wife zone matrix to determine the girl's worth. It is everything young men need to know about women. At any moment in time, any woman you have previously located on this chart can vanish from that location and appear anywhere else on the chart. + + + `{0}rategirl @SomeGurl` + + \ No newline at end of file diff --git a/src/NadekoBot/Resources/CommandStrings.nl-NL.resx b/src/NadekoBot/Resources/CommandStrings.nl-NL.resx new file mode 100644 index 00000000..662975cf --- /dev/null +++ b/src/NadekoBot/Resources/CommandStrings.nl-NL.resx @@ -0,0 +1,3153 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + help h + + + Either shows a help for a single command, or DMs you help link if no arguments are specified. + + + `{0}h !!q` or `{0}h` + + + hgit + + + Generates the commandlist.md file. + + + `{0}hgit` + + + donate + + + Instructions for helping the project financially. + + + `{0}donate` + + + modules mdls + + + Lists all bot modules. + + + `{0}modules` + + + commands cmds + + + List all of the bot's commands from a certain module. You can either specify full, or only first few letters of the module name. + + + `{0}commands Administration` or `{0}cmds Admin` + + + greetdel grdel + + + Sets the time it takes (in seconds) for greet messages to be auto-deleted. Set 0 to disable automatic deletion. + + + `{0}greetdel 0` or `{0}greetdel 30` + + + greet + + + Toggles anouncements on the current channel when someone joins the server. + + + `{0}greet` + + + greetmsg + + + Sets a new join announcement message which will be shown in the server's channel. Type %user% if you want to mention the new member. Using it with no message will show the current greet message. You can use embed json from <http://nadekobot.xyz/embedbuilder/> instead of a regular text, if you want the message to be embedded. + + + `{0}greetmsg Welcome, %user%.` + + + bye + + + Toggles anouncements on the current channel when someone leaves the server. + + + `{0}bye` + + + byemsg + + + Sets a new leave announcement message. Type %user% if you want to show the name the user who left. Type %id% to show id. Using this command with no message will show the current bye message. You can use embed json from <http://nadekobot.xyz/embedbuilder/> instead of a regular text, if you want the message to be embedded. + + + `{0}byemsg %user% has left.` + + + byedel + + + Sets the time it takes (in seconds) for bye messages to be auto-deleted. Set 0 to disable automatic deletion. + + + `{0}byedel 0` or `{0}byedel 30` + + + greetdm + + + Toggles whether the greet messages will be sent in a DM (This is separate from greet - you can have both, any or neither enabled). + + + `{0}greetdm` + + + logserver + + + Enables or Disables ALL log events. If enabled, all log events will log to this channel. + + + `{0}logserver enable` or `{0}logserver disable` + + + logignore + + + Toggles whether the .logserver command ignores this channel. Useful if you have hidden admin channel and public log channel. + + + `{0}logignore` + + + userpresence + + + Starts logging to this channel when someone from the server goes online/offline/idle. + + + `{0}userpresence` + + + voicepresence + + + Toggles logging to this channel whenever someone joins or leaves a voice channel you are currently in. + + + `{0}voicepresence` + + + repeatinvoke repinv + + + Immediately shows the repeat message on a certain index and restarts its timer. + + + `{0}repinv 1` + + + repeat + + + Repeat a message every X minutes in the current channel. You can have up to 5 repeating messages on the server in total. + + + `{0}repeat 5 Hello there` + + + rotateplaying ropl + + + Toggles rotation of playing status of the dynamic strings you previously specified. + + + `{0}ropl` + + + addplaying adpl + + + Adds a specified string to the list of playing strings to rotate. Supported placeholders: %servers%, %users%, %playing%, %queued%, %time%,%shardid%,%shardcount%, %shardguilds% + + + `{0}adpl` + + + listplaying lipl + + + Lists all playing statuses with their corresponding number. + + + `{0}lipl` + + + removeplaying rmpl repl + + + Removes a playing string on a given number. + + + `{0}rmpl` + + + slowmode + + + Toggles slowmode. Disable by specifying no parameters. To enable, specify a number of messages each user can send, and an interval in seconds. For example 1 message every 5 seconds. + + + `{0}slowmode 1 5` or `{0}slowmode` + + + cleanvplust cv+t + + + Deletes all text channels ending in `-voice` for which voicechannels are not found. Use at your own risk. + + + `{0}cleanv+t` + + + voice+text v+t + + + Creates a text channel for each voice channel only users in that voice channel can see.If you are server owner, keep in mind you will see them all the time regardless. + + + `{0}v+t` + + + scsc + + + Starts an instance of cross server channel. You will get a token as a DM that other people will use to tune in to the same instance. + + + `{0}scsc` + + + jcsc + + + Joins current channel to an instance of cross server channel using the token. + + + `{0}jcsc TokenHere` + + + lcsc + + + Leaves Cross server channel instance from this channel. + + + `{0}lcsc` + + + asar + + + Adds a role to the list of self-assignable roles. + + + `{0}asar Gamer` + + + rsar + + + Removes a specified role from the list of self-assignable roles. + + + `{0}rsar` + + + lsar + + + Lists all self-assignable roles. + + + `{0}lsar` + + + togglexclsar tesar + + + Toggles whether the self-assigned roles are exclusive. (So that any person can have only one of the self assignable roles) + + + `{0}tesar` + + + iam + + + Adds a role to you that you choose. Role must be on a list of self-assignable roles. + + + `{0}iam Gamer` + + + iamnot iamn + + + Removes a role to you that you choose. Role must be on a list of self-assignable roles. + + + `{0}iamn Gamer` + + + addcustreact acr + + + Add a custom reaction with a trigger and a response. Running this command in server requires Administration permission. Running this command in DM is Bot Owner only and adds a new global custom reaction. Guide here: <http://nadekobot.readthedocs.io/en/latest/Custom%20Reactions/> + + + `{0}acr "hello" Hi there %user%` + + + listcustreact lcr + + + Lists global or server custom reactions (20 commands per page). Running the command in DM will list global custom reactions, while running it in server will list that server's custom reactions. Specifying `all` argument instead of the number will DM you a text file with a list of all custom reactions. + + + `{0}lcr 1` or `{0}lcr all` + + + listcustreactg lcrg + + + Lists global or server custom reactions (20 commands per page) grouped by trigger, and show a number of responses for each. Running the command in DM will list global custom reactions, while running it in server will list that server's custom reactions. + + + `{0}lcrg 1` + + + showcustreact scr + + + Shows a custom reaction's response on a given ID. + + + `{0}scr 1` + + + delcustreact dcr + + + Deletes a custom reaction on a specific index. If ran in DM, it is bot owner only and deletes a global custom reaction. If ran in a server, it requires Administration priviledges and removes server custom reaction. + + + `{0}dcr 5` + + + autoassignrole aar + + + Automaticaly assigns a specified role to every user who joins the server. + + + `{0}aar` to disable, `{0}aar Role Name` to enable + + + leave + + + Makes Nadeko leave the server. Either name or id required. + + + `{0}leave 123123123331` + + + delmsgoncmd + + + Toggles the automatic deletion of user's successful command message to prevent chat flood. + + + `{0}delmsgoncmd` + + + restart + + + Restarts the bot. Might not work. + + + `{0}restart` + + + setrole sr + + + Sets a role for a given user. + + + `{0}sr @User Guest` + + + removerole rr + + + Removes a role from a given user. + + + `{0}rr @User Admin` + + + renamerole renr + + + Renames a role. Roles you are renaming must be lower than bot's highest role. + + + `{0}renr "First role" SecondRole` + + + removeallroles rar + + + Removes all roles from a mentioned user. + + + `{0}rar @User` + + + createrole cr + + + Creates a role with a given name. + + + `{0}cr Awesome Role` + + + rolecolor rc + + + Set a role's color to the hex or 0-255 rgb color value provided. + + + `{0}rc Admin 255 200 100` or `{0}rc Admin ffba55` + + + ban b + + + Bans a user by ID or name with an optional message. + + + `{0}b "@some Guy" Your behaviour is toxic.` + + + softban sb + + + Bans and then unbans a user by ID or name with an optional message. + + + `{0}sb "@some Guy" Your behaviour is toxic.` + + + kick k + + + Kicks a mentioned user. + + + `{0}k "@some Guy" Your behaviour is toxic.` + + + mute + + + Mutes a mentioned user both from speaking and chatting. + + + `{0}mute @Someone` + + + voiceunmute + + + Gives a previously voice-muted user a permission to speak. + + + `{0}voiceunmute @Someguy` + + + deafen deaf + + + Deafens mentioned user or users. + + + `{0}deaf "@Someguy"` or `{0}deaf "@Someguy" "@Someguy"` + + + undeafen undef + + + Undeafens mentioned user or users. + + + `{0}undef "@Someguy"` or `{0}undef "@Someguy" "@Someguy"` + + + delvoichanl dvch + + + Deletes a voice channel with a given name. + + + `{0}dvch VoiceChannelName` + + + creatvoichanl cvch + + + Creates a new voice channel with a given name. + + + `{0}cvch VoiceChannelName` + + + deltxtchanl dtch + + + Deletes a text channel with a given name. + + + `{0}dtch TextChannelName` + + + creatxtchanl ctch + + + Creates a new text channel with a given name. + + + `{0}ctch TextChannelName` + + + settopic st + + + Sets a topic on the current channel. + + + `{0}st My new topic` + + + setchanlname schn + + + Changes the name of the current channel. + + + `{0}schn NewName` + + + prune clr + + + `{0}prune` removes all nadeko's messages in the last 100 messages.`{0}prune X` removes last X messages from the channel (up to 100)`{0}prune @Someone` removes all Someone's messages in the last 100 messages.`{0}prune @Someone X` removes last X 'Someone's' messages in the channel. + + + `{0}prune` or `{0}prune 5` or `{0}prune @Someone` or `{0}prune @Someone X` + + + die + + + Shuts the bot down. + + + `{0}die` + + + setname newnm + + + Gives the bot a new name. + + + `{0}newnm BotName` + + + setavatar setav + + + Sets a new avatar image for the NadekoBot. Argument is a direct link to an image. + + + `{0}setav http://i.imgur.com/xTG3a1I.jpg` + + + setgame + + + Sets the bots game. + + + `{0}setgame with snakes` + + + send + + + Sends a message to someone on a different server through the bot. Separate server and channel/user ids with `|` and prepend channel id with `c:` and user id with `u:`. + + + `{0}send serverid|c:channelid message` or `{0}send serverid|u:userid message` + + + mentionrole menro + + + Mentions every person from the provided role or roles (separated by a ',') on this server. Requires you to have mention everyone permission. + + + `{0}menro RoleName` + + + unstuck + + + Clears the message queue. + + + `{0}unstuck` + + + donators + + + List of lovely people who donated to keep this project alive. + + + `{0}donators` + + + donadd + + + Add a donator to the database. + + + `{0}donadd Donate Amount` + + + announce + + + Sends a message to all servers' general channel bot is connected to. + + + `{0}announce Useless spam` + + + savechat + + + Saves a number of messages to a text file and sends it to you. + + + `{0}savechat 150` + + + remind + + + Sends a message to you or a channel after certain amount of time. First argument is me/here/'channelname'. Second argument is time in a descending order (mo>w>d>h>m) example: 1w5d3h10m. Third argument is a (multiword)message. + + + `{0}remind me 1d5h Do something` or `{0}remind #general 1m Start now!` + + + remindtemplate + + + Sets message for when the remind is triggered. Available placeholders are %user% - user who ran the command, %message% - Message specified in the remind, %target% - target channel of the remind. + + + `{0}remindtemplate %user%, do %message%!` + + + serverinfo sinfo + + + Shows info about the server the bot is on. If no channel is supplied, it defaults to current one. + + + `{0}sinfo Some Server` + + + channelinfo cinfo + + + Shows info about the channel. If no channel is supplied, it defaults to current one. + + + `{0}cinfo #some-channel` + + + userinfo uinfo + + + Shows info about the user. If no user is supplied, it defaults a user running the command. + + + `{0}uinfo @SomeUser` + + + whosplaying whpl + + + Shows a list of users who are playing the specified game. + + + `{0}whpl Overwatch` + + + inrole + + + Lists every person from the provided role or roles, separated with space, on this server. You can use role IDs, role names (in quotes if it has multiple words), or role mention If the list is too long for 1 message, you must have Manage Messages permission. + + + `{0}inrole Role` or `{0}inrole Role1 "Role 2" @role3` + + + checkmyperms + + + Checks your user-specific permissions on this channel. + + + `{0}checkmyperms` + + + stats + + + Shows some basic stats for Nadeko. + + + `{0}stats` + + + userid uid + + + Shows user ID. + + + `{0}uid` or `{0}uid "@SomeGuy"` + + + channelid cid + + + Shows current channel ID. + + + `{0}cid` + + + serverid sid + + + Shows current server ID. + + + `{0}sid` + + + roles + + + List roles on this server or a roles of a specific user if specified. Paginated. 20 roles per page. + + + `{0}roles 2` or `{0}roles @Someone` + + + channeltopic ct + + + Sends current channel's topic as a message. + + + `{0}ct` + + + chnlfilterinv cfi + + + Toggles automatic deleting of invites posted in the channel. Does not negate the {0}srvrfilterinv enabled setting. Does not affect Bot Owner. + + + `{0}cfi` + + + srvrfilterinv sfi + + + Toggles automatic deleting of invites posted in the server. Does not affect Bot Owner. + + + `{0}sfi` + + + chnlfilterwords cfw + + + Toggles automatic deleting of messages containing banned words on the channel. Does not negate the {0}srvrfilterwords enabled setting. Does not affect bot owner. + + + `{0}cfw` + + + fw + + + Adds or removes (if it exists) a word from the list of filtered words. Use`{0}sfw` or `{0}cfw` to toggle filtering. + + + `{0}fw poop` + + + lstfilterwords lfw + + + Shows a list of filtered words. + + + `{0}lfw` + + + srvrfilterwords sfw + + + Toggles automatic deleting of messages containing forbidden words on the server. Does not affect Bot Owner. + + + `{0}sfw` + + + permrole pr + + + Sets a role which can change permissions. Or supply no parameters to find out the current one. Default one is 'Nadeko'. + + + `{0}pr role` + + + verbose v + + + Sets whether to show when a command/module is blocked. + + + `{0}verbose true` + + + srvrmdl sm + + + Sets a module's permission at the server level. + + + `{0}sm ModuleName enable` + + + srvrcmd sc + + + Sets a command's permission at the server level. + + + `{0}sc "command name" disable` + + + rolemdl rm + + + Sets a module's permission at the role level. + + + `{0}rm ModuleName enable MyRole` + + + rolecmd rc + + + Sets a command's permission at the role level. + + + `{0}rc "command name" disable MyRole` + + + chnlmdl cm + + + Sets a module's permission at the channel level. + + + `{0}cm ModuleName enable SomeChannel` + + + chnlcmd cc + + + Sets a command's permission at the channel level. + + + `{0}cc "command name" enable SomeChannel` + + + usrmdl um + + + Sets a module's permission at the user level. + + + `{0}um ModuleName enable SomeUsername` + + + usrcmd uc + + + Sets a command's permission at the user level. + + + `{0}uc "command name" enable SomeUsername` + + + allsrvrmdls asm + + + Enable or disable all modules for your server. + + + `{0}asm [enable/disable]` + + + allchnlmdls acm + + + Enable or disable all modules in a specified channel. + + + `{0}acm enable #SomeChannel` + + + allrolemdls arm + + + Enable or disable all modules for a specific role. + + + `{0}arm [enable/disable] MyRole` + + + ubl + + + Either [add]s or [rem]oves a user specified by a mention or ID from a blacklist. + + + `{0}ubl add @SomeUser` or `{0}ubl rem 12312312313` + + + cbl + + + Either [add]s or [rem]oves a channel specified by an ID from a blacklist. + + + `{0}cbl rem 12312312312` + + + sbl + + + Either [add]s or [rem]oves a server specified by a Name or ID from a blacklist. + + + `{0}sbl add 12312321312` or `{0}sbl rem SomeTrashServer` + + + cmdcooldown cmdcd + + + Sets a cooldown per user for a command. Set to 0 to remove the cooldown. + + + `{0}cmdcd "some cmd" 5` + + + allcmdcooldowns acmdcds + + + Shows a list of all commands and their respective cooldowns. + + + `{0}acmdcds` + + + . + + + Adds a new quote with the specified name and message. + + + `{0}. sayhi Hi` + + + .. + + + Shows a random quote with a specified name. + + + `{0}.. abc` + + + qsearch + + + Shows a random quote for a keyword that contains any text specified in the search. + + + `{0}qsearch keyword text` + + + deletequote delq + + + Deletes a random quote with the specified keyword. You have to either be server Administrator or the creator of the quote to delete it. + + + `{0}delq abc` + + + draw + + + Draws a card from the deck.If you supply number X, she draws up to 5 cards from the deck. + + + `{0}draw` or `{0}draw 5` + + + shuffle sh + + + Shuffles the current playlist. + + + `{0}sh` + + + flip + + + Flips coin(s) - heads or tails, and shows an image. + + + `{0}flip` or `{0}flip 3` + + + betflip bf + + + Bet to guess will the result be heads or tails. Guessing awards you 1.95x the currency you've bet (rounded up). Multiplier can be changed by the bot owner. + + + `{0}bf 5 heads` or `{0}bf 3 t` + + + roll + + + Rolls 0-100. If you supply a number [x] it rolls up to 30 normal dice. If you split 2 numbers with letter d (xdy) it will roll x dice from 1 to y. Y can be a letter 'F' if you want to roll fate dice instead of dnd. + + + `{0}roll` or `{0}roll 7` or `{0}roll 3d5` or `{0}roll 5dF` + + + rolluo + + + Rolls X normal dice (up to 30) unordered. If you split 2 numbers with letter d (xdy) it will roll x dice from 1 to y. + + + `{0}rolluo` or `{0}rolluo 7` or `{0}rolluo 3d5` + + + nroll + + + Rolls in a given range. + + + `{0}nroll 5` (rolls 0-5) or `{0}nroll 5-15` + + + race + + + Starts a new animal race. + + + `{0}race` + + + joinrace jr + + + Joins a new race. You can specify an amount of currency for betting (optional). You will get YourBet*(participants-1) back if you win. + + + `{0}jr` or `{0}jr 5` + + + raffle + + + Prints a name and ID of a random user from the online list from the (optional) role. + + + `{0}raffle` or `{0}raffle RoleName` + + + give + + + Give someone a certain amount of currency. + + + `{0}give 1 "@SomeGuy"` + + + award + + + Awards someone a certain amount of currency. You can also specify a role name to award currency to all users in a role. + + + `{0}award 100 @person` or `{0}award 5 Role Of Gamblers` + + + take + + + Takes a certain amount of currency from someone. + + + `{0}take 1 "@someguy"` + + + betroll br + + + Bets a certain amount of currency and rolls a dice. Rolling over 66 yields x2 of your currency, over 90 - x4 and 100 x10. + + + `{0}br 5` + + + leaderboard lb + + + Displays bot currency leaderboard. + + + `{0}lb` + + + trivia t + + + Starts a game of trivia. You can add nohint to prevent hints.First player to get to 10 points wins by default. You can specify a different number. 30 seconds per question. + + + `{0}t` or `{0}t 5 nohint` + + + tl + + + Shows a current trivia leaderboard. + + + `{0}tl` + + + tq + + + Quits current trivia after current question. + + + `{0}tq` + + + typestart + + + Starts a typing contest. + + + `{0}typestart` + + + typestop + + + Stops a typing contest on the current channel. + + + `{0}typestop` + + + typeadd + + + Adds a new article to the typing contest. + + + `{0}typeadd wordswords` + + + poll + + + Creates a poll which requires users to send the number of the voting option to the bot. + + + `{0}poll Question?;Answer1;Answ 2;A_3` + + + pollend + + + Stops active poll on this server and prints the results in this channel. + + + `{0}pollend` + + + pick + + + Picks the currency planted in this channel. 60 seconds cooldown. + + + `{0}pick` + + + plant + + + Spend an amount of currency to plant it in this channel. Default is 1. (If bot is restarted or crashes, the currency will be lost) + + + `{0}plant` or `{0}plant 5` + + + gencurrency gc + + + Toggles currency generation on this channel. Every posted message will have chance to spawn currency. Chance is specified by the Bot Owner. (default is 2%) + + + `{0}gc` + + + leet + + + Converts a text to leetspeak with 6 (1-6) severity levels + + + `{0}leet 3 Hello` + + + choose + + + Chooses a thing from a list of things + + + `{0}choose Get up;Sleep;Sleep more` + + + 8ball + + + Ask the 8ball a yes/no question. + + + `{0}8ball should I do something` + + + rps + + + Play a game of rocket paperclip scissors with Nadeko. + + + `{0}rps scissors` + + + linux + + + Prints a customizable Linux interjection + + + `{0}linux Spyware Windows` + + + next n + + + Goes to the next song in the queue. You have to be in the same voice channel as the bot. You can skip multiple songs, but in that case songs will not be requeued if {0}rcs or {0}rpl is enabled. + + + `{0}n` or `{0}n 5` + + + stop s + + + Stops the music and clears the playlist. Stays in the channel. + + + `{0}s` + + + destroy d + + + Completely stops the music and unbinds the bot from the channel. (may cause weird behaviour) + + + `{0}d` + + + pause p + + + Pauses or Unpauses the song. + + + `{0}p` + + + queue q yq + + + Queue a song using keywords or a link. Bot will join your voice channel.**You must be in a voice channel**. + + + `{0}q Dream Of Venice` + + + soundcloudqueue sq + + + Queue a soundcloud song using keywords. Bot will join your voice channel.**You must be in a voice channel**. + + + `{0}sq Dream Of Venice` + + + listqueue lq + + + Lists 15 currently queued songs per page. Default page is 1. + + + `{0}lq` or `{0}lq 2` + + + nowplaying np + + + Shows the song currently playing. + + + `{0}np` + + + volume vol + + + Sets the music volume 0-100% + + + `{0}vol 50` + + + defvol dv + + + Sets the default music volume when music playback is started (0-100). Persists through restarts. + + + `{0}dv 80` + + + max + + + Sets the music volume to 100%. + + + `{0}max` + + + half + + + Sets the music volume to 50%. + + + `{0}half` + + + playlist pl + + + Queues up to 500 songs from a youtube playlist specified by a link, or keywords. + + + `{0}pl playlist link or name` + + + soundcloudpl scpl + + + Queue a soundcloud playlist using a link. + + + `{0}scpl soundcloudseturl` + + + localplaylst lopl + + + Queues all songs from a directory. + + + `{0}lopl C:/music/classical` + + + radio ra + + + Queues a radio stream from a link. It can be a direct mp3 radio stream, .m3u, .pls .asx or .xspf (Usage Video: <https://streamable.com/al54>) + + + `{0}ra radio link here` + + + local lo + + + Queues a local file by specifying a full path. + + + `{0}lo C:/music/mysong.mp3` + + + move mv + + + Moves the bot to your voice channel. (works only if music is already playing) + + + `{0}mv` + + + remove rm + + + Remove a song by its # in the queue, or 'all' to remove whole queue. + + + `{0}rm 5` + + + movesong ms + + + Moves a song from one position to another. + + + `{0}ms 5>3` + + + setmaxqueue smq + + + Sets a maximum queue size. Supply 0 or no argument to have no limit. + + + `{0}smq 50` or `{0}smq` + + + cleanup + + + Cleans up hanging voice connections. + + + `{0}cleanup` + + + reptcursong rcs + + + Toggles repeat of current song. + + + `{0}rcs` + + + rpeatplaylst rpl + + + Toggles repeat of all songs in the queue (every song that finishes is added to the end of the queue). + + + `{0}rpl` + + + save + + + Saves a playlist under a certain name. Name must be no longer than 20 characters and mustn't contain dashes. + + + `{0}save classical1` + + + load + + + Loads a saved playlist using it's ID. Use `{0}pls` to list all saved playlists and {0}save to save new ones. + + + `{0}load 5` + + + playlists pls + + + Lists all playlists. Paginated. 20 per page. Default page is 0. + + + `{0}pls 1` + + + deleteplaylist delpls + + + Deletes a saved playlist. Only if you made it or if you are the bot owner. + + + `{0}delpls animu-5` + + + goto + + + Goes to a specific time in seconds in a song. + + + `{0}goto 30` + + + autoplay ap + + + Toggles autoplay - When the song is finished, automatically queue a related youtube song. (Works only for youtube songs and when queue is empty) + + + `{0}ap` + + + lolchamp + + + Shows League Of Legends champion statistics. If there are spaces/apostrophes or in the name - omit them. Optional second parameter is a role. + + + `{0}lolchamp Riven` or `{0}lolchamp Annie sup` + + + lolban + + + Shows top banned champions ordered by ban rate. + + + `{0}lolban` + + + hitbox hb + + + Notifies this channel when a certain user starts streaming. + + + `{0}hitbox SomeStreamer` + + + twitch tw + + + Notifies this channel when a certain user starts streaming. + + + `{0}twitch SomeStreamer` + + + beam bm + + + Notifies this channel when a certain user starts streaming. + + + `{0}beam SomeStreamer` + + + removestream rms + + + Removes notifications of a certain streamer from a certain platform on this channel. + + + `{0}rms Twitch SomeGuy` or `{0}rms Beam SomeOtherGuy` + + + liststreams ls + + + Lists all streams you are following on this server. + + + `{0}ls` + + + convert + + + Convert quantities. Use `{0}convertlist` to see supported dimensions and currencies. + + + `{0}convert m km 1000` + + + convertlist + + + List of the convertible dimensions and currencies. + + + `{0}convertlist` + + + wowjoke + + + Get one of Kwoth's penultimate WoW jokes. + + + `{0}wowjoke` + + + calculate calc + + + Evaluate a mathematical expression. + + + `{0}calc 1+1` + + + osu + + + Shows osu stats for a player. + + + `{0}osu Name` or `{0}osu Name taiko` + + + osub + + + Shows information about an osu beatmap. + + + `{0}osub https://osu.ppy.sh/s/127712` + + + osu5 + + + Displays a user's top 5 plays. + + + `{0}osu5 Name` + + + pokemon poke + + + Searches for a pokemon. + + + `{0}poke Sylveon` + + + pokemonability pokeab + + + Searches for a pokemon ability. + + + `{0}pokeab overgrow` + + + memelist + + + Pulls a list of memes you can use with `{0}memegen` from http://memegen.link/templates/ + + + `{0}memelist` + + + memegen + + + Generates a meme from memelist with top and bottom text. + + + `{0}memegen biw "gets iced coffee" "in the winter"` + + + weather we + + + Shows weather data for a specified city. You can also specify a country after a comma. + + + `{0}we Moscow, RU` + + + youtube yt + + + Searches youtubes and shows the first result + + + `{0}yt query` + + + anime ani aq + + + Queries anilist for an anime and shows the first result. + + + `{0}ani aquarion evol` + + + imdb omdb + + + Queries omdb for movies or series, show first result. + + + `{0}imdb Batman vs Superman` + + + manga mang mq + + + Queries anilist for a manga and shows the first result. + + + `{0}mq Shingeki no kyojin` + + + randomcat meow + + + Shows a random cat image. + + + `{0}meow` + + + randomdog woof + + + Shows a random dog image. + + + `{0}woof` + + + image img + + + Pulls the first image found using a search parameter. Use {0}rimg for different results. + + + `{0}img cute kitten` + + + randomimage rimg + + + Pulls a random image using a search parameter. + + + `{0}rimg cute kitten` + + + lmgtfy + + + Google something for an idiot. + + + `{0}lmgtfy query` + + + google g + + + Get a google search link for some terms. + + + `{0}google query` + + + hearthstone hs + + + Searches for a Hearthstone card and shows its image. Takes a while to complete. + + + `{0}hs Ysera` + + + urbandict ud + + + Searches Urban Dictionary for a word. + + + `{0}ud Pineapple` + + + # + + + Searches Tagdef.com for a hashtag. + + + `{0}# ff` + + + catfact + + + Shows a random catfact from <http://catfacts-api.appspot.com/api/facts> + + + `{0}catfact` + + + yomama ym + + + Shows a random joke from <http://api.yomomma.info/> + + + `{0}ym` + + + randjoke rj + + + Shows a random joke from <http://tambal.azurewebsites.net/joke/random> + + + `{0}rj` + + + chucknorris cn + + + Shows a random chucknorris joke from <http://tambal.azurewebsites.net/joke/random> + + + `{0}cn` + + + magicitem mi + + + Shows a random magicitem from <https://1d4chan.org/wiki/List_of_/tg/%27s_magic_items> + + + `{0}mi` + + + revav + + + Returns a google reverse image search for someone's avatar. + + + `{0}revav "@SomeGuy"` + + + revimg + + + Returns a google reverse image search for an image from a link. + + + `{0}revimg Image link` + + + safebooru + + + Shows a random image from safebooru with a given tag. Tag is optional but preferred. (multiple tags are appended with +) + + + `{0}safebooru yuri+kissing` + + + wikipedia wiki + + + Gives you back a wikipedia link + + + `{0}wiki query` + + + color clr + + + Shows you what color corresponds to that hex. + + + `{0}clr 00ff00` + + + videocall + + + Creates a private <http://www.appear.in> video call link for you and other mentioned people. The link is sent to mentioned people via a private message. + + + `{0}videocall "@SomeGuy"` + + + avatar av + + + Shows a mentioned person's avatar. + + + `{0}av "@SomeGuy"` + + + hentai + + + Shows a hentai image from a random website (gelbooru or danbooru or konachan or atfbooru or yandere) with a given tag. Tag is optional but preferred. Only 1 tag allowed. + + + `{0}hentai yuri` + + + danbooru + + + Shows a random hentai image from danbooru with a given tag. Tag is optional but preferred. (multiple tags are appended with +) + + + `{0}danbooru yuri+kissing` + + + atfbooru atf + + + Shows a random hentai image from atfbooru with a given tag. Tag is optional but preferred. + + + `{0}atfbooru yuri+kissing` + + + gelbooru + + + Shows a random hentai image from gelbooru with a given tag. Tag is optional but preferred. (multiple tags are appended with +) + + + `{0}gelbooru yuri+kissing` + + + rule34 + + + Shows a random image from rule34.xx with a given tag. Tag is optional but preferred. (multiple tags are appended with +) + + + `{0}rule34 yuri+kissing` + + + e621 + + + Shows a random hentai image from e621.net with a given tag. Tag is optional but preferred. Use spaces for multiple tags. + + + `{0}e621 yuri kissing` + + + cp + + + We all know where this will lead you to. + + + `{0}cp` + + + boobs + + + Real adult content. + + + `{0}boobs` + + + butts ass butt + + + Real adult content. + + + `{0}butts` or `{0}ass` + + + createwar cw + + + Creates a new war by specifying a size (>10 and multiple of 5) and enemy clan name. + + + `{0}cw 15 The Enemy Clan` + + + startwar sw + + + Starts a war with a given number. + + + `{0}sw 15` + + + listwar lw + + + Shows the active war claims by a number. Shows all wars in a short way if no number is specified. + + + `{0}lw [war_number] or {0}lw` + + + claim call c + + + Claims a certain base from a certain war. You can supply a name in the third optional argument to claim in someone else's place. + + + `{0}call [war_number] [base_number] [optional_other_name]` + + + claimfinish cf + + + Finish your claim with 3 stars if you destroyed a base. First argument is the war number, optional second argument is a base number if you want to finish for someone else. + + + `{0}cf 1` or `{0}cf 1 5` + + + claimfinish2 cf2 + + + Finish your claim with 2 stars if you destroyed a base. First argument is the war number, optional second argument is a base number if you want to finish for someone else. + + + `{0}cf2 1` or `{0}cf2 1 5` + + + claimfinish1 cf1 + + + Finish your claim with 1 star if you destroyed a base. First argument is the war number, optional second argument is a base number if you want to finish for someone else. + + + `{0}cf1 1` or `{0}cf1 1 5` + + + unclaim ucall uc + + + Removes your claim from a certain war. Optional second argument denotes a person in whose place to unclaim + + + `{0}uc [war_number] [optional_other_name]` + + + endwar ew + + + Ends the war with a given index. + + + `{0}ew [war_number]` + + + translate trans + + + Translates from>to text. From the given language to the destination language. + + + `{0}trans en>fr Hello` + + + translangs + + + Lists the valid languages for translation. + + + `{0}translangs` + + + Sends a readme and a guide links to the channel. + + + `{0}readme` or `{0}guide` + + + readme guide + + + Shows all available operations in {0}calc command + + + `{0}calcops` + + + calcops + + + Deletes all quotes on a specified keyword. + + + `{0}delallq kek` + + + delallq daq + + + greetdmmsg + + + `{0}greetdmmsg Welcome to the server, %user%`. + + + Sets a new join announcement message which will be sent to the user who joined. Type %user% if you want to mention the new member. Using it with no message will show the current DM greet message. You can use embed json from <http://nadekobot.xyz/embedbuilder/> instead of a regular text, if you want the message to be embedded. + + + Check how much currency a person has. (Defaults to yourself) + + + `{0}$$` or `{0}$$ @SomeGuy` + + + cash $$ + + + Lists whole permission chain with their indexes. You can specify an optional page number if there are a lot of permissions. + + + `{0}lp` or `{0}lp 3` + + + listperms lp + + + Enable or disable all modules for a specific user. + + + `{0}aum enable @someone` + + + allusrmdls aum + + + Moves permission from one position to another in Permissions list. + + + `{0}mp 2 4` + + + moveperm mp + + + Removes a permission from a given position in Permissions list. + + + `{0}rp 1` + + + removeperm rp + + + Migrate data from old bot configuration + + + `{0}migratedata` + + + migratedata + + + Checks if a user is online on a certain streaming platform. + + + `{0}cs twitch MyFavStreamer` + + + checkstream cs + + + showemojis se + + + Shows a name and a link to every SPECIAL emoji in the message. + + + `{0}se A message full of SPECIAL emojis` + + + shuffle sh + + + Reshuffles all cards back into the deck. + + + `{0}sh` + + + fwmsgs + + + Toggles forwarding of non-command messages sent to bot's DM to the bot owners + + + `{0}fwmsgs` + + + fwtoall + + + Toggles whether messages will be forwarded to all bot owners or only to the first one specified in the credentials.json + + + `{0}fwtoall` + + + resetperms + + + Resets BOT's permissions module on this server to the default value. + + + `{0}resetperms` + + + antiraid + + + Sets an anti-raid protection on the server. First argument is number of people which will trigger the protection. Second one is a time interval in which that number of people needs to join in order to trigger the protection, and third argument is punishment for those people (Kick, Ban, Mute) + + + `{0}antiraid 5 20 Kick` + + + antispam + + + Stops people from repeating same message X times in a row. You can specify to either mute, kick or ban the offenders. Max message count is 10. + + + `{0}antispam 3 Mute` or `{0}antispam 4 Kick` or `{0}antispam 6 Ban` + + + chatmute + + + Prevents a mentioned user from chatting in text channels. + + + `{0}chatmute @Someone` + + + voicemute + + + Prevents a mentioned user from speaking in voice channels. + + + `{0}voicemute @Someone` + + + konachan + + + Shows a random hentai image from konachan with a given tag. Tag is optional but preferred. + + + `{0}konachan yuri` + + + setmuterole + + + Sets a name of the role which will be assigned to people who should be muted. Default is nadeko-mute. + + + `{0}setmuterole Silenced` + + + adsarm + + + Toggles the automatic deletion of confirmations for {0}iam and {0}iamn commands. + + + `{0}adsarm` + + + setstream + + + Sets the bots stream. First argument is the twitch link, second argument is stream name. + + + `{0}setstream TWITCHLINK Hello` + + + chatunmute + + + Removes a mute role previously set on a mentioned user with `{0}chatmute` which prevented him from chatting in text channels. + + + `{0}chatunmute @Someone` + + + unmute + + + Unmutes a mentioned user previously muted with `{0}mute` command. + + + `{0}unmute @Someone` + + + xkcd + + + Shows a XKCD comic. No arguments will retrieve random one. Number argument will retrieve a specific comic, and "latest" will get the latest one. + + + `{0}xkcd` or `{0}xkcd 1400` or `{0}xkcd latest` + + + placelist + + + Shows the list of available tags for the `{0}place` command. + + + `{0}placelist` + + + place + + + Shows a placeholder image of a given tag. Use `{0}placelist` to see all available tags. You can specify the width and height of the image as the last two optional arguments. + + + `{0}place Cage` or `{0}place steven 500 400` + + + togethertube totube + + + Creates a new room on <https://togethertube.com> and shows the link in the chat. + + + `{0}totube` + + + publicpoll ppoll + + + Creates a public poll which requires users to type a number of the voting option in the channel command is ran in. + + + `{0}ppoll Question?;Answer1;Answ 2;A_3` + + + autotranslang atl + + + Sets your source and target language to be used with `{0}at`. Specify no arguments to remove previously set value. + + + `{0}atl en>fr` + + + autotrans at + + + Starts automatic translation of all messages by users who set their `{0}atl` in this channel. You can set "del" argument to automatically delete all translated user messages. + + + `{0}at` or `{0}at del` + + + listquotes liqu + + + `{0}liqu` or `{0}liqu 3` + + + Lists all quotes on the server ordered alphabetically. 15 Per page. + + + typedel + + + Deletes a typing article given the ID. + + + `{0}typedel 3` + + + typelist + + + Lists added typing articles with their IDs. 15 per page. + + + `{0}typelist` or `{0}typelist 3` + + + listservers + + + Lists servers the bot is on with some basic info. 15 per page. + + + `{0}listservers 3` + + + hentaibomb + + + Shows a total 5 images (from gelbooru, danbooru, konachan, yandere and atfbooru). Tag is optional but preferred. + + + `{0}hentaibomb yuri` + + + cleverbot + + + Toggles cleverbot session. When enabled, the bot will reply to messages starting with bot mention in the server. Custom reactions starting with %mention% won't work if cleverbot is enabled. + + + `{0}cleverbot` + + + shorten + + + Attempts to shorten an URL, if it fails, returns the input URL. + + + `{0}shorten https://google.com` + + + minecraftping mcping + + + Pings a minecraft server. + + + `{0}mcping 127.0.0.1:25565` + + + minecraftquery mcq + + + Finds information about a minecraft server. + + + `{0}mcq server:ip` + + + wikia + + + Gives you back a wikia link + + + `{0}wikia mtg Vigilance` or `{0}wikia mlp Dashy` + + + yandere + + + Shows a random image from yandere with a given tag. Tag is optional but preferred. (multiple tags are appended with +) + + + `{0}yandere tag1+tag2` + + + magicthegathering mtg + + + Searches for a Magic The Gathering card. + + + `{0}magicthegathering about face` or `{0}mtg about face` + + + yodify yoda + + + Translates your normal sentences into Yoda styled sentences! + + + `{0}yoda my feelings hurt` + + + attack + + + Attacks a target with the given move. Use `{0}movelist` to see a list of moves your type can use. + + + `{0}attack "vine whip" @someguy` + + + heal + + + Heals someone. Revives those who fainted. Costs a NadekoFlower + + + `{0}heal @someone` + + + movelist ml + + + Lists the moves you are able to use + + + `{0}ml` + + + settype + + + Set your poketype. Costs a NadekoFlower. Provide no arguments to see a list of available types. + + + `{0}settype fire` or `{0}settype` + + + type + + + Get the poketype of the target. + + + `{0}type @someone` + + + hangmanlist + + + Shows a list of hangman term types. + + + `{0} hangmanlist` + + + hangman + + + Starts a game of hangman in the channel. Use `{0}hangmanlist` to see a list of available term types. Defaults to 'all'. + + + `{0}hangman` or `{0}hangman movies` + + + crstatsclear + + + Resets the counters on `{0}crstats`. You can specify a trigger to clear stats only for that trigger. + + + `{0}crstatsclear` or `{0}crstatsclear rng` + + + crstats + + + Shows a list of custom reactions and the number of times they have been executed. Paginated with 10 per page. Use `{0}crstatsclear` to reset the counters. + + + `{0}crstats` or `{0}crstats 3` + + + overwatch ow + + + Show's basic stats on a player (competitive rank, playtime, level etc) Region codes are: `eu` `us` `cn` `kr` + + + `{0}ow us Battletag#1337` or `{0}overwatch eu Battletag#2016` + + + acrophobia acro + + + Starts an Acrophobia game. Second argment is optional round length in seconds. (default is 60) + + + `{0}acro` or `{0}acro 30` + + + logevents + + + Shows a list of all events you can subscribe to with `{0}log` + + + `{0}logevents` + + + log + + + Toggles logging event. Disables it if it's active anywhere on the server. Enables if it's not active. Use `{0}logevents` to see a list of all events you can subscribe to. + + + `{0}log userpresence` or `{0}log userbanned` + + + fairplay fp + + + Toggles fairplay. While enabled, music player will prioritize songs from users who didn't have their song recently played instead of the song's position in the queue. + + + `{0}fp` + + + define def + + + Finds a definition of a word. + + + `{0}def heresy` + + + setmaxplaytime smp + + + Sets a maximum number of seconds (>14) a song can run before being skipped automatically. Set 0 to have no limit. + + + `{0}smp 0` or `{0}smp 270` + + + activity + + + Checks for spammers. + + + `{0}activity` + + + autohentai + + + Posts a hentai every X seconds with a random tag from the provided tags. Use `|` to separate tags. 20 seconds minimum. Provide no arguments to disable. + + + `{0}autohentai 30 yuri|tail|long_hair` or `{0}autohentai` + + + setstatus + + + Sets the bot's status. (Online/Idle/Dnd/Invisible) + + + `{0}setstatus Idle` + + + rotaterolecolor rrc + + + Rotates a roles color on an interval with a list of supplied colors. First argument is interval in seconds (Minimum 60). Second argument is a role, followed by a space-separated list of colors in hex. Provide a rolename with a 0 interval to disable. + + + `{0}rrc 60 MyLsdRole #ff0000 #00ff00 #0000ff` or `{0}rrc 0 MyLsdRole` + + + createinvite crinv + + + Creates a new invite which has infinite max uses and never expires. + + + `{0}crinv` + + + pollstats + + + Shows the poll results without stopping the poll on this server. + + + `{0}pollstats` + + + repeatlist replst + + + Shows currently repeating messages and their indexes. + + + `{0}repeatlist` + + + repeatremove reprm + + + Removes a repeating message on a specified index. Use `{0}repeatlist` to see indexes. + + + `{0}reprm 2` + + + antilist antilst + + + Shows currently enabled protection features. + + + `{0}antilist` + + + antispamignore + + + Toggles whether antispam ignores current channel. Antispam must be enabled. + + + `{0}antispamignore` + + + cmdcosts + + + Shows a list of command costs. Paginated with 9 command per page. + + + `{0}cmdcosts` or `{0}cmdcosts 2` + + + commandcost cmdcost + + + Sets a price for a command. Running that command will take currency from users. Set 0 to remove the price. + + + `{0}cmdcost 0 !!q` or `{0}cmdcost 1 >8ball` + + + startevent + + + Starts one of the events seen on public nadeko. + + + `{0}startevent flowerreaction` + + + slotstats + + + Shows the total stats of the slot command for this bot's session. + + + `{0}slotstats` + + + slottest + + + Tests to see how much slots payout for X number of plays. + + + `{0}slottest 1000` + + + slot + + + Play Nadeko slots. Max bet is 999. 3 seconds cooldown per user. + + + `{0}slot 5` + + + affinity + + + Sets your affinity towards someone you want to be claimed by. Setting affinity will reduce their `{0}claim` on you by 20%. You can leave second argument empty to clear your affinity. 30 minutes cooldown. + + + `{0}affinity @MyHusband` or `{0}affinity` + + + claimwaifu claim + + + Claim a waifu for yourself by spending currency. You must spend atleast 10% more than her current value unless she set `{0}affinity` towards you. + + + `{0}claim 50 @Himesama` + + + waifus waifulb + + + Shows top 9 waifus. + + + `{0}waifus` + + + divorce + + + Releases your claim on a specific waifu. You will get some of the money you've spent back unless that waifu has an affinity towards you. 6 hours cooldown. + + + `{0}divorce @CheatingSloot` + + + waifuinfo waifustats + + + Shows waifu stats for a target person. Defaults to you if no user is provided. + + + `{0}waifuinfo @MyCrush` or `{0}waifuinfo` + + + mal + + + Shows basic info from myanimelist profile. + + + `{0}mal straysocks` + + + setmusicchannel smch + + + Sets the current channel as the default music output channel. This will output playing, finished, paused and removed songs to that channel instead of the channel where the first song was queued in. + + + `{0}smch` + + + reloadimages + + + Reloads images bot is using. Safe to use even when bot is being used heavily. + + + `{0}reloadimages` + + + shardstats + + + Stats for shards. Paginated with 25 shards per page. + + + `{0}shardstats` or `{0}shardstats 2` + + + connectshard + + + Try (re)connecting a shard with a certain shardid when it dies. No one knows will it work. Keep an eye on the console for errors. + + + `{0}connectshard 2` + + + shardid + + + Shows which shard is a certain guild on, by guildid. + + + `{0}shardid 117523346618318850` + + + tictactoe ttt + + + Starts a game of tic tac toe. Another user must run the command in the same channel in order to accept the challenge. Use numbers 1-9 to play. 15 seconds per move. + + + >ttt + + + timezones + + + List of all timezones available on the system to be used with `{0}timezone`. + + + `{0}timezones` + + + timezone + + + Sets this guilds timezone. This affects bot's time output in this server (logs, etc..) + + + `{0}timezone` + + + langsetdefault langsetd + + + 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. + + + `{0}langsetd en-US` or `{0}langsetd default` + + + languageset langset + + + 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. + + + `{0}langset de-DE ` or `{0}langset default` + + + languageslist langli + + + List of languages for which translation (or part of it) exist atm. + + + `{0}langli` + + + rategirl + + + Use the universal hot-crazy wife zone matrix to determine the girl's worth. It is everything young men need to know about women. At any moment in time, any woman you have previously located on this chart can vanish from that location and appear anywhere else on the chart. + + + `{0}rategirl @SomeGurl` + + \ No newline at end of file diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index 49072329..a33b43b9 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -2180,15 +2180,6 @@ namespace NadekoBot.Resources { } } - /// - /// Looks up a localized string similar to Betflip Gamble. - /// - public static string gambling_betflip_gamble { - get { - return ResourceManager.GetString("gambling_betflip_gamble", resourceCulture); - } - } - /// /// Looks up a localized string similar to Better luck next time ^_^. /// diff --git a/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx b/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx new file mode 100644 index 00000000..898269f2 --- /dev/null +++ b/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx @@ -0,0 +1,2184 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Esta base já está aclamada ou destruída. + + + Esta base já está destruída. + + + Esta base não está aclamada. + + + + + + + + + + + + @{0} Você já clamou esta base #{1}. Você não pode clamar uma nova. + + + + + + Inimigo + + + + Informações sobre a guerra contra {0} + + + Número de base inválido. + + + Não é um tamanho de guerra válido. + + + Lista de guerras ativas + + + não clamado + + + Você não está participando nesta guerra. + + + @{0} Você não está participando nessa guerra, ou aquela base já está destruída. + + + Nenhuma guerra ativa. + + + Tamanho + + + Guerra contra {0} já começou. + + + Guera contra {0} criada. + + + Guerra contra {0} acabou. + + + Essa guerra não existe. + + + Guerra contra {0} começou! + + + Todos os status de reações personalizadas limpados. + + + Reação personalizada deletada + + + Permissão Insuficiente. Necessita o domínio do bot para reações personalizadas globais, e administrador para reações personalizadas em server. + + + Lista de todas as reações personalizadas + + + Reações personalizadas + + + Nova reação personalizada + + + Nenhuma reação personalizada encontrada. + + + Nenhuma reação personalizada encontrada com este id. + + + Resposta + + + Status de reações customizáveis + + + Status limpado para {0} reação customizável. + + + Nenhum status para aquele comando achado, nenhuma ação foi tomada. + + + Comando + + + Autohentai parou. + + + Nenhum resultado encontrado. + + + {0} já desmaiou. + + + {0} já tem HP cheio. + + + Seu tipo já é {0} + + + usou {0}{1} em {2}{3} para {4} dano. + Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage. + + + Você não pode atacar novamente sem retaliação! + + + Você não pode atacar a si mesmo. + + + {0} desmaiou! + + + curou {0} com uma {1} + + + {0} Tem {1} HP restante. + + + Você não pode usar {0}. Digite `{1}ml` para ver uma lista de ataques que você pode usar. + + + Lista de golpes para tipo {0} + + + Não é efetivo. + + + Você não tem {0} o suficiente + + + Reviveu {0} com uma {1} + + + Você reviveu a si mesmo com uma {0} + + + Seu tipo foi mudado de {0} para {1} + + + É mais ou menos efetivo. + + + É super efetivo! + + + Você usou muitos ataques de uma vez, então você não pode se mexer! + + + Tipo de {0} é {1} + + + Usuário não encontrado. + + + Você desmaiou, então você não pode se mexer! + + + **Cargo Automático** para novos usuários **desabilitado**. + + + **Cargo Automático** para novos usuários **habilitado** + + + Anexos + + + Avatar mudado + + + Você foi BANIDO do servidor {0}. +Razão: {1} + + + Banidos + PLURAL + + + Usuário Banido + + + Nome do bot mudado para {0}. + + + Status do bot mudado para {0}. + + + Deleção automática de mensagens de despedida foi desativado. + + + Mensagens de despedida serão deletas após {0} segundos. + + + Mensagem de despedida atual: {0} + + + Ative mensagens de despedidas digitando {0} + + + Nova mensagem de despedida colocada. + + + Mensagens de despedidas desativadas. + + + Mensagens de despedidas foram ativadas neste canal. + + + Nome do canal mudado + + + Nome antigo + + + Tópico do canal mudado + + + Limpo. + + + Conteúdo + + + Cargo {0} criado com sucesso. + + + Canal de texto {0} criado. + + + Canal de voz {0} criado. + + + Ensurdecido com sucesso. + + + Servidor {0} deletado. + + + Parou a eliminação automática de invocações de comandos bem sucedidos. + + + Agora automaticamente deletando invocações de comandos bem sucedidos + + + Canal de texto {0} deletado. + + + Canal de voz {0} deletado. + + + Mensagem direta de + + + Novo doador adicionado com sucesso. Número total doado por este usuário: {0} 👑 + + + Obrigado às pessoas listadas abaixo por fazer este projeto acontecer! + + + Vou enviar mensagens diretas a todos os donos. + + + Vou enviar mensagens diretas apenas ao primeiro dono. + + + Vou enviar mensagens diretas de agora em diante. + + + Vou parar de enviar mensagens diretas de agora em diante. + + + Eliminação automática de mensagens de boas vindas desabilitada. + + + Mensagens de boas vindas serão deletadas após {0} segundos. + + + Mensagem direta de boas vindas atual: {0} + + + Ative mensagens diretas de boas vindas digitando {0} + + + Novas mensagen direta de boas vindas definida. + + + + + + + + + Mensagem de boas vindas atual: {0} + + + Ative mensagens de boas vindas digitando {0} + + + Nova mensagem de boas vindas definida. + + + Anúncios de boas vindas desabilitados. + + + Anúncios de boas vindas habilitados neste canal. + + + Você não pode usar este comando em usuários com um cargo maior ou igual ao seu na hierarquia dos cargos. + + + Imagens carregadas após {0} segundos! + + + + + + Parâmetros inválidos. + + + {0} juntou-se a {1} + + + Você foi banido do servidor {0}. +Razão: {1} + + + Usuário Chutado + + + Lista de linguagens +{0} + + + A região do seu servidor agora é {0} - {1} + + + A região padrão do bot agora é {0} - {1} + + + A linguagem foi definida para {0} - {1} + + + Falha ao definir região. Veja a ajuda desse comando. + + + A língua do servidor está definida para: {0} - {1} + + + {0} saiu de {1} + + + Servidor {0} deixado. + + + + + + + + + + + + + + + + + + + + + + + + + + + Mensagem de {0} `[Bot Owner]` + + + Mensagem enviada. + + + {0} movido de {1} to {2} + + + Mensagem deletada em #{0} + + + Mensagem atualizada em #{0} + + + Mutados + PLURAL (users have been muted) + + + Mutado + singular "User muted." + + + Não tenho a permissão para isso, provavelmente. + + + Novo cargo mudo definido. + + + Eu preciso da permissão de **Administrador** para fazer isso. + + + Nova mensagem + + + Novo Apelido + + + Novo Tópico + + + Apelido Alterado + + + Não posso achar esse servidor + + + Nenhum shard com aquele ID foi encontrado. + + + Mensagem Antiga + + + Apelido Antigo + + + Tópico Antigo + + + Erro. Não tenho permissões suficientes. + + + As permissões para este servidor foram resetadas. + + + Proteções ativadas + + + {0} foi **desativado** neste servidor. + + + {0} Ativado + + + Erro. Preciso da permissão "Gerenciar Cargos". + + + Nenhuma proteção ativa. + + + + + + + + + O tempo deve ser entre {0} e {1} segundos. + + + Todos os cargos foram removidos do usuário {0} com sucesso. + + + Falha ao remover cargos. Eu não possuo permissões suficientes + + + + A cor do cargo {0} foi alterada. + + + Esse cargo não existe. + + + Os parâmetros especificados são inválidos. + + + Um erro ocorreu devido à cor inválida ou permissões insuficientes. + + + Cargo {0} removido do usuário {1} com sucesso. + + + Falha ao remover o cargo. Não possuo permissões suficientes. + + + Cargo renomeado. + + + Falha ao renomear o cargo. Não possuo permissões suficientes. + + + Você não pode editar cargos superiores ao seu cargo mais elevado. + + + + + + O cargo {0} foi adicionado a lista. + + + {0} não encontrado. Limpo. + + + O cargo {0} já está na lista. + + + Adicionado. + + + + + + + + + + + + + + + Você já possui o cargo {0}. + + + + + + Cargos auto-atribuíveis agora são exclusivos! + + + + + + Esse cargo não é auto-atribuível + + + Você não possui o cargo {0}. + + + + + + Não sou capaz de adicionar esse cargo a você. `Não posso adicionar cargos a donos ou outros cargos maiores que o meu cargo na hierarquia dos cargos.` + + + {0} foi removido da lista de cargos auto-aplicáveis. + + + + + + + + + + + + Falha ao adicionar o cargo. Não possuo permissões suficientes. + + + Novo avatar definido! + + + Novo nome do canal definido. + + + Novo jogo definido! + + + Nova stream definida! + + + Novo tópico do canal definido. + + + Shard {0} reconectado. + + + Reconectando shard {0}. + + + Desligando + + + Usuários não podem mandar mais de {0} mensagens a cada {1} segundos + + + Modo lento desativado. + + + Modo lento iniciado. + + + + PLURAL + + + {0} irá ignorar esse canal. + + + {0} irá deixar de ignorar esse canal. + + + Se um usuário postar {0} mensagens iguais em seguida, eu irei {1} eles. +__Canais Ignorados__: {2} + + + Canal de Texto Criado + + + Canal de Texto Destruído + + + + + + Desmutado + singular + + + Nome de usuário + + + Nome de usuário alterado + + + Usuários + + + Usuário Banido + + + {0} foi **mutado** + + + {0} foi **desmutado** + + + Usuário juntou-se + + + Usuário saiu + + + {0} foi **mutado** nos chats de voz e texto. + + + Cargo do usuário adicionado + + + Cargo do usuário removido + + + {0} agora está {1} + + + + + + {0} juntou-se ao canal de voz {1}. + + + {0} deixou o canal de voz {1}. + + + {0} moveu-se do canal de voz {1} para {2}. + + + {0} foi **mutado por voz** + + + {0} foi **desmutado por voz** + + + Canal de voz criado + + + Canal de voz destruído + + + + + + + + + + + + + + + + + + Usuário {0} do chat de texto + + + Usuário {0} dos chats de voz e texto + + + + + + + + + Usuário desbanido + + + Migração concluída! + + + + + + + + + + + + + + + Mais sorte na próxima vez ^_^ + + + Parabéns! Você ganhou {0} por rolar acima {1} + + + Baralho re-embaralhado. + + + + User flipped tails. + + + Você Adivinhou! Você ganhou {0} + + + O número especificado é inválido. Você pode girar de 1 a {0} moedas. + + + + + + Este evento está ativo por até {0} horas. + + + + + + deu {0} de presente para {1} + X has gifted 15 flowers to Y + + + {0} tem {1} + X has Y flowers + + + Cara + + + Placar de Líderes + + + + + + Você não pode apostar mais que {0} + + + Você não pode apostar menos que {0} + + + Você não tem {0} suficientes. + + + Sem cartas no baralho. + + + Usuario sorteado + + + + + + Aposta + + + WOAAHHHHHH!!! Parabéns!!! x{0} + + + + + + Wow! Que sorte! Três de um tipo! x{0} + + + Bom trabalho! Dois {0} - aposta x{1} + + + Ganhou + + + + + + + + + + + + Coroa + + + Tomou {0} de {1} com sucesso + + + Não foi possível tomar {0} de {1} porque o usuário não possuí tanto {2}! + + + + + + Proprietário do bot apenas. + + + Requer a permissão {0} do canal + + + Você pode dar suporte ao projeto no Patreon: <{0}> ou Paypal: <{1}> + + + Comandos e abreviações + + + + + + Digite `{0}h NomeDoComando` para ver a ajuda para o comando especificado. Ex: `{0}h >8ball` + + + Não consigo encontrar esse comando. Por favor, verifique se esse comando existe antes de tentar de novo. + + + Descrição + + + Você pode dar suporte ao projeto da NadekoBot por +Patreon <{0}> ou +Paypal <{1}> +Não esqueça de deixar seu nome ou id do discord na mensagem. +**Obrigado**♥️ + + + **Lista de Comandos**. <{0}> +**Guias de hosteamento e documentos podem ser encontrados aqui**. <{1}> + + + Lista de Comandos + + + Lista de Módulos + + + Digite `{0}cmds NomeDoMódulo` para receber uma lista de comandos deste módulo. Ex: `{0}cmds games` + + + Esse módulo não existe. + + + Requer a permissão {0} do servidor. + + + Tabela de Conteúdo + + + Modo de uso + + + Autohentai iniciado. Repostando a cada {0}s com uma das seguintes tags: +{1} + + + Tag + + + Corrida de Animais + + + Falha ao iniciar já que não tiveram participantes suficientes. + + + Corrida cheia! Começando imediatamente + + + {0} juntou-se como {1} + + + {0} juntou-se como {1} e apostou {2}! + + + Digite {0}jr para juntar-se a corrida. + + + Iniciando em 20 segundos ou quando estiver completa. + + + Iniciando com {0} participantes. + + + {0} como {1} ganhou a corrida! + + + {0} como {1} ganhou a corrida e {2}! + + + + + + + Someone rolled 35 + + + Dados rolados: {0} + Dice Rolled: 5 + + + Falha ao iniciar a corrida. Outra corrida provavelmente está em andamento. + + + Nenhuma raça existe neste servidor. + + + O segundo número deve ser maior que o primeiro. + + + Mudanças no Coração + + + Clamado por + + + Divórcios + + + + + + Preço + + + Nenhuma waifu foi reivindicada ainda. + + + Top Waifus + + + + + + Mudou a afinidade de {0} para {1}. + +*Isto é moralmente questionável.*🤔 + Make sure to get the formatting right, and leave the thinking emoji + + + + + + Sua afinidade foi reiniciada. Você não possui mas alguém que você goste. + + + quer ser a waifu de {0}. Aww <3 + + + clamou {0} como sua waifu por {1}! + + + Você se divorciou de uma waifu que gostava de você. Seu monstro sem coração. +{0} recebeu {1} como compensação. + + + Você não pode colocar sua afinidade em você mesmo, seu egomaníaco. + + + + + + Nenhuma waifu é tão barata. Você deve pagar pelo menos {0} para ter uma waifu, mesmo se o valor dela for menor. + + + Você deve pagar {0} ou mais para reivindicar essa waifu! + + + Essa waifu não é sua. + + + Você não pode reivindicar a si próprio. + + + Você se divorciou recentemente. Aguarde {0} horas e {1} minutos para se divorciar de novo. + + + Ninguém + + + Você se divorciou de uma waifu que não gostava de você. Você recebeu {0} de volta. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Questão + + + É um empate! ambos escolheram {0} + + + + + + + + + A Corrida de Animais já está em andamento + + + Total: {1} Média: {1} + + + Categoria + + + + + + Cleverbot ativado neste servidor. + + + + + + + + + + plural + + + + + + Falha ao carregar a questão + + + Jogo Iniciado + + + + + + + + + + + + + + + Placar de Lideres + + + Você não possui {0} suficiente + + + Sem resultados + + + pegou {0} + Kwoth picked 5* + + + {0} plantou {1} + Kwoth planted 5* + + + Trivia já está em andamento neste servidor. + + + Trivia + + + + + + Nenhuma trivia está em andamento neste servidor. + + + {0} tem {1} pontos + + + Parando após esta questão. + + + Tempo esgotado! A resposta correta era {0} + + + {0} adivinhou e VENCEU o jogo! A resposta era: {1} + + + Você não pode jogar contra si mesmo. + + + Um Jogo da Velha já está em andamento neste canal. + + + Um empate! + + + criou um Jogo da Velha. + + + {0} venceu! + + + Combinou três + + + Nenhum movimento restante! + + + Tempo Esgotado! + + + É a vez de {0} + + + {0} vs {1} + + + + + + Autoplay desabilitado. + + + Autoplay habilitado. + + + Volume padrão definido para {0}% + + + + + + + + + Música concluída. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Você precisa estar em um canal de voz nesse servidor + + + Nome + + + Tocando agora + + + Nenhum player de música ativo. + + + Nenhum resultado para a busca. + + + + + + + + + Tocando Musica + + + + + + Página {0} de Playlists Salvas + + + Playlist deletada. + + + Falha ao deletar essa playlist. Ela não existe ou você não é seu o criador. + + + + + + + + + Playlist Salva + + + + + + Fila + + + Músicas em fila + + + Fila de músicas limpa. + + + A fila está cheia em {0}/{0} + + + Música removida + context: "removed song #5" + + + Repetindo a Música Atual + + + Repetindo Playlist + + + Repetindo Faixa + + + + + + + + + Repetição de playlist desabilitada. + + + Repetição de playlist habilitada. + + + + + + + + + Musicas embaralhadas. + + + Musica movida. + + + + + + + + + + + + Volume deve estar entre 0 e 100 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Negado + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Comando + Gen (of command) + + + + Gen. (of module) + + + + + + + + + + + + + + + + + + + + + + + + + Short of seconds. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Habilidades + + + Nenhum anime favorito ainda + + + + + + + + + + + + + + + + + + + + + + + + Fato + + + Capítulos + + + + + + + + + + + + + + + + + + Completado + + + Condição + + + Custo + + + Data + + + Defina + + + + + + Episódios + + + Ocorreu um erro. + + + Exemplo + + + Falha ao encontrar este animu. + + + Falha ao encontrar este mango. + + + Gêneros + + + + + + Altura/Peso + + + + + + + + + + + + Falha ao encontrar este filme. + + + + + + + + + + + + + + + + Don't translate {0}place + + + Localização + + + + + + + + + + + + Min/Max + + + Nenhum canal encontrado + + + Nenhum resultado encontrado + + + + + + Url Original + + + + + + + + + + + + Usuário não encontrado! Por favor cheque a região e a BattleTag antes de tentar de novo. + + + + + + Plataforma + + + Nenhuma habilidade encontrada. + + + Nenhum pokemon encontrado + + + Link do Perfil: + + + Qualidade + + + + + + + + + + + + Pontuação + + + + + + + + + + + + Alguma coisa deu errado + + + + + + Status + + + + + + Streamer {0} está offline + + + Streamer {0} está online com {1} espectadores + + + + + + Você não está seguindo nenhuma stream neste servidor + + + + + + + + + + + + Eu notificarei este canal quando o status mudar + + + Nascer do Sol + + + Pôr do Sol + + + Temperatura + + + Título + + + Top 3 animes favoritos: + + + Tradução: + + + Tipos + + + + + + Url + + + + + + Assistindo + + + + + + + + + Página não encontrada + + + Velocidade do Vento + + + + + + + + + + + + + /s and total need to be localized to fit the context - +`1.` + + + + + + + + + Autor + + + + + + + + + + + + Tópico do Canal + + + Comandos utilizados + + + + + + + + + + + + + + + + + + + + + + + + + + + Emojis Personalizados + + + Erro + + + + + + + + + + + + Aqui está uma lista de usuários nestes cargos + + + + + + + Invalid months value/ Invalid hours value + + + + + + + + + + + + Nenhum servidor encontrado nessa página. + + + Lista de Repetidores + + + Membros + + + Memória + + + Mensagens + + + R + + + Nome + + + Apelido + + + Ninguém está jogando esse jogo. + + + + + + Nenhum cargo nesta página. + + + + + + + + + Dono + + + Dono IDs + + + Presença + + + {0} Servidores +{1} Canais de Texto +{2} Canais de Voz + + + + + + + + + Nenhuma citação nesta página + + + Nenhuma citação que você possa remover foi encontrada + + + Citação adicionada + + + + + + Região + + + + + + + + + + + + + + + + + + Lista de repetidores + + + Nenhum repetidor neste server. + + + #{0} parou. + + + Nenhuma mensagens repetidas encontradas. + + + Resultado + + + Cargos + + + + + + + + + + + + + + + + + + {0} deste servidor é {1} + + + Informações do Servidor + + + Fragmento + + + Status de fragmento + + + + + + **Nome:** {0} **Link:** {1} + + + Nenhum emoji especial encontrado. + + + Tocando {0} canções, {1} no queue. + + + Canais de Texto + + + Aqui está o link do quarto: + + + + + + + Id of the user kwoth#1234 is 123123123123 + + + Usuários + + + Canais de Voz + + + \ No newline at end of file diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index 3dfd8571..efa1fe55 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -873,9 +873,6 @@ Reason: {1} has awarded {0} to {1} - - Betflip Gamble - Better luck next time ^_^ From c48d755c9a8585d1f152572b764022c3ab805159 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 1 Mar 2017 01:50:52 +0100 Subject: [PATCH 105/496] Update ResponseStrings.fr-fr.resx (POEditor.com) --- .../Resources/ResponseStrings.fr-fr.resx | 134 +++++++++--------- 1 file changed, 65 insertions(+), 69 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx b/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx index dbce49d8..3708ba7a 100644 --- a/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx +++ b/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Cette base a déjà été revendiquée ou détruite + Cette base a déjà été revendiquée ou détruite. Cette base est déjà détruite. @@ -130,7 +130,7 @@ Base #{0} **DETRUITE** dans une guerre contre {1} - {0} a *ABANDONNÉ* la base #{1} dans une guerre contre {2} + {0} a **ABANDONNÉ** la base #{1} dans une guerre contre {2} {0} a revendiqué une base #{1} dans une guerre contre {2} @@ -154,10 +154,10 @@ La taille de la guerre n'est pas valide. - Liste des guerres en cours. + Liste des guerres en cours - Non réclamé. + non réclamé Vous ne participez pas a cette guerre. @@ -196,8 +196,7 @@ Permissions insuffisantes. Nécessite d'être le propriétaire du Bot pour avoir les réactions personnalisées globales, et Administrateur pour les réactions personnalisées du serveur. - Liste de toutes les réactions personnalisées. - + Liste de toutes les réactions personnalisées Réactions personnalisées @@ -236,7 +235,7 @@ {0} est déjà inconscient. - {0} a toute sa vie. + {0} a tous ses PV. Votre type est déjà {0} @@ -276,7 +275,7 @@ Vous avez ressuscité {0} avec un {1} - Vous vous êtes ressuscité avec un {0}. + Vous vous êtes ressuscité avec un {0} Votre type a bien été modifié de {0} à {1} @@ -536,18 +535,18 @@ Raison : {1} Mise à jour du message dans #{0} - Tous les utilisateurs ont été mis en sourdine. + Tous les utilisateurs sont maintenant muets. PLURAL (users have been muted) - L'utilisateur à été mis en sourdine. + L'utilisateur est maintenant muet. singular "User muted." Il semblerait que je n'ai pas la permission nécessaire pour effectuer cela. - Nouveau rôle de mise en sourdine crée. + Nouveau rôle muet créé. J'ai besoin de la permission d'**Administrateur** pour effectuer cela. @@ -568,7 +567,7 @@ Raison : {1} Impossible de trouver ce serveur - Aucune partition pour cet ID trouvée. + Aucun Shard pour cet ID trouvée. Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. @@ -593,16 +592,16 @@ Raison : {1} {0} a été **désactivé** sur ce serveur. - {0} activé + {0} Activé - Erreur. J'ai besoin de la permission Gérer les rôles + Erreur. J'ai besoin de la permission Gérer les rôles. Aucune protection activée. - Le seuil d'utilisateurs doit être entre {0} et {1} + Le seuil d'utilisateurs doit être entre {0} et {1}. Si {0} ou plus d'utilisateurs rejoignent dans les {1} secondes suivantes, je les {2}. @@ -623,7 +622,7 @@ Raison : {1} Ce rôle n'existe pas. - Le paramètre spécifié est invalide. + Les paramètres spécifiés sont invalides. Erreur due à un manque de permissions ou à une couleur invalide. @@ -675,13 +674,13 @@ Raison : {1} Vous avez déjà le rôle {0}. - Vous avez déjà {0} rôles exclusifs auto-affectés. + Vous avez déjà {0} rôles exclusifs auto-attribués. - Rôles auto-affectés désormais exclusifs. + Rôles auto-attribuables désormais exclusifs. - Il y a {0} rôles auto-affectés. + Il y a {0} rôles auto-attribuables. Ce rôle ne peux pas vous être attribué par vous-même. @@ -697,7 +696,7 @@ Raison : {1} Je suis incapable de vous ajouter ce rôle. `Je ne peux pas ajouter de rôles aux propriétaires et aux autres rôles plus haut que le mien dans la hiérarchie.` - {0} a été supprimé de la liste des affectations automatiques de rôle. + {0} a été supprimé de la liste des rôles auto-attribuables. Vous n'avez plus le rôle {0}. @@ -728,11 +727,11 @@ Raison : {1} Nouveau sujet du salon défini. - Partition {0} reconnectée. + Shard {0} reconnectée. Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. - Partition {0} en reconnection. + Shard {0} en reconnection. Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. @@ -787,10 +786,10 @@ Raison : {1} Utilisateur banni - {0} a été **mis en sourdine** sur le chat. + {0} est maintenant **muet** sur le chat. - **La parole a été rétablie** sur le chat pour {0} + **La parole a été rétablie** sur le chat pour {0}. L'utilisateur a rejoint @@ -799,7 +798,7 @@ Raison : {1} L'utilisateur a quitté - {0} a été **mis en sourdine** à la fois sur le salon textuel et vocal. + {0} est maintenant **muet** à la fois sur le salon textuel et vocal. Rôle ajouté à l'utilisateur @@ -811,7 +810,7 @@ Raison : {1} {0} est maintenant {1} - {0} n'est **plus en sourdine** des salons textuels et vocaux. + {0} n'est maintenant **plus muet** des salons textuels et vocaux. {0} a rejoint le salon vocal {1}. @@ -823,10 +822,10 @@ Raison : {1} {0} est allé du salon vocal {1} au {2}. - {0} a été **mis en sourdine**. + {0} est maintenant **muet**. - {0} a été **retiré de la sourdine** + {0} n'est maintenant **plus muet**. Salon vocal crée. @@ -880,9 +879,6 @@ Raison: {1} a récompensé {0} à {1} - - Pari à pile ou face - Meilleure chance la prochaine fois ^_^ @@ -890,10 +886,10 @@ Raison: {1} Félicitations! Vous avez gagné {0} pour avoir lancé au dessus de {1} - Deck remélangé + Deck remélangé. - Lancé {0} + Lancé {0}. User flipped tails. @@ -903,13 +899,13 @@ Raison: {1} Nombre spécifié invalide. Vous pouvez lancer 1 à {0} pièces. - Ajoute {0} réaction à ce message pour avoir {1} + Ajoute la réaction {0} à ce message pour avoir {1} Cet événement est actif pendant {0} heures. - L'événement "réactions fleuries" a démaré! + L'événement "réactions fleuries" a démarré! a donné {0} à {1} @@ -926,7 +922,7 @@ Raison: {1} Classement - {1} utilisateurs du rôle {2} ont été récompensé de {0} + {1} utilisateurs du rôle {2} ont été récompensé de {0}. Vous ne pouvez pas miser plus de {0} @@ -944,7 +940,7 @@ Raison: {1} Utilisateur tiré au sort - Vous avez roulé un {0} + Vous avez roulé un {0}. Mise @@ -989,7 +985,7 @@ Raison: {1} Propriétaire du Bot seulement - Nécessite {0} permissions du salon + Nécessite {0} permissions du salon. Vous pouvez supporter ce projet sur Patreon <{0}> ou via Paypal <{1}> @@ -1022,10 +1018,10 @@ N'oubliez pas de mettre votre nom discord ou ID dans le message. **La liste des guides et tous les documents peuvent être trouvés ici**: <{1}> - Liste Des Commandes + Liste des commandes - Liste Des Modules + Liste des modules Entrez `{0}cmds NomDuModule` pour avoir la liste des commandes de ce module. ex `{0}cmds games` @@ -1037,7 +1033,7 @@ N'oubliez pas de mettre votre nom discord ou ID dans le message. Permission serveur {0} requise. - Table Des Matières + Table des matières Usage @@ -1126,7 +1122,7 @@ N'oubliez pas de mettre votre nom discord ou ID dans le message. Affinités changées de de {0} à {1}. -*C'est moralement questionnable* 🤔 +*C'est moralement discutable.* 🤔 Make sure to get the formatting right, and leave the thinking emoji @@ -1142,7 +1138,7 @@ N'oubliez pas de mettre votre nom discord ou ID dans le message. a revendiqué {0} comme sa waifu pour {1} - Vous avez divorcé avec une waifu qui vous aimais. Monstre sans cœur. {0} a reçu {1} en guise de compensation. + Vous avez divorcé avec une waifu qui vous aimais. Monstre sans cœur. {0} a reçu {1} en guise de compensation. vous ne pouvez pas vous lier d'affinité avec vous-même, espèce d'égocentrique. @@ -1224,7 +1220,7 @@ La nouvelle valeur de {0} est {1} ! Inscriptions terminées. - Une Course d'animaux est déjà en cours. + Une course d'animaux est déjà en cours. Total : {0} Moyenne : {1} @@ -1250,7 +1246,7 @@ La nouvelle valeur de {0} est {1} ! plural - Un {1} aléatoire est apparu ! Attrapez-le en entrant `{1}pick` + Un {0} aléatoire est apparu ! Attrapez-le en entrant `{1}pick` Impossible de charger une question. @@ -1262,7 +1258,7 @@ La nouvelle valeur de {0} est {1} ! Partie de pendu commencée. - Une partie de pendu est déjà en cours sur ce canal + Une partie de pendu est déjà en cours sur ce canal. Initialisation du pendu erronée. @@ -1280,7 +1276,7 @@ La nouvelle valeur de {0} est {1} ! Pas de résultat - choisi {0} + a cueilli {0} Kwoth picked 5* @@ -1297,7 +1293,7 @@ La nouvelle valeur de {0} est {1} ! {0} a deviné! La réponse était: {1} - Aucune partie de trivia en cours sur ce serveur. + Aucune partie de Trivia en cours sur ce serveur. {0} a {1} points @@ -1345,10 +1341,10 @@ La nouvelle valeur de {0} est {1} ! Tentative d'ajouter {0} à la file d'attente... - Lecture automatique désactivée + Lecture automatique désactivée. - Lecture automatique activée + Lecture automatique activée. Volume de base défini à {0}% @@ -1375,7 +1371,7 @@ La nouvelle valeur de {0} est {1} ! Id - Entrée invalide + Entrée invalide. Le temps maximum de lecture n'a désormais plus de limite. @@ -1402,7 +1398,7 @@ La nouvelle valeur de {0} est {1} ! Aucun lecteur de musique actif. - Pas de résultat + Pas de résultat. Lecteur mis sur pause. @@ -1420,7 +1416,7 @@ La nouvelle valeur de {0} est {1} ! Page {0} des listes de lecture sauvegardées - Liste de lecture supprimée + Liste de lecture supprimée. Impossible de supprimer cette liste de lecture. Soit elle n'existe pas, soit vous n'en êtes pas le créateur. @@ -1447,7 +1443,7 @@ La nouvelle valeur de {0} est {1} ! Liste d'attente effacée. - Liste d'attente complète ({0}/{0}) + Liste d'attente complète ({0}/{0}). Son retiré @@ -1732,10 +1728,10 @@ La nouvelle valeur de {0} est {1} ! Exemple - Impossible de trouver cet anime + Impossible de trouver cet anime. - Impossible de trouver ce manga + Impossible de trouver ce manga. Genres @@ -1759,7 +1755,7 @@ La nouvelle valeur de {0} est {1} ! Impossible de trouver ce film. - Langue d'origine ou de destination invalide + Langue d'origine ou de destination invalide. Blagues non chargées. @@ -1802,10 +1798,10 @@ La nouvelle valeur de {0} est {1} ! Url originale - Une clé d'API osu! est nécessaire + Une clé d'API osu! est nécessaire. - Impossible de récupérer la signature osu! + Impossible de récupérer la signature osu!. Trouvé dans {0} images. Affichage de {0} aléatoires. @@ -1821,7 +1817,7 @@ La nouvelle valeur de {0} est {1} ! Plateforme - Attaque non trouvée + Attaque non trouvée. Pokémon non trouvé. @@ -1849,7 +1845,7 @@ La nouvelle valeur de {0} est {1} ! recherche plutôt non ? - Impossible de réduire cette Url + Impossible de réduire cette Url. Url réduite @@ -1927,10 +1923,10 @@ La nouvelle valeur de {0} est {1} ! Impossible de trouver ce terme sur le wikia spécifié. - Entrez un wikia cible, suivi d'une requête de recherche + Entrez un wikia cible, suivi d'une requête de recherche. - Page non trouvée + Page non trouvée. Vitesse du vent @@ -2067,7 +2063,7 @@ OwnerID: {2} Aucun rôle sur cette page. - Aucune partition sur cette page. + Aucun shard sur cette page. Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. @@ -2088,7 +2084,7 @@ OwnerID: {2} {2} Salons Vocaux - Toutes les citations possédant le mot-clé {0} ont été supprimées + Toutes les citations possédant le mot-clé {0} ont été supprimées. Page {0} des citations @@ -2121,7 +2117,7 @@ OwnerID: {2} Nouveau modèle de rappel défini. - Répétition de {0} chaque {1} jour(s), {2} heure(s) et {3} minute(s) + Répétition de {0} chaque {1} jour(s), {2} heure(s) et {3} minute(s). Liste des répétitions @@ -2163,15 +2159,15 @@ OwnerID: {2} Info du serveur - Partition + Shard Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. - Statistique des partitions + Statistique des shards Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. - La partition **#{0}** est en état {1} avec {2} serveurs. + Le shard **#{0}** est en état {1} avec {2} serveurs. Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. From 120da4a604065a61cf6df289f020c5968c941f64 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 1 Mar 2017 01:50:55 +0100 Subject: [PATCH 106/496] Update ResponseStrings.de-DE.resx (POEditor.com) --- .../Resources/ResponseStrings.de-DE.resx | 35 +++++++++---------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.de-DE.resx b/src/NadekoBot/Resources/ResponseStrings.de-DE.resx index 7dd58187..eb4c7511 100644 --- a/src/NadekoBot/Resources/ResponseStrings.de-DE.resx +++ b/src/NadekoBot/Resources/ResponseStrings.de-DE.resx @@ -874,9 +874,6 @@ Grund: {1} verleiht {1} {0} - - Münzwurf-Glücksspiel - Hoffentlich haben sie beim nächsten Mal mehr Glück ^_^ @@ -1238,11 +1235,11 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu Währungsgeneration in diesem Kanal aktiviert. - {0} zufällige {1} sind erschienen! Sammle sie indem sie `{2}pick` schreiben. + {0} zufällige {1} sind erschienen! Sammle sie indem sie `{2}pick` schreiben plural - Eine zufällige {0} ist erschienen! Sammle sie indem sie `{1}pick` schreiben. + Eine zufällige {0} ist erschienen! Sammle sie indem sie `{1}pick` schreiben Laden einer Frage fehlgeschlagen. @@ -1370,10 +1367,10 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu Ungültige Eingabe. - Maximale Spielzeit hat kein Limit mehr + Maximale Spielzeit hat kein Limit mehr. - Maximale Spielzeit ist nun {0} Sekunden + Maximale Spielzeit ist nun {0} Sekunden. Maximale Musik-Warteschlangengröße ist nun unbegrenzt. @@ -1436,10 +1433,10 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu Eingereihter Song - Musik-Warteschlange geleert + Musik-Warteschlange geleert. - Warteschlange ist voll bei {0}/{1} + Warteschlange ist voll bei {0}/{1}. Song entfernt @@ -1458,7 +1455,7 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu Aktueller Song wird nicht mehr wiederholt. - Musikwiedergabe wiederaufgenommen + Musikwiedergabe wiederaufgenommen. Playlist-Wiederholung deaktiviert. @@ -1473,7 +1470,7 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu Gesprungen zu `{0}:{1}` - Song gemischt + Song gemischt. Song bewegt @@ -1524,7 +1521,7 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu {0} mit ID {1} wurde zur Sperrliste hinzugefügt - Befehl {0} hat nun {1}s Abklingzeit + Befehl {0} hat nun {1}s Abklingzeit. Befehl {0} hat keine Abklingzeit mehr und alle laufenden Abklingzeiten wurden entfernt. @@ -1595,7 +1592,7 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu Benutzer brauchen nun Rolle {0} um die Berechtigungen zu editieren. - Keine Berechtigung für diesen Index gefunden + Keine Berechtigung für diesen Index gefunden. Berechtigung #{0} - {1} entfernt @@ -1611,7 +1608,7 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu Short of seconds. - Benutzung von {0} {1} wurde für diesen Server verboten + Benutzung von {0} {1} wurde für diesen Server verboten. Benutzung von {0} {1} wurde für diesen Server erlaubt. @@ -1659,7 +1656,7 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu Ihre Automatische-Übersetzungs Sprache wurde entfernt. - Ihre Automatische-Übersetzungs Sprache wurde zu {from}>{to} gesetzt. + Ihre Automatische-Übersetzungs Sprache wurde zu {from}>{to} gesetzt Automatische Übersetzung der Nachrichten wurde auf diesem kanal gestartet. @@ -1671,7 +1668,7 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu Schlechter Eingabeformat, oder etwas lief schief. - Konnte diese Karte nicht finden + Konnte diese Karte nicht finden. fakt @@ -1749,7 +1746,7 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu Konnte diesen Film nicht finden. - Ungültige Quell- oder Zielsprache, + Ungültige Quell- oder Zielsprache. Witze nicht geladen. @@ -2049,7 +2046,7 @@ ID des Besitzers: {2} Niemand spielt dieses Spiel. - Keine aktiven Wiederholer + Keine aktiven Wiederholer. Keine Rollen auf dieser Seite. @@ -2138,7 +2135,7 @@ ID des Besitzers: {2} Keine Farben sind in dem Richtigen Format. Benutze zum Beispiel `#00ff00`. - Startete die Farbrotation für Rolle {0} + Startete die Farbrotation für Rolle {0}. Stoppte die Farbrotation für Rolle {0} From 8be5e0bf61b8d9ed91f46b81d8fcd540d132164b Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 1 Mar 2017 01:50:57 +0100 Subject: [PATCH 107/496] Update ResponseStrings.ru-RU.resx (POEditor.com) --- .../Resources/ResponseStrings.ru-RU.resx | 279 ++++++++++-------- 1 file changed, 156 insertions(+), 123 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx b/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx index bf370873..d2980cc8 100644 --- a/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx +++ b/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx @@ -118,28 +118,34 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + Эта база уже захвачена или разрушена. + Fuzzy - + Эта база уже разрушена - + Эта база не захвачена. + Fuzzy - + **РАЗРУШЕННАЯ** база #{0} ведёт войну против {1}. - + У {0} есть **НЕ ЗАХВАЧЕННАЯ** база #{1}, ведущая войну против {2} + Fuzzy - + {0} захватил базу #{1} после войны с {2} + Fuzzy - + @{0} Вы уже захватили базу #{1}. Вы не можете захватить новую базу. + Fuzzy - + Время действия запроса от @{0} на войну против {1} истёкло. + Fuzzy Враг @@ -148,31 +154,32 @@ Информация о войне против {0} - + Неправильный номер базы. - + Неправильный размер войны. Список активных войн - + не захваченная + Fuzzy - + Вы не участвуете в этой войне. - + @{0} Вы либо не участвуете в этой войне, либо эта база разрушена. - + Нет активных войн. Размер - + Война против {0} уже началась. Война против {0} была создана. @@ -185,10 +192,11 @@ Эта война не существует. - + Война против {0} началась! Вся статистика настраиваемых реакций стёрта. + Fuzzy Настраиваемая реакция удалена. @@ -211,22 +219,27 @@ Fuzzy - + Не найдено настраиваемых реакций. + Fuzzy - + Не найдено настраеваемых реакций с таким номером. + Fuzzy Ответ - + Статистика настраеваемых реакций. + Fuzzy - + Статистика удалена для настраеваемой реакции {0}. + Fuzzy - + Не найдено статистики для этого запроса, никаких действий не применено. + Fuzzy Активатор @@ -267,33 +280,41 @@ Вы не можете использовать {0}. Напишите '{1}ml', чтобы увидеть список доступных Вам приёмов. + Fuzzy Список приёмов {0} типа Эта атака не эффективна. + Fuzzy У вас не достаточно {0} воскресил {0}, использовав один {1} + Fuzzy Вы воскресили себя, использовав один {0} + Fuzzy Ваш тип изменён с {0} на {1} + Fuzzy Эта атака немного эффективна. + Fuzzy Эта атака очень эффективна! + Fuzzy Вы использовали слишком много приёмов подряд и не можете двигаться! + Fuzzy Тип {0} — {1} @@ -363,10 +384,10 @@ Тема канала сменена. - + Чат очищен. - + Содержание Успешно создана роль {0}. @@ -542,11 +563,13 @@ Заглушёны - PLURAL (users have been muted) + PLURAL (users have been muted) +Fuzzy Заглушён - singular "User muted." + singular "User muted." +Fuzzy Скорее всего, у меня нет необходимых прав. @@ -593,7 +616,7 @@ Права для этого сервера - + Активные защиты от рейдов {0} был **отключён** на этом сервере. @@ -605,7 +628,7 @@ Ошибка. Требуется право на управление ролями. - + Нет защит от рейдов Порог пользователей должен лежать между {0} и {1}. @@ -650,13 +673,13 @@ Вы не можете редактировать роли, находящиеся выше чем ваша роль. - + Удалено повторяющееся сообщение: {0} Роль {0} добавлена в лист. - + {0} не найдена. Чат очищен. Роль {0} уже есть в списке. @@ -665,16 +688,17 @@ Добавлено. - + Отключены чередующиеся статусы. - + Чередующиеся статусы отключены. - + Список чередующихся статусов: +{0} - + Чередующиеся статусы не установлены. У вас уже есть роль {0} @@ -749,7 +773,7 @@ Медленный режим включен. - + выгнаны PLURAL @@ -771,8 +795,9 @@ Отключено заглушение. - - singular + Вкл. звук + singular +Fuzzy Имя @@ -787,10 +812,12 @@ Пользователь заблокирован - + {0} получил **запрет** на разговор в чате. + Fuzzy - + {0} потерял **запрет** на разговор в чате. + Fuzzy Пользователь присоединился @@ -799,7 +826,8 @@ Пользователь вышел - + {0} получил **запрет** на разговор в текстовом и голосовом чатах. + Fuzzy Добавлена роль пользователя @@ -811,7 +839,8 @@ {0} теперь {1} - + {0} потерял **запрет** на разговор в текстовом и голосовом чатах. + Fuzzy {0} присоединился к голосовому каналу {1}. @@ -820,26 +849,27 @@ {0} покинул голосовой канал {1}. - {0} переместил {1} в голосовой канал {2}. + {0} переместил из голосового канала {1} в {2}. - + **Выключен микрофон** у {0}. + Fuzzy - + **Включён микрофон** у {0}. + Fuzzy - Голосовой канал удалён - Fuzzy + Голосовой канал создан Голосовой канал удалён - + Отключены голосовые + текстовые функции. - + Включены голосовые + текстовые функции. Нет разрешений **Управление ролями** и/или **Управление каналами**, поэтому нельзя использовать команду 'voice+text' на сервере {0}. @@ -872,17 +902,14 @@ Ошибка при переносе файлов, проверьте консоль бота для получения дальнейшей информации. - + История присутвия пользователей - + Пользователя выгнали наградил {0} пользователю {1} - - - В следующий раз повезёт ^_^ @@ -941,13 +968,13 @@ В колоде закончились карты. - + Победитель лотереи - + Вам выпало {0}. - + Ставка НИЧЕГО СЕБЕ!!! Поздраляем!!! x{0} @@ -1043,7 +1070,8 @@ Paypal <{1}> Использование - + Авто-хентай запущен. Каждые {0}с будут отправляться изображения с одним из следующих тэгов: +{1} Тэг @@ -1082,7 +1110,7 @@ Paypal <{1}> Задано неправильное число. Можно бросить {0}-{1} костей одновременно. - + выпало {0} Someone rolled 35 @@ -1099,10 +1127,11 @@ Paypal <{1}> Второе число должно быть больше первого. - + Смены чувств - + В браке + Fuzzy Разводы @@ -1172,7 +1201,7 @@ Paypal <{1}> Вы развелись с вайфу, которой Вы не нравились. Вам вернули {0}. - + 8ball Акрофобия. @@ -1355,16 +1384,19 @@ Paypal <{1}> Папка успешно добавлена в очередь воспроизведения. - + fairplay + Fuzzy Песня завершилась. - + Отключено справедливое воспроизведение. + Fuzzy - + Включено справедливое воспроизведение. + Fuzzy С момента @@ -1716,7 +1748,7 @@ Paypal <{1}> Определить: - + Брошено Эпизоды @@ -1828,11 +1860,11 @@ Paypal <{1}> Качество: - + Время игры в Быстрой Игре Is this supposed to be Overwatch Quick Play stats? - + Побед в Быстрой Игре Рейтинг: @@ -1859,7 +1891,7 @@ Paypal <{1}> Состояние - + Url Магазина Стример {0} в оффлане. @@ -1883,7 +1915,7 @@ Paypal <{1}> Стрим {0} ({1}) убран из оповещений. - + Этот канал будет оповещён, когда статус стрима изменится. Рассвет @@ -1945,7 +1977,7 @@ Paypal <{1}> `1.` - + Страница списка активности #{0} Всего {0} пользователей. @@ -2025,55 +2057,56 @@ Paypal <{1}> Имя: {0} - +Участники: {1} +IDВладельца: {2} - + На этой странице не найдено серверов. - + Список повторяемых сообщений - + Участники - + Память - + Сообщения - + Повторяемое сообщения - + Имя - + Кличка - + Никто не играет в эту игру - + Нет активных повторяемых сообщений - + На этой странице нет ролей. - + На этой странице нет Shard-ов. - + Тема не задана - + Владелец - + ID владельца - + Присутствие {0} Серверов @@ -2081,116 +2114,116 @@ Paypal <{1}> {2} Голосовых каналов - + Удалены все цитаты с ключевым словом {0}. - + Страница {0} цитат - + На этой странице нет цитат. - + Не найдено цитат, пригодных для удаления. - + Цитата добавлена - + Случайно выбранная цитата удалена. - + Регион - + Зарегистрирован - + Я напомню, чтобы {0} сделал {2} '{3:d.M.yyyy.} в {4:HH:mm}' - + Неправильный формат времени. Проверьте список команд. - + Новый образец для напоминаний задан. - + Повторяю {0} каждые {} дня(ей), {2} час(а) и {3} минут(у). - + Список повторяемых сообщений - + На этом сервере нет повторяемых сообщений. - + #{0} остановлен. - + На этом сервере не найдено повторяемых сообщений - + Результат - + Роли - + Страница #{0} всех ролей на этом сервере: - + Страница #{0} ролей для {1} - + Цвета заданы в неправильном формате. Используйте, например '#00ff00'. - + Начато чередование цветов роли {0}. - + Остановлено чередование цветов роли {0}. - + {0} этого сервера — {1} - + Информация о сервере - + Shard - + Статискика Shard-а - + Shard **#{0}** находится в состоянии {1} с {2} серверами. - + **Имя:** {0} **Link:** {1} - + Серверные emoji не найдены. - + Проигрывается {0} песен, {1} в очереди - + Текстовые каналы - + Ссылка на Вашу комнату: - + Время работы - + {} пользователя {1} — {2} Id of the user kwoth#1234 is 123123123123 - + Пользователи - + Голосовые каналы \ No newline at end of file From 1d38b92757dc2762d73dfc168a93e04d22fb35ea Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 1 Mar 2017 01:51:00 +0100 Subject: [PATCH 108/496] Update CommandStrings.nl-NL.resx (POEditor.com) --- .../Resources/CommandStrings.nl-NL.resx | 5316 +++++++---------- 1 file changed, 2166 insertions(+), 3150 deletions(-) diff --git a/src/NadekoBot/Resources/CommandStrings.nl-NL.resx b/src/NadekoBot/Resources/CommandStrings.nl-NL.resx index 662975cf..d3b70713 100644 --- a/src/NadekoBot/Resources/CommandStrings.nl-NL.resx +++ b/src/NadekoBot/Resources/CommandStrings.nl-NL.resx @@ -1,3153 +1,2169 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Die basis is al veroverd of vernietigd. + + + Die basis is al vernietigd. + + + Die basis is nog niet veroverd. + + + **VERNIETIGD**basis #{0} in een oorlog tegen {1} + + + {0} heeft **ONOVERWONNEN** basis #{1} in een oorlog tegen {2} + + + {0} heeft basis #{1} overwonnen in een oorlog tegen {2} + + + @{0} Jij hebt al een basis overwonnen #{1}. Je kunt niet nog een nemen. + + + De aanvraag van @{0} voor een oorlog tegen {1} is niet meer geldig. + + + Vijand + + + Informatie over oorlog tegen {0} + + + Ongeldige basis nummer + + + Ongeldige oorlogs formaat. + + + Lijst van voorlopende oorlogen. + + + Niet veroverd. + + + Jij doet niet mee aan die oorlog. + + + @{0} Jij doet niet mee aan die oorlog, or die basis is al vernietigd. + + + Geen voorlopende oorlogen. + + + Grootte. + + + Oorlog tegen {0} is al begonnen. + + + Oorlog tegen {0} gecreëerd + + + De oorlog tegen {0} is beëindigd. + + + Die oorlog bestaat niet. + + + De oorlog tegen {0} is begonnen! + + + Alle speciale reactie statistieken zijn verwijderd. + + + Speciale Reactie verwijderdt. + + + Onvoldoende rechten. Bot Eigendom is nodig voor globale speciale reacties, en Administrator voor speciale server-reacties. + + + Lijst van alle zelf gemaakte reacties + + + Speciale Reacties + + + Nieuwe Speciale Reacties + + + Geen speciale reacties gevonden. + + + Geen speciale reacties gevonden met die ID. + + + Antwoord + + + Speciale Reactie Statistieken + + + Statistieke verwijderd voor {0} speciale reactie. + + + Geen statistieken voor die trekker gevonden, geen actie genomen. + + + Trekker + + + Autohentai gestopt. + + + Geen resultaten gevonden + + + {0} is al flauw gevallen. + + + {0} heeft al vol HP. + + + Jouw element is al {0} + + + heeft {0}{1} op {2}{3} gebruikt voor {4} schade. + Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage. + + + Jij zal niet winnen zonder tegenstand! + + + Je kunt je zelf niet aanvallen + + + {0} is verslagen! + + + heeft {0} genezen met een {1} + + + {0} heeft nog {1} HP over + + + Je kan {0} niet gebruiken. Typ `{1}ml` om een lijst te bekijken van de aanvallen die jij kunt gebruiken + + + Aanvallijst voor {0} element + + + Het heeft weinig effect. + + + Je hebt niet genoeg {0} + + + heeft {0} herstelt met een {1} + + + Je kunt jezelf herstellen met een {0} + + + Je element is veranderd van {0} naar {1} + + + Het is een beetje effectief. + + + Het is super effectief! + + + Je hebt te veel aanvallen achter elkaar gemaakt, je kan dus niet bewegen! + + + Element van {0} is {1} + + + Gebruiker niet gevonden. + + + Je bent flauw gevallen, dus je kunt niet bewegen! + + + **Auto aanwijzing van rollen** op gebruiker is nu **uitgeschakeld**. + + + **Auto aanwijzing van rollen** op gebruiker is nu **ingeschakeld**. + + + Bestanden + + + Avatar veranderd + + + Je bent verbannen van {0} server. Reden: {1} + + + Verbannen + PLURAL + + + Gebruiker verbannen + + + Bot naam is veranderd naar {0} + + + Bot status is veranderd naar {0} + + + Automatische verwijdering van de bye berichten is uitgeschakeld. + + + Bye berichten zullen worden verwijderd na {0} seconden. + + + Momenteel is de bye message: {0} + + + Schakel de bye berichten in door {0} te typen. + + + Nieuw bye bericht is geplaatst. + + + Dag aankondigingen uitgeschakeld. + + + Dag aankondigingen ingeschakeld op dit kanaal. + + + Kanaal naam is veranderd. + + + Oude naam + + + Kanaal onderwerp is veranderd + + + Opgeruimd + + + Inhoud + + + Met success een nieuwe rol gecreëerd. + + + Tekst kanaal {0} gecreëerd. + + + Stem kanaal {0} gecreëerd. + + + Dempen succesvol. + + + Server verwijderd {0} + + + Stopt van automatische verwijdering van succesvolle reacties aanroepingen commando. + + + Verwijdert nu automatisch succesvolle commando aanroepingen + + + Tekst kanaal {0} verwijdert. + + + Stem kanaal {0} verwijdert. + + + Privé bericht van + + + Met succes een nieuwe donateur toegevoegt. Totaal gedoneerde bedrag van deze gebruiker {0} + + + Dank aan de mensen hieronder vernoemt voor het waarmaken van dit project! + + + Ik zal alle eigenaren een privé bericht sturen. + + + Ik zal een privé bericht sturen naar de eerste eigenaar + + + Ik zal privé berichten sturen vanaf nu. + + + Ik stop vanaf nu met het sturen van privé berichten. + + + Automatisch verwijderen van groet berichten is uitgeschakeld. + + + Groet berichten zullen worden verwijderd na {0} seconden. + + + Momenteen is het privé groet bericht: {0} + + + Schakel DM begroetings bericht in door {0} in te typen. + + + Nieuwe DM begroetings bericht vastgesteld. + + + DM begroetings aankondiging uitgeschakeld. + + + DM begroetings aankondiging ingeschakeld. + + + Momentele begroetings bericht: {0} + + + Schakel begroetings bericht in door {0} in te typen + + + Nieuwe begroetings message vastgesteld. + + + Begroetings aankondiging uitgeschakeld. + + + Begroetings aankondiging uitschakeld op dit kanaal. + + + Jij kunt geen commando gebruiken op gebruikers met hogere of dezelfde rol als die van jouw in de rollen hiërarchie. + + + Afbeeldingen geplaatst na {0} seconden! + + + Ongelde invoer formaat. + + + Ongeldige parameters. + + + {0} heeft {1} toegetreden. + + + Je bent weggeschopt van de {0} server. +Reden: {1} + + + Gebruiker weggeschopt. + + + Lijst van talen +{0} + + + Jouw server's plaats van handeling is nu {0} - {1} + + + Bot's standaard plaats van handeling is nu {0} - {1} + + + Bot's taal is vastgesteld van {0} - {1} + + + + + + deze server taal is gezet naar: + + + heeft verlaten + + + Heeft de server verlaten + + + + + + + + + Logging uitgeschakeld + + + + + + + + + + + + + + + + + + + + + Bericht verstuurd + + + verplaats van ... naar ... + + + bericht verwijdert in + + + bericht bijgewerkt in + + + gemute + PLURAL (users have been muted) + + + gemute + singular "User muted." + + + + + + nieuwe demp group gezet + + + Ik heb **administrator** rechten nodig voor dat + + + nieuw bericht + + + nieuwe bijnaam + + + Nieuw onderwerp + + + Bijnaam veranderd + + + Kan de server niet vinden + + + + + + Oud bericht + + + Oude bijnaam + + + Oude onderwerp + + + error hoogst waarschijnlijk niet voldoende permissie + + + de rechten op deze server zijn gereset + + + actieve bescherming + + + is ** uitgeschakeld** op deze server + + + aangezet + + + fout. ik heb managergroup rechten nodig + + + geen bescherming aangezet + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + group naam veranderd + + + group naam veranderen mislukt. ik heb niet genoeg rechten + + + je kan geen groupen bijwerken die hoger zijn dan jou eigen group + + + Verwijderd van speel bericht + + + group... is toegevoegd aan de lijst + + + niet gevonden. aan het opruimen + + + group is al in de lijst + + + toegevoegd + + + + + + + + + + + + + + + je hebt al .. group + + + + + + + + + + + + deze group is niet zelf + + + + + + + + + + + + + + + je heb niet lang meer de {0} group + + + je hebt nu {0} group + + + met sucess een group {0) toegevoegd aan gebruiker {1} + + + fout bij het toevoegen van een group. je heb onvoldoende rechten + + + Nieuwe avatar gezet! + + + Nieuwe kanaal naam gezet. + + + Nieuwe game gezet! + + + Nieuwe stream gezet! + + + Nieuwe kanaal onderwerp gezet + + + + + + + + + afsluiten + + + + + + langzame mode uitgezet + + + langzame mode gestart + + + zacht-verbannen(kicked) + PLURAL + + + {0} wil deze kanaal dempen + + + + + + + + + + + + + + + + + + + singular + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + User flipped tails. + + + + + + + + + + + + + + + + + + + X has gifted 15 flowers to Y + + + + X has Y flowers + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Someone rolled 35 + + + + Dice Rolled: 5 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Make sure to get the formatting right, and leave the thinking emoji + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + plural + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Kwoth picked 5* + + + + Kwoth planted 5* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + context: "removed song #5" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Gen (of command) + + + + Gen. (of module) + + + + + + + + + + + + + + + + + + + + + + + + + Short of seconds. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Don't translate {0}place + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /s and total need to be localized to fit the context - +`1.` + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Invalid months value/ Invalid hours value + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Id of the user kwoth#1234 is 123123123123 + + + + + + + - mimetype: application/x-microsoft.net.object.bytearray.base64 - value : The object must be serialized into a byte array - : using a System.ComponentModel.TypeConverter - : and then encoded with base64 encoding. - --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - help h - - - Either shows a help for a single command, or DMs you help link if no arguments are specified. - - - `{0}h !!q` or `{0}h` - - - hgit - - - Generates the commandlist.md file. - - - `{0}hgit` - - - donate - - - Instructions for helping the project financially. - - - `{0}donate` - - - modules mdls - - - Lists all bot modules. - - - `{0}modules` - - - commands cmds - - - List all of the bot's commands from a certain module. You can either specify full, or only first few letters of the module name. - - - `{0}commands Administration` or `{0}cmds Admin` - - - greetdel grdel - - - Sets the time it takes (in seconds) for greet messages to be auto-deleted. Set 0 to disable automatic deletion. - - - `{0}greetdel 0` or `{0}greetdel 30` - - - greet - - - Toggles anouncements on the current channel when someone joins the server. - - - `{0}greet` - - - greetmsg - - - Sets a new join announcement message which will be shown in the server's channel. Type %user% if you want to mention the new member. Using it with no message will show the current greet message. You can use embed json from <http://nadekobot.xyz/embedbuilder/> instead of a regular text, if you want the message to be embedded. - - - `{0}greetmsg Welcome, %user%.` - - - bye - - - Toggles anouncements on the current channel when someone leaves the server. - - - `{0}bye` - - - byemsg - - - Sets a new leave announcement message. Type %user% if you want to show the name the user who left. Type %id% to show id. Using this command with no message will show the current bye message. You can use embed json from <http://nadekobot.xyz/embedbuilder/> instead of a regular text, if you want the message to be embedded. - - - `{0}byemsg %user% has left.` - - - byedel - - - Sets the time it takes (in seconds) for bye messages to be auto-deleted. Set 0 to disable automatic deletion. - - - `{0}byedel 0` or `{0}byedel 30` - - - greetdm - - - Toggles whether the greet messages will be sent in a DM (This is separate from greet - you can have both, any or neither enabled). - - - `{0}greetdm` - - - logserver - - - Enables or Disables ALL log events. If enabled, all log events will log to this channel. - - - `{0}logserver enable` or `{0}logserver disable` - - - logignore - - - Toggles whether the .logserver command ignores this channel. Useful if you have hidden admin channel and public log channel. - - - `{0}logignore` - - - userpresence - - - Starts logging to this channel when someone from the server goes online/offline/idle. - - - `{0}userpresence` - - - voicepresence - - - Toggles logging to this channel whenever someone joins or leaves a voice channel you are currently in. - - - `{0}voicepresence` - - - repeatinvoke repinv - - - Immediately shows the repeat message on a certain index and restarts its timer. - - - `{0}repinv 1` - - - repeat - - - Repeat a message every X minutes in the current channel. You can have up to 5 repeating messages on the server in total. - - - `{0}repeat 5 Hello there` - - - rotateplaying ropl - - - Toggles rotation of playing status of the dynamic strings you previously specified. - - - `{0}ropl` - - - addplaying adpl - - - Adds a specified string to the list of playing strings to rotate. Supported placeholders: %servers%, %users%, %playing%, %queued%, %time%,%shardid%,%shardcount%, %shardguilds% - - - `{0}adpl` - - - listplaying lipl - - - Lists all playing statuses with their corresponding number. - - - `{0}lipl` - - - removeplaying rmpl repl - - - Removes a playing string on a given number. - - - `{0}rmpl` - - - slowmode - - - Toggles slowmode. Disable by specifying no parameters. To enable, specify a number of messages each user can send, and an interval in seconds. For example 1 message every 5 seconds. - - - `{0}slowmode 1 5` or `{0}slowmode` - - - cleanvplust cv+t - - - Deletes all text channels ending in `-voice` for which voicechannels are not found. Use at your own risk. - - - `{0}cleanv+t` - - - voice+text v+t - - - Creates a text channel for each voice channel only users in that voice channel can see.If you are server owner, keep in mind you will see them all the time regardless. - - - `{0}v+t` - - - scsc - - - Starts an instance of cross server channel. You will get a token as a DM that other people will use to tune in to the same instance. - - - `{0}scsc` - - - jcsc - - - Joins current channel to an instance of cross server channel using the token. - - - `{0}jcsc TokenHere` - - - lcsc - - - Leaves Cross server channel instance from this channel. - - - `{0}lcsc` - - - asar - - - Adds a role to the list of self-assignable roles. - - - `{0}asar Gamer` - - - rsar - - - Removes a specified role from the list of self-assignable roles. - - - `{0}rsar` - - - lsar - - - Lists all self-assignable roles. - - - `{0}lsar` - - - togglexclsar tesar - - - Toggles whether the self-assigned roles are exclusive. (So that any person can have only one of the self assignable roles) - - - `{0}tesar` - - - iam - - - Adds a role to you that you choose. Role must be on a list of self-assignable roles. - - - `{0}iam Gamer` - - - iamnot iamn - - - Removes a role to you that you choose. Role must be on a list of self-assignable roles. - - - `{0}iamn Gamer` - - - addcustreact acr - - - Add a custom reaction with a trigger and a response. Running this command in server requires Administration permission. Running this command in DM is Bot Owner only and adds a new global custom reaction. Guide here: <http://nadekobot.readthedocs.io/en/latest/Custom%20Reactions/> - - - `{0}acr "hello" Hi there %user%` - - - listcustreact lcr - - - Lists global or server custom reactions (20 commands per page). Running the command in DM will list global custom reactions, while running it in server will list that server's custom reactions. Specifying `all` argument instead of the number will DM you a text file with a list of all custom reactions. - - - `{0}lcr 1` or `{0}lcr all` - - - listcustreactg lcrg - - - Lists global or server custom reactions (20 commands per page) grouped by trigger, and show a number of responses for each. Running the command in DM will list global custom reactions, while running it in server will list that server's custom reactions. - - - `{0}lcrg 1` - - - showcustreact scr - - - Shows a custom reaction's response on a given ID. - - - `{0}scr 1` - - - delcustreact dcr - - - Deletes a custom reaction on a specific index. If ran in DM, it is bot owner only and deletes a global custom reaction. If ran in a server, it requires Administration priviledges and removes server custom reaction. - - - `{0}dcr 5` - - - autoassignrole aar - - - Automaticaly assigns a specified role to every user who joins the server. - - - `{0}aar` to disable, `{0}aar Role Name` to enable - - - leave - - - Makes Nadeko leave the server. Either name or id required. - - - `{0}leave 123123123331` - - - delmsgoncmd - - - Toggles the automatic deletion of user's successful command message to prevent chat flood. - - - `{0}delmsgoncmd` - - - restart - - - Restarts the bot. Might not work. - - - `{0}restart` - - - setrole sr - - - Sets a role for a given user. - - - `{0}sr @User Guest` - - - removerole rr - - - Removes a role from a given user. - - - `{0}rr @User Admin` - - - renamerole renr - - - Renames a role. Roles you are renaming must be lower than bot's highest role. - - - `{0}renr "First role" SecondRole` - - - removeallroles rar - - - Removes all roles from a mentioned user. - - - `{0}rar @User` - - - createrole cr - - - Creates a role with a given name. - - - `{0}cr Awesome Role` - - - rolecolor rc - - - Set a role's color to the hex or 0-255 rgb color value provided. - - - `{0}rc Admin 255 200 100` or `{0}rc Admin ffba55` - - - ban b - - - Bans a user by ID or name with an optional message. - - - `{0}b "@some Guy" Your behaviour is toxic.` - - - softban sb - - - Bans and then unbans a user by ID or name with an optional message. - - - `{0}sb "@some Guy" Your behaviour is toxic.` - - - kick k - - - Kicks a mentioned user. - - - `{0}k "@some Guy" Your behaviour is toxic.` - - - mute - - - Mutes a mentioned user both from speaking and chatting. - - - `{0}mute @Someone` - - - voiceunmute - - - Gives a previously voice-muted user a permission to speak. - - - `{0}voiceunmute @Someguy` - - - deafen deaf - - - Deafens mentioned user or users. - - - `{0}deaf "@Someguy"` or `{0}deaf "@Someguy" "@Someguy"` - - - undeafen undef - - - Undeafens mentioned user or users. - - - `{0}undef "@Someguy"` or `{0}undef "@Someguy" "@Someguy"` - - - delvoichanl dvch - - - Deletes a voice channel with a given name. - - - `{0}dvch VoiceChannelName` - - - creatvoichanl cvch - - - Creates a new voice channel with a given name. - - - `{0}cvch VoiceChannelName` - - - deltxtchanl dtch - - - Deletes a text channel with a given name. - - - `{0}dtch TextChannelName` - - - creatxtchanl ctch - - - Creates a new text channel with a given name. - - - `{0}ctch TextChannelName` - - - settopic st - - - Sets a topic on the current channel. - - - `{0}st My new topic` - - - setchanlname schn - - - Changes the name of the current channel. - - - `{0}schn NewName` - - - prune clr - - - `{0}prune` removes all nadeko's messages in the last 100 messages.`{0}prune X` removes last X messages from the channel (up to 100)`{0}prune @Someone` removes all Someone's messages in the last 100 messages.`{0}prune @Someone X` removes last X 'Someone's' messages in the channel. - - - `{0}prune` or `{0}prune 5` or `{0}prune @Someone` or `{0}prune @Someone X` - - - die - - - Shuts the bot down. - - - `{0}die` - - - setname newnm - - - Gives the bot a new name. - - - `{0}newnm BotName` - - - setavatar setav - - - Sets a new avatar image for the NadekoBot. Argument is a direct link to an image. - - - `{0}setav http://i.imgur.com/xTG3a1I.jpg` - - - setgame - - - Sets the bots game. - - - `{0}setgame with snakes` - - - send - - - Sends a message to someone on a different server through the bot. Separate server and channel/user ids with `|` and prepend channel id with `c:` and user id with `u:`. - - - `{0}send serverid|c:channelid message` or `{0}send serverid|u:userid message` - - - mentionrole menro - - - Mentions every person from the provided role or roles (separated by a ',') on this server. Requires you to have mention everyone permission. - - - `{0}menro RoleName` - - - unstuck - - - Clears the message queue. - - - `{0}unstuck` - - - donators - - - List of lovely people who donated to keep this project alive. - - - `{0}donators` - - - donadd - - - Add a donator to the database. - - - `{0}donadd Donate Amount` - - - announce - - - Sends a message to all servers' general channel bot is connected to. - - - `{0}announce Useless spam` - - - savechat - - - Saves a number of messages to a text file and sends it to you. - - - `{0}savechat 150` - - - remind - - - Sends a message to you or a channel after certain amount of time. First argument is me/here/'channelname'. Second argument is time in a descending order (mo>w>d>h>m) example: 1w5d3h10m. Third argument is a (multiword)message. - - - `{0}remind me 1d5h Do something` or `{0}remind #general 1m Start now!` - - - remindtemplate - - - Sets message for when the remind is triggered. Available placeholders are %user% - user who ran the command, %message% - Message specified in the remind, %target% - target channel of the remind. - - - `{0}remindtemplate %user%, do %message%!` - - - serverinfo sinfo - - - Shows info about the server the bot is on. If no channel is supplied, it defaults to current one. - - - `{0}sinfo Some Server` - - - channelinfo cinfo - - - Shows info about the channel. If no channel is supplied, it defaults to current one. - - - `{0}cinfo #some-channel` - - - userinfo uinfo - - - Shows info about the user. If no user is supplied, it defaults a user running the command. - - - `{0}uinfo @SomeUser` - - - whosplaying whpl - - - Shows a list of users who are playing the specified game. - - - `{0}whpl Overwatch` - - - inrole - - - Lists every person from the provided role or roles, separated with space, on this server. You can use role IDs, role names (in quotes if it has multiple words), or role mention If the list is too long for 1 message, you must have Manage Messages permission. - - - `{0}inrole Role` or `{0}inrole Role1 "Role 2" @role3` - - - checkmyperms - - - Checks your user-specific permissions on this channel. - - - `{0}checkmyperms` - - - stats - - - Shows some basic stats for Nadeko. - - - `{0}stats` - - - userid uid - - - Shows user ID. - - - `{0}uid` or `{0}uid "@SomeGuy"` - - - channelid cid - - - Shows current channel ID. - - - `{0}cid` - - - serverid sid - - - Shows current server ID. - - - `{0}sid` - - - roles - - - List roles on this server or a roles of a specific user if specified. Paginated. 20 roles per page. - - - `{0}roles 2` or `{0}roles @Someone` - - - channeltopic ct - - - Sends current channel's topic as a message. - - - `{0}ct` - - - chnlfilterinv cfi - - - Toggles automatic deleting of invites posted in the channel. Does not negate the {0}srvrfilterinv enabled setting. Does not affect Bot Owner. - - - `{0}cfi` - - - srvrfilterinv sfi - - - Toggles automatic deleting of invites posted in the server. Does not affect Bot Owner. - - - `{0}sfi` - - - chnlfilterwords cfw - - - Toggles automatic deleting of messages containing banned words on the channel. Does not negate the {0}srvrfilterwords enabled setting. Does not affect bot owner. - - - `{0}cfw` - - - fw - - - Adds or removes (if it exists) a word from the list of filtered words. Use`{0}sfw` or `{0}cfw` to toggle filtering. - - - `{0}fw poop` - - - lstfilterwords lfw - - - Shows a list of filtered words. - - - `{0}lfw` - - - srvrfilterwords sfw - - - Toggles automatic deleting of messages containing forbidden words on the server. Does not affect Bot Owner. - - - `{0}sfw` - - - permrole pr - - - Sets a role which can change permissions. Or supply no parameters to find out the current one. Default one is 'Nadeko'. - - - `{0}pr role` - - - verbose v - - - Sets whether to show when a command/module is blocked. - - - `{0}verbose true` - - - srvrmdl sm - - - Sets a module's permission at the server level. - - - `{0}sm ModuleName enable` - - - srvrcmd sc - - - Sets a command's permission at the server level. - - - `{0}sc "command name" disable` - - - rolemdl rm - - - Sets a module's permission at the role level. - - - `{0}rm ModuleName enable MyRole` - - - rolecmd rc - - - Sets a command's permission at the role level. - - - `{0}rc "command name" disable MyRole` - - - chnlmdl cm - - - Sets a module's permission at the channel level. - - - `{0}cm ModuleName enable SomeChannel` - - - chnlcmd cc - - - Sets a command's permission at the channel level. - - - `{0}cc "command name" enable SomeChannel` - - - usrmdl um - - - Sets a module's permission at the user level. - - - `{0}um ModuleName enable SomeUsername` - - - usrcmd uc - - - Sets a command's permission at the user level. - - - `{0}uc "command name" enable SomeUsername` - - - allsrvrmdls asm - - - Enable or disable all modules for your server. - - - `{0}asm [enable/disable]` - - - allchnlmdls acm - - - Enable or disable all modules in a specified channel. - - - `{0}acm enable #SomeChannel` - - - allrolemdls arm - - - Enable or disable all modules for a specific role. - - - `{0}arm [enable/disable] MyRole` - - - ubl - - - Either [add]s or [rem]oves a user specified by a mention or ID from a blacklist. - - - `{0}ubl add @SomeUser` or `{0}ubl rem 12312312313` - - - cbl - - - Either [add]s or [rem]oves a channel specified by an ID from a blacklist. - - - `{0}cbl rem 12312312312` - - - sbl - - - Either [add]s or [rem]oves a server specified by a Name or ID from a blacklist. - - - `{0}sbl add 12312321312` or `{0}sbl rem SomeTrashServer` - - - cmdcooldown cmdcd - - - Sets a cooldown per user for a command. Set to 0 to remove the cooldown. - - - `{0}cmdcd "some cmd" 5` - - - allcmdcooldowns acmdcds - - - Shows a list of all commands and their respective cooldowns. - - - `{0}acmdcds` - - - . - - - Adds a new quote with the specified name and message. - - - `{0}. sayhi Hi` - - - .. - - - Shows a random quote with a specified name. - - - `{0}.. abc` - - - qsearch - - - Shows a random quote for a keyword that contains any text specified in the search. - - - `{0}qsearch keyword text` - - - deletequote delq - - - Deletes a random quote with the specified keyword. You have to either be server Administrator or the creator of the quote to delete it. - - - `{0}delq abc` - - - draw - - - Draws a card from the deck.If you supply number X, she draws up to 5 cards from the deck. - - - `{0}draw` or `{0}draw 5` - - - shuffle sh - - - Shuffles the current playlist. - - - `{0}sh` - - - flip - - - Flips coin(s) - heads or tails, and shows an image. - - - `{0}flip` or `{0}flip 3` - - - betflip bf - - - Bet to guess will the result be heads or tails. Guessing awards you 1.95x the currency you've bet (rounded up). Multiplier can be changed by the bot owner. - - - `{0}bf 5 heads` or `{0}bf 3 t` - - - roll - - - Rolls 0-100. If you supply a number [x] it rolls up to 30 normal dice. If you split 2 numbers with letter d (xdy) it will roll x dice from 1 to y. Y can be a letter 'F' if you want to roll fate dice instead of dnd. - - - `{0}roll` or `{0}roll 7` or `{0}roll 3d5` or `{0}roll 5dF` - - - rolluo - - - Rolls X normal dice (up to 30) unordered. If you split 2 numbers with letter d (xdy) it will roll x dice from 1 to y. - - - `{0}rolluo` or `{0}rolluo 7` or `{0}rolluo 3d5` - - - nroll - - - Rolls in a given range. - - - `{0}nroll 5` (rolls 0-5) or `{0}nroll 5-15` - - - race - - - Starts a new animal race. - - - `{0}race` - - - joinrace jr - - - Joins a new race. You can specify an amount of currency for betting (optional). You will get YourBet*(participants-1) back if you win. - - - `{0}jr` or `{0}jr 5` - - - raffle - - - Prints a name and ID of a random user from the online list from the (optional) role. - - - `{0}raffle` or `{0}raffle RoleName` - - - give - - - Give someone a certain amount of currency. - - - `{0}give 1 "@SomeGuy"` - - - award - - - Awards someone a certain amount of currency. You can also specify a role name to award currency to all users in a role. - - - `{0}award 100 @person` or `{0}award 5 Role Of Gamblers` - - - take - - - Takes a certain amount of currency from someone. - - - `{0}take 1 "@someguy"` - - - betroll br - - - Bets a certain amount of currency and rolls a dice. Rolling over 66 yields x2 of your currency, over 90 - x4 and 100 x10. - - - `{0}br 5` - - - leaderboard lb - - - Displays bot currency leaderboard. - - - `{0}lb` - - - trivia t - - - Starts a game of trivia. You can add nohint to prevent hints.First player to get to 10 points wins by default. You can specify a different number. 30 seconds per question. - - - `{0}t` or `{0}t 5 nohint` - - - tl - - - Shows a current trivia leaderboard. - - - `{0}tl` - - - tq - - - Quits current trivia after current question. - - - `{0}tq` - - - typestart - - - Starts a typing contest. - - - `{0}typestart` - - - typestop - - - Stops a typing contest on the current channel. - - - `{0}typestop` - - - typeadd - - - Adds a new article to the typing contest. - - - `{0}typeadd wordswords` - - - poll - - - Creates a poll which requires users to send the number of the voting option to the bot. - - - `{0}poll Question?;Answer1;Answ 2;A_3` - - - pollend - - - Stops active poll on this server and prints the results in this channel. - - - `{0}pollend` - - - pick - - - Picks the currency planted in this channel. 60 seconds cooldown. - - - `{0}pick` - - - plant - - - Spend an amount of currency to plant it in this channel. Default is 1. (If bot is restarted or crashes, the currency will be lost) - - - `{0}plant` or `{0}plant 5` - - - gencurrency gc - - - Toggles currency generation on this channel. Every posted message will have chance to spawn currency. Chance is specified by the Bot Owner. (default is 2%) - - - `{0}gc` - - - leet - - - Converts a text to leetspeak with 6 (1-6) severity levels - - - `{0}leet 3 Hello` - - - choose - - - Chooses a thing from a list of things - - - `{0}choose Get up;Sleep;Sleep more` - - - 8ball - - - Ask the 8ball a yes/no question. - - - `{0}8ball should I do something` - - - rps - - - Play a game of rocket paperclip scissors with Nadeko. - - - `{0}rps scissors` - - - linux - - - Prints a customizable Linux interjection - - - `{0}linux Spyware Windows` - - - next n - - - Goes to the next song in the queue. You have to be in the same voice channel as the bot. You can skip multiple songs, but in that case songs will not be requeued if {0}rcs or {0}rpl is enabled. - - - `{0}n` or `{0}n 5` - - - stop s - - - Stops the music and clears the playlist. Stays in the channel. - - - `{0}s` - - - destroy d - - - Completely stops the music and unbinds the bot from the channel. (may cause weird behaviour) - - - `{0}d` - - - pause p - - - Pauses or Unpauses the song. - - - `{0}p` - - - queue q yq - - - Queue a song using keywords or a link. Bot will join your voice channel.**You must be in a voice channel**. - - - `{0}q Dream Of Venice` - - - soundcloudqueue sq - - - Queue a soundcloud song using keywords. Bot will join your voice channel.**You must be in a voice channel**. - - - `{0}sq Dream Of Venice` - - - listqueue lq - - - Lists 15 currently queued songs per page. Default page is 1. - - - `{0}lq` or `{0}lq 2` - - - nowplaying np - - - Shows the song currently playing. - - - `{0}np` - - - volume vol - - - Sets the music volume 0-100% - - - `{0}vol 50` - - - defvol dv - - - Sets the default music volume when music playback is started (0-100). Persists through restarts. - - - `{0}dv 80` - - - max - - - Sets the music volume to 100%. - - - `{0}max` - - - half - - - Sets the music volume to 50%. - - - `{0}half` - - - playlist pl - - - Queues up to 500 songs from a youtube playlist specified by a link, or keywords. - - - `{0}pl playlist link or name` - - - soundcloudpl scpl - - - Queue a soundcloud playlist using a link. - - - `{0}scpl soundcloudseturl` - - - localplaylst lopl - - - Queues all songs from a directory. - - - `{0}lopl C:/music/classical` - - - radio ra - - - Queues a radio stream from a link. It can be a direct mp3 radio stream, .m3u, .pls .asx or .xspf (Usage Video: <https://streamable.com/al54>) - - - `{0}ra radio link here` - - - local lo - - - Queues a local file by specifying a full path. - - - `{0}lo C:/music/mysong.mp3` - - - move mv - - - Moves the bot to your voice channel. (works only if music is already playing) - - - `{0}mv` - - - remove rm - - - Remove a song by its # in the queue, or 'all' to remove whole queue. - - - `{0}rm 5` - - - movesong ms - - - Moves a song from one position to another. - - - `{0}ms 5>3` - - - setmaxqueue smq - - - Sets a maximum queue size. Supply 0 or no argument to have no limit. - - - `{0}smq 50` or `{0}smq` - - - cleanup - - - Cleans up hanging voice connections. - - - `{0}cleanup` - - - reptcursong rcs - - - Toggles repeat of current song. - - - `{0}rcs` - - - rpeatplaylst rpl - - - Toggles repeat of all songs in the queue (every song that finishes is added to the end of the queue). - - - `{0}rpl` - - - save - - - Saves a playlist under a certain name. Name must be no longer than 20 characters and mustn't contain dashes. - - - `{0}save classical1` - - - load - - - Loads a saved playlist using it's ID. Use `{0}pls` to list all saved playlists and {0}save to save new ones. - - - `{0}load 5` - - - playlists pls - - - Lists all playlists. Paginated. 20 per page. Default page is 0. - - - `{0}pls 1` - - - deleteplaylist delpls - - - Deletes a saved playlist. Only if you made it or if you are the bot owner. - - - `{0}delpls animu-5` - - - goto - - - Goes to a specific time in seconds in a song. - - - `{0}goto 30` - - - autoplay ap - - - Toggles autoplay - When the song is finished, automatically queue a related youtube song. (Works only for youtube songs and when queue is empty) - - - `{0}ap` - - - lolchamp - - - Shows League Of Legends champion statistics. If there are spaces/apostrophes or in the name - omit them. Optional second parameter is a role. - - - `{0}lolchamp Riven` or `{0}lolchamp Annie sup` - - - lolban - - - Shows top banned champions ordered by ban rate. - - - `{0}lolban` - - - hitbox hb - - - Notifies this channel when a certain user starts streaming. - - - `{0}hitbox SomeStreamer` - - - twitch tw - - - Notifies this channel when a certain user starts streaming. - - - `{0}twitch SomeStreamer` - - - beam bm - - - Notifies this channel when a certain user starts streaming. - - - `{0}beam SomeStreamer` - - - removestream rms - - - Removes notifications of a certain streamer from a certain platform on this channel. - - - `{0}rms Twitch SomeGuy` or `{0}rms Beam SomeOtherGuy` - - - liststreams ls - - - Lists all streams you are following on this server. - - - `{0}ls` - - - convert - - - Convert quantities. Use `{0}convertlist` to see supported dimensions and currencies. - - - `{0}convert m km 1000` - - - convertlist - - - List of the convertible dimensions and currencies. - - - `{0}convertlist` - - - wowjoke - - - Get one of Kwoth's penultimate WoW jokes. - - - `{0}wowjoke` - - - calculate calc - - - Evaluate a mathematical expression. - - - `{0}calc 1+1` - - - osu - - - Shows osu stats for a player. - - - `{0}osu Name` or `{0}osu Name taiko` - - - osub - - - Shows information about an osu beatmap. - - - `{0}osub https://osu.ppy.sh/s/127712` - - - osu5 - - - Displays a user's top 5 plays. - - - `{0}osu5 Name` - - - pokemon poke - - - Searches for a pokemon. - - - `{0}poke Sylveon` - - - pokemonability pokeab - - - Searches for a pokemon ability. - - - `{0}pokeab overgrow` - - - memelist - - - Pulls a list of memes you can use with `{0}memegen` from http://memegen.link/templates/ - - - `{0}memelist` - - - memegen - - - Generates a meme from memelist with top and bottom text. - - - `{0}memegen biw "gets iced coffee" "in the winter"` - - - weather we - - - Shows weather data for a specified city. You can also specify a country after a comma. - - - `{0}we Moscow, RU` - - - youtube yt - - - Searches youtubes and shows the first result - - - `{0}yt query` - - - anime ani aq - - - Queries anilist for an anime and shows the first result. - - - `{0}ani aquarion evol` - - - imdb omdb - - - Queries omdb for movies or series, show first result. - - - `{0}imdb Batman vs Superman` - - - manga mang mq - - - Queries anilist for a manga and shows the first result. - - - `{0}mq Shingeki no kyojin` - - - randomcat meow - - - Shows a random cat image. - - - `{0}meow` - - - randomdog woof - - - Shows a random dog image. - - - `{0}woof` - - - image img - - - Pulls the first image found using a search parameter. Use {0}rimg for different results. - - - `{0}img cute kitten` - - - randomimage rimg - - - Pulls a random image using a search parameter. - - - `{0}rimg cute kitten` - - - lmgtfy - - - Google something for an idiot. - - - `{0}lmgtfy query` - - - google g - - - Get a google search link for some terms. - - - `{0}google query` - - - hearthstone hs - - - Searches for a Hearthstone card and shows its image. Takes a while to complete. - - - `{0}hs Ysera` - - - urbandict ud - - - Searches Urban Dictionary for a word. - - - `{0}ud Pineapple` - - - # - - - Searches Tagdef.com for a hashtag. - - - `{0}# ff` - - - catfact - - - Shows a random catfact from <http://catfacts-api.appspot.com/api/facts> - - - `{0}catfact` - - - yomama ym - - - Shows a random joke from <http://api.yomomma.info/> - - - `{0}ym` - - - randjoke rj - - - Shows a random joke from <http://tambal.azurewebsites.net/joke/random> - - - `{0}rj` - - - chucknorris cn - - - Shows a random chucknorris joke from <http://tambal.azurewebsites.net/joke/random> - - - `{0}cn` - - - magicitem mi - - - Shows a random magicitem from <https://1d4chan.org/wiki/List_of_/tg/%27s_magic_items> - - - `{0}mi` - - - revav - - - Returns a google reverse image search for someone's avatar. - - - `{0}revav "@SomeGuy"` - - - revimg - - - Returns a google reverse image search for an image from a link. - - - `{0}revimg Image link` - - - safebooru - - - Shows a random image from safebooru with a given tag. Tag is optional but preferred. (multiple tags are appended with +) - - - `{0}safebooru yuri+kissing` - - - wikipedia wiki - - - Gives you back a wikipedia link - - - `{0}wiki query` - - - color clr - - - Shows you what color corresponds to that hex. - - - `{0}clr 00ff00` - - - videocall - - - Creates a private <http://www.appear.in> video call link for you and other mentioned people. The link is sent to mentioned people via a private message. - - - `{0}videocall "@SomeGuy"` - - - avatar av - - - Shows a mentioned person's avatar. - - - `{0}av "@SomeGuy"` - - - hentai - - - Shows a hentai image from a random website (gelbooru or danbooru or konachan or atfbooru or yandere) with a given tag. Tag is optional but preferred. Only 1 tag allowed. - - - `{0}hentai yuri` - - - danbooru - - - Shows a random hentai image from danbooru with a given tag. Tag is optional but preferred. (multiple tags are appended with +) - - - `{0}danbooru yuri+kissing` - - - atfbooru atf - - - Shows a random hentai image from atfbooru with a given tag. Tag is optional but preferred. - - - `{0}atfbooru yuri+kissing` - - - gelbooru - - - Shows a random hentai image from gelbooru with a given tag. Tag is optional but preferred. (multiple tags are appended with +) - - - `{0}gelbooru yuri+kissing` - - - rule34 - - - Shows a random image from rule34.xx with a given tag. Tag is optional but preferred. (multiple tags are appended with +) - - - `{0}rule34 yuri+kissing` - - - e621 - - - Shows a random hentai image from e621.net with a given tag. Tag is optional but preferred. Use spaces for multiple tags. - - - `{0}e621 yuri kissing` - - - cp - - - We all know where this will lead you to. - - - `{0}cp` - - - boobs - - - Real adult content. - - - `{0}boobs` - - - butts ass butt - - - Real adult content. - - - `{0}butts` or `{0}ass` - - - createwar cw - - - Creates a new war by specifying a size (>10 and multiple of 5) and enemy clan name. - - - `{0}cw 15 The Enemy Clan` - - - startwar sw - - - Starts a war with a given number. - - - `{0}sw 15` - - - listwar lw - - - Shows the active war claims by a number. Shows all wars in a short way if no number is specified. - - - `{0}lw [war_number] or {0}lw` - - - claim call c - - - Claims a certain base from a certain war. You can supply a name in the third optional argument to claim in someone else's place. - - - `{0}call [war_number] [base_number] [optional_other_name]` - - - claimfinish cf - - - Finish your claim with 3 stars if you destroyed a base. First argument is the war number, optional second argument is a base number if you want to finish for someone else. - - - `{0}cf 1` or `{0}cf 1 5` - - - claimfinish2 cf2 - - - Finish your claim with 2 stars if you destroyed a base. First argument is the war number, optional second argument is a base number if you want to finish for someone else. - - - `{0}cf2 1` or `{0}cf2 1 5` - - - claimfinish1 cf1 - - - Finish your claim with 1 star if you destroyed a base. First argument is the war number, optional second argument is a base number if you want to finish for someone else. - - - `{0}cf1 1` or `{0}cf1 1 5` - - - unclaim ucall uc - - - Removes your claim from a certain war. Optional second argument denotes a person in whose place to unclaim - - - `{0}uc [war_number] [optional_other_name]` - - - endwar ew - - - Ends the war with a given index. - - - `{0}ew [war_number]` - - - translate trans - - - Translates from>to text. From the given language to the destination language. - - - `{0}trans en>fr Hello` - - - translangs - - - Lists the valid languages for translation. - - - `{0}translangs` - - - Sends a readme and a guide links to the channel. - - - `{0}readme` or `{0}guide` - - - readme guide - - - Shows all available operations in {0}calc command - - - `{0}calcops` - - - calcops - - - Deletes all quotes on a specified keyword. - - - `{0}delallq kek` - - - delallq daq - - - greetdmmsg - - - `{0}greetdmmsg Welcome to the server, %user%`. - - - Sets a new join announcement message which will be sent to the user who joined. Type %user% if you want to mention the new member. Using it with no message will show the current DM greet message. You can use embed json from <http://nadekobot.xyz/embedbuilder/> instead of a regular text, if you want the message to be embedded. - - - Check how much currency a person has. (Defaults to yourself) - - - `{0}$$` or `{0}$$ @SomeGuy` - - - cash $$ - - - Lists whole permission chain with their indexes. You can specify an optional page number if there are a lot of permissions. - - - `{0}lp` or `{0}lp 3` - - - listperms lp - - - Enable or disable all modules for a specific user. - - - `{0}aum enable @someone` - - - allusrmdls aum - - - Moves permission from one position to another in Permissions list. - - - `{0}mp 2 4` - - - moveperm mp - - - Removes a permission from a given position in Permissions list. - - - `{0}rp 1` - - - removeperm rp - - - Migrate data from old bot configuration - - - `{0}migratedata` - - - migratedata - - - Checks if a user is online on a certain streaming platform. - - - `{0}cs twitch MyFavStreamer` - - - checkstream cs - - - showemojis se - - - Shows a name and a link to every SPECIAL emoji in the message. - - - `{0}se A message full of SPECIAL emojis` - - - shuffle sh - - - Reshuffles all cards back into the deck. - - - `{0}sh` - - - fwmsgs - - - Toggles forwarding of non-command messages sent to bot's DM to the bot owners - - - `{0}fwmsgs` - - - fwtoall - - - Toggles whether messages will be forwarded to all bot owners or only to the first one specified in the credentials.json - - - `{0}fwtoall` - - - resetperms - - - Resets BOT's permissions module on this server to the default value. - - - `{0}resetperms` - - - antiraid - - - Sets an anti-raid protection on the server. First argument is number of people which will trigger the protection. Second one is a time interval in which that number of people needs to join in order to trigger the protection, and third argument is punishment for those people (Kick, Ban, Mute) - - - `{0}antiraid 5 20 Kick` - - - antispam - - - Stops people from repeating same message X times in a row. You can specify to either mute, kick or ban the offenders. Max message count is 10. - - - `{0}antispam 3 Mute` or `{0}antispam 4 Kick` or `{0}antispam 6 Ban` - - - chatmute - - - Prevents a mentioned user from chatting in text channels. - - - `{0}chatmute @Someone` - - - voicemute - - - Prevents a mentioned user from speaking in voice channels. - - - `{0}voicemute @Someone` - - - konachan - - - Shows a random hentai image from konachan with a given tag. Tag is optional but preferred. - - - `{0}konachan yuri` - - - setmuterole - - - Sets a name of the role which will be assigned to people who should be muted. Default is nadeko-mute. - - - `{0}setmuterole Silenced` - - - adsarm - - - Toggles the automatic deletion of confirmations for {0}iam and {0}iamn commands. - - - `{0}adsarm` - - - setstream - - - Sets the bots stream. First argument is the twitch link, second argument is stream name. - - - `{0}setstream TWITCHLINK Hello` - - - chatunmute - - - Removes a mute role previously set on a mentioned user with `{0}chatmute` which prevented him from chatting in text channels. - - - `{0}chatunmute @Someone` - - - unmute - - - Unmutes a mentioned user previously muted with `{0}mute` command. - - - `{0}unmute @Someone` - - - xkcd - - - Shows a XKCD comic. No arguments will retrieve random one. Number argument will retrieve a specific comic, and "latest" will get the latest one. - - - `{0}xkcd` or `{0}xkcd 1400` or `{0}xkcd latest` - - - placelist - - - Shows the list of available tags for the `{0}place` command. - - - `{0}placelist` - - - place - - - Shows a placeholder image of a given tag. Use `{0}placelist` to see all available tags. You can specify the width and height of the image as the last two optional arguments. - - - `{0}place Cage` or `{0}place steven 500 400` - - - togethertube totube - - - Creates a new room on <https://togethertube.com> and shows the link in the chat. - - - `{0}totube` - - - publicpoll ppoll - - - Creates a public poll which requires users to type a number of the voting option in the channel command is ran in. - - - `{0}ppoll Question?;Answer1;Answ 2;A_3` - - - autotranslang atl - - - Sets your source and target language to be used with `{0}at`. Specify no arguments to remove previously set value. - - - `{0}atl en>fr` - - - autotrans at - - - Starts automatic translation of all messages by users who set their `{0}atl` in this channel. You can set "del" argument to automatically delete all translated user messages. - - - `{0}at` or `{0}at del` - - - listquotes liqu - - - `{0}liqu` or `{0}liqu 3` - - - Lists all quotes on the server ordered alphabetically. 15 Per page. - - - typedel - - - Deletes a typing article given the ID. - - - `{0}typedel 3` - - - typelist - - - Lists added typing articles with their IDs. 15 per page. - - - `{0}typelist` or `{0}typelist 3` - - - listservers - - - Lists servers the bot is on with some basic info. 15 per page. - - - `{0}listservers 3` - - - hentaibomb - - - Shows a total 5 images (from gelbooru, danbooru, konachan, yandere and atfbooru). Tag is optional but preferred. - - - `{0}hentaibomb yuri` - - - cleverbot - - - Toggles cleverbot session. When enabled, the bot will reply to messages starting with bot mention in the server. Custom reactions starting with %mention% won't work if cleverbot is enabled. - - - `{0}cleverbot` - - - shorten - - - Attempts to shorten an URL, if it fails, returns the input URL. - - - `{0}shorten https://google.com` - - - minecraftping mcping - - - Pings a minecraft server. - - - `{0}mcping 127.0.0.1:25565` - - - minecraftquery mcq - - - Finds information about a minecraft server. - - - `{0}mcq server:ip` - - - wikia - - - Gives you back a wikia link - - - `{0}wikia mtg Vigilance` or `{0}wikia mlp Dashy` - - - yandere - - - Shows a random image from yandere with a given tag. Tag is optional but preferred. (multiple tags are appended with +) - - - `{0}yandere tag1+tag2` - - - magicthegathering mtg - - - Searches for a Magic The Gathering card. - - - `{0}magicthegathering about face` or `{0}mtg about face` - - - yodify yoda - - - Translates your normal sentences into Yoda styled sentences! - - - `{0}yoda my feelings hurt` - - - attack - - - Attacks a target with the given move. Use `{0}movelist` to see a list of moves your type can use. - - - `{0}attack "vine whip" @someguy` - - - heal - - - Heals someone. Revives those who fainted. Costs a NadekoFlower - - - `{0}heal @someone` - - - movelist ml - - - Lists the moves you are able to use - - - `{0}ml` - - - settype - - - Set your poketype. Costs a NadekoFlower. Provide no arguments to see a list of available types. - - - `{0}settype fire` or `{0}settype` - - - type - - - Get the poketype of the target. - - - `{0}type @someone` - - - hangmanlist - - - Shows a list of hangman term types. - - - `{0} hangmanlist` - - - hangman - - - Starts a game of hangman in the channel. Use `{0}hangmanlist` to see a list of available term types. Defaults to 'all'. - - - `{0}hangman` or `{0}hangman movies` - - - crstatsclear - - - Resets the counters on `{0}crstats`. You can specify a trigger to clear stats only for that trigger. - - - `{0}crstatsclear` or `{0}crstatsclear rng` - - - crstats - - - Shows a list of custom reactions and the number of times they have been executed. Paginated with 10 per page. Use `{0}crstatsclear` to reset the counters. - - - `{0}crstats` or `{0}crstats 3` - - - overwatch ow - - - Show's basic stats on a player (competitive rank, playtime, level etc) Region codes are: `eu` `us` `cn` `kr` - - - `{0}ow us Battletag#1337` or `{0}overwatch eu Battletag#2016` - - - acrophobia acro - - - Starts an Acrophobia game. Second argment is optional round length in seconds. (default is 60) - - - `{0}acro` or `{0}acro 30` - - - logevents - - - Shows a list of all events you can subscribe to with `{0}log` - - - `{0}logevents` - - - log - - - Toggles logging event. Disables it if it's active anywhere on the server. Enables if it's not active. Use `{0}logevents` to see a list of all events you can subscribe to. - - - `{0}log userpresence` or `{0}log userbanned` - - - fairplay fp - - - Toggles fairplay. While enabled, music player will prioritize songs from users who didn't have their song recently played instead of the song's position in the queue. - - - `{0}fp` - - - define def - - - Finds a definition of a word. - - - `{0}def heresy` - - - setmaxplaytime smp - - - Sets a maximum number of seconds (>14) a song can run before being skipped automatically. Set 0 to have no limit. - - - `{0}smp 0` or `{0}smp 270` - - - activity - - - Checks for spammers. - - - `{0}activity` - - - autohentai - - - Posts a hentai every X seconds with a random tag from the provided tags. Use `|` to separate tags. 20 seconds minimum. Provide no arguments to disable. - - - `{0}autohentai 30 yuri|tail|long_hair` or `{0}autohentai` - - - setstatus - - - Sets the bot's status. (Online/Idle/Dnd/Invisible) - - - `{0}setstatus Idle` - - - rotaterolecolor rrc - - - Rotates a roles color on an interval with a list of supplied colors. First argument is interval in seconds (Minimum 60). Second argument is a role, followed by a space-separated list of colors in hex. Provide a rolename with a 0 interval to disable. - - - `{0}rrc 60 MyLsdRole #ff0000 #00ff00 #0000ff` or `{0}rrc 0 MyLsdRole` - - - createinvite crinv - - - Creates a new invite which has infinite max uses and never expires. - - - `{0}crinv` - - - pollstats - - - Shows the poll results without stopping the poll on this server. - - - `{0}pollstats` - - - repeatlist replst - - - Shows currently repeating messages and their indexes. - - - `{0}repeatlist` - - - repeatremove reprm - - - Removes a repeating message on a specified index. Use `{0}repeatlist` to see indexes. - - - `{0}reprm 2` - - - antilist antilst - - - Shows currently enabled protection features. - - - `{0}antilist` - - - antispamignore - - - Toggles whether antispam ignores current channel. Antispam must be enabled. - - - `{0}antispamignore` - - - cmdcosts - - - Shows a list of command costs. Paginated with 9 command per page. - - - `{0}cmdcosts` or `{0}cmdcosts 2` - - - commandcost cmdcost - - - Sets a price for a command. Running that command will take currency from users. Set 0 to remove the price. - - - `{0}cmdcost 0 !!q` or `{0}cmdcost 1 >8ball` - - - startevent - - - Starts one of the events seen on public nadeko. - - - `{0}startevent flowerreaction` - - - slotstats - - - Shows the total stats of the slot command for this bot's session. - - - `{0}slotstats` - - - slottest - - - Tests to see how much slots payout for X number of plays. - - - `{0}slottest 1000` - - - slot - - - Play Nadeko slots. Max bet is 999. 3 seconds cooldown per user. - - - `{0}slot 5` - - - affinity - - - Sets your affinity towards someone you want to be claimed by. Setting affinity will reduce their `{0}claim` on you by 20%. You can leave second argument empty to clear your affinity. 30 minutes cooldown. - - - `{0}affinity @MyHusband` or `{0}affinity` - - - claimwaifu claim - - - Claim a waifu for yourself by spending currency. You must spend atleast 10% more than her current value unless she set `{0}affinity` towards you. - - - `{0}claim 50 @Himesama` - - - waifus waifulb - - - Shows top 9 waifus. - - - `{0}waifus` - - - divorce - - - Releases your claim on a specific waifu. You will get some of the money you've spent back unless that waifu has an affinity towards you. 6 hours cooldown. - - - `{0}divorce @CheatingSloot` - - - waifuinfo waifustats - - - Shows waifu stats for a target person. Defaults to you if no user is provided. - - - `{0}waifuinfo @MyCrush` or `{0}waifuinfo` - - - mal - - - Shows basic info from myanimelist profile. - - - `{0}mal straysocks` - - - setmusicchannel smch - - - Sets the current channel as the default music output channel. This will output playing, finished, paused and removed songs to that channel instead of the channel where the first song was queued in. - - - `{0}smch` - - - reloadimages - - - Reloads images bot is using. Safe to use even when bot is being used heavily. - - - `{0}reloadimages` - - - shardstats - - - Stats for shards. Paginated with 25 shards per page. - - - `{0}shardstats` or `{0}shardstats 2` - - - connectshard - - - Try (re)connecting a shard with a certain shardid when it dies. No one knows will it work. Keep an eye on the console for errors. - - - `{0}connectshard 2` - - - shardid - - - Shows which shard is a certain guild on, by guildid. - - - `{0}shardid 117523346618318850` - - - tictactoe ttt - - - Starts a game of tic tac toe. Another user must run the command in the same channel in order to accept the challenge. Use numbers 1-9 to play. 15 seconds per move. - - - >ttt - - - timezones - - - List of all timezones available on the system to be used with `{0}timezone`. - - - `{0}timezones` - - - timezone - - - Sets this guilds timezone. This affects bot's time output in this server (logs, etc..) - - - `{0}timezone` - - - langsetdefault langsetd - - - 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. - - - `{0}langsetd en-US` or `{0}langsetd default` - - - languageset langset - - - 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. - - - `{0}langset de-DE ` or `{0}langset default` - - - languageslist langli - - - List of languages for which translation (or part of it) exist atm. - - - `{0}langli` - - - rategirl - - - Use the universal hot-crazy wife zone matrix to determine the girl's worth. It is everything young men need to know about women. At any moment in time, any woman you have previously located on this chart can vanish from that location and appear anywhere else on the chart. - - - `{0}rategirl @SomeGurl` - \ No newline at end of file From 5dcab616415eb135f254e8639786ad5521c09c3f Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 1 Mar 2017 01:51:02 +0100 Subject: [PATCH 109/496] Update CommandStrings.ja-JP.resx (POEditor.com) --- .../Resources/CommandStrings.ja-JP.resx | 5314 +++++++---------- 1 file changed, 2164 insertions(+), 3150 deletions(-) diff --git a/src/NadekoBot/Resources/CommandStrings.ja-JP.resx b/src/NadekoBot/Resources/CommandStrings.ja-JP.resx index 662975cf..17febe51 100644 --- a/src/NadekoBot/Resources/CommandStrings.ja-JP.resx +++ b/src/NadekoBot/Resources/CommandStrings.ja-JP.resx @@ -1,3153 +1,2167 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLURAL + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLURAL (users have been muted) + + + + singular "User muted." + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLURAL + + + + + + + + + + + + + + + + + + + + + + singular + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + User flipped tails. + + + + + + + + + + + + + + + + + + + X has gifted 15 flowers to Y + + + + X has Y flowers + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Someone rolled 35 + + + + Dice Rolled: 5 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Make sure to get the formatting right, and leave the thinking emoji + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + plural + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Kwoth picked 5* + + + + Kwoth planted 5* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + context: "removed song #5" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Gen (of command) + + + + Gen. (of module) + + + + + + + + + + + + + + + + + + + + + + + + + Short of seconds. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Don't translate {0}place + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /s and total need to be localized to fit the context - +`1.` + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Invalid months value/ Invalid hours value + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Id of the user kwoth#1234 is 123123123123 + + + + + + + - mimetype: application/x-microsoft.net.object.bytearray.base64 - value : The object must be serialized into a byte array - : using a System.ComponentModel.TypeConverter - : and then encoded with base64 encoding. - --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - help h - - - Either shows a help for a single command, or DMs you help link if no arguments are specified. - - - `{0}h !!q` or `{0}h` - - - hgit - - - Generates the commandlist.md file. - - - `{0}hgit` - - - donate - - - Instructions for helping the project financially. - - - `{0}donate` - - - modules mdls - - - Lists all bot modules. - - - `{0}modules` - - - commands cmds - - - List all of the bot's commands from a certain module. You can either specify full, or only first few letters of the module name. - - - `{0}commands Administration` or `{0}cmds Admin` - - - greetdel grdel - - - Sets the time it takes (in seconds) for greet messages to be auto-deleted. Set 0 to disable automatic deletion. - - - `{0}greetdel 0` or `{0}greetdel 30` - - - greet - - - Toggles anouncements on the current channel when someone joins the server. - - - `{0}greet` - - - greetmsg - - - Sets a new join announcement message which will be shown in the server's channel. Type %user% if you want to mention the new member. Using it with no message will show the current greet message. You can use embed json from <http://nadekobot.xyz/embedbuilder/> instead of a regular text, if you want the message to be embedded. - - - `{0}greetmsg Welcome, %user%.` - - - bye - - - Toggles anouncements on the current channel when someone leaves the server. - - - `{0}bye` - - - byemsg - - - Sets a new leave announcement message. Type %user% if you want to show the name the user who left. Type %id% to show id. Using this command with no message will show the current bye message. You can use embed json from <http://nadekobot.xyz/embedbuilder/> instead of a regular text, if you want the message to be embedded. - - - `{0}byemsg %user% has left.` - - - byedel - - - Sets the time it takes (in seconds) for bye messages to be auto-deleted. Set 0 to disable automatic deletion. - - - `{0}byedel 0` or `{0}byedel 30` - - - greetdm - - - Toggles whether the greet messages will be sent in a DM (This is separate from greet - you can have both, any or neither enabled). - - - `{0}greetdm` - - - logserver - - - Enables or Disables ALL log events. If enabled, all log events will log to this channel. - - - `{0}logserver enable` or `{0}logserver disable` - - - logignore - - - Toggles whether the .logserver command ignores this channel. Useful if you have hidden admin channel and public log channel. - - - `{0}logignore` - - - userpresence - - - Starts logging to this channel when someone from the server goes online/offline/idle. - - - `{0}userpresence` - - - voicepresence - - - Toggles logging to this channel whenever someone joins or leaves a voice channel you are currently in. - - - `{0}voicepresence` - - - repeatinvoke repinv - - - Immediately shows the repeat message on a certain index and restarts its timer. - - - `{0}repinv 1` - - - repeat - - - Repeat a message every X minutes in the current channel. You can have up to 5 repeating messages on the server in total. - - - `{0}repeat 5 Hello there` - - - rotateplaying ropl - - - Toggles rotation of playing status of the dynamic strings you previously specified. - - - `{0}ropl` - - - addplaying adpl - - - Adds a specified string to the list of playing strings to rotate. Supported placeholders: %servers%, %users%, %playing%, %queued%, %time%,%shardid%,%shardcount%, %shardguilds% - - - `{0}adpl` - - - listplaying lipl - - - Lists all playing statuses with their corresponding number. - - - `{0}lipl` - - - removeplaying rmpl repl - - - Removes a playing string on a given number. - - - `{0}rmpl` - - - slowmode - - - Toggles slowmode. Disable by specifying no parameters. To enable, specify a number of messages each user can send, and an interval in seconds. For example 1 message every 5 seconds. - - - `{0}slowmode 1 5` or `{0}slowmode` - - - cleanvplust cv+t - - - Deletes all text channels ending in `-voice` for which voicechannels are not found. Use at your own risk. - - - `{0}cleanv+t` - - - voice+text v+t - - - Creates a text channel for each voice channel only users in that voice channel can see.If you are server owner, keep in mind you will see them all the time regardless. - - - `{0}v+t` - - - scsc - - - Starts an instance of cross server channel. You will get a token as a DM that other people will use to tune in to the same instance. - - - `{0}scsc` - - - jcsc - - - Joins current channel to an instance of cross server channel using the token. - - - `{0}jcsc TokenHere` - - - lcsc - - - Leaves Cross server channel instance from this channel. - - - `{0}lcsc` - - - asar - - - Adds a role to the list of self-assignable roles. - - - `{0}asar Gamer` - - - rsar - - - Removes a specified role from the list of self-assignable roles. - - - `{0}rsar` - - - lsar - - - Lists all self-assignable roles. - - - `{0}lsar` - - - togglexclsar tesar - - - Toggles whether the self-assigned roles are exclusive. (So that any person can have only one of the self assignable roles) - - - `{0}tesar` - - - iam - - - Adds a role to you that you choose. Role must be on a list of self-assignable roles. - - - `{0}iam Gamer` - - - iamnot iamn - - - Removes a role to you that you choose. Role must be on a list of self-assignable roles. - - - `{0}iamn Gamer` - - - addcustreact acr - - - Add a custom reaction with a trigger and a response. Running this command in server requires Administration permission. Running this command in DM is Bot Owner only and adds a new global custom reaction. Guide here: <http://nadekobot.readthedocs.io/en/latest/Custom%20Reactions/> - - - `{0}acr "hello" Hi there %user%` - - - listcustreact lcr - - - Lists global or server custom reactions (20 commands per page). Running the command in DM will list global custom reactions, while running it in server will list that server's custom reactions. Specifying `all` argument instead of the number will DM you a text file with a list of all custom reactions. - - - `{0}lcr 1` or `{0}lcr all` - - - listcustreactg lcrg - - - Lists global or server custom reactions (20 commands per page) grouped by trigger, and show a number of responses for each. Running the command in DM will list global custom reactions, while running it in server will list that server's custom reactions. - - - `{0}lcrg 1` - - - showcustreact scr - - - Shows a custom reaction's response on a given ID. - - - `{0}scr 1` - - - delcustreact dcr - - - Deletes a custom reaction on a specific index. If ran in DM, it is bot owner only and deletes a global custom reaction. If ran in a server, it requires Administration priviledges and removes server custom reaction. - - - `{0}dcr 5` - - - autoassignrole aar - - - Automaticaly assigns a specified role to every user who joins the server. - - - `{0}aar` to disable, `{0}aar Role Name` to enable - - - leave - - - Makes Nadeko leave the server. Either name or id required. - - - `{0}leave 123123123331` - - - delmsgoncmd - - - Toggles the automatic deletion of user's successful command message to prevent chat flood. - - - `{0}delmsgoncmd` - - - restart - - - Restarts the bot. Might not work. - - - `{0}restart` - - - setrole sr - - - Sets a role for a given user. - - - `{0}sr @User Guest` - - - removerole rr - - - Removes a role from a given user. - - - `{0}rr @User Admin` - - - renamerole renr - - - Renames a role. Roles you are renaming must be lower than bot's highest role. - - - `{0}renr "First role" SecondRole` - - - removeallroles rar - - - Removes all roles from a mentioned user. - - - `{0}rar @User` - - - createrole cr - - - Creates a role with a given name. - - - `{0}cr Awesome Role` - - - rolecolor rc - - - Set a role's color to the hex or 0-255 rgb color value provided. - - - `{0}rc Admin 255 200 100` or `{0}rc Admin ffba55` - - - ban b - - - Bans a user by ID or name with an optional message. - - - `{0}b "@some Guy" Your behaviour is toxic.` - - - softban sb - - - Bans and then unbans a user by ID or name with an optional message. - - - `{0}sb "@some Guy" Your behaviour is toxic.` - - - kick k - - - Kicks a mentioned user. - - - `{0}k "@some Guy" Your behaviour is toxic.` - - - mute - - - Mutes a mentioned user both from speaking and chatting. - - - `{0}mute @Someone` - - - voiceunmute - - - Gives a previously voice-muted user a permission to speak. - - - `{0}voiceunmute @Someguy` - - - deafen deaf - - - Deafens mentioned user or users. - - - `{0}deaf "@Someguy"` or `{0}deaf "@Someguy" "@Someguy"` - - - undeafen undef - - - Undeafens mentioned user or users. - - - `{0}undef "@Someguy"` or `{0}undef "@Someguy" "@Someguy"` - - - delvoichanl dvch - - - Deletes a voice channel with a given name. - - - `{0}dvch VoiceChannelName` - - - creatvoichanl cvch - - - Creates a new voice channel with a given name. - - - `{0}cvch VoiceChannelName` - - - deltxtchanl dtch - - - Deletes a text channel with a given name. - - - `{0}dtch TextChannelName` - - - creatxtchanl ctch - - - Creates a new text channel with a given name. - - - `{0}ctch TextChannelName` - - - settopic st - - - Sets a topic on the current channel. - - - `{0}st My new topic` - - - setchanlname schn - - - Changes the name of the current channel. - - - `{0}schn NewName` - - - prune clr - - - `{0}prune` removes all nadeko's messages in the last 100 messages.`{0}prune X` removes last X messages from the channel (up to 100)`{0}prune @Someone` removes all Someone's messages in the last 100 messages.`{0}prune @Someone X` removes last X 'Someone's' messages in the channel. - - - `{0}prune` or `{0}prune 5` or `{0}prune @Someone` or `{0}prune @Someone X` - - - die - - - Shuts the bot down. - - - `{0}die` - - - setname newnm - - - Gives the bot a new name. - - - `{0}newnm BotName` - - - setavatar setav - - - Sets a new avatar image for the NadekoBot. Argument is a direct link to an image. - - - `{0}setav http://i.imgur.com/xTG3a1I.jpg` - - - setgame - - - Sets the bots game. - - - `{0}setgame with snakes` - - - send - - - Sends a message to someone on a different server through the bot. Separate server and channel/user ids with `|` and prepend channel id with `c:` and user id with `u:`. - - - `{0}send serverid|c:channelid message` or `{0}send serverid|u:userid message` - - - mentionrole menro - - - Mentions every person from the provided role or roles (separated by a ',') on this server. Requires you to have mention everyone permission. - - - `{0}menro RoleName` - - - unstuck - - - Clears the message queue. - - - `{0}unstuck` - - - donators - - - List of lovely people who donated to keep this project alive. - - - `{0}donators` - - - donadd - - - Add a donator to the database. - - - `{0}donadd Donate Amount` - - - announce - - - Sends a message to all servers' general channel bot is connected to. - - - `{0}announce Useless spam` - - - savechat - - - Saves a number of messages to a text file and sends it to you. - - - `{0}savechat 150` - - - remind - - - Sends a message to you or a channel after certain amount of time. First argument is me/here/'channelname'. Second argument is time in a descending order (mo>w>d>h>m) example: 1w5d3h10m. Third argument is a (multiword)message. - - - `{0}remind me 1d5h Do something` or `{0}remind #general 1m Start now!` - - - remindtemplate - - - Sets message for when the remind is triggered. Available placeholders are %user% - user who ran the command, %message% - Message specified in the remind, %target% - target channel of the remind. - - - `{0}remindtemplate %user%, do %message%!` - - - serverinfo sinfo - - - Shows info about the server the bot is on. If no channel is supplied, it defaults to current one. - - - `{0}sinfo Some Server` - - - channelinfo cinfo - - - Shows info about the channel. If no channel is supplied, it defaults to current one. - - - `{0}cinfo #some-channel` - - - userinfo uinfo - - - Shows info about the user. If no user is supplied, it defaults a user running the command. - - - `{0}uinfo @SomeUser` - - - whosplaying whpl - - - Shows a list of users who are playing the specified game. - - - `{0}whpl Overwatch` - - - inrole - - - Lists every person from the provided role or roles, separated with space, on this server. You can use role IDs, role names (in quotes if it has multiple words), or role mention If the list is too long for 1 message, you must have Manage Messages permission. - - - `{0}inrole Role` or `{0}inrole Role1 "Role 2" @role3` - - - checkmyperms - - - Checks your user-specific permissions on this channel. - - - `{0}checkmyperms` - - - stats - - - Shows some basic stats for Nadeko. - - - `{0}stats` - - - userid uid - - - Shows user ID. - - - `{0}uid` or `{0}uid "@SomeGuy"` - - - channelid cid - - - Shows current channel ID. - - - `{0}cid` - - - serverid sid - - - Shows current server ID. - - - `{0}sid` - - - roles - - - List roles on this server or a roles of a specific user if specified. Paginated. 20 roles per page. - - - `{0}roles 2` or `{0}roles @Someone` - - - channeltopic ct - - - Sends current channel's topic as a message. - - - `{0}ct` - - - chnlfilterinv cfi - - - Toggles automatic deleting of invites posted in the channel. Does not negate the {0}srvrfilterinv enabled setting. Does not affect Bot Owner. - - - `{0}cfi` - - - srvrfilterinv sfi - - - Toggles automatic deleting of invites posted in the server. Does not affect Bot Owner. - - - `{0}sfi` - - - chnlfilterwords cfw - - - Toggles automatic deleting of messages containing banned words on the channel. Does not negate the {0}srvrfilterwords enabled setting. Does not affect bot owner. - - - `{0}cfw` - - - fw - - - Adds or removes (if it exists) a word from the list of filtered words. Use`{0}sfw` or `{0}cfw` to toggle filtering. - - - `{0}fw poop` - - - lstfilterwords lfw - - - Shows a list of filtered words. - - - `{0}lfw` - - - srvrfilterwords sfw - - - Toggles automatic deleting of messages containing forbidden words on the server. Does not affect Bot Owner. - - - `{0}sfw` - - - permrole pr - - - Sets a role which can change permissions. Or supply no parameters to find out the current one. Default one is 'Nadeko'. - - - `{0}pr role` - - - verbose v - - - Sets whether to show when a command/module is blocked. - - - `{0}verbose true` - - - srvrmdl sm - - - Sets a module's permission at the server level. - - - `{0}sm ModuleName enable` - - - srvrcmd sc - - - Sets a command's permission at the server level. - - - `{0}sc "command name" disable` - - - rolemdl rm - - - Sets a module's permission at the role level. - - - `{0}rm ModuleName enable MyRole` - - - rolecmd rc - - - Sets a command's permission at the role level. - - - `{0}rc "command name" disable MyRole` - - - chnlmdl cm - - - Sets a module's permission at the channel level. - - - `{0}cm ModuleName enable SomeChannel` - - - chnlcmd cc - - - Sets a command's permission at the channel level. - - - `{0}cc "command name" enable SomeChannel` - - - usrmdl um - - - Sets a module's permission at the user level. - - - `{0}um ModuleName enable SomeUsername` - - - usrcmd uc - - - Sets a command's permission at the user level. - - - `{0}uc "command name" enable SomeUsername` - - - allsrvrmdls asm - - - Enable or disable all modules for your server. - - - `{0}asm [enable/disable]` - - - allchnlmdls acm - - - Enable or disable all modules in a specified channel. - - - `{0}acm enable #SomeChannel` - - - allrolemdls arm - - - Enable or disable all modules for a specific role. - - - `{0}arm [enable/disable] MyRole` - - - ubl - - - Either [add]s or [rem]oves a user specified by a mention or ID from a blacklist. - - - `{0}ubl add @SomeUser` or `{0}ubl rem 12312312313` - - - cbl - - - Either [add]s or [rem]oves a channel specified by an ID from a blacklist. - - - `{0}cbl rem 12312312312` - - - sbl - - - Either [add]s or [rem]oves a server specified by a Name or ID from a blacklist. - - - `{0}sbl add 12312321312` or `{0}sbl rem SomeTrashServer` - - - cmdcooldown cmdcd - - - Sets a cooldown per user for a command. Set to 0 to remove the cooldown. - - - `{0}cmdcd "some cmd" 5` - - - allcmdcooldowns acmdcds - - - Shows a list of all commands and their respective cooldowns. - - - `{0}acmdcds` - - - . - - - Adds a new quote with the specified name and message. - - - `{0}. sayhi Hi` - - - .. - - - Shows a random quote with a specified name. - - - `{0}.. abc` - - - qsearch - - - Shows a random quote for a keyword that contains any text specified in the search. - - - `{0}qsearch keyword text` - - - deletequote delq - - - Deletes a random quote with the specified keyword. You have to either be server Administrator or the creator of the quote to delete it. - - - `{0}delq abc` - - - draw - - - Draws a card from the deck.If you supply number X, she draws up to 5 cards from the deck. - - - `{0}draw` or `{0}draw 5` - - - shuffle sh - - - Shuffles the current playlist. - - - `{0}sh` - - - flip - - - Flips coin(s) - heads or tails, and shows an image. - - - `{0}flip` or `{0}flip 3` - - - betflip bf - - - Bet to guess will the result be heads or tails. Guessing awards you 1.95x the currency you've bet (rounded up). Multiplier can be changed by the bot owner. - - - `{0}bf 5 heads` or `{0}bf 3 t` - - - roll - - - Rolls 0-100. If you supply a number [x] it rolls up to 30 normal dice. If you split 2 numbers with letter d (xdy) it will roll x dice from 1 to y. Y can be a letter 'F' if you want to roll fate dice instead of dnd. - - - `{0}roll` or `{0}roll 7` or `{0}roll 3d5` or `{0}roll 5dF` - - - rolluo - - - Rolls X normal dice (up to 30) unordered. If you split 2 numbers with letter d (xdy) it will roll x dice from 1 to y. - - - `{0}rolluo` or `{0}rolluo 7` or `{0}rolluo 3d5` - - - nroll - - - Rolls in a given range. - - - `{0}nroll 5` (rolls 0-5) or `{0}nroll 5-15` - - - race - - - Starts a new animal race. - - - `{0}race` - - - joinrace jr - - - Joins a new race. You can specify an amount of currency for betting (optional). You will get YourBet*(participants-1) back if you win. - - - `{0}jr` or `{0}jr 5` - - - raffle - - - Prints a name and ID of a random user from the online list from the (optional) role. - - - `{0}raffle` or `{0}raffle RoleName` - - - give - - - Give someone a certain amount of currency. - - - `{0}give 1 "@SomeGuy"` - - - award - - - Awards someone a certain amount of currency. You can also specify a role name to award currency to all users in a role. - - - `{0}award 100 @person` or `{0}award 5 Role Of Gamblers` - - - take - - - Takes a certain amount of currency from someone. - - - `{0}take 1 "@someguy"` - - - betroll br - - - Bets a certain amount of currency and rolls a dice. Rolling over 66 yields x2 of your currency, over 90 - x4 and 100 x10. - - - `{0}br 5` - - - leaderboard lb - - - Displays bot currency leaderboard. - - - `{0}lb` - - - trivia t - - - Starts a game of trivia. You can add nohint to prevent hints.First player to get to 10 points wins by default. You can specify a different number. 30 seconds per question. - - - `{0}t` or `{0}t 5 nohint` - - - tl - - - Shows a current trivia leaderboard. - - - `{0}tl` - - - tq - - - Quits current trivia after current question. - - - `{0}tq` - - - typestart - - - Starts a typing contest. - - - `{0}typestart` - - - typestop - - - Stops a typing contest on the current channel. - - - `{0}typestop` - - - typeadd - - - Adds a new article to the typing contest. - - - `{0}typeadd wordswords` - - - poll - - - Creates a poll which requires users to send the number of the voting option to the bot. - - - `{0}poll Question?;Answer1;Answ 2;A_3` - - - pollend - - - Stops active poll on this server and prints the results in this channel. - - - `{0}pollend` - - - pick - - - Picks the currency planted in this channel. 60 seconds cooldown. - - - `{0}pick` - - - plant - - - Spend an amount of currency to plant it in this channel. Default is 1. (If bot is restarted or crashes, the currency will be lost) - - - `{0}plant` or `{0}plant 5` - - - gencurrency gc - - - Toggles currency generation on this channel. Every posted message will have chance to spawn currency. Chance is specified by the Bot Owner. (default is 2%) - - - `{0}gc` - - - leet - - - Converts a text to leetspeak with 6 (1-6) severity levels - - - `{0}leet 3 Hello` - - - choose - - - Chooses a thing from a list of things - - - `{0}choose Get up;Sleep;Sleep more` - - - 8ball - - - Ask the 8ball a yes/no question. - - - `{0}8ball should I do something` - - - rps - - - Play a game of rocket paperclip scissors with Nadeko. - - - `{0}rps scissors` - - - linux - - - Prints a customizable Linux interjection - - - `{0}linux Spyware Windows` - - - next n - - - Goes to the next song in the queue. You have to be in the same voice channel as the bot. You can skip multiple songs, but in that case songs will not be requeued if {0}rcs or {0}rpl is enabled. - - - `{0}n` or `{0}n 5` - - - stop s - - - Stops the music and clears the playlist. Stays in the channel. - - - `{0}s` - - - destroy d - - - Completely stops the music and unbinds the bot from the channel. (may cause weird behaviour) - - - `{0}d` - - - pause p - - - Pauses or Unpauses the song. - - - `{0}p` - - - queue q yq - - - Queue a song using keywords or a link. Bot will join your voice channel.**You must be in a voice channel**. - - - `{0}q Dream Of Venice` - - - soundcloudqueue sq - - - Queue a soundcloud song using keywords. Bot will join your voice channel.**You must be in a voice channel**. - - - `{0}sq Dream Of Venice` - - - listqueue lq - - - Lists 15 currently queued songs per page. Default page is 1. - - - `{0}lq` or `{0}lq 2` - - - nowplaying np - - - Shows the song currently playing. - - - `{0}np` - - - volume vol - - - Sets the music volume 0-100% - - - `{0}vol 50` - - - defvol dv - - - Sets the default music volume when music playback is started (0-100). Persists through restarts. - - - `{0}dv 80` - - - max - - - Sets the music volume to 100%. - - - `{0}max` - - - half - - - Sets the music volume to 50%. - - - `{0}half` - - - playlist pl - - - Queues up to 500 songs from a youtube playlist specified by a link, or keywords. - - - `{0}pl playlist link or name` - - - soundcloudpl scpl - - - Queue a soundcloud playlist using a link. - - - `{0}scpl soundcloudseturl` - - - localplaylst lopl - - - Queues all songs from a directory. - - - `{0}lopl C:/music/classical` - - - radio ra - - - Queues a radio stream from a link. It can be a direct mp3 radio stream, .m3u, .pls .asx or .xspf (Usage Video: <https://streamable.com/al54>) - - - `{0}ra radio link here` - - - local lo - - - Queues a local file by specifying a full path. - - - `{0}lo C:/music/mysong.mp3` - - - move mv - - - Moves the bot to your voice channel. (works only if music is already playing) - - - `{0}mv` - - - remove rm - - - Remove a song by its # in the queue, or 'all' to remove whole queue. - - - `{0}rm 5` - - - movesong ms - - - Moves a song from one position to another. - - - `{0}ms 5>3` - - - setmaxqueue smq - - - Sets a maximum queue size. Supply 0 or no argument to have no limit. - - - `{0}smq 50` or `{0}smq` - - - cleanup - - - Cleans up hanging voice connections. - - - `{0}cleanup` - - - reptcursong rcs - - - Toggles repeat of current song. - - - `{0}rcs` - - - rpeatplaylst rpl - - - Toggles repeat of all songs in the queue (every song that finishes is added to the end of the queue). - - - `{0}rpl` - - - save - - - Saves a playlist under a certain name. Name must be no longer than 20 characters and mustn't contain dashes. - - - `{0}save classical1` - - - load - - - Loads a saved playlist using it's ID. Use `{0}pls` to list all saved playlists and {0}save to save new ones. - - - `{0}load 5` - - - playlists pls - - - Lists all playlists. Paginated. 20 per page. Default page is 0. - - - `{0}pls 1` - - - deleteplaylist delpls - - - Deletes a saved playlist. Only if you made it or if you are the bot owner. - - - `{0}delpls animu-5` - - - goto - - - Goes to a specific time in seconds in a song. - - - `{0}goto 30` - - - autoplay ap - - - Toggles autoplay - When the song is finished, automatically queue a related youtube song. (Works only for youtube songs and when queue is empty) - - - `{0}ap` - - - lolchamp - - - Shows League Of Legends champion statistics. If there are spaces/apostrophes or in the name - omit them. Optional second parameter is a role. - - - `{0}lolchamp Riven` or `{0}lolchamp Annie sup` - - - lolban - - - Shows top banned champions ordered by ban rate. - - - `{0}lolban` - - - hitbox hb - - - Notifies this channel when a certain user starts streaming. - - - `{0}hitbox SomeStreamer` - - - twitch tw - - - Notifies this channel when a certain user starts streaming. - - - `{0}twitch SomeStreamer` - - - beam bm - - - Notifies this channel when a certain user starts streaming. - - - `{0}beam SomeStreamer` - - - removestream rms - - - Removes notifications of a certain streamer from a certain platform on this channel. - - - `{0}rms Twitch SomeGuy` or `{0}rms Beam SomeOtherGuy` - - - liststreams ls - - - Lists all streams you are following on this server. - - - `{0}ls` - - - convert - - - Convert quantities. Use `{0}convertlist` to see supported dimensions and currencies. - - - `{0}convert m km 1000` - - - convertlist - - - List of the convertible dimensions and currencies. - - - `{0}convertlist` - - - wowjoke - - - Get one of Kwoth's penultimate WoW jokes. - - - `{0}wowjoke` - - - calculate calc - - - Evaluate a mathematical expression. - - - `{0}calc 1+1` - - - osu - - - Shows osu stats for a player. - - - `{0}osu Name` or `{0}osu Name taiko` - - - osub - - - Shows information about an osu beatmap. - - - `{0}osub https://osu.ppy.sh/s/127712` - - - osu5 - - - Displays a user's top 5 plays. - - - `{0}osu5 Name` - - - pokemon poke - - - Searches for a pokemon. - - - `{0}poke Sylveon` - - - pokemonability pokeab - - - Searches for a pokemon ability. - - - `{0}pokeab overgrow` - - - memelist - - - Pulls a list of memes you can use with `{0}memegen` from http://memegen.link/templates/ - - - `{0}memelist` - - - memegen - - - Generates a meme from memelist with top and bottom text. - - - `{0}memegen biw "gets iced coffee" "in the winter"` - - - weather we - - - Shows weather data for a specified city. You can also specify a country after a comma. - - - `{0}we Moscow, RU` - - - youtube yt - - - Searches youtubes and shows the first result - - - `{0}yt query` - - - anime ani aq - - - Queries anilist for an anime and shows the first result. - - - `{0}ani aquarion evol` - - - imdb omdb - - - Queries omdb for movies or series, show first result. - - - `{0}imdb Batman vs Superman` - - - manga mang mq - - - Queries anilist for a manga and shows the first result. - - - `{0}mq Shingeki no kyojin` - - - randomcat meow - - - Shows a random cat image. - - - `{0}meow` - - - randomdog woof - - - Shows a random dog image. - - - `{0}woof` - - - image img - - - Pulls the first image found using a search parameter. Use {0}rimg for different results. - - - `{0}img cute kitten` - - - randomimage rimg - - - Pulls a random image using a search parameter. - - - `{0}rimg cute kitten` - - - lmgtfy - - - Google something for an idiot. - - - `{0}lmgtfy query` - - - google g - - - Get a google search link for some terms. - - - `{0}google query` - - - hearthstone hs - - - Searches for a Hearthstone card and shows its image. Takes a while to complete. - - - `{0}hs Ysera` - - - urbandict ud - - - Searches Urban Dictionary for a word. - - - `{0}ud Pineapple` - - - # - - - Searches Tagdef.com for a hashtag. - - - `{0}# ff` - - - catfact - - - Shows a random catfact from <http://catfacts-api.appspot.com/api/facts> - - - `{0}catfact` - - - yomama ym - - - Shows a random joke from <http://api.yomomma.info/> - - - `{0}ym` - - - randjoke rj - - - Shows a random joke from <http://tambal.azurewebsites.net/joke/random> - - - `{0}rj` - - - chucknorris cn - - - Shows a random chucknorris joke from <http://tambal.azurewebsites.net/joke/random> - - - `{0}cn` - - - magicitem mi - - - Shows a random magicitem from <https://1d4chan.org/wiki/List_of_/tg/%27s_magic_items> - - - `{0}mi` - - - revav - - - Returns a google reverse image search for someone's avatar. - - - `{0}revav "@SomeGuy"` - - - revimg - - - Returns a google reverse image search for an image from a link. - - - `{0}revimg Image link` - - - safebooru - - - Shows a random image from safebooru with a given tag. Tag is optional but preferred. (multiple tags are appended with +) - - - `{0}safebooru yuri+kissing` - - - wikipedia wiki - - - Gives you back a wikipedia link - - - `{0}wiki query` - - - color clr - - - Shows you what color corresponds to that hex. - - - `{0}clr 00ff00` - - - videocall - - - Creates a private <http://www.appear.in> video call link for you and other mentioned people. The link is sent to mentioned people via a private message. - - - `{0}videocall "@SomeGuy"` - - - avatar av - - - Shows a mentioned person's avatar. - - - `{0}av "@SomeGuy"` - - - hentai - - - Shows a hentai image from a random website (gelbooru or danbooru or konachan or atfbooru or yandere) with a given tag. Tag is optional but preferred. Only 1 tag allowed. - - - `{0}hentai yuri` - - - danbooru - - - Shows a random hentai image from danbooru with a given tag. Tag is optional but preferred. (multiple tags are appended with +) - - - `{0}danbooru yuri+kissing` - - - atfbooru atf - - - Shows a random hentai image from atfbooru with a given tag. Tag is optional but preferred. - - - `{0}atfbooru yuri+kissing` - - - gelbooru - - - Shows a random hentai image from gelbooru with a given tag. Tag is optional but preferred. (multiple tags are appended with +) - - - `{0}gelbooru yuri+kissing` - - - rule34 - - - Shows a random image from rule34.xx with a given tag. Tag is optional but preferred. (multiple tags are appended with +) - - - `{0}rule34 yuri+kissing` - - - e621 - - - Shows a random hentai image from e621.net with a given tag. Tag is optional but preferred. Use spaces for multiple tags. - - - `{0}e621 yuri kissing` - - - cp - - - We all know where this will lead you to. - - - `{0}cp` - - - boobs - - - Real adult content. - - - `{0}boobs` - - - butts ass butt - - - Real adult content. - - - `{0}butts` or `{0}ass` - - - createwar cw - - - Creates a new war by specifying a size (>10 and multiple of 5) and enemy clan name. - - - `{0}cw 15 The Enemy Clan` - - - startwar sw - - - Starts a war with a given number. - - - `{0}sw 15` - - - listwar lw - - - Shows the active war claims by a number. Shows all wars in a short way if no number is specified. - - - `{0}lw [war_number] or {0}lw` - - - claim call c - - - Claims a certain base from a certain war. You can supply a name in the third optional argument to claim in someone else's place. - - - `{0}call [war_number] [base_number] [optional_other_name]` - - - claimfinish cf - - - Finish your claim with 3 stars if you destroyed a base. First argument is the war number, optional second argument is a base number if you want to finish for someone else. - - - `{0}cf 1` or `{0}cf 1 5` - - - claimfinish2 cf2 - - - Finish your claim with 2 stars if you destroyed a base. First argument is the war number, optional second argument is a base number if you want to finish for someone else. - - - `{0}cf2 1` or `{0}cf2 1 5` - - - claimfinish1 cf1 - - - Finish your claim with 1 star if you destroyed a base. First argument is the war number, optional second argument is a base number if you want to finish for someone else. - - - `{0}cf1 1` or `{0}cf1 1 5` - - - unclaim ucall uc - - - Removes your claim from a certain war. Optional second argument denotes a person in whose place to unclaim - - - `{0}uc [war_number] [optional_other_name]` - - - endwar ew - - - Ends the war with a given index. - - - `{0}ew [war_number]` - - - translate trans - - - Translates from>to text. From the given language to the destination language. - - - `{0}trans en>fr Hello` - - - translangs - - - Lists the valid languages for translation. - - - `{0}translangs` - - - Sends a readme and a guide links to the channel. - - - `{0}readme` or `{0}guide` - - - readme guide - - - Shows all available operations in {0}calc command - - - `{0}calcops` - - - calcops - - - Deletes all quotes on a specified keyword. - - - `{0}delallq kek` - - - delallq daq - - - greetdmmsg - - - `{0}greetdmmsg Welcome to the server, %user%`. - - - Sets a new join announcement message which will be sent to the user who joined. Type %user% if you want to mention the new member. Using it with no message will show the current DM greet message. You can use embed json from <http://nadekobot.xyz/embedbuilder/> instead of a regular text, if you want the message to be embedded. - - - Check how much currency a person has. (Defaults to yourself) - - - `{0}$$` or `{0}$$ @SomeGuy` - - - cash $$ - - - Lists whole permission chain with their indexes. You can specify an optional page number if there are a lot of permissions. - - - `{0}lp` or `{0}lp 3` - - - listperms lp - - - Enable or disable all modules for a specific user. - - - `{0}aum enable @someone` - - - allusrmdls aum - - - Moves permission from one position to another in Permissions list. - - - `{0}mp 2 4` - - - moveperm mp - - - Removes a permission from a given position in Permissions list. - - - `{0}rp 1` - - - removeperm rp - - - Migrate data from old bot configuration - - - `{0}migratedata` - - - migratedata - - - Checks if a user is online on a certain streaming platform. - - - `{0}cs twitch MyFavStreamer` - - - checkstream cs - - - showemojis se - - - Shows a name and a link to every SPECIAL emoji in the message. - - - `{0}se A message full of SPECIAL emojis` - - - shuffle sh - - - Reshuffles all cards back into the deck. - - - `{0}sh` - - - fwmsgs - - - Toggles forwarding of non-command messages sent to bot's DM to the bot owners - - - `{0}fwmsgs` - - - fwtoall - - - Toggles whether messages will be forwarded to all bot owners or only to the first one specified in the credentials.json - - - `{0}fwtoall` - - - resetperms - - - Resets BOT's permissions module on this server to the default value. - - - `{0}resetperms` - - - antiraid - - - Sets an anti-raid protection on the server. First argument is number of people which will trigger the protection. Second one is a time interval in which that number of people needs to join in order to trigger the protection, and third argument is punishment for those people (Kick, Ban, Mute) - - - `{0}antiraid 5 20 Kick` - - - antispam - - - Stops people from repeating same message X times in a row. You can specify to either mute, kick or ban the offenders. Max message count is 10. - - - `{0}antispam 3 Mute` or `{0}antispam 4 Kick` or `{0}antispam 6 Ban` - - - chatmute - - - Prevents a mentioned user from chatting in text channels. - - - `{0}chatmute @Someone` - - - voicemute - - - Prevents a mentioned user from speaking in voice channels. - - - `{0}voicemute @Someone` - - - konachan - - - Shows a random hentai image from konachan with a given tag. Tag is optional but preferred. - - - `{0}konachan yuri` - - - setmuterole - - - Sets a name of the role which will be assigned to people who should be muted. Default is nadeko-mute. - - - `{0}setmuterole Silenced` - - - adsarm - - - Toggles the automatic deletion of confirmations for {0}iam and {0}iamn commands. - - - `{0}adsarm` - - - setstream - - - Sets the bots stream. First argument is the twitch link, second argument is stream name. - - - `{0}setstream TWITCHLINK Hello` - - - chatunmute - - - Removes a mute role previously set on a mentioned user with `{0}chatmute` which prevented him from chatting in text channels. - - - `{0}chatunmute @Someone` - - - unmute - - - Unmutes a mentioned user previously muted with `{0}mute` command. - - - `{0}unmute @Someone` - - - xkcd - - - Shows a XKCD comic. No arguments will retrieve random one. Number argument will retrieve a specific comic, and "latest" will get the latest one. - - - `{0}xkcd` or `{0}xkcd 1400` or `{0}xkcd latest` - - - placelist - - - Shows the list of available tags for the `{0}place` command. - - - `{0}placelist` - - - place - - - Shows a placeholder image of a given tag. Use `{0}placelist` to see all available tags. You can specify the width and height of the image as the last two optional arguments. - - - `{0}place Cage` or `{0}place steven 500 400` - - - togethertube totube - - - Creates a new room on <https://togethertube.com> and shows the link in the chat. - - - `{0}totube` - - - publicpoll ppoll - - - Creates a public poll which requires users to type a number of the voting option in the channel command is ran in. - - - `{0}ppoll Question?;Answer1;Answ 2;A_3` - - - autotranslang atl - - - Sets your source and target language to be used with `{0}at`. Specify no arguments to remove previously set value. - - - `{0}atl en>fr` - - - autotrans at - - - Starts automatic translation of all messages by users who set their `{0}atl` in this channel. You can set "del" argument to automatically delete all translated user messages. - - - `{0}at` or `{0}at del` - - - listquotes liqu - - - `{0}liqu` or `{0}liqu 3` - - - Lists all quotes on the server ordered alphabetically. 15 Per page. - - - typedel - - - Deletes a typing article given the ID. - - - `{0}typedel 3` - - - typelist - - - Lists added typing articles with their IDs. 15 per page. - - - `{0}typelist` or `{0}typelist 3` - - - listservers - - - Lists servers the bot is on with some basic info. 15 per page. - - - `{0}listservers 3` - - - hentaibomb - - - Shows a total 5 images (from gelbooru, danbooru, konachan, yandere and atfbooru). Tag is optional but preferred. - - - `{0}hentaibomb yuri` - - - cleverbot - - - Toggles cleverbot session. When enabled, the bot will reply to messages starting with bot mention in the server. Custom reactions starting with %mention% won't work if cleverbot is enabled. - - - `{0}cleverbot` - - - shorten - - - Attempts to shorten an URL, if it fails, returns the input URL. - - - `{0}shorten https://google.com` - - - minecraftping mcping - - - Pings a minecraft server. - - - `{0}mcping 127.0.0.1:25565` - - - minecraftquery mcq - - - Finds information about a minecraft server. - - - `{0}mcq server:ip` - - - wikia - - - Gives you back a wikia link - - - `{0}wikia mtg Vigilance` or `{0}wikia mlp Dashy` - - - yandere - - - Shows a random image from yandere with a given tag. Tag is optional but preferred. (multiple tags are appended with +) - - - `{0}yandere tag1+tag2` - - - magicthegathering mtg - - - Searches for a Magic The Gathering card. - - - `{0}magicthegathering about face` or `{0}mtg about face` - - - yodify yoda - - - Translates your normal sentences into Yoda styled sentences! - - - `{0}yoda my feelings hurt` - - - attack - - - Attacks a target with the given move. Use `{0}movelist` to see a list of moves your type can use. - - - `{0}attack "vine whip" @someguy` - - - heal - - - Heals someone. Revives those who fainted. Costs a NadekoFlower - - - `{0}heal @someone` - - - movelist ml - - - Lists the moves you are able to use - - - `{0}ml` - - - settype - - - Set your poketype. Costs a NadekoFlower. Provide no arguments to see a list of available types. - - - `{0}settype fire` or `{0}settype` - - - type - - - Get the poketype of the target. - - - `{0}type @someone` - - - hangmanlist - - - Shows a list of hangman term types. - - - `{0} hangmanlist` - - - hangman - - - Starts a game of hangman in the channel. Use `{0}hangmanlist` to see a list of available term types. Defaults to 'all'. - - - `{0}hangman` or `{0}hangman movies` - - - crstatsclear - - - Resets the counters on `{0}crstats`. You can specify a trigger to clear stats only for that trigger. - - - `{0}crstatsclear` or `{0}crstatsclear rng` - - - crstats - - - Shows a list of custom reactions and the number of times they have been executed. Paginated with 10 per page. Use `{0}crstatsclear` to reset the counters. - - - `{0}crstats` or `{0}crstats 3` - - - overwatch ow - - - Show's basic stats on a player (competitive rank, playtime, level etc) Region codes are: `eu` `us` `cn` `kr` - - - `{0}ow us Battletag#1337` or `{0}overwatch eu Battletag#2016` - - - acrophobia acro - - - Starts an Acrophobia game. Second argment is optional round length in seconds. (default is 60) - - - `{0}acro` or `{0}acro 30` - - - logevents - - - Shows a list of all events you can subscribe to with `{0}log` - - - `{0}logevents` - - - log - - - Toggles logging event. Disables it if it's active anywhere on the server. Enables if it's not active. Use `{0}logevents` to see a list of all events you can subscribe to. - - - `{0}log userpresence` or `{0}log userbanned` - - - fairplay fp - - - Toggles fairplay. While enabled, music player will prioritize songs from users who didn't have their song recently played instead of the song's position in the queue. - - - `{0}fp` - - - define def - - - Finds a definition of a word. - - - `{0}def heresy` - - - setmaxplaytime smp - - - Sets a maximum number of seconds (>14) a song can run before being skipped automatically. Set 0 to have no limit. - - - `{0}smp 0` or `{0}smp 270` - - - activity - - - Checks for spammers. - - - `{0}activity` - - - autohentai - - - Posts a hentai every X seconds with a random tag from the provided tags. Use `|` to separate tags. 20 seconds minimum. Provide no arguments to disable. - - - `{0}autohentai 30 yuri|tail|long_hair` or `{0}autohentai` - - - setstatus - - - Sets the bot's status. (Online/Idle/Dnd/Invisible) - - - `{0}setstatus Idle` - - - rotaterolecolor rrc - - - Rotates a roles color on an interval with a list of supplied colors. First argument is interval in seconds (Minimum 60). Second argument is a role, followed by a space-separated list of colors in hex. Provide a rolename with a 0 interval to disable. - - - `{0}rrc 60 MyLsdRole #ff0000 #00ff00 #0000ff` or `{0}rrc 0 MyLsdRole` - - - createinvite crinv - - - Creates a new invite which has infinite max uses and never expires. - - - `{0}crinv` - - - pollstats - - - Shows the poll results without stopping the poll on this server. - - - `{0}pollstats` - - - repeatlist replst - - - Shows currently repeating messages and their indexes. - - - `{0}repeatlist` - - - repeatremove reprm - - - Removes a repeating message on a specified index. Use `{0}repeatlist` to see indexes. - - - `{0}reprm 2` - - - antilist antilst - - - Shows currently enabled protection features. - - - `{0}antilist` - - - antispamignore - - - Toggles whether antispam ignores current channel. Antispam must be enabled. - - - `{0}antispamignore` - - - cmdcosts - - - Shows a list of command costs. Paginated with 9 command per page. - - - `{0}cmdcosts` or `{0}cmdcosts 2` - - - commandcost cmdcost - - - Sets a price for a command. Running that command will take currency from users. Set 0 to remove the price. - - - `{0}cmdcost 0 !!q` or `{0}cmdcost 1 >8ball` - - - startevent - - - Starts one of the events seen on public nadeko. - - - `{0}startevent flowerreaction` - - - slotstats - - - Shows the total stats of the slot command for this bot's session. - - - `{0}slotstats` - - - slottest - - - Tests to see how much slots payout for X number of plays. - - - `{0}slottest 1000` - - - slot - - - Play Nadeko slots. Max bet is 999. 3 seconds cooldown per user. - - - `{0}slot 5` - - - affinity - - - Sets your affinity towards someone you want to be claimed by. Setting affinity will reduce their `{0}claim` on you by 20%. You can leave second argument empty to clear your affinity. 30 minutes cooldown. - - - `{0}affinity @MyHusband` or `{0}affinity` - - - claimwaifu claim - - - Claim a waifu for yourself by spending currency. You must spend atleast 10% more than her current value unless she set `{0}affinity` towards you. - - - `{0}claim 50 @Himesama` - - - waifus waifulb - - - Shows top 9 waifus. - - - `{0}waifus` - - - divorce - - - Releases your claim on a specific waifu. You will get some of the money you've spent back unless that waifu has an affinity towards you. 6 hours cooldown. - - - `{0}divorce @CheatingSloot` - - - waifuinfo waifustats - - - Shows waifu stats for a target person. Defaults to you if no user is provided. - - - `{0}waifuinfo @MyCrush` or `{0}waifuinfo` - - - mal - - - Shows basic info from myanimelist profile. - - - `{0}mal straysocks` - - - setmusicchannel smch - - - Sets the current channel as the default music output channel. This will output playing, finished, paused and removed songs to that channel instead of the channel where the first song was queued in. - - - `{0}smch` - - - reloadimages - - - Reloads images bot is using. Safe to use even when bot is being used heavily. - - - `{0}reloadimages` - - - shardstats - - - Stats for shards. Paginated with 25 shards per page. - - - `{0}shardstats` or `{0}shardstats 2` - - - connectshard - - - Try (re)connecting a shard with a certain shardid when it dies. No one knows will it work. Keep an eye on the console for errors. - - - `{0}connectshard 2` - - - shardid - - - Shows which shard is a certain guild on, by guildid. - - - `{0}shardid 117523346618318850` - - - tictactoe ttt - - - Starts a game of tic tac toe. Another user must run the command in the same channel in order to accept the challenge. Use numbers 1-9 to play. 15 seconds per move. - - - >ttt - - - timezones - - - List of all timezones available on the system to be used with `{0}timezone`. - - - `{0}timezones` - - - timezone - - - Sets this guilds timezone. This affects bot's time output in this server (logs, etc..) - - - `{0}timezone` - - - langsetdefault langsetd - - - 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. - - - `{0}langsetd en-US` or `{0}langsetd default` - - - languageset langset - - - 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. - - - `{0}langset de-DE ` or `{0}langset default` - - - languageslist langli - - - List of languages for which translation (or part of it) exist atm. - - - `{0}langli` - - - rategirl - - - Use the universal hot-crazy wife zone matrix to determine the girl's worth. It is everything young men need to know about women. At any moment in time, any woman you have previously located on this chart can vanish from that location and appear anywhere else on the chart. - - - `{0}rategirl @SomeGurl` - \ No newline at end of file From 9a8c77a4b7ab38d2195e5b39dc12a3985b4e9612 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 1 Mar 2017 01:51:05 +0100 Subject: [PATCH 110/496] Update ResponseStrings.pt-BR.resx (POEditor.com) --- .../Resources/ResponseStrings.pt-BR.resx | 280 +++++++++--------- 1 file changed, 140 insertions(+), 140 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx b/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx index 898269f2..30bb7b31 100644 --- a/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx +++ b/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx @@ -1,121 +1,121 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Esta base já está aclamada ou destruída. @@ -1207,7 +1207,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. É um empate! ambos escolheram {0} - + {0} ganhou! {1} vence {2} @@ -1222,10 +1222,10 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Categoria - + Cleverbot desabilitado neste servidor - Cleverbot ativado neste servidor. + Cleverbot habilitado neste servidor. @@ -1241,7 +1241,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. - Falha ao carregar a questão + Falha ao carregar a questão. Jogo Iniciado @@ -1487,7 +1487,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Volume deve estar entre 0 e 100 - + Volume ajustado para {0}% @@ -1582,10 +1582,10 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Gen. (of module) - + Pagina {0} de permissões - + Atual cargo de permissões é {0} @@ -1594,29 +1594,29 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. - + Permissões removidas #{0} - {1} - + Desabilitado o uso de {0} {1} para o cargo {2}. - + Habilitado o uso de {0} {1} para o cargo {2}. Short of seconds. - + Desabilitado o uso de {0} {1} nesse servidor. - + Habilitado o uso de {0} {1} nesse servidor. - + Não editavel @@ -1625,22 +1625,22 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. - + Não vou mas mostrar avisos de permissões. - + Vou passar a mostrar avisos de permissões. - + Filtragem de palavras desabilitada nesse canal. - + Filtragem de palavras habilitada nesse canal. - + Filtragem de palavras desabilitada nesse servidor. - + Filtragem de palavras habilitada nesse servidor. Habilidades @@ -1679,16 +1679,16 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. - + Derrotas Competitivas - + Partidas Competitivas jogadas - + Rank Competitivo - + Vitorias Competitivas Completado From 79681b4958b755c2f42a56a1a42a8918982187a3 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 1 Mar 2017 01:51:07 +0100 Subject: [PATCH 111/496] Update ResponseStrings.sr-cyrl-rs.resx (POEditor.com) --- .../Resources/ResponseStrings.sr-cyrl-rs.resx | 1705 ++++++++++++++--- 1 file changed, 1424 insertions(+), 281 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx b/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx index 8d58263b..ea90f4b6 100644 --- a/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx +++ b/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx @@ -1,189 +1,122 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - {0} је већ онесвешћен. - - - {0} је већ потпуно здрав. - - - Твој тип већ јесте {0} - - - је искористио {0}{1} на {2}{3} и нанео {4} штете. - Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage. - - - Не можеш напасти пре узвратног ударца. - - - Не можеш напасти себе. - - - {0} се онесвестио. - - - је излечио {0} са једним {1} - - - {0} има {1} преосталог здравља. - - - Не можеш искористити {0}. Укуцај `{1}ml` да би видео листу удараца које можеш користити. - - - Листа покрета за {0} тип - - - Није ефективно. - - - Немаш довољно {0} - - - је оживео {0} са једним {1} - - - Оживео си себе са једним {0} - - - Твој тип је промењен на {0} за један {1} - - - Има неког ефекта! - - - Супер ефективно! - - - Користио си превише напада узастопно, не можеш да се крећеш! - - - {0}-ов тип је {1} - - - Корисник није нађен. - - - Онесвешћен си, не можеш да се крећеш. - Та база је већ под захетвом или је уништена. @@ -193,6 +126,9 @@ Та база није под захтевом. + + **DESTROYED** base #{0} in a war against {1} + {0} је **ПОНИШТИО ЗАХТЕВ** за базу #{1} у рату против {2} @@ -289,82 +225,79 @@ Окидач - - Назад на Садржај - - - Само Власник Бота - - - Захтева {0} дозволу на каналу. - - - Можете подржати пројекат на Пејтриону: <{0}> или Пејпалу: <{1}> - - - Команде и псеудоними - - - Листа команди је обновљена. - - - Укуцај `{0}h ИмеКоманде` да видиш помоћ за ту команду. нпр. `{0}h >8ball` - - - Не могу да нађем ту команду. Проверите да ли команда постоји, па покушајте поново. - - - Опис - - - Можете подржати НадекоБот пројекат на -Пејтриону <{0}> или -Пејпалу <{1}> -Не заборавите да оставите своје корисничко име или ИД. - -**Хвала** ♥️ - - - **List of Commands**: <{0}> -**Hosting Guides and docs can be found here**: <{1}> - - - Листа Команди - - - Листа Модула - - - Укуцај `{0}cmds ИмеМодула` да видиш листу свих команди у том модулу. нпр `{0}cmds games` - - - Тај модул не постоји. - - - Захтева {0} дозволу на серверу. - - - Садржај - - - Упутство - - - Аутохентаи започет. Постоваћу сваких {0} сек. користећи један од следећих тагова: -{1} - АутоХентаи заустављен. - - Таг - - - **DESTROYED** base #{0} in a war against {1} - No results found. + + {0} је већ онесвешћен. + + + {0} је већ потпуно здрав. + + + Твој тип већ јесте {0} + + + је искористио {0}{1} на {2}{3} и нанео {4} штете. + Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage. + + + Не можеш напасти пре узвратног ударца. + + + Не можеш напасти себе. + + + {0} се онесвестио. + + + је излечио {0} са једним {1} + + + {0} има {1} преосталог здравља. + + + Не можеш искористити {0}. Укуцај `{1}ml` да би видео листу удараца које можеш користити. + + + Листа покрета за {0} тип + + + Није ефективно. + + + Немаш довољно {0} + + + је оживео {0} са једним {1} + + + Оживео си себе са једним {0} + + + Твој тип је промењен на {0} за један {1} + + + Има неког ефекта! + + + Супер ефективно! + + + Користио си превише напада узастопно, не можеш да се крећеш! + + + {0}-ов тип је {1} + + + Корисник није нађен. + + + Онесвешћен си, не можеш да се крећеш. + **Auto assign role** on user join is now **disabled**. @@ -515,7 +448,7 @@ Reason: {1} Greet announcements enabled on this channel. - You can't use this command on users with a role higher or equal to yours in the role hierarchy. + You can't use this command on users with a role higher or equal to yours in the role hierarchy. Images loaded after {0} seconds! @@ -541,19 +474,21 @@ Reason: {1} {0} - Your server's locale is now {0} - {1} + Your server's locale is now {0} - {1} - Bot's default locale is now {0} - {1} + Bot's default locale is now {0} - {1} - Bot's language is set to {0} - {0} + Bot's language is set to {0} - {0} + Fuzzy - Failed setting locale. Revisit this command's help. + Failed setting locale. Revisit this command's help. - This server's language is set to {0} - {0} + This server's language is set to {0} - {0} + Fuzzy {0} has left {1} @@ -606,10 +541,10 @@ Reason: {1} Muted - singular "User muted." + singular "User muted." - I don't have the permission necessary for that most likely. + I don't have the permission necessary for that most likely. New mute role set. @@ -630,7 +565,7 @@ Reason: {1} Nickname Changed - Can't find that server + Can't find that server No shard with that ID found. @@ -645,7 +580,7 @@ Reason: {1} Old Topic - Error. Most likely I don't have sufficient permissions. + Error. Most likely I don't have sufficient permissions. Permissions for this server are reset. @@ -705,7 +640,7 @@ Reason: {1} Failed to rename role. I have insufficient permissions. - You can't edit roles higher than your highest role. + You can't edit roles higher than your highest role. Removed the playing message: {0} @@ -751,13 +686,13 @@ Reason: {1} That role is not self-assignable. - You don't have {0} role. + You don't have {0} role. Self assigned roles are now not exclusive! - I am unable to add that role to you. `I can't add roles to owners or other roles higher than my role in the role hierarchy.` + I am unable to add that role to you. `I can't add roles to owners or other roles higher than my role in the role hierarchy.` {0} has been removed from the list of self-assignable roles. @@ -799,7 +734,7 @@ Reason: {1} Shutting down - Users can't send more than {0} messages every {1} seconds. + Users can't send more than {0} messages every {1} seconds. Slow mode disabled. @@ -862,10 +797,10 @@ Reason: {1} {0} has been **muted** from text and voice chat. - User's Role Added + User's Role Added - User's Role Removed + User's Role Removed {0} is now {1} @@ -901,7 +836,7 @@ Reason: {1} Enabled voice + text feature. - I don't have **manage roles** and/or **manage channels** permission, so I cannot run `voice+text` on {0} server. + I don't have **manage roles** and/or **manage channels** permission, so I cannot run `voice+text` on {0} server. You are enabling/disabling this feature and **I do not have ADMINISTRATOR permissions**. This may cause some issues, and you will have to clean up text channels yourself afterwards. @@ -929,7 +864,7 @@ Reason: {1} Migration done! - Error while migrating, check bot's console for more information. + Error while migrating, check bot's console for more information. Presence Updates @@ -940,9 +875,6 @@ Reason: {1} has awarded {0} to {1} - - Betflip Gamble - Better luck next time ^_^ @@ -989,13 +921,13 @@ Reason: {1} Awarded {0} to {1} users from {2} role. - You can't bet more than {0} + You can't bet more than {0} - You can't bet less than {0} + You can't bet less than {0} - You don't have enough {0} + You don't have enough {0} No more cards in the deck. @@ -1026,7 +958,7 @@ Reason: {1} Users must type a secret code to get {0}. -Lasts {1} seconds. Don't tell anyone. Shhh. +Lasts {1} seconds. Don't tell anyone. Shhh. SneakyGame event ended. {0} users received the reward. @@ -1041,6 +973,1217 @@ Lasts {1} seconds. Don't tell anyone. Shhh. successfully took {0} from {1} - was unable to take {0} from{1} because the user doesn't have that much {2}! + was unable to take {0} from{1} because the user doesn't have that much {2}! + + Назад на Садржај + + + Само Власник Бота + + + Захтева {0} дозволу на каналу. + + + Можете подржати пројекат на Пејтриону: <{0}> или Пејпалу: <{1}> + + + Команде и псеудоними + + + Листа команди је обновљена. + + + Укуцај `{0}h ИмеКоманде` да видиш помоћ за ту команду. нпр. `{0}h >8ball` + + + Не могу да нађем ту команду. Проверите да ли команда постоји, па покушајте поново. + + + Опис + + + Можете подржати НадекоБот пројекат на +Пејтриону <{0}> или +Пејпалу <{1}> +Не заборавите да оставите своје корисничко име или ИД. + +**Хвала** ♥️ + + + **List of Commands**: <{0}> +**Hosting Guides and docs can be found here**: <{1}> + + + Листа Команди + + + Листа Модула + + + Укуцај `{0}cmds ИмеМодула` да видиш листу свих команди у том модулу. нпр `{0}cmds games` + + + Тај модул не постоји. + + + Захтева {0} дозволу на серверу. + + + Садржај + + + Упутство + + + Аутохентаи започет. Постоваћу сваких {0} сек. користећи један од следећих тагова: +{1} + + + Таг + + + Трка Животиња + + + Започињање трке није успело јер нема довољно учесника. + + + Трка је пуна! Почиње одмах. + + + {0} се прикључио као {1} + + + {0} се прикључио као {1} и уложио {2}! + + + Укуцај {0}jr да би се прикључио трци. + + + Почиње за 20 секунди или када је соба пуна. + + + Почиње са {0} учесника. + + + {0} као {1} је победио! + + + {0} као {1} је победио трку и освојио {2}! + + + Неисправан број. Можете бацити {0}-{1} коцкица у исто време. + Fuzzy + + + је добио {0} + Someone rolled 35 + + + Коцкица бачена: {0} + Dice Rolled: 5 + + + Неуспешно започињање партије. Друга трка је вероватно у току. + + + Не постоји трка на овом серверу. + + + Други број мора бити већи од првог. + + + Промена Осећања + + + Присвојена од стране + + + Развода + + + Свиђа јој се + + + Цена + + + Ниједна waifu још није присвојена. + + + Најбоље Waifu + + + твој афинитет је већ постављен на ту waifu или покушаваш да обришеш афинитет који не постоји. + + + + Make sure to get the formatting right, and leave the thinking emoji + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + plural + + + + + + + + + + + + + + + + + + + + + + + + Ранг листа + + + + Немаш довољно {0} + + + + + + + Kwoth picked 5* + + + + Kwoth planted 5* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + context: "removed song #5" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Gen (of command) + + + + Gen. (of module) + + + + + + + + + + + + + + + + + + + + + + + + + Short of seconds. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Don't translate {0}place + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /s and total need to be localized to fit the context - +`1.` + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Емотикони по Мери + + + Грешка + + + Додатак + + + ИД + + + Индекс је ван опсега. + + + Ево је листа корисника у тим ролама: + + + није ти дозвољено да користиш ову команду на ролама са пуно корисника да би се спречила злоупотреба. + + + Нетачна вредност {0}. + Invalid months value/ Invalid hours value + + + Регистровао се + + + Ушао на сервер + + + ИД: {0} +Чланова; {1} +Ид Власника; {2} + + + Нема сервера на овој страници. + + + Листа Понављача + + + Чланова + + + Меморија + + + Поруке + + + Понављач Порука + + + Име + + + Надимак + + + Нико не игра ту игру. + + + Нема активних понављача. + + + Нема рола на овој страни. + + + Нема шардова на овој страни. + + + Нема теме. + + + Бласник + + + ИДеви Власника + + + Присуство + + + {0} Сервера +{1} Текстуалних Канала +{2} Говорних Канала + + + Обрисани су сви цитати са кључном речи {0}. + + + Страна {0} цитата. + + + Нема цитата на овој страни. + + + Није нађен цитат који можеш да обришеш. + + + Цитат додат + + + Обрисана насумишна + + + Регион + + + Регистрован + + + + + + Није исправан формат времена. Проверите листу команди. + + + Нови темплејт за подсетник је постаљен. + + + + + + Листа понављача + + + Нема понављача на овом серверу. + + + + + + Нису пронађене понављајуће поруке на овом серверу. + + + Резултат + + + Роле + + + + + + + + + + + + + + + + + + + + + Инфо Сервера + + + Шард + + + Статови Шардова + + + + + + + + + Нема специјалних емотикона. + + + + + + Текст Канали + + + Ево га твој линк ка соби: + + + Време Рада + + + + Id of the user kwoth#1234 is 123123123123 + + + Корисници + + + Говорни канал + + \ No newline at end of file From 139bd79778bfa478e5e2d91a75766195acbd079f Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 1 Mar 2017 10:36:27 +0100 Subject: [PATCH 112/496] Update CommandStrings.nl-NL.resx (POEditor.com) From 972726e6afd55d90e56c872ce283c10c8e113c36 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 1 Mar 2017 10:36:32 +0100 Subject: [PATCH 113/496] Update ResponseStrings.fr-fr.resx (POEditor.com) --- src/NadekoBot/Resources/ResponseStrings.fr-fr.resx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx b/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx index 3708ba7a..72a2957f 100644 --- a/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx +++ b/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx @@ -1410,7 +1410,7 @@ La nouvelle valeur de {0} est {1} ! Lecture en cours: - #{0}` - **{1}** par *{2}* ({3} morceaux) + `#{0}` - **{1}** par *{2}* ({3} morceaux) Page {0} des listes de lecture sauvegardées @@ -1525,7 +1525,7 @@ La nouvelle valeur de {0} est {1} ! Activation de l'usage de TOUS LES MODULES pour l'utilisateur {0}. - Banni {0} avec l'ID {1} + {0} sur liste noire avec l'ID {1} Il ne s'agit pas d'un ban mais d'une blacklist interdisant l'utilisateur d'utiliser le bot. @@ -1767,7 +1767,7 @@ La nouvelle valeur de {0} est {1} ! Niveau - Liste de {0} tags placés. + Liste de tags pour {0}place. Don't translate {0}place @@ -1810,7 +1810,7 @@ La nouvelle valeur de {0} est {1} ! Utilisateur non trouvé! Veuillez vérifier la région ainsi que le BattleTag avant de réessayer. - Prévision de lecture + Prévus de regarder Je ne pense pas que le sens de la traduction soit le bon. @@ -1946,7 +1946,7 @@ La nouvelle valeur de {0} est {1} ! `1.` - Page d'Activité #{0} + Page d'activité #{0} {0} utilisateurs en total. From f025ee646161a55da82ba7376c3c5ea7c2168701 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 1 Mar 2017 10:36:35 +0100 Subject: [PATCH 114/496] Update ResponseStrings.de-DE.resx (POEditor.com) --- src/NadekoBot/Resources/ResponseStrings.de-DE.resx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.de-DE.resx b/src/NadekoBot/Resources/ResponseStrings.de-DE.resx index eb4c7511..8d8866c5 100644 --- a/src/NadekoBot/Resources/ResponseStrings.de-DE.resx +++ b/src/NadekoBot/Resources/ResponseStrings.de-DE.resx @@ -1956,7 +1956,10 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu Thema des Kanals - Befehl ausgeführt + Befehle ausgeführt + Commands ran +9 +^used like that in .stats {0} {1} ist gleich zu {2} {3} From 98a0f97bbe33e43120a7c36f6cbac49e91196e9f Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 1 Mar 2017 10:36:37 +0100 Subject: [PATCH 115/496] Update CommandStrings.ja-JP.resx (POEditor.com) --- .../Resources/CommandStrings.ja-JP.resx | 36 ++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/src/NadekoBot/Resources/CommandStrings.ja-JP.resx b/src/NadekoBot/Resources/CommandStrings.ja-JP.resx index 17febe51..76de6cb2 100644 --- a/src/NadekoBot/Resources/CommandStrings.ja-JP.resx +++ b/src/NadekoBot/Resources/CommandStrings.ja-JP.resx @@ -118,16 +118,19 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + その基盤はすでに主張されている。または破壊されました。 + - + ベースが破壊されました + - + その基地は主張されていない。 + - + {1}との戦争中の整数{0}を破壊しました @@ -169,7 +172,7 @@ - + サイズ @@ -211,7 +214,7 @@ - + 反応 @@ -223,7 +226,7 @@ - + トリガー @@ -305,7 +308,7 @@ - + 接続 @@ -314,11 +317,11 @@ - + ＢＡＮＮＥＤ PLURAL - + ユーザーはＢＡＮＮＥＤ @@ -351,7 +354,7 @@ - + 古称 @@ -360,7 +363,7 @@ - + コンテント @@ -390,7 +393,7 @@ - + タイレクトメッセージガ @@ -531,11 +534,12 @@ - - PLURAL (users have been muted) + ミュート + PLURAL (users have been muted) +Fuzzy - + ミュート singular "User muted." From 71f542081907fcefd3a904d6de61fa0a95414c29 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 1 Mar 2017 10:36:40 +0100 Subject: [PATCH 116/496] Update ResponseStrings.pt-BR.resx (POEditor.com) --- .../Resources/ResponseStrings.pt-BR.resx | 405 +++++++++--------- 1 file changed, 205 insertions(+), 200 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx b/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx index 30bb7b31..634142d7 100644 --- a/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx +++ b/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx @@ -118,13 +118,13 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Esta base já está aclamada ou destruída. + Esta base já foi reivindicada ou destruída. Esta base já está destruída. - Esta base não está aclamada. + Esta base não foi reivindicada. @@ -133,10 +133,10 @@ - + {0} clamou a base #{1} durante a guerra contra {2} - @{0} Você já clamou esta base #{1}. Você não pode clamar uma nova. + @{0} Você já reivindicou esta base #{1}. Você não pode reivindicar uma nova. @@ -158,7 +158,7 @@ Lista de guerras ativas - não clamado + não reivindicado Você não está participando nesta guerra. @@ -188,13 +188,13 @@ Guerra contra {0} começou! - Todos os status de reações personalizadas limpados. + Todos os status de reações personalizadas limpos. Reação personalizada deletada - Permissão Insuficiente. Necessita o domínio do bot para reações personalizadas globais, e administrador para reações personalizadas em server. + Permissão Insuficiente. Precisa ser dono do bot para reações personalizadas globais, e permissão de administrador para reações personalizadas no servidor. Lista de todas as reações personalizadas @@ -215,13 +215,13 @@ Resposta - Status de reações customizáveis + Status de reações personalizadas Status limpado para {0} reação customizável. - Nenhum status para aquele comando achado, nenhuma ação foi tomada. + Nenhum status para aquele comando encontrado, nenhuma ação foi tomada. Comando @@ -258,7 +258,7 @@ curou {0} com uma {1} - {0} Tem {1} HP restante. + {0} tem {1} HP restante. Você não pode usar {0}. Digite `{1}ml` para ver uma lista de ataques que você pode usar. @@ -291,7 +291,7 @@ Você usou muitos ataques de uma vez, então você não pode se mexer! - Tipo de {0} é {1} + O tipo de {0} é {1} Usuário não encontrado. @@ -300,20 +300,20 @@ Você desmaiou, então você não pode se mexer! - **Cargo Automático** para novos usuários **desabilitado**. + **Atribuir cargo automaticamente** a novos usuários **desabilitado**. - **Cargo Automático** para novos usuários **habilitado** + **Atribuir cargo automaticamente** a novos usuários **habilitado**. Anexos - Avatar mudado + Avatar alterado Você foi BANIDO do servidor {0}. -Razão: {1} +Motivo: {1} Banidos @@ -323,16 +323,16 @@ Razão: {1} Usuário Banido - Nome do bot mudado para {0}. + Nome do bot alterado para {0}. - Status do bot mudado para {0}. + Status do bot alterado para {0}. Deleção automática de mensagens de despedida foi desativado. - Mensagens de despedida serão deletas após {0} segundos. + Mensagens de despedida serão deletadas após {0} segundos. Mensagem de despedida atual: {0} @@ -341,7 +341,7 @@ Razão: {1} Ative mensagens de despedidas digitando {0} - Nova mensagem de despedida colocada. + Nova mensagem de despedida definida. Mensagens de despedidas desativadas. @@ -350,13 +350,13 @@ Razão: {1} Mensagens de despedidas foram ativadas neste canal. - Nome do canal mudado + Nome do canal alterado Nome antigo - Tópico do canal mudado + Tópico do canal alterado Limpo. @@ -517,7 +517,7 @@ Razão: {1} - + {0} invocou uma menção nos seguintes cargos Mensagem de {0} `[Bot Owner]` @@ -603,7 +603,7 @@ Razão: {1} - + Se {0} ou mais usuários entrarem em menos de {1} segundos, {2}. O tempo deve ser entre {0} e {1} segundos. @@ -643,7 +643,7 @@ Razão: {1} Você não pode editar cargos superiores ao seu cargo mais elevado. - + Removida a mensagem "jogando": {0} O cargo {0} foi adicionado a lista. @@ -658,13 +658,14 @@ Razão: {1} Adicionado. - + Rotação de status "jogando" desativada. - + Rotação de status "jogando" ativada. - + Aqui está uma lista dos status rotacionados: +{0} @@ -688,7 +689,7 @@ Razão: {1} Você não possui o cargo {0}. - + Cargos auto-atribuíveis agora são exclusivos! Não sou capaz de adicionar esse cargo a você. `Não posso adicionar cargos a donos ou outros cargos maiores que o meu cargo na hierarquia dos cargos.` @@ -697,13 +698,13 @@ Razão: {1} {0} foi removido da lista de cargos auto-aplicáveis. - + Voce nao possui mas o cargo {0}. - + Voce agora possui o cargo {0}. - + Cargo {0} adicionado à {1} com sucesso. Falha ao adicionar o cargo. Não possuo permissões suficientes. @@ -829,19 +830,19 @@ __Canais Ignorados__: {2} Canal de voz destruído - + Atributo voz + texto desabilitado. - + Atributo voz + texto habilitado. - + Eu não possuo a permissão de **gerenciar cargos** e/ou **gerenciar canais**, então não posso executar `voz+texto` no servidor {0}. - + Você está habilitando/desabilitando este atributo e **Eu não tenho permissão de ADMINISTRADOR**. Isso pode causar alguns problemas e você terá que limpar os canais de texto você mesmo depois. - + Eu preciso pelo menos das permissões de **gerenciar cargos** e **gerenciar canais** para habilitar este atributo. (Preferencialmente, permissão de Administrador) Usuário {0} do chat de texto @@ -850,10 +851,11 @@ __Canais Ignorados__: {2} Usuário {0} dos chats de voz e texto - + Usuário {0} do chat de voz - + Você foi banido temporariamente do servidor {0}. +Motivo: {1} Usuário desbanido @@ -862,16 +864,16 @@ __Canais Ignorados__: {2} Migração concluída! - + Erro enquanto migrava, verifique o console do bot para mais informações. - + Atualizações de Presença - + Usuário Banido Temporariamente - + concedeu {0} para {1} Mais sorte na próxima vez ^_^ @@ -883,7 +885,7 @@ __Canais Ignorados__: {2} Baralho re-embaralhado. - + girou {0}. User flipped tails. @@ -893,7 +895,7 @@ __Canais Ignorados__: {2} O número especificado é inválido. Você pode girar de 1 a {0} moedas. - + Adicione {0} reação Este evento está ativo por até {0} horas. @@ -934,7 +936,7 @@ __Canais Ignorados__: {2} Usuario sorteado - + Você rolou {0} Aposta @@ -955,7 +957,8 @@ __Canais Ignorados__: {2} Ganhou - + Usuários devem digitar um código secreto pra ganhar {0}. +Dura {1} segundos. Não diga a ninguém. Shhh. @@ -1183,19 +1186,19 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. - + Você tem {0} segundos para fazer uma submissão. - + {0} submeteram suas frases. ({1} total) - + Vote digitando um número da submissão - + {0} lançam seus votos! - + Vence {0} com {1} pontos. @@ -1234,11 +1237,11 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. - + {0} {1} aleatórios aparecem! Capture-os digitando `{2}pick` plural - + Um {0} aleatório apareceu! Capture-o digitando `{1}pick` Falha ao carregar a questão. @@ -1247,16 +1250,16 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Jogo Iniciado - + Jogo da Forca iniciado - + Já existe um Jogo da Forca em andamento neste canal. - + Erro ao iniciar o Jogo da Forca. - + Lista dos tipos de termo do "{0}hangman" Placar de Lideres @@ -1282,7 +1285,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Trivia - + {0} acertou! A resposta era: {1} Nenhuma trivia está em andamento neste servidor. @@ -1330,7 +1333,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. {0} vs {1} - + Tentando adicionar {0} músicas à fila... Autoplay desabilitado. @@ -1360,10 +1363,10 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. - + Id - + Entrada inválida. @@ -1372,13 +1375,13 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. - + Tamanho máximo da fila de música definido para ilimitado. - + Tamanho máximo da fila de música definido para {0} faixa(s). - Você precisa estar em um canal de voz nesse servidor + Você precisa estar em um canal de voz nesse servidor. Nome @@ -1402,7 +1405,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Tocando Musica - + `#{0}` - **{1}** by *{2}* ({3} músicas) Página {0} de Playlists Salvas @@ -1414,7 +1417,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Falha ao deletar essa playlist. Ela não existe ou você não é seu o criador. - + Não existe uma playlist com esse ID. @@ -1451,7 +1454,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Repetindo Faixa - + A repetição da faixa atual parou. @@ -1463,25 +1466,25 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Repetição de playlist habilitada. - + Eu irei mostrar as músicas em andamento, concluídas, pausadas e removidas neste canal. - + Pulando para `{0}:{1}` - Musicas embaralhadas. + Músicas embaralhadas. - Musica movida. + Música movida. - + {0}h {1}m {2}s - + para a posição - + ilimitada Volume deve estar entre 0 e 100 @@ -1490,67 +1493,67 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Volume ajustado para {0}% - + O uso de TODOS OS MÓDULOS foi desabilitado no canal {0}. - + O uso de TODOS OS MÓDULOS foi habilitado no canal {0}. - + Permitido - + O uso de TODOS OS MÓDULOS foi desabilitado para o cargo {0}. - + O uso de TODOS OS MÓDULOS foi habilitado para o cargo {0}. - + O uso de TODOS OS MÓDULOS foi desabilitado neste servidor. - + O uso de TODOS OS MÓDULOS foi habilitado neste servidor. - + O uso de TODOS OS MÓDULOS foi desabilitado para o usuário {0}. - + O uso de TODOS OS MÓDULOS foi habilitado para o usuário {0}. - + O comando {0} agora possui um cooldown de {1}s. - + O comando {0} não possui nenhum cooldown agora e todos os cooldowns existentes foram limpos. - + Nenhum cooldown de comando definido. - + Desabilitado o uso de {0} {1} no canal {2}. - + Desabilitado o uso de {0} {1} no canal {2}. Negado - + A palavra {0} foi adicionada a lista de palavras filtradas. - + Lista de Palavras Filtradas - + A palavra {0} foi removida da lista de palavras filtradas. - + Segundo parâmetro inválido. (Deve ser um número entre {0} e {1}) @@ -1565,24 +1568,24 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. - + Permissão {0} movida de #{1} para #{2} - + Nenhum custo definido. - Comando + comando Gen (of command) - + módulo Gen. (of module) - Pagina {0} de permissões + Página {0} de Permissões Atual cargo de permissões é {0} @@ -1603,7 +1606,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Habilitado o uso de {0} {1} para o cargo {2}. - + sec. Short of seconds. @@ -1616,7 +1619,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. - Não editavel + Não editável @@ -1625,7 +1628,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. - Não vou mas mostrar avisos de permissões. + Não vou mais mostrar avisos de permissões. Vou passar a mostrar avisos de permissões. @@ -1649,25 +1652,25 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Nenhum anime favorito ainda - + A tradução automática de mensagens nesse canal foi iniciada. As mensagens do usuário serão deletadas automaticamente. - + A linguagem de tradução automática foi removida. - + A linguagem de tradução automática foi definida de {from}>{to} - + A tradução automática de mensagens foi ativada neste canal. - + A tradução automática de mensagens neste canal parou. - + Entrada com má formatação ou algo deu errado. - + Não consegui encontrar essa carta. Fato @@ -1676,7 +1679,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Capítulos - + HQ # Derrotas Competitivas @@ -1688,7 +1691,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Rank Competitivo - Vitorias Competitivas + Vitórias Competitivas Completado @@ -1703,10 +1706,10 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Data - Defina + Defina: - + Dropado Episódios @@ -1727,80 +1730,80 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Gêneros - + Falha ao encontrar uma definição para essa tag. Altura/Peso - + {0}m/{1}kg - + Humidade - + Busca de Imagens para: Falha ao encontrar este filme. - + Linguagem ou fonte inválida. - + Piadas não carregadas. - + Nível - + lista de tags {0}place Don't translate {0}place Localização - + Itens mágicos não carregados. - + Perfil MAL de {0} - + O proprietário do bot não especificou a MashapeApiKey. Você não pode usar essa funcionalidade. Min/Max - Nenhum canal encontrado + Nenhum canal encontrado. - Nenhum resultado encontrado + Nenhum resultado encontrado. - + Em espera Url Original - + Requer uma API key de osu! - + Falha ao obter a assinatura osu! - + Cerca de {0} imagens encontradas. Mostrando aleatória {0}. Usuário não encontrado! Por favor cheque a região e a BattleTag antes de tentar de novo. - + Planeja assistir Plataforma @@ -1809,13 +1812,13 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Nenhuma habilidade encontrada. - Nenhum pokemon encontrado + Nenhum pokemon encontrado. Link do Perfil: - Qualidade + Qualidade: @@ -1824,25 +1827,25 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. - + Avaliação - Pontuação + Pontuação: - + Busca Por: - + Falha ao encurtar esse url. - Alguma coisa deu errado + Alguma coisa deu errado. - + Por favor, especifique os parâmetros de busca. Status @@ -1851,28 +1854,28 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. - Streamer {0} está offline + Streamer {0} está offline. - Streamer {0} está online com {1} espectadores + Streamer {0} está online com {1} espectadores. - + Você esta seguindo {0} streams nesse servidor. - Você não está seguindo nenhuma stream neste servidor + Você não está seguindo nenhuma stream neste servidor. - + Nenhuma stream. - + Stream provavelmente não existe. - + Stream de {0} ({1}) removida das notificações. - Eu notificarei este canal quando o status mudar + Eu notificarei este canal quando o status mudar. Nascer do Sol @@ -1884,7 +1887,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Temperatura - Título + Título: Top 3 animes favoritos: @@ -1896,37 +1899,37 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Tipos - + Falha ao encontrar a definição para esse termo. Url - + Espectadores Assistindo - + Falha ao tentar encontrar esse termo na wikia especificada. - + Por favor, insira a wikia alvo, seguida do que deve ser pesquisado. - Página não encontrada + Página não encontrada. Velocidade do Vento - + Os {0} campeões mais banidos - + Falha ao yodificar sua frase. - + Juntou-se @@ -1937,16 +1940,16 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. - + {0} usuários no total. Autor - + Bot ID - + Lista de funções no comando {0}calc @@ -1955,22 +1958,22 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Tópico do Canal - Comandos utilizados + Comandos utilizados - + {0} {1} é igual a {2} {3} - + Unidades que podem ser utilizadas pelo conversor - + Não foi possível converter {0} para {1}: unidades não encontradas - + Não foi possível converter {0} para {1}: as unidades não são do mesmo tipo - + Criado em @@ -1991,29 +1994,31 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. - + ID - + Índice fora de alcance. - Aqui está uma lista de usuários nestes cargos + Aqui está uma lista de usuários nestes cargos: - + você não tem permissão de usar esse comando em cargos com muitos usuários neles para prevenir abuso. - + Valor {0} inválido. Invalid months value/ Invalid hours value - + Juntou-se ao Discord - + Juntou-se ao Servidor - + ID: {0} +Membros: {1} +OwnerID: {2} Nenhum servidor encontrado nessa página. @@ -2031,7 +2036,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Mensagens - R + Repetidor de Mensagem Nome @@ -2043,22 +2048,22 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Ninguém está jogando esse jogo. - + Nenhum repetidor ativo. Nenhum cargo nesta página. - + Nenhum Shard nesta página. - + Nenhum tópico definido. Dono - Dono IDs + IDs do Dono Presença @@ -2069,52 +2074,52 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. {2} Canais de Voz - + Todas as citações com a palavra-chave {0} foram deletadas. - + Página {0} de citações - Nenhuma citação nesta página + Nenhuma citação nesta página. - Nenhuma citação que você possa remover foi encontrada + Nenhuma citação que você possa remover foi encontrada. Citação adicionada - + Uma citação aleatória foi removida. Região - + Registrado em - + Eu lembrarei {0} de {1} em {2} `({3:d.M.yyyy.} at {4:HH:mm})` - + Formato de data inválido. Verifique a lista de comandos. - + Novo modelo de lembrete definido. - + Repetindo {0} a cada {1} dia(s), {2} hora(s) e {3} minuto(s). - Lista de repetidores + Lista de Repetidores - Nenhum repetidor neste server. + Nenhum repetidor neste servidor. #{0} parou. - Nenhuma mensagens repetidas encontradas. + Nenhuma mensagem repetindo neste servidor. Resultado @@ -2123,19 +2128,19 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Cargos - + Página #{0} de todos os cargos neste servidor: - + Página #{0} de cargos para {1} - + Nenhuma cor no formato correto. Use `#00ff00`, por exemplo. - + Começando a rotacionar cores do cargo {0}. - + Parando de rotacionar cores do cargo {0} {0} deste servidor é {1} @@ -2144,13 +2149,13 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Informações do Servidor - Fragmento + Shard - Status de fragmento + Status do Shard - + Shard **#{0}** está no estado {1} com {2} servidores **Nome:** {0} **Link:** {1} @@ -2159,7 +2164,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Nenhum emoji especial encontrado. - Tocando {0} canções, {1} no queue. + Tocando {0} músicas, {1} na fila. Canais de Texto @@ -2168,10 +2173,10 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Aqui está o link do quarto: - + Tempo de Atividade - + {0} do usuário {1} é {2} Id of the user kwoth#1234 is 123123123123 From 130bdd767a4df965ba0f0f7af646ec2a1cdaabae Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 1 Mar 2017 10:36:43 +0100 Subject: [PATCH 117/496] Update ResponseStrings.ru-RU.resx (POEditor.com) From ca4a798d5fcdf36f4ce63db1239d4c44cb7d585b Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 1 Mar 2017 10:36:45 +0100 Subject: [PATCH 118/496] Update ResponseStrings.sr-cyrl-rs.resx (POEditor.com) From d17055f36430e1adab73a50983b26adb80cf1253 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Wed, 1 Mar 2017 12:36:28 +0100 Subject: [PATCH 119/496] Fixed .prune X --- src/NadekoBot/Modules/Administration/Administration.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/NadekoBot/Modules/Administration/Administration.cs b/src/NadekoBot/Modules/Administration/Administration.cs index 405485dd..f779a751 100644 --- a/src/NadekoBot/Modules/Administration/Administration.cs +++ b/src/NadekoBot/Modules/Administration/Administration.cs @@ -452,7 +452,6 @@ namespace NadekoBot.Modules.Administration { if (count < 1) return; - count += 1; await Context.Message.DeleteAsync().ConfigureAwait(false); int limit = (count < 100) ? count : 100; var enumerable = (await Context.Channel.GetMessagesAsync(limit: limit).Flatten().ConfigureAwait(false)); From ca98cc51edb1e8f208612b8b1cfca3aeb2224917 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 1 Mar 2017 16:24:39 +0100 Subject: [PATCH 120/496] Update ResponseStrings.pt-BR.resx (POEditor.com) --- .../Resources/ResponseStrings.pt-BR.resx | 273 +++++++++--------- 1 file changed, 137 insertions(+), 136 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx b/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx index 634142d7..27351b00 100644 --- a/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx +++ b/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx @@ -127,26 +127,26 @@ Esta base não foi reivindicada. - + Base #{0} **DESTRUÍDA** na guerra contra {1} - + {0} **RENUNCIOU** a base #{1} na guerra contra {2} - {0} clamou a base #{1} durante a guerra contra {2} + {0} reivindicou a base #{1} durante a guerra contra {2} - @{0} Você já reivindicou esta base #{1}. Você não pode reivindicar uma nova. + @{0} Você já reivindicou a base #{1}. Você não pode reivindicar uma nova. - + O pedido de guerra de @{0} contra {1} expirou. Inimigo - Informações sobre a guerra contra {0} + Informações sobre a guerra contra {0} Número de base inválido. @@ -164,7 +164,7 @@ Você não está participando nesta guerra. - @{0} Você não está participando nessa guerra, ou aquela base já está destruída. + @{0} Você não está participando nessa guerra, ou essa base já está destruída. Nenhuma guerra ativa. @@ -185,7 +185,7 @@ Essa guerra não existe. - Guerra contra {0} começou! + Guerra contra {0} iniciada! Todos os status de reações personalizadas limpos. @@ -200,10 +200,10 @@ Lista de todas as reações personalizadas - Reações personalizadas + Reações Personalizadas - Nova reação personalizada + Nova Reação Personalizada Nenhuma reação personalizada encontrada. @@ -215,10 +215,10 @@ Resposta - Status de reações personalizadas + Status de Reação Personalizada - Status limpado para {0} reação customizável. + Status da reação customizável {0} limpo. Nenhum status para aquele comando encontrado, nenhuma ação foi tomada. @@ -270,7 +270,7 @@ Não é efetivo. - Você não tem {0} o suficiente + Você não tem {0} suficiente Reviveu {0} com uma {1} @@ -323,13 +323,13 @@ Motivo: {1} Usuário Banido - Nome do bot alterado para {0}. + Nome do bot alterado para {0} - Status do bot alterado para {0}. + Status do bot alterado para {0} - Deleção automática de mensagens de despedida foi desativado. + Remoção automática de mensagens de despedida foi desativada. Mensagens de despedida serão deletadas após {0} segundos. @@ -365,7 +365,7 @@ Motivo: {1} Conteúdo - Cargo {0} criado com sucesso. + Cargo {0} criado com sucesso Canal de texto {0} criado. @@ -383,7 +383,7 @@ Motivo: {1} Parou a eliminação automática de invocações de comandos bem sucedidos. - Agora automaticamente deletando invocações de comandos bem sucedidos + Agora automaticamente deletando invocações de comandos bem sucedidos. Canal de texto {0} deletado. @@ -395,7 +395,7 @@ Motivo: {1} Mensagem direta de - Novo doador adicionado com sucesso. Número total doado por este usuário: {0} 👑 + Novo doador adicionado com sucesso. Valor total doado por este usuário: {0} 👑 Obrigado às pessoas listadas abaixo por fazer este projeto acontecer! @@ -413,7 +413,7 @@ Motivo: {1} Vou parar de enviar mensagens diretas de agora em diante. - Eliminação automática de mensagens de boas vindas desabilitada. + Remoção automática de mensagens de boas vindas desabilitada. Mensagens de boas vindas serão deletadas após {0} segundos. @@ -428,10 +428,10 @@ Motivo: {1} Novas mensagen direta de boas vindas definida. - + Mensagens diretas de boas vindas desabilitadas. - + Mensagens diretas de boas vindas habilitadas. Mensagem de boas vindas atual: {0} @@ -443,10 +443,10 @@ Motivo: {1} Nova mensagem de boas vindas definida. - Anúncios de boas vindas desabilitados. + Mensagens de boas vindas desabilitadas. - Anúncios de boas vindas habilitados neste canal. + Mensagens de boas vindas habilitadas neste canal. Você não pode usar este comando em usuários com um cargo maior ou igual ao seu na hierarquia dos cargos. @@ -455,7 +455,7 @@ Motivo: {1} Imagens carregadas após {0} segundos! - + Formato de entrada inválido. Parâmetros inválidos. @@ -464,14 +464,14 @@ Motivo: {1} {0} juntou-se a {1} - Você foi banido do servidor {0}. + Você foi kickado do servidor {0}. Razão: {1} - Usuário Chutado + Usuário Kickado - Lista de linguagens + Lista de Linguagens {0} @@ -496,25 +496,25 @@ Razão: {1} Servidor {0} deixado. - + Logando o evento {0} neste canal. - + Logando todos os eventos neste canal. - + Log desativado. - + Eventos Log em que você pode se inscrever: - + O log vai ignorar {0} - + O log vai deixar de ignorar {0} - + Parando de logar o evento {0}. {0} invocou uma menção nos seguintes cargos @@ -564,7 +564,7 @@ Razão: {1} Apelido Alterado - Não posso achar esse servidor + Não posso encontrar esse servidor Nenhum shard com aquele ID foi encontrado. @@ -600,7 +600,7 @@ Razão: {1} Nenhuma proteção ativa. - + O limite de usuários deve ser entre {0} e {1}. Se {0} ou mais usuários entrarem em menos de {1} segundos, {2}. @@ -609,10 +609,10 @@ Razão: {1} O tempo deve ser entre {0} e {1} segundos. - Todos os cargos foram removidos do usuário {0} com sucesso. + Todos os cargos foram removidos do usuário {0} com sucesso - Falha ao remover cargos. Eu não possuo permissões suficientes + Falha ao remover cargos. Eu não possuo permissões suficientes. @@ -628,7 +628,7 @@ Razão: {1} Um erro ocorreu devido à cor inválida ou permissões insuficientes. - Cargo {0} removido do usuário {1} com sucesso. + Cargo {0} removido do usuário {1} com sucesso Falha ao remover o cargo. Não possuo permissões suficientes. @@ -668,22 +668,22 @@ Razão: {1} {0} - + Nenhum status de rotação "jogando" definido. Você já possui o cargo {0}. - + Você já possui o cargo auto-atribuível exclusivo {0}. Cargos auto-atribuíveis agora são exclusivos! - + Existem {0} cargos auto-atribuíveis - Esse cargo não é auto-atribuível + Esse cargo não é auto-atribuível. Você não possui o cargo {0}. @@ -695,16 +695,16 @@ Razão: {1} Não sou capaz de adicionar esse cargo a você. `Não posso adicionar cargos a donos ou outros cargos maiores que o meu cargo na hierarquia dos cargos.` - {0} foi removido da lista de cargos auto-aplicáveis. + {0} foi removido da lista de cargos auto-atribuíveis. - Voce nao possui mas o cargo {0}. + Você não possui mais o cargo {0}. - Voce agora possui o cargo {0}. + Você agora possui o cargo {0}. - Cargo {0} adicionado à {1} com sucesso. + Cargo {0} adicionado ao usuário {1} com sucesso. Falha ao adicionar o cargo. Não possuo permissões suficientes. @@ -734,7 +734,7 @@ Razão: {1} Desligando - Usuários não podem mandar mais de {0} mensagens a cada {1} segundos + Usuários não podem mandar mais de {0} mensagens a cada {1} segundos. Modo lento desativado. @@ -743,7 +743,7 @@ Razão: {1} Modo lento iniciado. - + Banidos temporariamente (kickados) PLURAL @@ -753,7 +753,7 @@ Razão: {1} {0} irá deixar de ignorar esse canal. - Se um usuário postar {0} mensagens iguais em seguida, eu irei {1} eles. + Se um usuário postar {0} mensagens iguais em seguida, {1}. __Canais Ignorados__: {2} @@ -763,7 +763,7 @@ __Canais Ignorados__: {2} Canal de Texto Destruído - + Desensurdecido com sucesso. Desmutado @@ -806,7 +806,7 @@ __Canais Ignorados__: {2} {0} agora está {1} - + {0} foi **desmutado** nos chats de voz e texto. {0} juntou-se ao canal de voz {1}. @@ -818,10 +818,10 @@ __Canais Ignorados__: {2} {0} moveu-se do canal de voz {1} para {2}. - {0} foi **mutado por voz** + {0} foi **mutado por voz**. - {0} foi **desmutado por voz** + {0} foi **desmutado por voz**. Canal de voz criado @@ -879,7 +879,7 @@ Motivo: {1} Mais sorte na próxima vez ^_^ - Parabéns! Você ganhou {0} por rolar acima {1} + Parabéns! Você ganhou {0} por rolar acima de {1} Baralho re-embaralhado. @@ -895,13 +895,13 @@ Motivo: {1} O número especificado é inválido. Você pode girar de 1 a {0} moedas. - Adicione {0} reação + Adicione {0} reação a esta mensagem para ganhar {1} Este evento está ativo por até {0} horas. - + Evento de Reação da Flor iniciado! deu {0} de presente para {1} @@ -918,7 +918,7 @@ Motivo: {1} Placar de Líderes - + Concedeu {0} a {1} usuários do cargo {2}. Você não pode apostar mais que {0} @@ -933,10 +933,10 @@ Motivo: {1} Sem cartas no baralho. - Usuario sorteado + Usuário sorteado - Você rolou {0} + Você rolou {0}. Aposta @@ -945,7 +945,7 @@ Motivo: {1} WOAAHHHHHH!!! Parabéns!!! x{0} - + Um único {0}, x{1} Wow! Que sorte! Três de um tipo! x{0} @@ -961,10 +961,10 @@ Motivo: {1} Dura {1} segundos. Não diga a ninguém. Shhh. - + O evento "Jogo Sorrateiro" terminou. {0} usuários receberam o prêmio. - + O evento "Jogo Sorrateiro" começou Coroa @@ -976,13 +976,13 @@ Dura {1} segundos. Não diga a ninguém. Shhh. Não foi possível tomar {0} de {1} porque o usuário não possuí tanto {2}! - + Voltar à Tabela de Conteúdos Proprietário do bot apenas. - Requer a permissão {0} do canal + Requer a permissão {0} do canal. Você pode dar suporte ao projeto no Patreon: <{0}> ou Paypal: <{1}> @@ -991,7 +991,7 @@ Dura {1} segundos. Não diga a ninguém. Shhh. Comandos e abreviações - + Lista de Comandos Regenerada. Digite `{0}h NomeDoComando` para ver a ajuda para o comando especificado. Ex: `{0}h >8ball` @@ -1045,10 +1045,10 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Corrida de Animais - Falha ao iniciar já que não tiveram participantes suficientes. + Falha ao iniciar, não houve participantes suficientes. - Corrida cheia! Começando imediatamente + Corrida cheia! Começando imediatamente. {0} juntou-se como {1} @@ -1072,10 +1072,10 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. {0} como {1} ganhou a corrida e {2}! - + Número especificado inválido. Você pode rolar {0}-{1} dados de uma vez. - + rolou {0} Someone rolled 35 @@ -1095,13 +1095,13 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Mudanças no Coração - Clamado por + Reivindicado por Divórcios - + Gosta de Preço @@ -1113,7 +1113,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Top Waifus - + Sua afinidade já foi definida para essa waifu ou você está tentando remover sua afinidade sem ter uma. Mudou a afinidade de {0} para {1}. @@ -1122,7 +1122,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Make sure to get the formatting right, and leave the thinking emoji - + Você deve esperar {0} horas e {1} minutos para mudar sua afinidade de novo. Sua afinidade foi reiniciada. Você não possui mas alguém que você goste. @@ -1141,7 +1141,8 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Você não pode colocar sua afinidade em você mesmo, seu egomaníaco. - + 🎉 O amor deles está realizado! 🎉 +O novo valor de {0} é {1}! Nenhuma waifu é tão barata. Você deve pagar pelo menos {0} para ter uma waifu, mesmo se o valor dela for menor. @@ -1165,31 +1166,31 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Você se divorciou de uma waifu que não gostava de você. Você recebeu {0} de volta. - + 8ball - + Acrofobia - + O jogo terminou sem submissões. - + Nenhum voto recebido. O jogo terminou sem vencedores. - + O acrônimo era {0}. - + Acrofobia já está em andamento neste canal. - + Jogo iniciado. Crie uma frase com o seguinte acrônimo: {0}. Você tem {0} segundos para fazer uma submissão. - {0} submeteram suas frases. ({1} total) + {0} submeteram suas frases. ({1} no total) Vote digitando um número da submissão @@ -1201,7 +1202,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Vence {0} com {1} pontos. - + {0} venceu por ser o único usuário a fazer uma submissão! Questão @@ -1213,7 +1214,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. {0} ganhou! {1} vence {2} - + Submissões Encerradas A Corrida de Animais já está em andamento @@ -1231,10 +1232,10 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Cleverbot habilitado neste servidor. - + Geração de moeda desabilitada neste canal. - + Geração de moeda habilitada neste canal. {0} {1} aleatórios aparecem! Capture-os digitando `{2}pick` @@ -1259,7 +1260,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Erro ao iniciar o Jogo da Forca. - Lista dos tipos de termo do "{0}hangman" + Lista dos tipos de termos do "{0}hangman" Placar de Lideres @@ -1345,22 +1346,22 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Volume padrão definido para {0}% - + Diretório adicionado à fila. - + fairplay Música concluída. - + Fair play desativado. - + Fair play ativado. - + Da posição Id @@ -1369,10 +1370,10 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Entrada inválida. - + Tempo de atividade máximo agora não tem limite. - + Tempo de atividade máximo definido para {0} segundo(s). Tamanho máximo da fila de música definido para ilimitado. @@ -1396,10 +1397,10 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Nenhum resultado para a busca. - + Música pausada. - + Fila de Músicas - Página {0}/{1} Tocando Musica @@ -1420,13 +1421,13 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Não existe uma playlist com esse ID. - + Playlist adicionada à fila. Playlist Salva - + Limite de {0}s Fila @@ -1441,7 +1442,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. A fila está cheia em {0}/{0} - Música removida + Música removida: context: "removed song #5" @@ -1457,7 +1458,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. A repetição da faixa atual parou. - + Música retomada. Repetição de playlist desabilitada. @@ -1475,7 +1476,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Músicas embaralhadas. - Música movida. + Música movida {0}h {1}m {2}s @@ -1520,7 +1521,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. O uso de TODOS OS MÓDULOS foi habilitado para o usuário {0}. - + {0} entrou na Lista Negra com o ID {1} O comando {0} agora possui um cooldown de {1}s. @@ -1532,13 +1533,13 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Nenhum cooldown de comando definido. - + Custos de Comando Desabilitado o uso de {0} {1} no canal {2}. - Desabilitado o uso de {0} {1} no canal {2}. + Habilitado o uso de {0} {1} no canal {2}. Negado @@ -1556,22 +1557,22 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Segundo parâmetro inválido. (Deve ser um número entre {0} e {1}) - + Filtro de convite desabilitado neste canal. - + Filtro de convite habilitado neste canal. - + Filtro de convite desabilitado neste servidor. - + Filtro de convite habilitado neste servidor. Permissão {0} movida de #{1} para #{2} - + Não consigo encontrar a permissão no índice #{0} Nenhum custo definido. @@ -1588,13 +1589,13 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Página {0} de Permissões - Atual cargo de permissões é {0} + Cargo atual de permissões é {0}. - + Usuários agora precisam do cargo {0} para editar permissões. - + Nenhuma permissão encontrada nesse índice. Permissões removidas #{0} - {1} @@ -1616,16 +1617,16 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Habilitado o uso de {0} {1} nesse servidor. - + {0} saiu da Lista Negra com o ID {1} - Não editável + não editável - + Desabilitado o uso de {0} {1} para o usuário {2}. - + Habilitado o uso de {0} {1} para o usuário {2}. Não vou mais mostrar avisos de permissões. @@ -1652,7 +1653,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Nenhum anime favorito ainda - A tradução automática de mensagens nesse canal foi iniciada. As mensagens do usuário serão deletadas automaticamente. + Iniciada a tradução automática de mensagens nesse canal. As mensagens do usuário serão deletadas automaticamente. A linguagem de tradução automática foi removida. @@ -1673,7 +1674,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Não consegui encontrar essa carta. - Fato + fato Capítulos @@ -1694,7 +1695,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Vitórias Competitivas - Completado + Concluída Condição @@ -1754,7 +1755,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Piadas não carregadas. - + Latitude/Longitude Nível @@ -1821,10 +1822,10 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Qualidade: - + Tempo em Partida Rápida - + Vitórias em Partida Rápida Avaliação @@ -1839,7 +1840,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Falha ao encurtar esse url. - + Url Curta Alguma coisa deu errado. @@ -1851,7 +1852,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Status - + Url da Loja Streamer {0} está offline. @@ -1932,12 +1933,12 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Juntou-se - + `{0}.` {1} [{2:F2}/s] - {3} total /s and total need to be localized to fit the context - `1.` - + Página de Atividade #{0} {0} usuários no total. @@ -1952,13 +1953,13 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Lista de funções no comando {0}calc - + {0} deste canal é {1} Tópico do Canal - Comandos utilizados + Comandos Utilizados {0} {1} é igual a {2} {3} @@ -1976,13 +1977,13 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Criado em - + Juntou-se ao canal de servidor cruzado. - + Deixou o canal de servidor cruzado. - + Este é seu token de Canal de Servidor Cruzado Emojis Personalizados @@ -1991,7 +1992,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Erro - + Atributos ID @@ -2003,7 +2004,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Aqui está uma lista de usuários nestes cargos: - você não tem permissão de usar esse comando em cargos com muitos usuários neles para prevenir abuso. + você não tem permissão de usar esse comando em cargos com muitos usuários para prevenir abuso. Valor {0} inválido. @@ -2170,7 +2171,7 @@ OwnerID: {2} Canais de Texto - Aqui está o link do quarto: + Aqui está o link da sala: Tempo de Atividade From a199891612d7f2c18e4c4b2279d0171054c6708c Mon Sep 17 00:00:00 2001 From: Kwoth Date: Wed, 1 Mar 2017 17:12:38 +0100 Subject: [PATCH 121/496] fixed some strings, thx xnaas, closes #1093 --- src/NadekoBot/Modules/Utility/Utility.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Modules/Utility/Utility.cs b/src/NadekoBot/Modules/Utility/Utility.cs index f69aef7d..0452dab6 100644 --- a/src/NadekoBot/Modules/Utility/Utility.cs +++ b/src/NadekoBot/Modules/Utility/Utility.cs @@ -273,7 +273,7 @@ namespace NadekoBot.Modules.Utility [NadekoCommand, Usage, Description, Aliases] public async Task ChannelId() { - await ReplyConfirmLocalized("channelidd", "🆔", Format.Code(Context.Channel.Id.ToString())) + await ReplyConfirmLocalized("channelid", "🆔", Format.Code(Context.Channel.Id.ToString())) .ConfigureAwait(false); } @@ -439,7 +439,7 @@ namespace NadekoBot.Modules.Utility var result = string.Join("\n", tags.Select(m => GetText("showemojis", m, m.Url))); if (string.IsNullOrWhiteSpace(result)) - await ReplyErrorLocalized("emojis_none").ConfigureAwait(false); + await ReplyErrorLocalized("showemojis_none").ConfigureAwait(false); else await Context.Channel.SendMessageAsync(result).ConfigureAwait(false); } From c65398482a1776f9564d238b32a5737a01a7f0dc Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 1 Mar 2017 18:10:58 +0100 Subject: [PATCH 122/496] Update ResponseStrings.fr-fr.resx (POEditor.com) --- src/NadekoBot/Resources/ResponseStrings.fr-fr.resx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx b/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx index 72a2957f..ac95afb6 100644 --- a/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx +++ b/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx @@ -483,7 +483,7 @@ Raison : {1} La langue du bot a été changée pour {0} - {1} - Échec dans la tentative de changement de langue. Réessayer avec l'aide pour cette commande. + Échec dans la tentative de changement de langue. Veuillez consulter l'aide pour cette commande. La langue de ce serveur est {0} - {1} @@ -1664,7 +1664,8 @@ La nouvelle valeur de {0} est {1} ! Votre langue de traduction à été supprimée. - Votre langue de traduction a été changée de {from} à {to} + Votre langue de traduction a été changée de {0} à {1} + Fuzzy Traduction automatique des messages commencée sur ce salon. @@ -2111,7 +2112,7 @@ OwnerID: {2} Je vais vous rappeler {0} pour {1} dans {2} `({3:d.M.yyyy} à {4:HH:mm})` - Format de date non valide. Regardez la liste des commandes. + Format de date non valide. Vérifiez la liste des commandes. Nouveau modèle de rappel défini. From 78c2eb4430eca2216e62084707713e7c5c7cce08 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 1 Mar 2017 18:11:01 +0100 Subject: [PATCH 123/496] Update ResponseStrings.de-DE.resx (POEditor.com) --- .../Resources/ResponseStrings.de-DE.resx | 43 ++++++++++--------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.de-DE.resx b/src/NadekoBot/Resources/ResponseStrings.de-DE.resx index 8d8866c5..04611d86 100644 --- a/src/NadekoBot/Resources/ResponseStrings.de-DE.resx +++ b/src/NadekoBot/Resources/ResponseStrings.de-DE.resx @@ -872,7 +872,7 @@ Grund: {1} Nutzer wurde gekickt - verleiht {1} {0} + vegab {0} zu {1} Hoffentlich haben sie beim nächsten Mal mehr Glück ^_^ @@ -907,7 +907,7 @@ Grund: {1} X has gifted 15 flowers to Y - {0} hat eine {1} + {0} hat {1} X has Y flowers @@ -1031,7 +1031,7 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu Inhaltsverzeichnis - Nutzung + Benutzweise Autohentai wurde gestartet. Es wird alle {0} Sekunden etwas mit einem der folgenden Stichwörtern gepostet: {1} @@ -1099,7 +1099,7 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu Scheidungen - Positive Bewertungen + Mag Preis @@ -1202,7 +1202,7 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu {0} gewinnt, weil dieser Benutzer die einzigste Einsendung hat! - Frage + Gestellte Frage Unentschieden! Beide haben {0} gewählt @@ -1292,7 +1292,7 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu {0} hat {1} punkte - Wird beendet after dieser Frage. + Wird beendet nach dieser Frage. Die Zeit is um! Die richtige Antwort war {0} @@ -1331,7 +1331,7 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu {0} gegen {1} - Versuche {0} Songs einzureihen... + Versuche {0} Lieder einzureihen... Autoplay deaktiviert. @@ -1349,7 +1349,7 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu fairer Modus - Song beendet + Lied beendet Fairer Modus deaktiviert. @@ -1376,7 +1376,7 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu Maximale Musik-Warteschlangengröße ist nun unbegrenzt. - Maximale Musik-Warteschlangengröße ist nun {0} Songs. + Maximale Musik-Warteschlangengröße ist nun {0} Lieder. Sie müssen sich in einem Sprachkanal auf diesem Server befinden. @@ -1385,7 +1385,7 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu Name - Aktueller Song: + Aktuelles Lied: Kein aktiver Musikspieler. @@ -1400,10 +1400,10 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu Musik-Warteschlange - Seite {0}/{1} - Spiele Song + Spiele Lied - `#{0}` - **{1}** by *{2}* ({3} Songs) + `#{0}` - **{1}** by *{2}* ({3} Lieder) Seite {0} der gespeicherten Playlists @@ -1430,7 +1430,7 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu Warteschlange - Eingereihter Song + Eingereihtes Lied Musik-Warteschlange geleert. @@ -1439,20 +1439,20 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu Warteschlange ist voll bei {0}/{1}. - Song entfernt + Lied entfernt context: "removed song #5" - Aktueller Song wird wiederholt + Aktuelle Lied wird wiederholt Playlist wird wiederholt - Song wird wiederholt + Lied wird wiederholt - Aktueller Song wird nicht mehr wiederholt. + Aktuelles Lied wird nicht mehr wiederholt. Musikwiedergabe wiederaufgenommen. @@ -1464,16 +1464,16 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu Playlist-Wiederholung aktiviert. - Ich werde nun spielende, beendete, pausierte und entfernte Songs in diesen Channel ausgeben. + Ich werde nun spielende, beendete, pausierte und entfernte Lieder in diesem Channel ausgeben. Gesprungen zu `{0}:{1}` - Song gemischt. + Lieder gemischt. - Song bewegt + Lieder bewegt {0}h {1}m {2}s @@ -1656,7 +1656,8 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu Ihre Automatische-Übersetzungs Sprache wurde entfernt. - Ihre Automatische-Übersetzungs Sprache wurde zu {from}>{to} gesetzt + Ihre Automatische-Übersetzungs Sprache wurde zu {0}>{1} gesetzt + Fuzzy Automatische Übersetzung der Nachrichten wurde auf diesem kanal gestartet. From ded86b51b02a0127a5dc338cc9482c24c7388109 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 1 Mar 2017 18:11:04 +0100 Subject: [PATCH 124/496] Update ResponseStrings.pt-BR.resx (POEditor.com) --- src/NadekoBot/Resources/ResponseStrings.pt-BR.resx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx b/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx index 27351b00..bac83942 100644 --- a/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx +++ b/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx @@ -1659,7 +1659,8 @@ O novo valor de {0} é {1}! A linguagem de tradução automática foi removida. - A linguagem de tradução automática foi definida de {from}>{to} + A linguagem de tradução automática foi definida de {0}>{1} + Fuzzy A tradução automática de mensagens foi ativada neste canal. From b93c212c687ddcad38e9f1766e4269c1bbb019f9 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 1 Mar 2017 18:11:07 +0100 Subject: [PATCH 125/496] Update ResponseStrings.ru-RU.resx (POEditor.com) --- .../Resources/ResponseStrings.ru-RU.resx | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx b/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx index d2980cc8..21b36460 100644 --- a/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx +++ b/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx @@ -119,14 +119,12 @@ Эта база уже захвачена или разрушена. - Fuzzy Эта база уже разрушена Эта база не захвачена. - Fuzzy **РАЗРУШЕННАЯ** база #{0} ведёт войну против {1}. @@ -136,7 +134,7 @@ Fuzzy - {0} захватил базу #{1} после войны с {2} + {0} захватил базу #{1} ведя войну против {2} Fuzzy @@ -163,7 +161,7 @@ Список активных войн - не захваченная + не захваченна Fuzzy @@ -211,11 +209,11 @@ Fuzzy - Настроить реакции. + Настроить ответы. Fuzzy - Создана новая реакция. + Новый ответ. Fuzzy @@ -223,7 +221,7 @@ Fuzzy - Не найдено настраеваемых реакций с таким номером. + Не найдено настраиваемых реакций с таким номером. Fuzzy @@ -1010,7 +1008,7 @@ Fuzzy не смог забрать {0} у {1}, поскольку у пользователя нет столько {2}! - Вернуться к содержанию + Вернуться к оглавлению Только для владельца бота @@ -1064,7 +1062,7 @@ Paypal <{1}> Требуются серверное право {0} - Содержание + Оглавление Использование @@ -1384,7 +1382,7 @@ Paypal <{1}> Папка успешно добавлена в очередь воспроизведения. - fairplay + справедливое воспроизведение Fuzzy @@ -1697,7 +1695,7 @@ Paypal <{1}> Ваш язык автоперевода был удалён. - Ваш язык автоперевода изменён с {from} на {to} + Ваш язык автоперевода изменён с {0} на {1} Начинается автоматический перевод сообщений в этом канале. From f294b9997b0793bbea78a9534cef3e518c3dfaa6 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Wed, 1 Mar 2017 18:14:22 +0100 Subject: [PATCH 126/496] fixed string --- src/NadekoBot/Resources/ResponseStrings.Designer.cs | 2 +- src/NadekoBot/Resources/ResponseStrings.resx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index a33b43b9..c3d3a842 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -4587,7 +4587,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Your auto-translate language has been set to {from}>{to}. + /// Looks up a localized string similar to Your auto-translate language has been set to {0}>{1}. /// public static string searches_atl_set { get { diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index efa1fe55..c89a5084 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -1658,7 +1658,7 @@ Don't forget to leave your discord name or id in the message. your auto-translate language has been removed. - Your auto-translate language has been set to {from}>{to} + Your auto-translate language has been set to {0}>{1} Started automatic translation of messages on this channel. From 50553bd8b01c4e976e2ec455fda8e5190b7636cc Mon Sep 17 00:00:00 2001 From: Kwoth Date: Wed, 1 Mar 2017 20:40:09 +0100 Subject: [PATCH 127/496] Fixed resource filenames --- .../Modules/Administration/Commands/LocalizationCommands.cs | 2 +- .../{ResponseStrings.fr-fr.resx => ResponseStrings.fr-FR.resx} | 0 ...rl-rs.Designer.cs => ResponseStrings.sr-Cyrl-RS.Designer.cs} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename src/NadekoBot/Resources/{ResponseStrings.fr-fr.resx => ResponseStrings.fr-FR.resx} (100%) rename src/NadekoBot/Resources/{ResponseStrings.sr-cyrl-rs.Designer.cs => ResponseStrings.sr-Cyrl-RS.Designer.cs} (100%) diff --git a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs index 4200fafb..135a1da7 100644 --- a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs +++ b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs @@ -25,7 +25,7 @@ namespace NadekoBot.Modules.Administration {"nl-NL", "Dutch, Netherlands"}, {"ja-JP", "Japanese, Japan"}, {"pt-BR", "Portuguese, Brazil"}, - {"sr-cyrl-rs", "Serbian, Serbia - Cyrillic"} + {"sr-Cyrl-RS", "Serbian, Serbia - Cyrillic"} }.ToImmutableDictionary(); [NadekoCommand, Usage, Description, Aliases] diff --git a/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx b/src/NadekoBot/Resources/ResponseStrings.fr-FR.resx similarity index 100% rename from src/NadekoBot/Resources/ResponseStrings.fr-fr.resx rename to src/NadekoBot/Resources/ResponseStrings.fr-FR.resx diff --git a/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.sr-Cyrl-RS.Designer.cs similarity index 100% rename from src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.Designer.cs rename to src/NadekoBot/Resources/ResponseStrings.sr-Cyrl-RS.Designer.cs From c04163e4c1e41794441a7ae65654366d12222896 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 1 Mar 2017 21:36:58 +0100 Subject: [PATCH 128/496] Create ResponseStrings.fr-fr.resx (POEditor.com) --- .../Resources/ResponseStrings.fr-fr.resx | 2203 +++++++++++++++++ 1 file changed, 2203 insertions(+) create mode 100644 src/NadekoBot/Resources/ResponseStrings.fr-fr.resx diff --git a/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx b/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx new file mode 100644 index 00000000..1c802a95 --- /dev/null +++ b/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx @@ -0,0 +1,2203 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Cette base a déjà été revendiquée ou détruite. + + + Cette base est déjà détruite. + + + Cette base n'est pas revendiquée. + + + Base #{0} **DETRUITE** dans une guerre contre {1} + + + {0} a **ABANDONNÉ** la base #{1} dans une guerre contre {2} + + + {0} a revendiqué une base #{1} dans une guerre contre {2} + + + @{0} Vous avez déjà revendiqué la base #{1}. Vous ne pouvez pas en revendiquer une nouvelle. + + + La demande de la part de @{0} pour une guerre contre {1} a expiré. + + + Ennemi + + + Informations concernant la guerre contre {0} + + + Numéro de base invalide. + + + La taille de la guerre n'est pas valide. + + + Liste des guerres en cours + + + non réclamé + + + Vous ne participez pas a cette guerre. + + + @{0} Vous ne participez pas à cette guerre ou la base a déjà été détruite. + + + Aucune guerre en cours. + + + Taille + + + La guerre contre {0} a déjà commencé! + + + La guerre contre {0} commence! + + + La guerre contre {0} est terminée. + + + Cette guerre n'existe pas. + + + La guerre contre {0} a éclaté ! + + + Statistiques de réactions personnalisées effacées. + + + Réaction personnalisée supprimée + + + Permissions insuffisantes. Nécessite d'être le propriétaire du Bot pour avoir les réactions personnalisées globales, et Administrateur pour les réactions personnalisées du serveur. + + + Liste de toutes les réactions personnalisées + + + Réactions personnalisées + + + Nouvelle réaction personnalisée + + + Aucune réaction personnalisée trouvée. + + + Aucune réaction personnalisée ne correspond à cet ID. + + + Réponse + + + Statistiques des Réactions Personnalisées + + + Statistiques effacées pour {0} réaction personnalisée. + + + Pas de statistiques pour ce déclencheur trouvées, aucune action effectuée. + + + Déclencheur + + + Autohentai arrêté. + + + Aucun résultat trouvé. + + + {0} est déjà inconscient. + + + {0} a tous ses PV. + + + Votre type est déjà {0} + + + Vous avez utilisé {0}{1} sur {2}{3} pour {4} dégâts. + Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage. + + + Vous ne pouvez pas attaquer de nouveau sans représailles ! + + + Vous ne pouvez pas vous attaquer vous-même. + + + {0} s'est évanoui! + + + Vous avez soigné {0} avec un {1} + + + {0} a {1} points de vie restants. + + + Vous ne pouvez pas utiliser {0}. Ecrivez `{1}ml` pour voir la liste des actions que vous pouvez effectuer. + + + Liste des attaques pour le type {0} + + + Ce n'est pas très efficace. + + + Vous n'avez pas assez de {0} + + + Vous avez ressuscité {0} avec un {1} + + + Vous vous êtes ressuscité avec un {0} + + + Votre type a bien été modifié de {0} à {1} + + + C'est légèrement efficace. + + + C'est très efficace ! + + + Vous avez utilisé trop de mouvements d'affilée, vous ne pouvez donc plus bouger! + + + Le type de {0} est {1} + + + Utilisateur non trouvé. + + + Vous vous êtes évanoui, vous n'êtes donc pas capable de bouger! + + + **L'affectation automatique de rôle** à l'arrivé d'un nouvel utilisateur est désormais **désactivée**. + + + **L'affectation automatique de rôle** à l'arrivé d'un nouvel utilisateur est désormais **activée**. + + + Liens + + + Avatar modifié + + + Vous avez été banni du serveur {0}. +Raison: {1} + + + banni + PLURAL + + + Utilisateur banni + + + Le nom du Bot a changé pour {0} + + + Le statut du Bot a changé pour {0} + + + La suppression automatique des annonces de départ a été désactivée. + + + Les annonces de départ seront supprimées après {0} secondes. + + + Annonce de départ actuelle : {0} + + + Activez les annonces de départ en entrant {0} + + + Nouvelle annonce de départ définie. + + + Annonce de départ désactivée. + + + Annonce de départ activée sur ce salon. + + + Nom du salon modifié + + + Ancien nom + + + Sujet du salon modifié + + + Nettoyé. + + + Contenu + + + Rôle {0} créé avec succès + + + Salon textuel {0} créé. + + + Salon vocal {0} créé. + + + Mise en sourdine effectuée. + + + Serveur {0} supprimé + + + Suppression automatique des commandes effectuées avec succès, désactivée. + + + Suppression automatique des commandes effectuées avec succès, activée. + + + Le salon textuel {0} a été supprimé. + + + Le salon vocal {0} a été supprimé. + + + MP de + + + Nouveau donateur ajouté avec succès. Montant total des dons de cet utilisateur : {0} 👑 + + + Merci aux personnes ci-dessous pour avoir permis à ce projet d'exister! + + + Je transmettrai désormais les MPs à tous les propriétaires. + + + Je transmettrai désormais les MPs seulement au propriétaire principal. + + + Je transmettrai désormais les MPs. + + + Je ne transmettrai désormais plus les MPs. + + + La suppression automatique des messages d'accueil a été désactivé. + + + Les messages d'accueil seront supprimés après {0} secondes. + + + MP de bienvenue actuel: {0} + + + Activez les MPs de bienvenue en écrivant {0} + + + Nouveau MP de bienvenue défini. + + + MPs de bienvenue désactivés. + + + MPs de bienvenue activés. + + + Message de bienvenue actuel: {0} + + + Activez les messages de bienvenue en écrivant {0} + + + Nouveau message de bienvenue défini. + + + Messages de bienvenue désactivés. + + + Messages de bienvenue activés sur ce salon. + + + Vous ne pouvez pas utiliser cette commande sur les utilisateurs dont le rôle est supérieur ou égal au vôtre dans la hiérarchie. + + + Images chargées après {0} secondes! + + + Format d'entrée invalide. + + + Paramètres invalides. + + + {0} a rejoint {1} + + + Vous avez été expulsé du serveur {0}. +Raison : {1} + + + Utilisateur expulsé + + + Listes des langues +{0} + + + La langue du serveur est désormais {0} - {1} + + + La langue par défaut du bot est désormais {0} - {1} + + + La langue du bot a été changée pour {0} - {1} + + + Échec dans la tentative de changement de langue. Veuillez consulter l'aide pour cette commande. + + + La langue de ce serveur est {0} - {1} + + + {0} a quitté {1} + + + Serveur {0} quitté + + + Enregistrement de {0} événements dans ce salon. + + + Enregistrement de tous les événements dans ce salon. + + + Enregistrement désactivé. + + + Événements enregistrés que vous pouvez suivre : + + + L'enregistrement ignorera désormais {0} + + + L'enregistrement n'ignorera pas {0} + + + L’événement {0} ne sera plus enregistré. + + + {0} a émis une notification pour les rôles suivants + + + Message de {0} `[Bot Owner]` : + + + Message envoyé. + + + {0} déplacé de {1} à {2} + L'utilisateur n'a pas forcément été déplacé de son plein gré. S'est déplacé - déplacé + + + Message supprimé dans #{0} + + + Mise à jour du message dans #{0} + + + Tous les utilisateurs sont maintenant muets. + PLURAL (users have been muted) + + + L'utilisateur est maintenant muet. + singular "User muted." + + + Il semblerait que je n'ai pas la permission nécessaire pour effectuer cela. + + + Nouveau rôle muet créé. + + + J'ai besoin de la permission d'**Administrateur** pour effectuer cela. + + + Nouveau message + + + Nouveau pseudonyme + + + Nouveau sujet + + + Pseudonyme changé + + + Impossible de trouver ce serveur + + + Aucun Shard pour cet ID trouvée. + Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. + + + Ancien message + + + Ancien pseudonyme + + + Ancien sujet + + + Erreur. Je ne dois sûrement pas posséder les permissions suffisantes. + + + Les permissions pour ce serveur ont été réinitialisées. + + + Protections actives + + + {0} a été **désactivé** sur ce serveur. + + + {0} Activé + + + Erreur. J'ai besoin de la permission Gérer les rôles. + + + Aucune protection activée. + + + Le seuil d'utilisateurs doit être entre {0} et {1}. + + + Si {0} ou plus d'utilisateurs rejoignent dans les {1} secondes suivantes, je les {2}. + + + Le temps doit être compris entre {0} et {1} secondes. + + + Vous avez retirés tous les rôles de l'utilisateur {0} avec succès + + + Impossible de retirer des rôles. Je n'ai pas les permissions suffisantes. + + + La couleur du rôle {0} a été modifiée. + + + Ce rôle n'existe pas. + + + Les paramètres spécifiés sont invalides. + + + Erreur due à un manque de permissions ou à une couleur invalide. + + + L'utilisateur {1} n'a plus le rôle {0}. + + + Impossible de supprimer ce rôle. Je ne possède pas les permissions suffisantes. + + + Rôle renommé. + + + Impossible de renommer ce rôle. Je ne possède pas les permissions suffisantes. + + + Vous ne pouvez pas modifier les rôles supérieurs au votre. + + + La répétition du message suivant a été désactivé: {0} + + + Le rôle {0} a été ajouté à la liste. + + + {0} introuvable. Nettoyé. + + + Le rôle {0} est déjà présent dans la liste. + + + Ajouté. + + + Rotation du statut de jeu désactivée. + + + Rotation du statut de jeu activée. + + + Voici une liste des rotations de statuts : +{0} + + + Aucune rotation de statuts en place. + + + Vous avez déjà le rôle {0}. + + + Vous avez déjà {0} rôles exclusifs auto-attribués. + + + Rôles auto-attribuables désormais exclusifs. + + + Il y a {0} rôles auto-attribuables. + + + Ce rôle ne peux pas vous être attribué par vous-même. + + + Vous ne possédez pas le rôle {0}. + + + Les rôles auto-attribuables ne sont désormais plus exclusifs! + Je ne pense pas que ce soit la bonne traduction.. self-assignable role serait plutôt rôle auto-attribuable + + + Je suis incapable de vous ajouter ce rôle. `Je ne peux pas ajouter de rôles aux propriétaires et aux autres rôles plus haut que le mien dans la hiérarchie.` + + + {0} a été supprimé de la liste des rôles auto-attribuables. + + + Vous n'avez plus le rôle {0}. + + + Vous avez désormais le rôle {0}. + + + L'utilisateur {1} a désormais le rôle {0}. + + + Impossible d'ajouter un rôle. Je ne possède pas les permissions suffisantes. + + + Nouvel avatar défini! + + + Nouveau nom de Salon défini avec succès. + + + Nouveau jeu défini! + Pour "set", je pense que défini irait mieux que "en service" + + + Nouveau stream défini! + + + Nouveau sujet du salon défini. + + + Shard {0} reconnecté. + Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. + + + Shard {0} en reconnection. + Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. + + + Arrêt en cours. + + + Les utilisateurs ne peuvent pas envoyer plus de {0} messages toutes les {1} secondes. + + + Mode ralenti désactivé. + + + Mode ralenti activé + + + expulsés (kick) + PLURAL + + + {0} ignorera ce Salon. + + + {0} n'ignorera plus ce Salon. + + + Si un utilisateur poste {0} le même message à la suite, je le {1}. + __SalonsIgnorés__: {2} + + + Salon textuel crée. + + + Salon textuel supprimé. + + + Son activé avec succès. + + + Micro activé + singular + + + Nom d'utilisateur + + + Nom d'utilisateur modifié. + + + Utilisateurs + + + Utilisateur banni + + + {0} est maintenant **muet** sur le chat. + + + **La parole a été rétablie** sur le chat pour {0}. + + + L'utilisateur a rejoint + + + L'utilisateur a quitté + + + {0} est maintenant **muet** à la fois sur les salons textuels et vocaux. + + + Rôle ajouté à l'utilisateur + + + Rôle retiré de l'utilisateur + + + {0} est maintenant {1} + + + {0} n'est maintenant **plus muet** des salons textuels et vocaux. + + + {0} a rejoint le salon vocal {1}. + + + {0} a quitté le salon vocal {1}. + + + {0} est allé du salon vocal {1} à {2}. + + + {0} est maintenant **muet**. + + + {0} n'est maintenant **plus muet**. + + + Salon vocal crée. + + + Salon vocal supprimé. + + + Fonctionnalités vocales et textuelles désactivées. + + + Fonctionnalités vocales et textuelles activées. + + + Je n'ai pas la permission **Gérer les rôles** et/ou **Gérer les salons**, je ne peux donc pas utiliser `voice+text` sur le serveur {0}. + + + Vous activez/désactivez cette fonctionnalité et **je n'ai pas la permission ADMINISTRATEUR**. Cela pourrait causer des dysfonctionnements, et vous devrez nettoyer les salons textuels vous-même après ça. + + + Je nécessite au moins les permissions **Gérer les rôles** et **Gérer les salons** pour activer cette fonctionnalité. (Permission Administrateur de préférence) + + + Utilisateur {0} depuis un salon textuel. + + + Utilisateur {0} depuis salon textuel et vocal. + + + Utilisateur {0} depuis un salon vocal. + + + Vous avez été expulsé du serveur {0}. +Raison: {1} + + + Utilisateur débanni + + + Migration effectuée! + + + Erreur lors de la migration, veuillez consulter la console pour plus d'informations. + + + Présences mises à jour. + + + Utilisateur expulsé. + + + a récompensé {0} à {1} + + + Plus de chance la prochaine fois ^_^ + C'est vraiment québecois ca.. On ne le dit pas comme ca ici xD + + + Félicitations! Vous avez gagné {0} pour avoir lancé au dessus de {1}. + + + Deck remélangé. + + + Lancé {0}. + User flipped tails. + + + Vous avez deviné! Vous avez gagné {0} + + + Nombre spécifié invalide. Vous pouvez lancer 1 à {0} pièces. + + + Ajoute la réaction {0} à ce message pour avoir {1} + + + Cet événement est actif pendant {0} heures. + + + L'événement "réactions fleuries" a démarré! + + + a donné {0} à {1} + X has gifted 15 flowers to Y + + + {0} a {1} + X has Y flowers + + + Face + + + Classement + + + {1} utilisateurs du rôle {2} ont été récompensé de {0}. + + + Vous ne pouvez pas miser plus de {0} + + + Vous ne pouvez pas parier moins de {0} + + + Vous n'avez pas assez de {0} + + + Plus de carte dans le deck. + + + Utilisateur tiré au sort + + + Vous avez roulé un {0}. + + + Mise + + + WOAAHHHHHH!!! Félicitations!!! x{0} + + + Une simple {0}, x{1} + + + Wow! Quelle chance! Trois du même genre! x{0} + + + Bon travail! Deux {0} - mise x{1} + + + Gagné + + + Les utilisateurs doivent écrire un code secret pour avoir {0}. Dure {1} secondes. Ne le dite à personne. Shhh. + + + L’événement "jeu sournois" s'est fini. {0} utilisateurs ont reçu la récompense. + + + L'événement "jeu sournois" a démarré + + + Pile + + + Vous avez pris {0} de {1} avec succès + + + Impossible de prendre {0} de {1} car l'utilisateur n'a pas assez de {2}! + + + Retour à la table des matières + + + Propriétaire du Bot seulement + + + Nécessite {0} permissions du salon. + + + Vous pouvez supporter ce projet sur Patreon <{0}> ou via Paypal <{1}> + + + Commandes et alias + + + Liste des commandes rafraîchie. + + + Écrivez `{0}h NomDeLaCommande` pour voir l'aide spécifique à cette commande. Ex: `{0}h >8ball` + + + Impossible de trouver cette commande. Veuillez vérifier qu'elle existe avant de réessayer. + + + Description + + + Vous pouvez supporter le projet NadekoBot +sur Patreon <{0}> +par Paypal <{1}> +N'oubliez pas de mettre votre nom discord ou ID dans le message. + +**Merci** ♥️ + + + **Liste des Commandes**: <{0}> +**La liste des guides et tous les documents peuvent être trouvés ici**: <{1}> + + + Liste des commandes + + + Liste des modules + + + Entrez `{0}cmds NomDuModule` pour avoir la liste des commandes de ce module. ex `{0}cmds games` + + + Ce module n'existe pas. + + + Permission serveur {0} requise. + + + Table des matières + + + Usage + + + Autohentai commencé. Publie toutes les {0}s avec l'un des tags suivants : +{1} + + + Tag + + + Course d'animaux + + + Pas assez de participants pour commencer. + + + Suffisamment de participants ! La course commence. + + + {0} a rejoint sous la forme d'un {1} + + + {0} a rejoint sous la forme d'un {1} et mise sur {2} ! + + + Entrez {0}jr pour rejoindre la course. + + + Début dans 20 secondes ou quand le nombre maximum de participants est atteint. + + + Début avec {0} participants. + + + {0} sous la forme d'un {1} a gagné la course ! + + + {0} sous la forme d'un {1} a gagné la course et {2}! + + + Nombre spécifié invalide. Vous pouvez lancer de {0} à {1} dés à la fois. + + + tiré au sort {0} + Someone rolled 35 + + + Dé tiré au sort: {0} + Dice Rolled: 5 + + + Le lancement de la course a échoué. Une autre course doit probablement être en cours. + + + Aucune course n'existe sur ce serveur. + + + Le deuxième nombre doit être plus grand que le premier. + + + Changements de Coeur + + + Revendiquée par + + + Divorces + + + Aime + + + Prix + + + Aucune waifu n'a été revendiquée pour l'instant. + + + Top Waifus + + + votre affinité est déjà liée à cette waifu ou vous êtes en train de retirer votre affinité avec quelqu'un alors que vous n'en possédez pas. + + + Affinités changées de de {0} à {1}. + +*C'est moralement discutable.* 🤔 + Make sure to get the formatting right, and leave the thinking emoji + + + Vous devez attendre {0} heures et {1} minutes avant de pouvoir changer de nouveau votre affinité. + + + Votre affinité a été réinitialisée. Vous n'avez désormais plus la personne que vous aimez. + + + veut être la waifu de {0}. Aww <3 + + + a revendiqué {0} comme sa waifu pour {1} + + + Vous avez divorcé avec une waifu qui vous aimais. Monstre sans cœur. {0} a reçu {1} en guise de compensation. + + + vous ne pouvez pas vous lier d'affinité avec vous-même, espèce d'égocentrique. + + + 🎉Leur amour est comblé !🎉 +La nouvelle valeur de {0} est {1} ! + + + Aucune waifu n'est à ce prix. Tu dois payer au moins {0} pour avoir une waifu, même si sa vraie valeur est inférieure. + + + Tu dois payer {0} ou plus pour avoir cette waifu ! + + + Cette waifu ne t'appartient pas. + + + Tu ne peux pas t'acquérir toi-même. + + + Vous avez récemment divorcé. Vous devez attendre {0} heures et {1} minutes pour divorcer à nouveau. + + + Personne + + + Vous avez divorcé d'une waifu qui ne vous aimait pas. Vous recevez {0} en retour. + + + 8ball + + + Acrophobie + + + Le jeu a pris fin sans soumissions. + + + Personne n'a voté : la partie se termine sans vainqueur. + + + L'acronyme était {0}. + + + Une partie d'Acrophobia est déjà en cours sur ce salon. + + + La partie commence. Créez une phrase avec l'acronyme suivant : {0}. + + + Vous avez {0} secondes pour faire une soumission. + + + {0} a soumit sa phrase. ({1} au total) + + + Votez en entrant le numéro d'une soumission. + + + {0} a voté! + + + Le gagnant est {0} avec {1} points! + + + {0} est le gagnant pour être le seul utilisateur à avoir fait une soumission! + + + Question + + + Egalité ! Vous avez choisi {0}. + + + {0} a gagné ! {1} bat {2}. + + + Inscriptions terminées. + + + Une course d'animaux est déjà en cours. + + + Total : {0} Moyenne : {1} + + + Catégorie + + + Cleverbot désactivé sur ce serveur. + + + Cleverbot activé sur ce serveur. + + + La génération monétaire a été désactivée sur ce salon. + Currency =/= current !!! Il s'agit de monnaie. Par example: Euro is a currency. US Dollar also is. Sur Public Nadeko, il s'agit des fleurs :) + + + La génération monétaire a été désactivée sur ce salon. + + + {0} {1} aléatoires sont apparus ! Attrapez-les en entrant `{2}pick` + plural + + + Un {0} aléatoire est apparu ! Attrapez-le en entrant `{1}pick` + + + Impossible de charger une question. + + + La jeu a commencé. + + + Partie de pendu commencée. + + + Une partie de pendu est déjà en cours sur ce canal. + + + Initialisation du pendu erronée. + + + Liste des "{0}hangman" types de termes : + + + Classement + + + Vous n'avez pas assez de {0} + + + Pas de résultat + + + a cueilli {0} + Kwoth picked 5* + + + {0} a planté {1} + Kwoth planted 5* + + + Une partie de Trivia est déjà en cours sur ce serveur. + + + Partie de Trivia + + + {0} a deviné! La réponse était: {1} + + + Aucune partie de Trivia en cours sur ce serveur. + + + {0} a {1} points + + + Le jeu s'arrêtera après cette question. + + + Le temps a expiré! La réponse était {0} + + + {0} a deviné la réponse et gagne la partie! La réponse était: {1} + + + Vous ne pouvez pas jouer contre vous-même. + + + Une partie de Morpion est déjà en cours sur ce salon. + + + Égalité! + + + a crée une partie de Morpion. + + + {0} a gagné ! + + + Trois alignés. + + + Aucun mouvement restant ! + + + Le temps a expiré ! + + + Tour de {0}. + + + {0} contre {1} + + + Tentative d'ajouter {0} musiques à la file d'attente... + + + Lecture automatique désactivée. + + + Lecture automatique activée. + + + Volume par défaut défini à {0}% + + + File d'attente complète. + + + à tour de rôle + + + Lecture terminée + + + Système de tour de rôle désactivé. + + + Système de tour de rôle activé. + + + De la position + + + Id + + + Entrée invalide. + + + Le temps maximum de lecture est désormais illimité. + + + Temps maximum de lecture défini à {0} seconde(s). + + + La taille de la file d'attente est désormais illmitée. + + + La taille de la file d'attente est désormais de {0} piste(s). + + + Vous avez besoin d'être dans un salon vocal sur ce serveur. + + + Nom + + + Vous écoutez + + + Aucun lecteur de musique actif. + + + Pas de résultat. + + + Lecteur mis sur pause. + + + Liste d'attente - Page {0}/{1} + + + Lecture en cours: + + + `#{0}` - **{1}** par *{2}* ({3} morceaux) + + + Page {0} des listes de lecture sauvegardées + + + Liste de lecture supprimée. + + + Impossible de supprimer cette liste de lecture. Soit elle n'existe pas, soit vous n'en êtes pas le créateur. + + + Aucune liste de lecture ne correspond a cet ID. + + + File d'attente de la liste complétée. + + + Liste de lecture sauvegardée + + + Limite à {0}s + + + Liste d'attente + + + Musique ajoutée à la file d'attente + + + Liste d'attente effacée. + + + Liste d'attente complète ({0}/{0}). + + + Musique retirée + context: "removed song #5" + + + Répétition de la musique en cours + + + Liste de lecture en boucle + + + Piste en boucle + + + La piste ne sera lue qu'une fois. + + + Reprise de la lecture. + + + Lecture en boucle désactivée. + + + Lecture en boucle activée. + + + Je vais désormais afficher les musiques en cours, en pause, terminées et supprimées sur ce salon. + + + Saut à `{0}:{1}` + + + Lecture aléatoire activée. + + + Musique déplacée + + + {0}h {1}m {2}s + + + En position + + + Illimité + + + Le volume doit être compris entre 0 et 100 + + + Volume réglé sur {0}% + + + Désactivation de l'usage de TOUS LES MODULES pour le salon {0}. + + + Activation de l'usage de TOUS LES MODULES pour le salon {0}. + + + Permis + + + Désactivation de l'usage de TOUS LES MODULES pour le rôle {0}. + + + Activation de l'usage de TOUS LES MODULES pour le rôle {0}. + + + Désactivation de l'usage de TOUS LES MODULES sur ce serveur. + + + Activation de l'usage de TOUS LES MODULES sur ce serveur. + + + Désactivation de l'usage de TOUS LES MODULES pour l'utilisateur {0}. + + + Activation de l'usage de TOUS LES MODULES pour l'utilisateur {0}. + + + {0} sur liste noire avec l'ID {1} + Il ne s'agit pas d'un ban mais d'une blacklist interdisant l'utilisateur d'utiliser le bot. + + + La commande {0} a désormais {1}s de temps de recharge. + + + La commande {0} n'a pas de temps de recharge et tous les temps de recharge ont été réinitialisés. + + + Aucune commande n'a de temps de recharge. + + + Coût de la commande : + + + Usage de {0} {1} désactivé sur le salon {2}. + + + Usage de {0} {1} activé sur le salon {2}. + + + Refusé + + + Ajout du mot {0} à la liste des mots filtrés. + + + Liste Des Mots Filtrés + + + Suppression du mot {0} de la liste des mots filtrés. + + + Second paramètre invalide. (nécessite un nombre entre {0} et {1}) + + + Filtrage des invitations désactivé sur ce salon. + + + Filtrage des invitations activé sur ce salon. + + + Filtrage des invitations désactivé sur le serveur. + + + Filtrage des invitations activé sur le serveur. + + + Permission {0} déplacée de #{1} à #{2} + + + Impossible de trouver la permission à l'index #{0} + + + Aucun coût défini. + + + Commande + Gen (of command) + + + Module + Gen. (of module) + + + Page {0} des permissions + + + Le rôle des permissions actuelles est {0}. + + + Il faut maintenant avoir le rôle {0} pour modifier les permissions. + + + Aucune permission trouvée à cet index. + + + Supression des permissions #{0} - {1} + + + Usage de {0} {1} désactivé pour le rôle {2}. + + + Usage de {0} {1} activé pour le rôle {2}. + + + sec. + Short of seconds. + + + Usage de {0} {1} désactivé pour le serveur. + + + Usage de {0} {1} activé pour le serveur. + + + Débanni {0} avec l'ID {1} + + + Non modifiable + + + Usage de {0} {1} désactivé pour l'utilisateur {2}. + + + Usage de {0} {1} activé pour l'utilisateur {2}. + + + Je n'afficherai plus les avertissements des permissions. + + + J'afficherai désormais les avertissements des permissions. + + + Filtrage des mots désactivé sur ce salon. + + + Filtrage des mots activé sur ce salon. + + + Filtrage des mots désactivé sur le serveur. + + + Filtrage des mots activé sur le serveur. + + + Capacités + + + Pas encore d'anime préféré + + + Traduction automatique des messages activée sur ce salon. Les messages utilisateurs vont désormais être supprimés. + + + Votre langue de traduction à été supprimée. + + + Votre langue de traduction a été changée de {0} à {1} + + + Traduction automatique des messages commencée sur ce salon. + + + Traduction automatique des messages arrêtée sur ce salon. + + + Le format est invalide ou une erreur s'est produite. + + + Impossible de trouver cette carte. + + + fait + + + Chapitres + + + Bande dessinée # + + + Parties compétitives perdues + + + Parties compétitives jouées + + + Rang en compétitif + + + Parties compétitives gagnées + + + Complétés + + + Condition + + + Coût + + + Date + + + Définis: + + + Abandonnés + droppped as in, "stopped watching" referring to shows/anime + + + Episodes + + + Une erreur s'est produite. + + + Exemple + + + Impossible de trouver cet anime. + + + Impossible de trouver ce manga. + + + Genres + + + Impossible de trouver une définition pour ce hashtag. + + + Taille/Poid + + + {0}m/{1}kg + + + Humidité + + + Recherche d'images pour: + + + Impossible de trouver ce film. + + + Langue d'origine ou de destination invalide. + + + Blagues non chargées. + + + Lat/Long + + + Niveau + + + Liste de tags pour {0}place. + Don't translate {0}place + + + Emplacement + + + Les objets magiques ne sont pas chargés. + + + Profil MAL de {0} + + + Le propriétaire du Bot n'a pas spécifié de clé d'API Mashape (MashapeApiKey). Fonctionnalité non disponible + + + Min/Max + + + Aucun salon trouvé. + + + Aucun résultat trouvé. + + + En attente + + + Url originale + + + Une clé d'API osu! est nécessaire. + + + Impossible de récupérer la signature osu!. + + + Trouvé dans {0} images. Affichage de {0} aléatoires. + + + Utilisateur non trouvé! Veuillez vérifier la région ainsi que le BattleTag avant de réessayer. + + + Prévus de regarder + Je ne pense pas que le sens de la traduction soit le bon. + + + Plateforme + + + Attaque non trouvée. + + + Pokémon non trouvé. + + + Lien du profil : + + + Qualité + + + Durée en Jeux Rapides + + + Victoires Rapides + + + Évaluation + + + Score: + + + Chercher pour: + recherche plutôt non ? + + + Impossible de réduire cette Url. + + + Url réduite + + + Une erreur s'est produite. + + + Veuillez spécifier les paramètres de recherche. + + + Statut + + + Url stockée + + + Le streamer {0} est hors ligne. + + + Le streamer {0} est en ligne avec {1} viewers. + + + Vous suivez {0} streams sur ce serveur. + + + Vous ne suivez aucun stream sur ce serveur. + + + Aucun stream de ce nom. + + + Ce stream n'existe probablement pas. + + + Stream de {0} ({1}) retirée des notifications. + + + Je préviendrai ce salon lors d'un changement de statut. + + + Aube + + + Crépuscule + + + Température + + + Titre: + + + Top 3 anime favoris + + + Traduction: + + + Types + + + Impossible de trouver une définition pour ce terme. + + + Url + + + Viewers + + + En écoute + + + Impossible de trouver ce terme sur le wikia spécifié. + + + Entrez un wikia cible, suivi d'une requête de recherche. + + + Page non trouvée. + + + Vitesse du vent + + + Les {0} champions les plus bannis + + + Impossible de yodifier votre phrase. + + + Rejoint + + + `{0}.` {1} [{2:F2}/s] - {3} total + /s and total need to be localized to fit the context - +`1.` + + + Page d'activité #{0} + + + {0} utilisateurs en total. + + + Créateur + + + ID du Bot + + + Liste des fonctions pour la commande {0}calc + + + {0} de ce salon est {1} + + + Sujet du salon + + + Commandes exécutées + + + {0} {1} est équivalent à {2} {3} + + + Unités pouvant être converties : + + + Impossible de convertir {0} en {1}: unités non trouvées + + + Impossible de convertir {0} en {1} : les types des unités ne sont pas compatibles. + + + Créé le + + + Salon inter-serveur rejoint. + + + Salon inter-serveur quitté. + + + Voici votre jeton CSC + + + Emojis personnalisées + + + Erreur + + + Fonctionnalités + + + ID + + + Index hors limites. + + + Voici une liste des utilisateurs dans ces rôles : + + + Vous ne pouvez pas utiliser cette commande sur un rôle incluant beaucoup d'utilisateurs afin d'éviter les abus. + + + Valeur {0} invalide. + Invalid months value/ Invalid hours value + + + Discord rejoint + + + Serveur rejoint + + + ID: {0} +Membres: {1} +OwnerID: {2} + + + Aucun serveur trouvée sur cette page. + + + Liste des messages répétés + + + Membres + + + Mémoire + + + Messages + + + Répéteur de messages + + + Nom + + + Pseudonyme + + + Personne ne joue à ce jeu. + + + Aucune répétition active. + + + Aucun rôle sur cette page. + + + Aucun shard sur cette page. + Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. + + + Aucun sujet choisi. + + + Propriétaire + + + ID des propriétaires + + + Présence + + + {0} Serveurs +{1} Salons Textuels +{2} Salons Vocaux + + + Toutes les citations possédant le mot-clé {0} ont été supprimées. + + + Page {0} des citations + + + Aucune citation sur cette page. + + + Aucune citation que vous puissiez supprimer n'a été trouvé. + + + Citation ajoutée + + + Une citation aléatoire a été supprimée. + + + Région + + + Inscrit sur + + + Je vais vous rappeler {0} pour {1} dans {2} `({3:d.M.yyyy} à {4:HH:mm})` + + + Format de date non valide. Vérifiez la liste des commandes. + + + Nouveau modèle de rappel défini. + + + Répétition de {0} chaque {1} jour(s), {2} heure(s) et {3} minute(s). + + + Liste des répétitions + + + Aucune répétition active sur ce serveur. + + + #{0} arrêté. + + + Pas de message répété trouvé sur ce serveur. + + + Résultat + + + Rôles + + + Page #{0} de tout les rôles sur ce serveur. + + + Page #{0} des rôles pour {1} + + + Aucune couleur n'est dans le bon format. Utilisez `#00ff00` par exemple. + + + Couleurs alternées pour le rôle {0} activées. + + + Couleurs alternées pour le rôle {0} arrêtées + + + {0} de ce serveur est {1} + + + Info du serveur + + + Shard + Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. + + + Statistique des shards + Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. + + + Le shard **#{0}** est en état {1} avec {2} serveurs. + Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. + + + **Nom:** {0} **Lien:** {1} + + + Pas d'emojis spéciaux trouvés. + + + Joue actuellement {0} musiques, {1} en attente. + + + Salons textuels + + + Voici le lien pour votre salon: + + + Durée de fonctionnement + + + {0} de l'utilisateur {1} est {2} + Id of the user kwoth#1234 is 123123123123 + + + Utilisateurs + + + Salons vocaux + + + \ No newline at end of file From fb574f0925172596886cdf6f54bdabc585b792b4 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 1 Mar 2017 21:37:01 +0100 Subject: [PATCH 129/496] Update ResponseStrings.de-DE.resx (POEditor.com) --- src/NadekoBot/Resources/ResponseStrings.de-DE.resx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.de-DE.resx b/src/NadekoBot/Resources/ResponseStrings.de-DE.resx index 04611d86..8b3974b3 100644 --- a/src/NadekoBot/Resources/ResponseStrings.de-DE.resx +++ b/src/NadekoBot/Resources/ResponseStrings.de-DE.resx @@ -241,7 +241,7 @@ Dein Typ ist bereits {0} - benutzt {0}{1} auf {2}{3} für {4} Schaden. + benutzte {0}{1} an {2}{3} für {4} Schaden. Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage. @@ -281,7 +281,7 @@ Dein Typ wurde verändert von {0} mit einem {1} - Das ist effektiv. + Das ist etwas effektiv. Das ist sehr effektiv! @@ -838,7 +838,7 @@ __ignoredChannels__: {2} Ich habe keine **Rollenmanagement**- und/oder **Kanalmanagement**-Rechte, sodass ich `voice+text` auf dem Server {0} nicht ausführen kann. - Sie schalten diese Funktion ein bzw. aus und **ich habe keine ADMINISTRATORRECHTE**. Dies könnte einige Probleme hervorrufen, sodass sie ihre Textkanäle eventuell selber aufräumen musst. + Sie schalten diese Funktion ein bzw. aus und **ich habe keine ADMINISTRATORRECHTE**. Dies könnte einige Probleme hervorrufen, sodass sie ihre Textkanäle eventuell selber aufräumen müssen. Ich benötige zumindest **Rollenmanagement**- und **Kanalmanagement**-Rechte um diese Funktion einzuschalten. (Bevorzugt Administratorrechte) @@ -1181,7 +1181,7 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu Akrophobia läuft bereits in diesem Kanal. - Spiel gestartet. Erstelle einen Satz aus dem folgenden Akronym. + Spiel gestartet. Erstelle einen Satz aus dem folgenden Akronym: {0}. Sie haben {0} Sekunden für ihre Einsendung. @@ -1942,7 +1942,7 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu {0} totale Benutzer. - Autor(in) + Autor ID des Bots @@ -2091,7 +2091,7 @@ ID des Besitzers: {2} Zitat hinzugefügt - Zufälliger Zitat wurde gelöscht. + Zufälliges Zitat wurde gelöscht. Region From 8b859ab0278c94f66e2c2298dd48644740508ce6 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 1 Mar 2017 21:37:05 +0100 Subject: [PATCH 130/496] Update ResponseStrings.pt-BR.resx (POEditor.com) From 5e06ccb5bfc4802bd2f2892b71da0ef5af919944 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 1 Mar 2017 21:37:08 +0100 Subject: [PATCH 131/496] Update ResponseStrings.ru-RU.resx (POEditor.com) --- .../Resources/ResponseStrings.ru-RU.resx | 86 ++++++------------- 1 file changed, 24 insertions(+), 62 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx b/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx index 21b36460..12a8b4d2 100644 --- a/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx +++ b/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx @@ -131,19 +131,15 @@ У {0} есть **НЕ ЗАХВАЧЕННАЯ** база #{1}, ведущая войну против {2} - Fuzzy - {0} захватил базу #{1} ведя войну против {2} - Fuzzy + {0} захватил базу #{1}, ведя войну против {2} @{0} Вы уже захватили базу #{1}. Вы не можете захватить новую базу. - Fuzzy Время действия запроса от @{0} на войну против {1} истёкло. - Fuzzy Враг @@ -161,8 +157,7 @@ Список активных войн - не захваченна - Fuzzy + не захвачена Вы не участвуете в этой войне. @@ -180,8 +175,7 @@ Война против {0} уже началась. - Война против {0} была создана. - Fuzzy + Война против {0} была начата. Закончилась война против {0}. @@ -194,50 +188,39 @@ Вся статистика настраиваемых реакций стёрта. - Fuzzy - Настраиваемая реакция удалена. - Fuzzy + Настраиваемая реакция удалена Недостаточно прав. Необходимо владеть Бот-ом для глобальных настраиваемых реакций или быть Администратором для реакций по серверу. - Fuzzy - Список всех настраиваемых реакций. - Fuzzy + Список всех настраиваемых реакций - Настроить ответы. - Fuzzy + Настраиваемые реакции - Новый ответ. - Fuzzy + Новая настраиваемая реакция Не найдено настраиваемых реакций. - Fuzzy Не найдено настраиваемых реакций с таким номером. - Fuzzy Ответ - Статистика настраеваемых реакций. - Fuzzy + Статистика настраеваемых реакций Статистика удалена для настраеваемой реакции {0}. - Fuzzy - Не найдено статистики для этого запроса, никаких действий не применено. - Fuzzy + Не найдено статистики для этого активатора, никаких действий не применено. Активатор @@ -278,41 +261,33 @@ Вы не можете использовать {0}. Напишите '{1}ml', чтобы увидеть список доступных Вам приёмов. - Fuzzy Список приёмов {0} типа Эта атака не эффективна. - Fuzzy У вас не достаточно {0} воскресил {0}, использовав один {1} - Fuzzy Вы воскресили себя, использовав один {0} - Fuzzy Ваш тип изменён с {0} на {1} - Fuzzy Эта атака немного эффективна. - Fuzzy Эта атака очень эффективна! - Fuzzy Вы использовали слишком много приёмов подряд и не можете двигаться! - Fuzzy Тип {0} — {1} @@ -398,7 +373,6 @@ Успешное оглушение. - Fuzzy Сервер {0} удален. @@ -420,7 +394,6 @@ Успешно добавлен новый донатор. Общее количество пожертвований от этого пользователя: {0} 👑 - Fuzzy Спасибо всем, указанным ниже, что помогли этому проекту! @@ -444,19 +417,19 @@ Приветственные сообщения будут удаляться через {0} секунд. - Приветствие, используемое в настоящий момент: {0} + Приветственное ЛС, используемое в настоящий момент: {0} - Чтобы включить приветствия, напишите {0} + Чтобы включить приветственное ЛС, напишите {0} - Новое приветствие установлено. + Новое приветственное ЛС установлено. - Приветствия в личных сообщениях отключены. + Приветственые ЛС отключены. - Приветствия в личных сообщениях включены. + Приветственные ЛС включены. Текущее привественное сообщение: {0} @@ -560,25 +533,21 @@ Сообщение изменено в #{0} - Заглушёны - PLURAL (users have been muted) -Fuzzy + Заглушены + PLURAL (users have been muted) Заглушён - singular "User muted." -Fuzzy + singular "User muted." Скорее всего, у меня нет необходимых прав. - Новая немая роль установлена. - Fuzzy + Новая роль заглушения установлена. Мне нужно право **Администратор**, чтобы это сделать. - Fuzzy Новое сообщение @@ -793,7 +762,7 @@ Fuzzy Отключено заглушение. - Вкл. звук + Вернут звук singular Fuzzy @@ -810,12 +779,10 @@ Fuzzy Пользователь заблокирован - {0} получил **запрет** на разговор в чате. - Fuzzy + {0} получил **запрет** на разговор в текстовых каналах. - {0} потерял **запрет** на разговор в чате. - Fuzzy + {0} получил **разрешение** на разговор в текстовых каналах. Пользователь присоединился @@ -824,8 +791,7 @@ Fuzzy Пользователь вышел - {0} получил **запрет** на разговор в текстовом и голосовом чатах. - Fuzzy + {0} получил **запрет** на разговор в текстовых и голосовых каналах Добавлена роль пользователя @@ -837,8 +803,7 @@ Fuzzy {0} теперь {1} - {0} потерял **запрет** на разговор в текстовом и голосовом чатах. - Fuzzy + {0} получил **разрешение** на разговор в текстовых и голосовых каналах. {0} присоединился к голосовому каналу {1}. @@ -851,11 +816,9 @@ Fuzzy **Выключен микрофон** у {0}. - Fuzzy **Включён микрофон** у {0}. - Fuzzy Голосовой канал создан @@ -1128,7 +1091,7 @@ Paypal <{1}> Смены чувств - В браке + Является мужем Fuzzy @@ -1383,7 +1346,6 @@ Paypal <{1}> справедливое воспроизведение - Fuzzy Песня завершилась. From bef5549f1198281d2413220c59f9613af6a52d4b Mon Sep 17 00:00:00 2001 From: Kwoth Date: Wed, 1 Mar 2017 21:38:05 +0100 Subject: [PATCH 132/496] Commented out unfinished languages from the list of supported ones --- .../Modules/Administration/Commands/LocalizationCommands.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs index 135a1da7..5707429b 100644 --- a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs +++ b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs @@ -22,10 +22,10 @@ namespace NadekoBot.Modules.Administration {"fr-FR", "French, France"}, {"ru-RU", "Russian, Russia"}, {"de-DE", "German, Germany"}, - {"nl-NL", "Dutch, Netherlands"}, - {"ja-JP", "Japanese, Japan"}, + //{"nl-NL", "Dutch, Netherlands"}, + //{"ja-JP", "Japanese, Japan"}, {"pt-BR", "Portuguese, Brazil"}, - {"sr-Cyrl-RS", "Serbian, Serbia - Cyrillic"} + //{"sr-Cyrl-RS", "Serbian, Serbia - Cyrillic"} }.ToImmutableDictionary(); [NadekoCommand, Usage, Description, Aliases] From ccef094388335e680eff64911560b1dc069614ee Mon Sep 17 00:00:00 2001 From: Kwoth Date: Wed, 1 Mar 2017 21:42:20 +0100 Subject: [PATCH 133/496] Fixed smp string --- src/NadekoBot/Modules/Music/Music.cs | 2 +- src/NadekoBot/Modules/NadekoModule.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Modules/Music/Music.cs b/src/NadekoBot/Modules/Music/Music.cs index 79dd3d42..eb4cbbdf 100644 --- a/src/NadekoBot/Modules/Music/Music.cs +++ b/src/NadekoBot/Modules/Music/Music.cs @@ -592,7 +592,7 @@ namespace NadekoBot.Modules.Music if (seconds == 0) await ReplyConfirmLocalized("max_playtime_none").ConfigureAwait(false); else - await ReplyConfirmLocalized("max_playtime_set").ConfigureAwait(false); + await ReplyConfirmLocalized("max_playtime_set", seconds).ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] diff --git a/src/NadekoBot/Modules/NadekoModule.cs b/src/NadekoBot/Modules/NadekoModule.cs index ea4a0049..d71a2ba9 100644 --- a/src/NadekoBot/Modules/NadekoModule.cs +++ b/src/NadekoBot/Modules/NadekoModule.cs @@ -69,7 +69,7 @@ namespace NadekoBot.Modules LogManager.GetCurrentClassLogger().Warn(lowerModuleTypeName + "_" + key + " key is missing from " + cultureInfo + " response strings. PLEASE REPORT THIS."); text = NadekoBot.ResponsesResourceManager.GetString(lowerModuleTypeName + "_" + key, _usCultureInfo) ?? $"Error: dkey {lowerModuleTypeName + "_" + key} not found!"; if (string.IsNullOrWhiteSpace(text)) - return "I cant tell if you command is executed, because there was an error printing out the response. Key '" + + return "I can't tell you is the command executed, because there was an error printing out the response. Key '" + lowerModuleTypeName + "_" + key + "' " + "is missing from resources. Please report this."; } return text; From f53c68e11372af2d4c71cd55028dfbad00d1628a Mon Sep 17 00:00:00 2001 From: Kwoth Date: Wed, 1 Mar 2017 22:06:37 +0100 Subject: [PATCH 134/496] version upped to 1.2 --- .../Resources/ResponseStrings.fr-fr.resx | 44 +++++++++---------- src/NadekoBot/Services/Impl/StatsService.cs | 2 +- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx b/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx index 1c802a95..ac95afb6 100644 --- a/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx +++ b/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx @@ -628,7 +628,7 @@ Raison : {1} Erreur due à un manque de permissions ou à une couleur invalide. - L'utilisateur {1} n'a plus le rôle {0}. + L'utilisateur {1} n'appartient plus au rôle {0}. Impossible de supprimer ce rôle. Je ne possède pas les permissions suffisantes. @@ -705,7 +705,7 @@ Raison : {1} Vous avez désormais le rôle {0}. - L'utilisateur {1} a désormais le rôle {0}. + L'ajout du rôle {0} pour l'utilisateur {1} a été réalisé avec succès. Impossible d'ajouter un rôle. Je ne possède pas les permissions suffisantes. @@ -727,7 +727,7 @@ Raison : {1} Nouveau sujet du salon défini. - Shard {0} reconnecté. + Shard {0} reconnectée. Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. @@ -758,13 +758,13 @@ Raison : {1} Si un utilisateur poste {0} le même message à la suite, je le {1}. - __SalonsIgnorés__: {2} + __SalonsIgnorés__: {2} Salon textuel crée. - Salon textuel supprimé. + Salon textuel détruit. Son activé avec succès. @@ -774,7 +774,7 @@ Raison : {1} singular - Nom d'utilisateur + Nom d'utilisateur. Nom d'utilisateur modifié. @@ -798,7 +798,7 @@ Raison : {1} L'utilisateur a quitté - {0} est maintenant **muet** à la fois sur les salons textuels et vocaux. + {0} est maintenant **muet** à la fois sur le salon textuel et vocal. Rôle ajouté à l'utilisateur @@ -819,7 +819,7 @@ Raison : {1} {0} a quitté le salon vocal {1}. - {0} est allé du salon vocal {1} à {2}. + {0} est allé du salon vocal {1} au {2}. {0} est maintenant **muet**. @@ -831,7 +831,7 @@ Raison : {1} Salon vocal crée. - Salon vocal supprimé. + Salon vocal détruit. Fonctionnalités vocales et textuelles désactivées. @@ -843,10 +843,10 @@ Raison : {1} Je n'ai pas la permission **Gérer les rôles** et/ou **Gérer les salons**, je ne peux donc pas utiliser `voice+text` sur le serveur {0}. - Vous activez/désactivez cette fonctionnalité et **je n'ai pas la permission ADMINISTRATEUR**. Cela pourrait causer des dysfonctionnements, et vous devrez nettoyer les salons textuels vous-même après ça. + Vous activez/désactivez cette fonctionnalité et **je n'ai pas les permissions ADMINISTRATEURS**. Cela pourrait causer des dysfonctionnements, et vous devrez nettoyer les salons textuels vous-même après ça. - Je nécessite au moins les permissions **Gérer les rôles** et **Gérer les salons** pour activer cette fonctionnalité. (Permission Administrateur de préférence) + Je nécessite au moins les permissions **Gérer les rôles** et **Gérer les salons** pour activer cette fonctionnalité. (permissions administateurs préférées) Utilisateur {0} depuis un salon textuel. @@ -880,11 +880,10 @@ Raison: {1} a récompensé {0} à {1} - Plus de chance la prochaine fois ^_^ - C'est vraiment québecois ca.. On ne le dit pas comme ca ici xD + Meilleure chance la prochaine fois ^_^ - Félicitations! Vous avez gagné {0} pour avoir lancé au dessus de {1}. + Félicitations! Vous avez gagné {0} pour avoir lancé au dessus de {1} Deck remélangé. @@ -894,7 +893,7 @@ Raison: {1} User flipped tails. - Vous avez deviné! Vous avez gagné {0} + Vous l'avez deviné! Vous avez gagné {0} Nombre spécifié invalide. Vous pouvez lancer 1 à {0} pièces. @@ -1339,7 +1338,7 @@ La nouvelle valeur de {0} est {1} ! {0} contre {1} - Tentative d'ajouter {0} musiques à la file d'attente... + Tentative d'ajouter {0} à la file d'attente... Lecture automatique désactivée. @@ -1348,7 +1347,7 @@ La nouvelle valeur de {0} est {1} ! Lecture automatique activée. - Volume par défaut défini à {0}% + Volume de base défini à {0}% File d'attente complète. @@ -1375,10 +1374,10 @@ La nouvelle valeur de {0} est {1} ! Entrée invalide. - Le temps maximum de lecture est désormais illimité. + Le temps maximum de lecture n'a désormais plus de limite. - Temps maximum de lecture défini à {0} seconde(s). + Le temps de lecture maximum a été mis à {0} seconde(s). La taille de la file d'attente est désormais illmitée. @@ -1438,7 +1437,7 @@ La nouvelle valeur de {0} est {1} ! Liste d'attente - Musique ajoutée à la file d'attente + Son ajouté à la file d'attente Liste d'attente effacée. @@ -1447,7 +1446,7 @@ La nouvelle valeur de {0} est {1} ! Liste d'attente complète ({0}/{0}). - Musique retirée + Son retiré context: "removed song #5" @@ -1666,6 +1665,7 @@ La nouvelle valeur de {0} est {1} ! Votre langue de traduction a été changée de {0} à {1} + Fuzzy Traduction automatique des messages commencée sur ce salon. @@ -2145,7 +2145,7 @@ OwnerID: {2} Page #{0} des rôles pour {1} - Aucune couleur n'est dans le bon format. Utilisez `#00ff00` par exemple. + Aucunes couleurs ne sont dans le format correct. Utilisez `#00ff00` par exemple. Couleurs alternées pour le rôle {0} activées. diff --git a/src/NadekoBot/Services/Impl/StatsService.cs b/src/NadekoBot/Services/Impl/StatsService.cs index f3058f97..0390cbda 100644 --- a/src/NadekoBot/Services/Impl/StatsService.cs +++ b/src/NadekoBot/Services/Impl/StatsService.cs @@ -16,7 +16,7 @@ namespace NadekoBot.Services.Impl private readonly DiscordShardedClient _client; private readonly DateTime _started; - public const string BotVersion = "1.2-beta"; + public const string BotVersion = "1.2"; public string Author => "Kwoth#2560"; public string Library => "Discord.Net"; From 011b951a29d7a1754ad8e058bc2c092c78c281e3 Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Thu, 2 Mar 2017 03:29:27 -0500 Subject: [PATCH 135/496] Update QuoteRepository.cs --- .../Services/Database/Repositories/Impl/QuoteRepository.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs b/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs index 898f0efd..3de5853c 100644 --- a/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs +++ b/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs @@ -26,7 +26,8 @@ namespace NadekoBot.Services.Database.Repositories.Impl public Task 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(); + lowertext = text.toLowerInvariant(); + return _set.Where(q => q.Text.Contains(text) || q.Text.Contains(lowertext) && q.GuildId == guildId && q.Keyword == keyword).OrderBy(q => rngk.Next()).FirstOrDefaultAsync(); } } } From 9344c1b498462dc9378a879df9617bcae16e12ac Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Thu, 2 Mar 2017 03:41:33 -0500 Subject: [PATCH 136/496] Support for embeds in .qsearch output - Support for embeds in .qsearch output results - Search can be case insensitive (changes made 011b951a29d7a1754ad8e058bc2c092c78c281e3) - Output shows keyword in lowercase as it's easier to read (line 104) - Minor syntax cleanups --- .../Modules/Utility/Commands/QuoteCommands.cs | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs b/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs index 5a7fc983..2b5a927d 100644 --- a/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs +++ b/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs @@ -72,8 +72,8 @@ namespace NadekoBot.Modules.Utility await Context.Channel.SendMessageAsync("📣 " + quote.Text.SanitizeMentions()); } - [NadekoCommand, Usage, Description, Aliases] - [RequireContext(ContextType.Guild)] + [NadekoCommand, Usage, Description, Aliases] + [RequireContext(ContextType.Guild)] public async Task SearchQuote(string keyword, [Remainder] string text) { if (string.IsNullOrWhiteSpace(keyword) || string.IsNullOrWhiteSpace(text)) @@ -83,14 +83,25 @@ namespace NadekoBot.Modules.Utility 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()); + + CREmbed crembed; + if (CREmbed.TryParse(keywordquote.Text, out crembed)) + { + try { await Context.Channel.EmbedAsync(crembed.ToEmbed(), crembed.PlainText ?? "").ConfigureAwait(false); } + catch (Exception ex) + { + _log.Warn("Sending CREmbed failed"); + _log.Warn(ex); + } + return; + } + await Context.Channel.SendMessageAsync("💬 " + keyword.toLowerInvariant(); + ": " + keywordquote.Text.SanitizeMentions()); } [NadekoCommand, Usage, Description, Aliases] From e2f855a72904c299ff48dc565bdb5d66bf45b364 Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Thu, 2 Mar 2017 03:46:10 -0500 Subject: [PATCH 137/496] Support for embeds in .qsearch output + case - Support for embeds in .qsearch output results - Search can be case insensitive (changes made 011b951a29d7a1754ad8e058bc2c092c78c281e3) - Output shows keyword in lowercase as it's easier to read (line 104) - Minor syntax cleanups --- 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 2b5a927d..654f6853 100644 --- a/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs +++ b/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs @@ -101,7 +101,7 @@ namespace NadekoBot.Modules.Utility } return; } - await Context.Channel.SendMessageAsync("💬 " + keyword.toLowerInvariant(); + ": " + keywordquote.Text.SanitizeMentions()); + await Context.Channel.SendMessageAsync("💬 " + keyword.toLowerInvariant() + ": " + keywordquote.Text.SanitizeMentions()); } [NadekoCommand, Usage, Description, Aliases] From b3080f193fe48312c84f245fce669838fa83f4c0 Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Thu, 2 Mar 2017 03:49:34 -0500 Subject: [PATCH 138/496] Update QuoteRepository.cs --- .../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 3de5853c..fe41b6d2 100644 --- a/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs +++ b/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs @@ -26,7 +26,7 @@ namespace NadekoBot.Services.Database.Repositories.Impl public Task SearchQuoteKeywordTextAsync(ulong guildId, string keyword, string text) { var rngk = new NadekoRandom(); - lowertext = text.toLowerInvariant(); + lowertext = text.ToLowerInvariant(); return _set.Where(q => q.Text.Contains(text) || q.Text.Contains(lowertext) && q.GuildId == guildId && q.Keyword == keyword).OrderBy(q => rngk.Next()).FirstOrDefaultAsync(); } } From 6773d1e86d17feccb78244c5f2d29fd0a18afde8 Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Thu, 2 Mar 2017 03:49:53 -0500 Subject: [PATCH 139/496] See 9344c1b498462dc9378a879df9617bcae16e12ac --- 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 654f6853..e0445e0c 100644 --- a/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs +++ b/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs @@ -101,7 +101,7 @@ namespace NadekoBot.Modules.Utility } return; } - await Context.Channel.SendMessageAsync("💬 " + keyword.toLowerInvariant() + ": " + keywordquote.Text.SanitizeMentions()); + await Context.Channel.SendMessageAsync("💬 " + keyword.ToLowerInvariant() + ": " + keywordquote.Text.SanitizeMentions()); } [NadekoCommand, Usage, Description, Aliases] From 72de465c34ea710b383c5d959397a50b1c6ee5ac Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Thu, 2 Mar 2017 03:57:39 -0500 Subject: [PATCH 140/496] Update QuoteRepository.cs handle all standard cases (matches text that contains the exact, upper, or lowercase forms of the input text to search) --- .../Services/Database/Repositories/Impl/QuoteRepository.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs b/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs index fe41b6d2..fff61d22 100644 --- a/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs +++ b/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs @@ -27,7 +27,8 @@ namespace NadekoBot.Services.Database.Repositories.Impl { var rngk = new NadekoRandom(); lowertext = text.ToLowerInvariant(); - return _set.Where(q => q.Text.Contains(text) || q.Text.Contains(lowertext) && q.GuildId == guildId && q.Keyword == keyword).OrderBy(q => rngk.Next()).FirstOrDefaultAsync(); + uppertext = text.ToUpperInvariant(); + return _set.Where(q => q.Text.Contains(text) || q.Text.Contains(lowertext) || q.Text.Contains(uppertext) && q.GuildId == guildId && q.Keyword == keyword).OrderBy(q => rngk.Next()).FirstOrDefaultAsync(); } } } From 0a55c6f09c05b0f152684b4d33368a3572b0b0ed Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Thu, 2 Mar 2017 04:09:12 -0500 Subject: [PATCH 141/496] Update QuoteRepository.cs syntax cleanup --- .../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 fff61d22..26639165 100644 --- a/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs +++ b/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs @@ -28,7 +28,7 @@ namespace NadekoBot.Services.Database.Repositories.Impl var rngk = new NadekoRandom(); lowertext = text.ToLowerInvariant(); uppertext = text.ToUpperInvariant(); - return _set.Where(q => q.Text.Contains(text) || q.Text.Contains(lowertext) || q.Text.Contains(uppertext) && q.GuildId == guildId && q.Keyword == keyword).OrderBy(q => rngk.Next()).FirstOrDefaultAsync(); + return _set.Where(q => q.GuildId == guildId && q.Keyword == keyword && (q.Text.Contains(text) || q.Text.Contains(lowertext) || q.Text.Contains(uppertext))).OrderBy(q => rngk.Next()).FirstOrDefaultAsync(); } } } From 97b314d61155e5dfa192f1cbf639638a8a112e70 Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Thu, 2 Mar 2017 04:44:49 -0500 Subject: [PATCH 142/496] Update QuoteRepository.cs whoops xD --- .../Services/Database/Repositories/Impl/QuoteRepository.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs b/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs index 26639165..591c3dde 100644 --- a/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs +++ b/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs @@ -26,8 +26,8 @@ namespace NadekoBot.Services.Database.Repositories.Impl public Task SearchQuoteKeywordTextAsync(ulong guildId, string keyword, string text) { var rngk = new NadekoRandom(); - lowertext = text.ToLowerInvariant(); - uppertext = text.ToUpperInvariant(); + string lowertext = text.ToLowerInvariant(); + string uppertext = text.ToUpperInvariant(); return _set.Where(q => q.GuildId == guildId && q.Keyword == keyword && (q.Text.Contains(text) || q.Text.Contains(lowertext) || q.Text.Contains(uppertext))).OrderBy(q => rngk.Next()).FirstOrDefaultAsync(); } } From 63823d10bf66ba48310b67e738d4b6ad167d6ec3 Mon Sep 17 00:00:00 2001 From: samvaio Date: Thu, 2 Mar 2017 15:17:15 +0530 Subject: [PATCH 143/496] music playlist and weather fixes --- src/NadekoBot/Modules/Music/Music.cs | 8 +++----- src/NadekoBot/Modules/Searches/Searches.cs | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/NadekoBot/Modules/Music/Music.cs b/src/NadekoBot/Modules/Music/Music.cs index eb4cbbdf..50ed4089 100644 --- a/src/NadekoBot/Modules/Music/Music.cs +++ b/src/NadekoBot/Modules/Music/Music.cs @@ -347,10 +347,8 @@ namespace NadekoBot.Modules.Music return; } var count = ids.Count(); - - var msg = await Context.Channel.SendMessageAsync(GetText("attempting_to_queue", - Format.Bold(count.ToString()))) - .ConfigureAwait(false); + var msg = await Context.Channel.SendMessageAsync("🎵 " + GetText("attempting_to_queue", + Format.Bold(count.ToString()))).ConfigureAwait(false); var cancelSource = new CancellationTokenSource(); @@ -374,7 +372,7 @@ namespace NadekoBot.Modules.Music ids = ids.Skip(5); } - await msg.ModifyAsync(m => m.Content = GetText("playlist_queue_complete")).ConfigureAwait(false); + await msg.ModifyAsync(m => m.Content = "✅ " + Format.Bold(GetText("playlist_queue_complete"))).ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] diff --git a/src/NadekoBot/Modules/Searches/Searches.cs b/src/NadekoBot/Modules/Searches/Searches.cs index 7ed4dae9..72969f49 100644 --- a/src/NadekoBot/Modules/Searches/Searches.cs +++ b/src/NadekoBot/Modules/Searches/Searches.cs @@ -41,17 +41,17 @@ namespace NadekoBot.Modules.Searches var data = JsonConvert.DeserializeObject(response); var embed = new EmbedBuilder() - .AddField(fb => fb.WithName("🌍 " + GetText("location")).WithValue(data.name + ", " + data.sys.country).WithIsInline(true)) - .AddField(fb => fb.WithName("📏 " + GetText("latlong")).WithValue($"{data.coord.lat}, {data.coord.lon}").WithIsInline(true)) - .AddField(fb => fb.WithName("☁ " + GetText("condition")).WithValue(string.Join(", ", data.weather.Select(w => w.main))).WithIsInline(true)) - .AddField(fb => fb.WithName("😓 " + GetText("humidity")).WithValue($"{data.main.humidity}%").WithIsInline(true)) - .AddField(fb => fb.WithName("💨 " + GetText("wind_speed")).WithValue(data.wind.speed + " km/h").WithIsInline(true)) - .AddField(fb => fb.WithName("🌡 " + GetText("temperature")).WithValue(data.main.temp + "°C").WithIsInline(true)) - .AddField(fb => fb.WithName("🔆 " + GetText("min_max")).WithValue($"{data.main.temp_min}°C - {data.main.temp_max}°C").WithIsInline(true)) - .AddField(fb => fb.WithName("🌄 " + GetText("sunrise")).WithValue($"{data.sys.sunrise.ToUnixTimestamp():HH:mm}").WithIsInline(true)) - .AddField(fb => fb.WithName("🌇 " + GetText("sunset")).WithValue($"{data.sys.sunset.ToUnixTimestamp():HH:mm}").WithIsInline(true)) + .AddField(fb => fb.WithName("🌍 " + Format.Bold(GetText("location"))).WithValue($"[{data.name + ", " + data.sys.country}](https://openweathermap.org/city/{data.id})").WithIsInline(true)) + .AddField(fb => fb.WithName("📏 " + Format.Bold(GetText("latlong"))).WithValue($"{data.coord.lat}, {data.coord.lon}").WithIsInline(true)) + .AddField(fb => fb.WithName("☁ " + Format.Bold(GetText("condition"))).WithValue(string.Join(", ", data.weather.Select(w => w.main))).WithIsInline(true)) + .AddField(fb => fb.WithName("😓 " + Format.Bold(GetText("humidity"))).WithValue($"{data.main.humidity}%").WithIsInline(true)) + .AddField(fb => fb.WithName("💨 " + Format.Bold(GetText("wind_speed"))).WithValue(data.wind.speed + " m/s").WithIsInline(true)) + .AddField(fb => fb.WithName("🌡 " + Format.Bold(GetText("temperature"))).WithValue(data.main.temp + "°C").WithIsInline(true)) + .AddField(fb => fb.WithName("🔆 " + Format.Bold(GetText("min_max"))).WithValue($"{data.main.temp_min}°C - {data.main.temp_max}°C").WithIsInline(true)) + .AddField(fb => fb.WithName("🌄 " + Format.Bold(GetText("sunrise"))).WithValue($"{data.sys.sunrise.ToUnixTimestamp():HH:mm} UTC").WithIsInline(true)) + .AddField(fb => fb.WithName("🌇 " + Format.Bold(GetText("sunset"))).WithValue($"{data.sys.sunset.ToUnixTimestamp():HH:mm} UTC").WithIsInline(true)) .WithOkColor() - .WithFooter(efb => efb.WithText("Powered by http://openweathermap.org")); + .WithFooter(efb => efb.WithText("Powered by openweathermap.org").WithIconUrl($"http://openweathermap.org/img/w/{string.Join(", ", data.weather.Select(w => w.icon))}.png")); await Context.Channel.EmbedAsync(embed).ConfigureAwait(false); } From 1418297958047ecd6b5a821dfecab8f22a2767ca Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Thu, 2 Mar 2017 05:20:12 -0500 Subject: [PATCH 144/496] Update QuoteRepository.cs --- .../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 591c3dde..be9db36d 100644 --- a/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs +++ b/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs @@ -28,7 +28,7 @@ namespace NadekoBot.Services.Database.Repositories.Impl var rngk = new NadekoRandom(); string lowertext = text.ToLowerInvariant(); string uppertext = text.ToUpperInvariant(); - return _set.Where(q => q.GuildId == guildId && q.Keyword == keyword && (q.Text.Contains(text) || q.Text.Contains(lowertext) || q.Text.Contains(uppertext))).OrderBy(q => rngk.Next()).FirstOrDefaultAsync(); + return _set.Where(q => (q.Text.Contains(text) | q.Text.Contains(lowertext) | q.Text.Contains(uppertext)) & (q.GuildId == guildId && q.Keyword == keyword)).OrderBy(q => rngk.Next()).FirstOrDefaultAsync(); } } } From c77048769d0775b868ac11b85982998cc3c9857b Mon Sep 17 00:00:00 2001 From: Rajath Ranganath Date: Thu, 2 Mar 2017 17:03:23 +0530 Subject: [PATCH 145/496] Fixed a crap ton of command help messages Added extra markdown too. Command help looks bootiful now :3 --- src/NadekoBot/Resources/CommandStrings.resx | 142 ++++++++++---------- 1 file changed, 71 insertions(+), 71 deletions(-) diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx index 662975cf..98cc7345 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -124,7 +124,7 @@ Either shows a help for a single command, or DMs you help link if no arguments are specified. - `{0}h !!q` or `{0}h` + `{0}h -cmds` or `{0}h` hgit @@ -157,7 +157,7 @@ commands cmds - List all of the bot's commands from a certain module. You can either specify full, or only first few letters of the module name. + List all of the bot's commands from a certain module. You can either specify the full name or only the first few letters of the module name. `{0}commands Administration` or `{0}cmds Admin` @@ -166,7 +166,7 @@ greetdel grdel - Sets the time it takes (in seconds) for greet messages to be auto-deleted. Set 0 to disable automatic deletion. + Sets the time it takes (in seconds) for greet messages to be auto-deleted. Set it to 0 to disable automatic deletion. `{0}greetdel 0` or `{0}greetdel 30` @@ -184,7 +184,7 @@ greetmsg - Sets a new join announcement message which will be shown in the server's channel. Type %user% if you want to mention the new member. Using it with no message will show the current greet message. You can use embed json from <http://nadekobot.xyz/embedbuilder/> instead of a regular text, if you want the message to be embedded. + Sets a new join announcement message which will be shown in the server's channel. Type `%user%` if you want to mention the new member. Using it with no message will show the current greet message. You can use embed json from <http://nadekobot.xyz/embedbuilder/> instead of a regular text, if you want the message to be embedded. `{0}greetmsg Welcome, %user%.` @@ -202,7 +202,7 @@ byemsg - Sets a new leave announcement message. Type %user% if you want to show the name the user who left. Type %id% to show id. Using this command with no message will show the current bye message. You can use embed json from <http://nadekobot.xyz/embedbuilder/> instead of a regular text, if you want the message to be embedded. + Sets a new leave announcement message. Type `%user%` if you want to show the name the user who left. Type `%id%` to show id. Using this command with no message will show the current bye message. You can use embed json from <http://nadekobot.xyz/embedbuilder/> instead of a regular text, if you want the message to be embedded. `{0}byemsg %user% has left.` @@ -211,7 +211,7 @@ byedel - Sets the time it takes (in seconds) for bye messages to be auto-deleted. Set 0 to disable automatic deletion. + Sets the time it takes (in seconds) for bye messages to be auto-deleted. Set it to `0` to disable automatic deletion. `{0}byedel 0` or `{0}byedel 30` @@ -238,7 +238,7 @@ logignore - Toggles whether the .logserver command ignores this channel. Useful if you have hidden admin channel and public log channel. + Toggles whether the `.logserver` command ignores this channel. Useful if you have hidden admin channel and public log channel. `{0}logignore` @@ -274,7 +274,7 @@ repeat - Repeat a message every X minutes in the current channel. You can have up to 5 repeating messages on the server in total. + Repeat a message every `X` minutes in the current channel. You can have up to 5 repeating messages on the server in total. `{0}repeat 5 Hello there` @@ -292,7 +292,7 @@ addplaying adpl - Adds a specified string to the list of playing strings to rotate. Supported placeholders: %servers%, %users%, %playing%, %queued%, %time%,%shardid%,%shardcount%, %shardguilds% + Adds a specified string to the list of playing strings to rotate. Supported placeholders: `%servers%`, `%users%`, `%playing%`, `%queued%`, `%time%`, `%shardid%`, `%shardcount%`, `%shardguilds%`. `{0}adpl` @@ -337,7 +337,7 @@ voice+text v+t - Creates a text channel for each voice channel only users in that voice channel can see.If you are server owner, keep in mind you will see them all the time regardless. + Creates a text channel for each voice channel only users in that voice channel can see. If you are server owner, keep in mind you will see them all the time regardless. `{0}v+t` @@ -364,7 +364,7 @@ lcsc - Leaves Cross server channel instance from this channel. + Leaves a cross server channel instance from this channel. `{0}lcsc` @@ -427,7 +427,7 @@ addcustreact acr - Add a custom reaction with a trigger and a response. Running this command in server requires Administration permission. Running this command in DM is Bot Owner only and adds a new global custom reaction. Guide here: <http://nadekobot.readthedocs.io/en/latest/Custom%20Reactions/> + Add a custom reaction with a trigger and a response. Running this command in server requires the Administration permission. Running this command in DM is Bot Owner only and adds a new global custom reaction. Guide here: <http://nadekobot.readthedocs.io/en/latest/Custom%20Reactions/> `{0}acr "hello" Hi there %user%` @@ -463,7 +463,7 @@ delcustreact dcr - Deletes a custom reaction on a specific index. If ran in DM, it is bot owner only and deletes a global custom reaction. If ran in a server, it requires Administration priviledges and removes server custom reaction. + Deletes a custom reaction on a specific index. If ran in DM, it is bot owner only and deletes a global custom reaction. If ran in a server, it requires Administration privileges and removes server custom reaction. `{0}dcr 5` @@ -481,7 +481,7 @@ leave - Makes Nadeko leave the server. Either name or id required. + Makes Nadeko leave the server. Either server name or server ID is required. `{0}leave 123123123331` @@ -490,7 +490,7 @@ delmsgoncmd - Toggles the automatic deletion of user's successful command message to prevent chat flood. + Toggles the automatic deletion of the user's successful command message to prevent chat flood. `{0}delmsgoncmd` @@ -526,7 +526,7 @@ renamerole renr - Renames a role. Roles you are renaming must be lower than bot's highest role. + Renames a role. The role you are renaming must be lower than bot's highest role. `{0}renr "First role" SecondRole` @@ -679,7 +679,7 @@ prune clr - `{0}prune` removes all nadeko's messages in the last 100 messages.`{0}prune X` removes last X messages from the channel (up to 100)`{0}prune @Someone` removes all Someone's messages in the last 100 messages.`{0}prune @Someone X` removes last X 'Someone's' messages in the channel. + `{0}prune` removes all Nadeko's messages in the last 100 messages. `{0}prune X` removes last `X` number of messages from the channel (up to 100). `{0}prune @Someone` removes all Someone's messages in the last 100 messages. `{0}prune @Someone X` removes last `X` number of 'Someone's' messages in the channel. `{0}prune` or `{0}prune 5` or `{0}prune @Someone` or `{0}prune @Someone X` @@ -724,7 +724,7 @@ send - Sends a message to someone on a different server through the bot. Separate server and channel/user ids with `|` and prepend channel id with `c:` and user id with `u:`. + Sends a message to someone on a different server through the bot. Separate server and channel/user ids with `|` and prefix the channel id with `c:` and the user id with `u:`. `{0}send serverid|c:channelid message` or `{0}send serverid|u:userid message` @@ -733,7 +733,7 @@ mentionrole menro - Mentions every person from the provided role or roles (separated by a ',') on this server. Requires you to have mention everyone permission. + Mentions every person from the provided role or roles (separated by a ',') on this server. Requires you to have the mention everyone permission. `{0}menro RoleName` @@ -751,7 +751,7 @@ donators - List of lovely people who donated to keep this project alive. + List of the lovely people who donated to keep this project alive. `{0}donators` @@ -769,7 +769,7 @@ announce - Sends a message to all servers' general channel bot is connected to. + Sends a message to all servers' default channel that bot is connected to. `{0}announce Useless spam` @@ -787,7 +787,7 @@ remind - Sends a message to you or a channel after certain amount of time. First argument is me/here/'channelname'. Second argument is time in a descending order (mo>w>d>h>m) example: 1w5d3h10m. Third argument is a (multiword)message. + Sends a message to you or a channel after certain amount of time. First argument is `me`/`here`/'channelname'. Second argument is time in a descending order (mo>w>d>h>m) example: 1w5d3h10m. Third argument is a (multiword) message. `{0}remind me 1d5h Do something` or `{0}remind #general 1m Start now!` @@ -796,7 +796,7 @@ remindtemplate - Sets message for when the remind is triggered. Available placeholders are %user% - user who ran the command, %message% - Message specified in the remind, %target% - target channel of the remind. + Sets message for when the remind is triggered. Available placeholders are `%user%` - user who ran the command, `%message%` - Message specified in the remind, `%target%` - target channel of the remind. `{0}remindtemplate %user%, do %message%!` @@ -895,7 +895,7 @@ roles - List roles on this server or a roles of a specific user if specified. Paginated. 20 roles per page. + List roles on this server or a roles of a specific user if specified. Paginated, 20 roles per page. `{0}roles 2` or `{0}roles @Someone` @@ -913,7 +913,7 @@ chnlfilterinv cfi - Toggles automatic deleting of invites posted in the channel. Does not negate the {0}srvrfilterinv enabled setting. Does not affect Bot Owner. + Toggles automatic deletion of invites posted in the channel. Does not negate the `{0}srvrfilterinv` enabled setting. Does not affect the Bot Owner. `{0}cfi` @@ -922,7 +922,7 @@ srvrfilterinv sfi - Toggles automatic deleting of invites posted in the server. Does not affect Bot Owner. + Toggles automatic deletion of invites posted in the server. Does not affect the Bot Owner. `{0}sfi` @@ -931,7 +931,7 @@ chnlfilterwords cfw - Toggles automatic deleting of messages containing banned words on the channel. Does not negate the {0}srvrfilterwords enabled setting. Does not affect bot owner. + Toggles automatic deletion of messages containing filtered words on the channel. Does not negate the `{0}srvrfilterwords` enabled setting. Does not affect the Bot Owner. `{0}cfw` @@ -958,7 +958,7 @@ srvrfilterwords sfw - Toggles automatic deleting of messages containing forbidden words on the server. Does not affect Bot Owner. + Toggles automatic deleting of messages containing filtered words on the server. Does not affect the Bot Owner. `{0}sfw` @@ -967,7 +967,7 @@ permrole pr - Sets a role which can change permissions. Or supply no parameters to find out the current one. Default one is 'Nadeko'. + Sets a role which can change permissions. Supply no parameters to find out the current one. Default is 'Nadeko'. `{0}pr role` @@ -1084,7 +1084,7 @@ ubl - Either [add]s or [rem]oves a user specified by a mention or ID from a blacklist. + Either [add]s or [rem]oves a user specified by a Mention or an ID from a blacklist. `{0}ubl add @SomeUser` or `{0}ubl rem 12312312313` @@ -1102,7 +1102,7 @@ sbl - Either [add]s or [rem]oves a server specified by a Name or ID from a blacklist. + Either [add]s or [rem]oves a server specified by a Name or an ID from a blacklist. `{0}sbl add 12312321312` or `{0}sbl rem SomeTrashServer` @@ -1111,7 +1111,7 @@ cmdcooldown cmdcd - Sets a cooldown per user for a command. Set to 0 to remove the cooldown. + Sets a cooldown per user for a command. Set it to 0 to remove the cooldown. `{0}cmdcd "some cmd" 5` @@ -1201,7 +1201,7 @@ roll - Rolls 0-100. If you supply a number [x] it rolls up to 30 normal dice. If you split 2 numbers with letter d (xdy) it will roll x dice from 1 to y. Y can be a letter 'F' if you want to roll fate dice instead of dnd. + Rolls 0-100. If you supply a number `X` it rolls up to 30 normal dice. If you split 2 numbers with letter `d` (`xdy`) it will roll `X` dice from 1 to `y`. `Y` can be a letter 'F' if you want to roll fate dice instead of dnd. `{0}roll` or `{0}roll 7` or `{0}roll 3d5` or `{0}roll 5dF` @@ -1210,7 +1210,7 @@ rolluo - Rolls X normal dice (up to 30) unordered. If you split 2 numbers with letter d (xdy) it will roll x dice from 1 to y. + Rolls `X` normal dice (up to 30) unordered. If you split 2 numbers with letter `d` (`xdy`) it will roll `X` dice from 1 to `y`. `{0}rolluo` or `{0}rolluo 7` or `{0}rolluo 3d5` @@ -1291,7 +1291,7 @@ leaderboard lb - Displays bot currency leaderboard. + Displays the bot's currency leaderboard. `{0}lb` @@ -1300,7 +1300,7 @@ trivia t - Starts a game of trivia. You can add nohint to prevent hints.First player to get to 10 points wins by default. You can specify a different number. 30 seconds per question. + Starts a game of trivia. You can add `nohint` to prevent hints. First player to get to 10 points wins by default. You can specify a different number. 30 seconds per question. `{0}t` or `{0}t 5 nohint` @@ -1426,7 +1426,7 @@ rps - Play a game of rocket paperclip scissors with Nadeko. + Play a game of Rocket-Paperclip-Scissors with Nadeko. `{0}rps scissors` @@ -1480,7 +1480,7 @@ queue q yq - Queue a song using keywords or a link. Bot will join your voice channel.**You must be in a voice channel**. + Queue a song using keywords or a link. Bot will join your voice channel. **You must be in a voice channel**. `{0}q Dream Of Venice` @@ -1489,7 +1489,7 @@ soundcloudqueue sq - Queue a soundcloud song using keywords. Bot will join your voice channel.**You must be in a voice channel**. + Queue a soundcloud song using keywords. Bot will join your voice channel. **You must be in a voice channel**. `{0}sq Dream Of Venice` @@ -1507,7 +1507,7 @@ nowplaying np - Shows the song currently playing. + Shows the song that the bot is currently playing. `{0}np` @@ -1516,7 +1516,7 @@ volume vol - Sets the music volume 0-100% + Sets the music playback volume (0-100%) `{0}vol 50` @@ -1534,7 +1534,7 @@ max - Sets the music volume to 100%. + Sets the music playback volume to 100%. `{0}max` @@ -1543,7 +1543,7 @@ half - Sets the music volume to 50%. + Sets the music playback volume to 50%. `{0}half` @@ -1561,7 +1561,7 @@ soundcloudpl scpl - Queue a soundcloud playlist using a link. + Queue a Soundcloud playlist using a link. `{0}scpl soundcloudseturl` @@ -1660,7 +1660,7 @@ save - Saves a playlist under a certain name. Name must be no longer than 20 characters and mustn't contain dashes. + Saves a playlist under a certain name. Playlist name must be no longer than 20 characters and must not contain dashes. `{0}save classical1` @@ -1669,7 +1669,7 @@ load - Loads a saved playlist using it's ID. Use `{0}pls` to list all saved playlists and {0}save to save new ones. + Loads a saved playlist using its ID. Use `{0}pls` to list all saved playlists and `{0}save` to save new ones. `{0}load 5` @@ -1678,7 +1678,7 @@ playlists pls - Lists all playlists. Paginated. 20 per page. Default page is 0. + Lists all playlists. Paginated, 20 per page. Default page is 0. `{0}pls 1` @@ -1687,7 +1687,7 @@ deleteplaylist delpls - Deletes a saved playlist. Only if you made it or if you are the bot owner. + Deletes a saved playlist. Works only if you made it or if you are the bot owner. `{0}delpls animu-5` @@ -1705,7 +1705,7 @@ autoplay ap - Toggles autoplay - When the song is finished, automatically queue a related youtube song. (Works only for youtube songs and when queue is empty) + Toggles autoplay - When the song is finished, automatically queue a related Youtube song. (Works only for Youtube songs and when queue is empty) `{0}ap` @@ -1939,7 +1939,7 @@ image img - Pulls the first image found using a search parameter. Use {0}rimg for different results. + Pulls the first image found using a search parameter. Use `{0}rimg` for different results. `{0}img cute kitten` @@ -1966,7 +1966,7 @@ google g - Get a google search link for some terms. + Get a Google search link for some terms. `{0}google query` @@ -2029,7 +2029,7 @@ chucknorris cn - Shows a random chucknorris joke from <http://tambal.azurewebsites.net/joke/random> + Shows a random Chuck Norris joke from <http://tambal.azurewebsites.net/joke/random> `{0}cn` @@ -2038,7 +2038,7 @@ magicitem mi - Shows a random magicitem from <https://1d4chan.org/wiki/List_of_/tg/%27s_magic_items> + Shows a random magic item from <https://1d4chan.org/wiki/List_of_/tg/%27s_magic_items> `{0}mi` @@ -2047,7 +2047,7 @@ revav - Returns a google reverse image search for someone's avatar. + Returns a Google reverse image search for someone's avatar. `{0}revav "@SomeGuy"` @@ -2056,7 +2056,7 @@ revimg - Returns a google reverse image search for an image from a link. + Returns a Google reverse image search for an image from a link. `{0}revimg Image link` @@ -2212,7 +2212,7 @@ Shows the active war claims by a number. Shows all wars in a short way if no number is specified. - `{0}lw [war_number] or {0}lw` + `{0}lw [war_number]` or `{0}lw` claim call c @@ -2296,7 +2296,7 @@ readme guide - Shows all available operations in {0}calc command + Shows all available operations in the `{0}calc` command `{0}calcops` @@ -2320,7 +2320,7 @@ `{0}greetdmmsg Welcome to the server, %user%`. - Sets a new join announcement message which will be sent to the user who joined. Type %user% if you want to mention the new member. Using it with no message will show the current DM greet message. You can use embed json from <http://nadekobot.xyz/embedbuilder/> instead of a regular text, if you want the message to be embedded. + Sets a new join announcement message which will be sent to the user who joined. Type `%user%` if you want to mention the new member. Using it with no message will show the current DM greet message. You can use embed json from <http://nadekobot.xyz/embedbuilder/> instead of a regular text, if you want the message to be embedded. Check how much currency a person has. (Defaults to yourself) @@ -2350,7 +2350,7 @@ allusrmdls aum - Moves permission from one position to another in Permissions list. + Moves permission from one position to another in the Permissions list. `{0}mp 2 4` @@ -2359,7 +2359,7 @@ moveperm mp - Removes a permission from a given position in Permissions list. + Removes a permission from a given position in the Permissions list. `{0}rp 1` @@ -2416,7 +2416,7 @@ fwtoall - Toggles whether messages will be forwarded to all bot owners or only to the first one specified in the credentials.json + Toggles whether messages will be forwarded to all bot owners or only to the first one specified in the credentials.json file `{0}fwtoall` @@ -2425,7 +2425,7 @@ resetperms - Resets BOT's permissions module on this server to the default value. + Resets the bot's permissions module on this server to the default value. `{0}resetperms` @@ -2443,7 +2443,7 @@ antispam - Stops people from repeating same message X times in a row. You can specify to either mute, kick or ban the offenders. Max message count is 10. + Stops people from repeating same message X times in a row. You can specify to either mute, kick or ban the offenders. Max message count is 10. `{0}antispam 3 Mute` or `{0}antispam 4 Kick` or `{0}antispam 6 Ban` @@ -2488,7 +2488,7 @@ adsarm - Toggles the automatic deletion of confirmations for {0}iam and {0}iamn commands. + Toggles the automatic deletion of confirmations for `{0}iam` and `{0}iamn` commands. `{0}adsarm` @@ -2713,7 +2713,7 @@ heal - Heals someone. Revives those who fainted. Costs a NadekoFlower + Heals someone. Revives those who fainted. Costs a NadekoFlower. `{0}heal @someone` @@ -2812,7 +2812,7 @@ log - Toggles logging event. Disables it if it's active anywhere on the server. Enables if it's not active. Use `{0}logevents` to see a list of all events you can subscribe to. + Toggles logging event. Disables it if it iss active anywhere on the server. Enables if it isn't active. Use `{0}logevents` to see a list of all events you can subscribe to. `{0}log userpresence` or `{0}log userbanned` @@ -2821,7 +2821,7 @@ fairplay fp - Toggles fairplay. While enabled, music player will prioritize songs from users who didn't have their song recently played instead of the song's position in the queue. + Toggles fairplay. While enabled, the bot will prioritize songs from users who didn't have their song recently played instead of the song's position in the queue. `{0}fp` @@ -2938,7 +2938,7 @@ cmdcosts - Shows a list of command costs. Paginated with 9 command per page. + Shows a list of command costs. Paginated with 9 commands per page. `{0}cmdcosts` or `{0}cmdcosts 2` @@ -3037,7 +3037,7 @@ mal - Shows basic info from myanimelist profile. + Shows basic info from a MyAnimeList profile. `{0}mal straysocks` @@ -3127,7 +3127,7 @@ languageset langset - 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. + 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. `{0}langset de-DE ` or `{0}langset default` @@ -3150,4 +3150,4 @@ `{0}rategirl @SomeGurl` - \ No newline at end of file + From aba3a5f6f3e37a68cb91891481d9a84388cc8187 Mon Sep 17 00:00:00 2001 From: Rajath Ranganath Date: Thu, 2 Mar 2017 17:08:49 +0530 Subject: [PATCH 146/496] Minor typo fix --- 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 98cc7345..49bd76e8 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -2812,7 +2812,7 @@ log - Toggles logging event. Disables it if it iss active anywhere on the server. Enables if it isn't active. Use `{0}logevents` to see a list of all events you can subscribe to. + Toggles logging event. Disables it if it is active anywhere on the server. Enables if it isn't active. Use `{0}logevents` to see a list of all events you can subscribe to. `{0}log userpresence` or `{0}log userbanned` From f4870c4678112638b693e59872ae936dc2989ae7 Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Thu, 2 Mar 2017 11:22:07 -0500 Subject: [PATCH 147/496] Update QuoteRepository.cs --- .../Services/Database/Repositories/Impl/QuoteRepository.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs b/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs index be9db36d..a7036dff 100644 --- a/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs +++ b/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs @@ -1,4 +1,5 @@ -using NadekoBot.Services.Database.Models; +using NadekoBot.Services.Database.Models; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -26,9 +27,7 @@ namespace NadekoBot.Services.Database.Repositories.Impl public Task SearchQuoteKeywordTextAsync(ulong guildId, string keyword, string text) { var rngk = new NadekoRandom(); - string lowertext = text.ToLowerInvariant(); - string uppertext = text.ToUpperInvariant(); - return _set.Where(q => (q.Text.Contains(text) | q.Text.Contains(lowertext) | q.Text.Contains(uppertext)) & (q.GuildId == guildId && q.Keyword == keyword)).OrderBy(q => rngk.Next()).FirstOrDefaultAsync(); + return _set.Where(q => q.Text.IndexOf(text, StringComparison.OrdinalIgnoreCase) >=0 && q.GuildId == guildId && q.Keyword == keyword).OrderBy(q => rngk.Next()).FirstOrDefaultAsync(); } } } From c7e694fc1d01fe07d9e1b0fd92b769ef1ff81678 Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Thu, 2 Mar 2017 11:24:37 -0500 Subject: [PATCH 148/496] Update QuoteCommands.cs --- .../Modules/Utility/Commands/QuoteCommands.cs | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs b/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs index e0445e0c..d811f565 100644 --- a/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs +++ b/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs @@ -89,18 +89,7 @@ namespace NadekoBot.Modules.Utility if (keywordquote == null) return; - - CREmbed crembed; - if (CREmbed.TryParse(keywordquote.Text, out crembed)) - { - try { await Context.Channel.EmbedAsync(crembed.ToEmbed(), crembed.PlainText ?? "").ConfigureAwait(false); } - catch (Exception ex) - { - _log.Warn("Sending CREmbed failed"); - _log.Warn(ex); - } - return; - } + await Context.Channel.SendMessageAsync("💬 " + keyword.ToLowerInvariant() + ": " + keywordquote.Text.SanitizeMentions()); } From 33faec9649ad47f64ea47af55925e8e3f85006d3 Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Thu, 2 Mar 2017 17:21:03 -0500 Subject: [PATCH 149/496] ContainsNoCase Extension for Contains() used extensively, here as `ContainsNoCase` for indexOf() with StringComparison type options: CurrentCulture, CurrentCultureIgnoreCase, InvariantCulture, InvariantCultureIgnoreCase, Ordinal, OrdinalIgnoreCase The extension here implements the String.IndexOf Method (String,StringComparison) method: https://msdn.microsoft.com/en-us/library/ms224425(v=vs.110).aspx Allows clean access to this method as `ContainsNoCase(string, StringComparison.TYPE)` --- src/NadekoBot/_Extensions/Extensions.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/NadekoBot/_Extensions/Extensions.cs b/src/NadekoBot/_Extensions/Extensions.cs index 8dbdf02b..f95e6fbb 100644 --- a/src/NadekoBot/_Extensions/Extensions.cs +++ b/src/NadekoBot/_Extensions/Extensions.cs @@ -278,6 +278,15 @@ namespace NadekoBot.Extensions return list; } } + + /// + /// Easy use of fast, efficient case-insensitive Contains check with StringComparison Member Types + /// CurrentCulture, CurrentCultureIgnoreCase, InvariantCulture, InvariantCultureIgnoreCase, Ordinal, OrdinalIgnoreCase + /// + public static bool ContainsNoCase(this string str, string contains, StringComparison compare) + { + return str.IndexOf(contains, compare) >= 0; + } public static string TrimTo(this string str, int maxLength, bool hideDots = false) { @@ -436,4 +445,4 @@ namespace NadekoBot.Extensions : usr.AvatarUrl; } } -} \ No newline at end of file +} From f023251170fd98f683433993165643b9bae6884e Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Thu, 2 Mar 2017 17:26:40 -0500 Subject: [PATCH 150/496] Update QuoteRepository.cs updated with syntax from added extensions --- .../Services/Database/Repositories/Impl/QuoteRepository.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs b/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs index a7036dff..c2963c2b 100644 --- a/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs +++ b/src/NadekoBot/Services/Database/Repositories/Impl/QuoteRepository.cs @@ -1,4 +1,5 @@ using NadekoBot.Services.Database.Models; +using NadekoBot.Extensions; using System; using System.Collections.Generic; using System.Linq; @@ -27,7 +28,7 @@ namespace NadekoBot.Services.Database.Repositories.Impl public Task SearchQuoteKeywordTextAsync(ulong guildId, string keyword, string text) { var rngk = new NadekoRandom(); - return _set.Where(q => q.Text.IndexOf(text, StringComparison.OrdinalIgnoreCase) >=0 && q.GuildId == guildId && q.Keyword == keyword).OrderBy(q => rngk.Next()).FirstOrDefaultAsync(); + return _set.Where(q => q.Text.ContainsNoCase(text, StringComparison.OrdinalIgnoreCase) && q.GuildId == guildId && q.Keyword == keyword).OrderBy(q => rngk.Next()).FirstOrDefaultAsync(); } } } From 2b35d1c6556a304b8bc07494fda8d9c6639fe394 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 3 Mar 2017 02:06:20 +0100 Subject: [PATCH 151/496] fixed names for jap and nl translations --- ....ja-JP.resx => ResponseStrings.ja-JP.resx} | 234 +++++++++--------- ....nl-NL.resx => ResponseStrings.nl-NL.resx} | 234 +++++++++--------- 2 files changed, 234 insertions(+), 234 deletions(-) rename src/NadekoBot/Resources/{CommandStrings.ja-JP.resx => ResponseStrings.ja-JP.resx} (99%) rename src/NadekoBot/Resources/{CommandStrings.nl-NL.resx => ResponseStrings.nl-NL.resx} (99%) diff --git a/src/NadekoBot/Resources/CommandStrings.ja-JP.resx b/src/NadekoBot/Resources/ResponseStrings.ja-JP.resx similarity index 99% rename from src/NadekoBot/Resources/CommandStrings.ja-JP.resx rename to src/NadekoBot/Resources/ResponseStrings.ja-JP.resx index 76de6cb2..29a0675a 100644 --- a/src/NadekoBot/Resources/CommandStrings.ja-JP.resx +++ b/src/NadekoBot/Resources/ResponseStrings.ja-JP.resx @@ -1,121 +1,121 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 その基盤はすでに主張されている。または破壊されました。 diff --git a/src/NadekoBot/Resources/CommandStrings.nl-NL.resx b/src/NadekoBot/Resources/ResponseStrings.nl-NL.resx similarity index 99% rename from src/NadekoBot/Resources/CommandStrings.nl-NL.resx rename to src/NadekoBot/Resources/ResponseStrings.nl-NL.resx index d3b70713..f70710fa 100644 --- a/src/NadekoBot/Resources/CommandStrings.nl-NL.resx +++ b/src/NadekoBot/Resources/ResponseStrings.nl-NL.resx @@ -1,121 +1,121 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Die basis is al veroverd of vernietigd. From ebe662594b1bb3e2f62df37de77333a5c14219f1 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 3 Mar 2017 02:11:21 +0100 Subject: [PATCH 152/496] .langli no longer requires bot ownership --- .../Modules/Administration/Commands/LocalizationCommands.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs index 5707429b..45dedc1d 100644 --- a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs +++ b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs @@ -97,7 +97,6 @@ namespace NadekoBot.Modules.Administration } [NadekoCommand, Usage, Description, Aliases] - [OwnerOnly] public async Task LanguagesList() { await Context.Channel.EmbedAsync(new EmbedBuilder().WithOkColor() From 6390da46143cc867f5ef41a62e3ca4b4d8e72f03 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Fri, 3 Mar 2017 02:26:20 +0100 Subject: [PATCH 153/496] Update ResponseStrings.nl-NL.resx (POEditor.com) --- .../Resources/ResponseStrings.nl-NL.resx | 458 +++++++++--------- 1 file changed, 232 insertions(+), 226 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.nl-NL.resx b/src/NadekoBot/Resources/ResponseStrings.nl-NL.resx index f70710fa..b8945702 100644 --- a/src/NadekoBot/Resources/ResponseStrings.nl-NL.resx +++ b/src/NadekoBot/Resources/ResponseStrings.nl-NL.resx @@ -1,121 +1,121 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Die basis is al veroverd of vernietigd. @@ -127,7 +127,7 @@ Die basis is nog niet veroverd. - **VERNIETIGD**basis #{0} in een oorlog tegen {1} + **VERNIETIGD** basis #{0} in een oorlog tegen {1} {0} heeft **ONOVERWONNEN** basis #{1} in een oorlog tegen {2} @@ -136,7 +136,7 @@ {0} heeft basis #{1} overwonnen in een oorlog tegen {2} - @{0} Jij hebt al een basis overwonnen #{1}. Je kunt niet nog een nemen. + @{0} Je hebt al basis #{1} overwonnen. Je kunt er niet nog een nemen. De aanvraag van @{0} voor een oorlog tegen {1} is niet meer geldig. @@ -145,7 +145,7 @@ Vijand - Informatie over oorlog tegen {0} + Informatie over de oorlog tegen {0} Ongeldige basis nummer @@ -163,7 +163,7 @@ Jij doet niet mee aan die oorlog. - @{0} Jij doet niet mee aan die oorlog, or die basis is al vernietigd. + @{0} Je doet niet mee aan die oorlog, of die basis is al vernietigd. Geen voorlopende oorlogen. @@ -420,7 +420,7 @@ Momenteen is het privé groet bericht: {0} - Schakel DM begroetings bericht in door {0} in te typen. + Schakel DM begroetings bericht in door {0} in te typen Nieuwe DM begroetings bericht vastgesteld. @@ -429,7 +429,7 @@ DM begroetings aankondiging uitgeschakeld. - DM begroetings aankondiging ingeschakeld. + DM begroetingen aankondiging ingeschakeld. Momentele begroetings bericht: {0} @@ -459,81 +459,81 @@ Ongeldige parameters. - {0} heeft {1} toegetreden. + {0} heeft {1} toegetreden Je bent weggeschopt van de {0} server. Reden: {1} - Gebruiker weggeschopt. + Gebruiker weggeschopt Lijst van talen {0} - Jouw server's plaats van handeling is nu {0} - {1} + Jouw server's locale is nu {0} - {1} - Bot's standaard plaats van handeling is nu {0} - {1} + Bot's standaard locale is nu {0} - {1} - Bot's taal is vastgesteld van {0} - {1} + Taal van de bot is gezet naar {0} - {1} - + Instellen van locale mislukt. Ga naar de hulp voor dit commando. - deze server taal is gezet naar: + De taal van de server is gezet naar {0} - {1} - heeft verlaten + {0} heeft {1} verlaten - Heeft de server verlaten + Server {0} verlaten - + Gebeurtenis {0} wordt bijgehouden in dit kanaal. - + Alle gebeurtenissen worden bijgehouden in dit kanaal. - Logging uitgeschakeld + Logging uitgeschakeld. - + Log gebeurtenissen waar je op kan abonneren: - + Logging zal {0} negeren - + Logging zal {0} niet negeren - + Gestopt met het loggen van {0}. - + {0} heeft een melding geplaatst op de volgende rollen - + Bericht van {0} `[Bot Eigenaar]`: - Bericht verstuurd + Bericht verstuurd. - verplaats van ... naar ... + {0} verplaats van {1} naar {2} - bericht verwijdert in + Bericht in #{0} verwijdert - bericht bijgewerkt in + Bericht in #{0} bijgewerkt - gemute + Gebruikers zijn gedempt PLURAL (users have been muted) @@ -541,13 +541,13 @@ Reden: {1} singular "User muted." - + Ik heb de benodigde rechten daar voor waarschijnlijk niet. - nieuwe demp group gezet + Nieuwe demp rol geplaatst. - Ik heb **administrator** rechten nodig voor dat + Ik heb **administrator** rechten daar voor nodig. nieuw bericht @@ -565,7 +565,7 @@ Reden: {1} Kan de server niet vinden - + Geen shard gevonden met dat ID. Oud bericht @@ -577,160 +577,161 @@ Reden: {1} Oude onderwerp - error hoogst waarschijnlijk niet voldoende permissie + Fout. Hoogst waarschijnlijk heb ik geen voldoende rechten. - de rechten op deze server zijn gereset + De rechten op deze server zijn gereset. - actieve bescherming + Actieve Beschermingen. - is ** uitgeschakeld** op deze server + {0} is nu ** uitgeschakeld** op deze server. - aangezet + {0} Ingeschakeld - fout. ik heb managergroup rechten nodig + Fout. ik heb Beheer Rollen rechten nodig - geen bescherming aangezet + Geen bescherming aangezet. - + Gebruiker's drempel moet tussen {0} en {1} zijn. - + Als {0} of meerdere gebruikers binnen {1} seconden, zal ik hun {2}. - + Aangegeven tijd hoort binnen {0} en {1} seconden te vallen. - + Met succes alle roles van de gebruiker {0} verwijderd - + Het verwijderen van de rollen is mislukt. Ik heb onvoldoende rechten. - + De kleur van de rol {0} is veranderd - + Die rol bestaat niet. - + De aangegeven parameters zijn ongeldig. - + Error opgekomen vanwege ongeldige kleur, of onvoldoende rechten. - + Met sucess rol {0} verwijderd van gebruiker {1}. - + Mislukt om rol te verwijderen. Ik heb onvoldoende rechten. - group naam veranderd + Rol naam veranderd. - group naam veranderen mislukt. ik heb niet genoeg rechten + Rol naam veranderen mislukt. Ik heb onvoldoende rechten. - je kan geen groupen bijwerken die hoger zijn dan jou eigen group + je kan geen rollen bijwerken die hoger zijn dan je eigen rol. - Verwijderd van speel bericht + Speel bericht verwijderd: {0} - group... is toegevoegd aan de lijst + Rol {0} is toegevoegd aan de lijst. - niet gevonden. aan het opruimen + {0} niet gevonden. Klaar met opruimen. - group is al in de lijst + Rol {0} staat al in de lijst. - toegevoegd + Toegevoegd. - + Routerende speelstatus uitgeschakeld. - + Routerende speelstatus ingeschakeld. - + Hier is een lijst met routerende statussen: +{0} - + Nog geen routerende speelstatussen ingesteld. - je hebt al .. group + Je hebt al {0} rol. - + Je hebt {0} exclusieve zelf toegewezen rol al. - + Zelf toegewezen rollen zijn nu exclusief! - + Er zijn {0} zelf toewijsbare rollen - deze group is niet zelf + Deze rol is niet zelf toewijsbaar. - + Je hebt niet {0} rol. - + Zelf toegewezen rollen zijn nu niet exclusief! - + Ik kan deze rol niet aan je toevoegen. `Ik kan niet rollen toevoegen aan eigenaren of andere rollen die boven mij staan in de rol hiërarchie.` - + {0} is verwijderd van de lijst met zelf toewijsbare rollen. - je heb niet lang meer de {0} group + Je hebt {0} rol niet meer. - je hebt nu {0} group + je hebt nu {0} rol. - met sucess een group {0) toegevoegd aan gebruiker {1} + Succesvol de rol {0} toegevoegd aan gebruiker {1} - fout bij het toevoegen van een group. je heb onvoldoende rechten + Fout bij het toevoegen van de rol. Ik heb onvoldoende rechten. - Nieuwe avatar gezet! + Nieuwe avatar ingesteld! - Nieuwe kanaal naam gezet. + Nieuwe kanaal naam ingesteld. - Nieuwe game gezet! + Nieuwe game ingesteld! - Nieuwe stream gezet! + Nieuwe stream ingesteld! - Nieuwe kanaal onderwerp gezet + Nieuwe kanaal onderwerp ingesteld. - + Shard {0} opnieuw verbonden. - + Shard {0} is opnieuw aan het verbinden. - afsluiten + Afsluiten - + Gebruikers kunnen niet meer dan {0} berichten sturen per {1} seconden. langzame mode uitgezet @@ -739,66 +740,71 @@ Reden: {1} langzame mode gestart - zacht-verbannen(kicked) + zacht-verbannen (kicked) PLURAL - {0} wil deze kanaal dempen + {0} zal dit kanaal negeren. - + {0} zal dit kanaal niet meer negeren. - + Als een gebruiker {0} de zelfde berichten plaatst, zal ik ze {1}. +__IgnoredChannels__: {2} - + Tekst kanaal aangemaakt. - + Tekst kanaal verwijderd. - + Ongedempt singular - + Gebruikersnaam - + Gebruikersnaam veranderd - + Gebruikers - + Gebruiker verbannen - + {0} is **gedempt** van chatten. + Fuzzy - + {0} is **ongedempt** van chatten. + Fuzzy - + Gebruiker toegetreden + Fuzzy - + Gebruiker verlaten + Fuzzy - + Gebruiker's rol toegevoegd - + Gebruiker's rol verwijderd - + {0} is nu {1} @@ -1173,16 +1179,16 @@ Reden: {1} - + {0} heeft een zin ingezonden. ({1} in totaal) - + {0} heeft gestemd! - + De winnaar is {0} met {1} punten. @@ -2063,13 +2069,13 @@ Reden: {1} - + Geen verwijderbare citaten gevonden - + Citaat toegevoegd - + Een willekeurig citaat verwijderd From 55fc4432dde3455f799953f29d4b8bfb43fd5213 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Fri, 3 Mar 2017 02:26:23 +0100 Subject: [PATCH 154/496] Update ResponseStrings.fr-fr.resx (POEditor.com) --- .../Resources/ResponseStrings.fr-fr.resx | 72 +++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx b/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx index ac95afb6..b0bcd0c5 100644 --- a/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx +++ b/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx @@ -315,7 +315,7 @@ Raison: {1} - banni + bannis PLURAL @@ -628,7 +628,7 @@ Raison : {1} Erreur due à un manque de permissions ou à une couleur invalide. - L'utilisateur {1} n'appartient plus au rôle {0}. + L'utilisateur {1} n'a plus le rôle {0}. Impossible de supprimer ce rôle. Je ne possède pas les permissions suffisantes. @@ -705,7 +705,7 @@ Raison : {1} Vous avez désormais le rôle {0}. - L'ajout du rôle {0} pour l'utilisateur {1} a été réalisé avec succès. + L'utilisateur {1} a désormais le rôle {0}. Impossible d'ajouter un rôle. Je ne possède pas les permissions suffisantes. @@ -727,7 +727,7 @@ Raison : {1} Nouveau sujet du salon défini. - Shard {0} reconnectée. + Shard {0} reconnecté. Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. @@ -758,13 +758,13 @@ Raison : {1} Si un utilisateur poste {0} le même message à la suite, je le {1}. - __SalonsIgnorés__: {2} + __SalonsIgnorés__: {2} Salon textuel crée. - Salon textuel détruit. + Salon textuel supprimé. Son activé avec succès. @@ -774,7 +774,7 @@ Raison : {1} singular - Nom d'utilisateur. + Nom d'utilisateur Nom d'utilisateur modifié. @@ -798,7 +798,7 @@ Raison : {1} L'utilisateur a quitté - {0} est maintenant **muet** à la fois sur le salon textuel et vocal. + {0} est maintenant **muet** à la fois sur les salons textuels et vocaux. Rôle ajouté à l'utilisateur @@ -819,7 +819,7 @@ Raison : {1} {0} a quitté le salon vocal {1}. - {0} est allé du salon vocal {1} au {2}. + {0} est allé du salon vocal {1} à {2}. {0} est maintenant **muet**. @@ -831,7 +831,7 @@ Raison : {1} Salon vocal crée. - Salon vocal détruit. + Salon vocal supprimé. Fonctionnalités vocales et textuelles désactivées. @@ -843,10 +843,10 @@ Raison : {1} Je n'ai pas la permission **Gérer les rôles** et/ou **Gérer les salons**, je ne peux donc pas utiliser `voice+text` sur le serveur {0}. - Vous activez/désactivez cette fonctionnalité et **je n'ai pas les permissions ADMINISTRATEURS**. Cela pourrait causer des dysfonctionnements, et vous devrez nettoyer les salons textuels vous-même après ça. + Vous activez/désactivez cette fonctionnalité et **je n'ai pas la permission ADMINISTRATEUR**. Cela pourrait causer des dysfonctionnements, et vous devrez nettoyer les salons textuels vous-même après ça. - Je nécessite au moins les permissions **Gérer les rôles** et **Gérer les salons** pour activer cette fonctionnalité. (permissions administateurs préférées) + Je nécessite au moins les permissions **Gérer les rôles** et **Gérer les salons** pour activer cette fonctionnalité. (Permission Administrateur de préférence) Utilisateur {0} depuis un salon textuel. @@ -880,10 +880,11 @@ Raison: {1} a récompensé {0} à {1} - Meilleure chance la prochaine fois ^_^ + Plus de chance la prochaine fois ^_^ + C'est vraiment québecois ca.. On ne le dit pas comme ca ici xD - Félicitations! Vous avez gagné {0} pour avoir lancé au dessus de {1} + Félicitations! Vous avez gagné {0} pour avoir lancé au dessus de {1}. Deck remélangé. @@ -893,7 +894,7 @@ Raison: {1} User flipped tails. - Vous l'avez deviné! Vous avez gagné {0} + Vous avez deviné! Vous avez gagné {0} Nombre spécifié invalide. Vous pouvez lancer 1 à {0} pièces. @@ -1338,7 +1339,7 @@ La nouvelle valeur de {0} est {1} ! {0} contre {1} - Tentative d'ajouter {0} à la file d'attente... + Tentative d'ajouter {0} pistes à la file d'attente... Lecture automatique désactivée. @@ -1347,7 +1348,7 @@ La nouvelle valeur de {0} est {1} ! Lecture automatique activée. - Volume de base défini à {0}% + Volume par défaut défini à {0}% File d'attente complète. @@ -1374,10 +1375,10 @@ La nouvelle valeur de {0} est {1} ! Entrée invalide. - Le temps maximum de lecture n'a désormais plus de limite. + Le temps maximum de lecture est désormais illimité. - Le temps de lecture maximum a été mis à {0} seconde(s). + Temps maximum de lecture défini à {0} seconde(s). La taille de la file d'attente est désormais illmitée. @@ -1401,16 +1402,16 @@ La nouvelle valeur de {0} est {1} ! Pas de résultat. - Lecteur mis sur pause. + Lecteure mise en pause. - Liste d'attente - Page {0}/{1} + File d'attente - Page {0}/{1} - Lecture en cours: + Lecture en cours - `#{0}` - **{1}** par *{2}* ({3} morceaux) + `#{0}` - **{1}** par *{2}* ({3} pistes) Page {0} des listes de lecture sauvegardées @@ -1434,23 +1435,23 @@ La nouvelle valeur de {0} est {1} ! Limite à {0}s - Liste d'attente + File d'attente - Son ajouté à la file d'attente + Piste ajoutée à la file d'attente - Liste d'attente effacée. + File d'attente effacée. - Liste d'attente complète ({0}/{0}). + File d'attente complète ({0}/{0}). - Son retiré + Piste retirée context: "removed song #5" - Répétition de la musique en cours + Répétition de la piste en cours de lecture Liste de lecture en boucle @@ -1471,7 +1472,7 @@ La nouvelle valeur de {0} est {1} ! Lecture en boucle activée. - Je vais désormais afficher les musiques en cours, en pause, terminées et supprimées sur ce salon. + Je vais désormais afficher les pistess en cours, en pause, terminées et supprimées sur ce salon. Saut à `{0}:{1}` @@ -1480,13 +1481,13 @@ La nouvelle valeur de {0} est {1} ! Lecture aléatoire activée. - Musique déplacée + Piste déplacée {0}h {1}m {2}s - En position + À la position Illimité @@ -1665,7 +1666,6 @@ La nouvelle valeur de {0} est {1} ! Votre langue de traduction a été changée de {0} à {1} - Fuzzy Traduction automatique des messages commencée sur ce salon. @@ -2145,7 +2145,7 @@ OwnerID: {2} Page #{0} des rôles pour {1} - Aucunes couleurs ne sont dans le format correct. Utilisez `#00ff00` par exemple. + Aucune couleur n'est dans le bon format. Utilisez `#00ff00` par exemple. Couleurs alternées pour le rôle {0} activées. @@ -2178,7 +2178,7 @@ OwnerID: {2} Pas d'emojis spéciaux trouvés. - Joue actuellement {0} musiques, {1} en attente. + Joue actuellement {0} piste(s), {1} en attente. Salons textuels @@ -2190,7 +2190,7 @@ OwnerID: {2} Durée de fonctionnement - {0} de l'utilisateur {1} est {2} + {0} de l'utilisateur {1}: {2} Id of the user kwoth#1234 is 123123123123 From 8881d32151bd753dc97dcea1be68ffcaa89bc562 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Fri, 3 Mar 2017 02:26:25 +0100 Subject: [PATCH 155/496] Update ResponseStrings.de-DE.resx (POEditor.com) --- .../Resources/ResponseStrings.de-DE.resx | 94 +++++++++---------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.de-DE.resx b/src/NadekoBot/Resources/ResponseStrings.de-DE.resx index 8b3974b3..6b61e5f6 100644 --- a/src/NadekoBot/Resources/ResponseStrings.de-DE.resx +++ b/src/NadekoBot/Resources/ResponseStrings.de-DE.resx @@ -121,7 +121,7 @@ Diese Basis wurde bereits beansprucht oder zerstört. - Diese Basis ist bereits zertört. + Diese Basis ist bereits zerstört. Diese Basis ist nicht beansprucht. @@ -193,7 +193,7 @@ Benutzerdefinierte Reaktion gelöscht. - Unzureichende Rechte. Dies erfordert das sie den Bot besitzen für globale Reaktionen, und Administratorrechte für serverseitige Reaktionen. + Unzureichende Rechte. Dies erfordert das Sie den Bot besitzen für globale Reaktionen, und Administratorrechte für serverseitige Reaktionen. Liste aller benutzerdefinierten Reaktionen. @@ -287,7 +287,7 @@ Das ist sehr effektiv! - Sie haben zu viele Angriffe hintereinander eingesetzt, sodass sie sich nicht bewegen können! + Sie haben zu viele Angriffe hintereinander eingesetzt, sodass Sie sich nicht bewegen können! Typ von {0} ist {1} @@ -296,7 +296,7 @@ Benutzer nicht gefunden. - Sie sind ohnmächtig, daher können sie sich nicht bewegen! + Sie sind ohnmächtig, daher können Sie sich nicht bewegen! **Automatische Rollenzuteilung** wenn ein Benutzer beitritt ist nun **deaktiviert**. @@ -448,7 +448,7 @@ Grund: {1} Begrüßungsankündigungen wurden für diesen Kanal aktiviert. - Sie können diesen befehl nicht an Benutzern mit einer Rolle über oder gleich zu ihrer in der Rangordnung benutzen. + Sie können diesen befehl nicht an Benutzern mit einer Rolle über oder gleich zu Ihrer in der Rangordnung benutzen. Bilder wurden geladen nach {0} sekunden! @@ -477,13 +477,13 @@ Grund: {1} Ihr Servers Sprachumgebung ist jetzt {1} - {1} - Der Bots standard Sprachumgebung ist jetzt {0} - {1} + Die Sprachumgebung des Bots ist nun {0} - {1} Die Sprache des Bots ist {0} - {1} - Setzen der Sprachumgebung fehlgeschlagen. Greifen sie auf diesen Befehls hilfe erneut auf. + Setzen der Sprachumgebung fehlgeschlagen. Greifen Sie auf diesen Befehls hilfe erneut auf. Dieser Servers Sprache wurde zu {0} - {1} gesetzt @@ -504,7 +504,7 @@ Grund: {1} Aufzeichnungen wurden deaktiviert. - Aufzeichnungs Ereignise die sie abonnieren können: + Aufzeichnungs Ereignise die Sie abonnieren können: Aufzeichnungen werden {0} ignorieren @@ -602,7 +602,7 @@ Grund: {1} Benutzerschwelle muss zwischen {0} und {1} sein. - Wenn {0} oder mehr Benutzer innerhalb von {1} Sekunden beitreten werde ich sie {2}. + Wenn {0} oder mehr Benutzer innerhalb von {1} Sekunden beitreten werde ich Sie {2}. Zeit muss zwischen {0} und {1} sekunden sein. @@ -638,7 +638,7 @@ Grund: {1} Umbenennen der Rolle fehlgeschlagen. Ich habe nicht die erforderlichen Rechte. - Sie kännen keine Rollen bearbeiten die höher als ihre eigenen sind. + Sie kännen keine Rollen bearbeiten die höher als Ihre eigenen sind. Die Abspielnachricht wurde entfernt: {0} @@ -675,25 +675,25 @@ Grund: {1} Sie haben bereits die exklusive, selbstzugewiesene Rolle {0}. - Selbstzuweisbare Rollen sind nun exklusiv! + Selbst zugewiesene Rollen sind nun exklusiv! - Es gibt {0} selbstzuweisbare Rollen + Es gibt {0} Rollen, die man sich selbst zuweisen kann. - Diese Rolle ist nicht selbstzuweisbar. + Diese Rolle kann man sich nicht selbst zuweisen. Sie haben die Rolle {0} nicht. - Selbstzuweisbare Rollen sind nicht länger exklusiv! + Selbst zugewiesene Rollen sind nicht länger exklusiv! - Ich kann dir diese Rolle nicht zuweisen. `Ich kann keine Rollen zu Besitzern oder andere Rollen die höher als meine in der Rangordnung sind hinzufügen.` + Ich kann Ihnen diese Rolle nicht zuweisen. `Ich kann keine Rollen zu Besitzern oder andere Rollen die höher als meine in der Rangordnung sind hinzufügen.` - {0} wurde von der Liste der selbstzuweisbaren Rollen entfernt. + {0} wurde von der Liste der selbst zuweisbaren Rollen entfernt. Sie haben nicht länger die Rolle {0}. @@ -875,10 +875,10 @@ Grund: {1} vegab {0} zu {1} - Hoffentlich haben sie beim nächsten Mal mehr Glück ^_^ + Hoffentlich haben Sie beim nächsten Mal mehr Glück ^_^ - Glückwunsch! Sie haben {0} gewonnen, weil sie über {1} gewürfelt haben + Glückwunsch! Sie haben {0} gewonnen, weil Sie über {1} gewürfelt haben Deck neu gemischt. @@ -995,7 +995,7 @@ Grund: {1} Gebe `{0}h NameDesBefehls` ein, um die Hilfestellung für diesen Befehl zu sehen. Z.B. `{0}h >8ball` - Ich konnte diesen Befehl nicht finden. Bitte stelle sicher das dieser Befehl existiert bevor sie es erneut versuchen. + Ich konnte diesen Befehl nicht finden. Bitte stelle sicher das dieser Befehl existiert bevor Sie es erneut versuchen. Beschreibung @@ -1004,7 +1004,7 @@ Grund: {1} Sie können das NadekoBot-Projekt über Patreon <{0}> oder PayPal <{1}> unterstützen. -Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu hinterlassen. +Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu hinterlassen. **Vielen Dank**♥️ @@ -1031,7 +1031,7 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu Inhaltsverzeichnis - Benutzweise + Verwendung Autohentai wurde gestartet. Es wird alle {0} Sekunden etwas mit einem der folgenden Stichwörtern gepostet: {1} @@ -1111,7 +1111,7 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu Top Waifus - Ihre Neigung ist bereits zu dieser Waifu gesetzt oder sie versuchsen ihre Neigung zu entfernen während sie keine gesetzt haben. + Ihre Neigung ist bereits zu dieser Waifu gesetzt oder Sie versuchsen Ihre Neigung zu entfernen während Sie keine gesetzt haben. hat seine Neigung von {0} zu {1} geändert. @@ -1120,47 +1120,47 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu Make sure to get the formatting right, and leave the thinking emoji - Sie müssen {0} Stunden und {1} Minuten warten bevor sie ihre Neigung ändern können. + Sie müssen {0} Stunden und {1} Minuten warten bevor Sie Ihre Neigung ändern können. - Ihre Neigung wurde zurückgesetzt. Sie haben keine Person mehr die sie mögen. + Ihre Neigung wurde zurückgesetzt. Sie haben keine Person mehr die Sie mögen. will {0}s Waifu sein. Aww <3 - hat {0} als seine/ihre Waifu für {1} beansprucht! + hat {0} als seine/Ihre Waifu für {1} beansprucht! - Sie haben sich von ihrer Waifu die sie mochte scheiden lassen. Du herzloses Monster. {0} hat {1} als Kompensation erhalten. + Sie haben sich von Ihrer Waifu die Sie mochte scheiden lassen. Du herzloses Monster. {0} hat {1} als Kompensation erhalten. - Sie können deine Neigung nicht zu ihnen selbst setzen, sie egomanische Person. + Sie können deine Neigung nicht zu Ihnen selbst setzen, Sie egomanische Person. 🎉 Ihre Liebe ist besiegelt! 🎉 {0}'s neuer Wert ist {1}! - Keine Waifu ist so billig. Sie müssen wenigstens {0} bezahlen um diese Waifu zu beanspruchen, selbst wenn ihr tatsächlicher Wert geringer ist. + Keine Waifu ist so billig. Sie müssen wenigstens {0} bezahlen um diese Waifu zu beanspruchen, selbst wenn Ihr tatsächlicher Wert geringer ist. Sie müssen {0} oder mehr bezahlen um diese Waifu zu beanspruchen! - Diese Waifu gehört nicht dir. + Diese Waifu gehört nicht Ihnen. Sie können sich nicht selbst beanspruchen. - Sie haben sich vor kurzem scheiden lassen. Sie müssen {0} Stunden und {1} Minuten warten bevor sie sich erneut scheiden lassen können. + Sie haben sich vor kurzem scheiden lassen. Sie müssen {0} Stunden und {1} Minuten warten bevor Sie sich erneut scheiden lassen können. Niemand - Sie haben sich von einer Waifu scheiden lassen die sie nicht mochte, Du erhältst {0} zurück. + Sie haben sich von einer Waifu scheiden lassen die Sie nicht mochte, Du erhältst {0} zurück. 8ball @@ -1184,7 +1184,7 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu Spiel gestartet. Erstelle einen Satz aus dem folgenden Akronym: {0}. - Sie haben {0} Sekunden für ihre Einsendung. + Sie haben {0} Sekunden für Ihre Einsendung. {0} hat seinen Satz eingereicht. ({1} insgesamt) @@ -1193,7 +1193,7 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu Stimme ab indem du die Nummer der Einsendung eingibst - {0} hat seine/ihre Stimme abgegeben! + {0} hat seine/Ihre Stimme abgegeben! Der Gewinner ist {0} mit {1} Punkten. @@ -1235,11 +1235,11 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu Währungsgeneration in diesem Kanal aktiviert. - {0} zufällige {1} sind erschienen! Sammle sie indem sie `{2}pick` schreiben + {0} zufällige {1} sind erschienen! Sammle sie indem Sie `{2}pick` schreiben plural - Eine zufällige {0} ist erschienen! Sammle sie indem sie `{1}pick` schreiben + Eine zufällige {0} ist erschienen! Sammle sie indem Sie `{1}pick` schreiben Laden einer Frage fehlgeschlagen. @@ -1269,7 +1269,7 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu Keine Ergebnisse - {0} aufgehoben + hat {0} aufgehoben Kwoth picked 5* @@ -1367,10 +1367,10 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu Ungültige Eingabe. - Maximale Spielzeit hat kein Limit mehr. + Maximale Länge eines Liedes hat kein Limit mehr. - Maximale Spielzeit ist nun {0} Sekunden. + Maximale länge eines Liedes ist nun {0} Sekunden. Maximale Musik-Warteschlangengröße ist nun unbegrenzt. @@ -1412,7 +1412,7 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu Playlist gelöscht. - Playlist konnte nicht gelöscht werden. Entweder sie existiert nicht oder sie gehört nicht dir. + Playlist konnte nicht gelöscht werden. Entweder es existiert nicht oder es gehört nicht Ihnen. Es gibt keine Playlist mit dieser ID. @@ -1473,7 +1473,7 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu Lieder gemischt. - Lieder bewegt + Lied bewegt {0}h {1}m {2}s @@ -1666,7 +1666,7 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu Automatische Übersetzung der Nachrichten wurde auf diesem kanal gestoppt. - Schlechter Eingabeformat, oder etwas lief schief. + Schlechtes Eingabeformat oder etwas lief schief. Konnte diese Karte nicht finden. @@ -1844,7 +1844,7 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu Etwas lief schief. - Bitte spezifizieren sie die Such Parameter. + Bitte spezifizieren Sie die Such Parameter. Status @@ -1883,7 +1883,7 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu Sonnenuntergang - Temperature + Temperatur Titel: @@ -1913,7 +1913,7 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu Der Begriff konnte auf dem spezifizierten wikia nicht gefunden werden. - Bitte geben sie ein Ziel wikia ein, gefolgt bei der Suchanfrage. + Bitte geben Sie ein Ziel wikia ein, gefolgt bei der Suchanfrage. Seite konnte nicht gefunden werden. @@ -1984,7 +1984,7 @@ Vergessen sie bitte nicht, ihren Discord-Namen oder ihre ID in der Nachricht zu Verließ Multi-Server-Kanal. - Dies ist ihr MSK token + Dies ist Ihr MSK token Benutzerdefinierte Emojis @@ -2085,7 +2085,7 @@ ID des Besitzers: {2} Keine Zitate auf dieser Seite. - Kein Zitat das sie entfernen können gefunden. + Kein Zitat das Sie entfernen können gefunden. Zitat hinzugefügt @@ -2172,7 +2172,7 @@ ID des Besitzers: {2} Text Kanäle - Hier ist ihr Raum link + Hier ist Ihr Raum link Betriebszeit From 66b135b2dbafd41cd6d5a1e99a9260a760f53e87 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Fri, 3 Mar 2017 02:26:28 +0100 Subject: [PATCH 156/496] Update ResponseStrings.pt-BR.resx (POEditor.com) From 5ddd92fe8d0cd3b5d90ed6d2761b347c07f7af6e Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Fri, 3 Mar 2017 02:26:30 +0100 Subject: [PATCH 157/496] Update ResponseStrings.ru-RU.resx (POEditor.com) From 349645c019a5f508f650850d5bbab5b06616b89e Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Fri, 3 Mar 2017 02:26:33 +0100 Subject: [PATCH 158/496] Update ResponseStrings.sr-cyrl-rs.resx (POEditor.com) From 71c06f6020a3227f96d4608dbf1f76db6a557a9f Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Fri, 3 Mar 2017 02:26:36 +0100 Subject: [PATCH 159/496] Update ResponseStrings.ja-JP.resx (POEditor.com) --- .../Resources/ResponseStrings.ja-JP.resx | 316 ++++++++++-------- 1 file changed, 169 insertions(+), 147 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.ja-JP.resx b/src/NadekoBot/Resources/ResponseStrings.ja-JP.resx index 29a0675a..1261856c 100644 --- a/src/NadekoBot/Resources/ResponseStrings.ja-JP.resx +++ b/src/NadekoBot/Resources/ResponseStrings.ja-JP.resx @@ -1,121 +1,121 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 その基盤はすでに主張されている。または破壊されました。 @@ -130,7 +130,7 @@ - {1}との戦争中の整数{0}を破壊しました + {1}との戦いで基地#{0}を**破壊**しました @@ -145,79 +145,99 @@ - + 敵 + - + {0} との戦争に関する情報 - + 無効な城の番号 + - + 有効な戦争サイズではありません。 + - + アクティブな戦争を一覧表示する。 + - + 請求されていない + - + あなたはこの戦争の参加者ではありません。 + - + @{0} +あなたはその戦争に参加していないか、その基地はすでに破壊されています。 - + 活動的な戦争はない サイズ - + 戦争の戦い{0}は既に始まった。 + - + 戦争{0}が作成されました。 + - + {0}に対する戦争は終わった。 + - + その戦争は存在しない。 + - + 戦争{0}が始まった！ + - + すべてのカスタム反応がクリアされました。 + - + カスタム反応が削除されました。 + - + すべてのカスタム反応をリストします。 + - + カスタム反応。 + - + 新しいカスタム反応。 + - + カスタム反応が見つかりませんでした。 + - + その識別情報でカスタム反応が見つかりませんでした。 + 反応 - + カスタム反応の統計 + @@ -226,13 +246,14 @@ - トリガー + 引き金 - + 結果が見つかりません + @@ -317,7 +338,7 @@ - ＢＡＮＮＥＤ + 亡命 PLURAL @@ -534,12 +555,12 @@ - ミュート + ミュート中 PLURAL (users have been muted) Fuzzy - ミュート + ミュート中 singular "User muted." @@ -633,7 +654,7 @@ Fuzzy - + 役割名を変更しました @@ -773,7 +794,8 @@ Fuzzy - + ユーザーズ + Fuzzy From 2bd7080324c48d6f1989dbab9ca9648649ff2eae Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 3 Mar 2017 03:08:55 +0100 Subject: [PATCH 160/496] fixed calcops --- src/NadekoBot/Modules/Utility/Commands/CalcCommand.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Utility/Commands/CalcCommand.cs b/src/NadekoBot/Modules/Utility/Commands/CalcCommand.cs index 8eccc500..7617cdc9 100644 --- a/src/NadekoBot/Modules/Utility/Commands/CalcCommand.cs +++ b/src/NadekoBot/Modules/Utility/Commands/CalcCommand.cs @@ -53,7 +53,7 @@ namespace NadekoBot.Modules.Utility "GetHashCode", "GetType" }); - await Context.Channel.SendConfirmAsync(GetText("utility_calcops", Prefix), string.Join(", ", selection)); + await Context.Channel.SendConfirmAsync(GetText("calcops", Prefix), string.Join(", ", selection)); } } From ac6ad1d853219ca4b19d7e3c872139f5d3663ee6 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 3 Mar 2017 03:59:12 +0100 Subject: [PATCH 161/496] fixed nsfw string --- src/NadekoBot/Modules/NSFW/NSFW.cs | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/NadekoBot/Modules/NSFW/NSFW.cs b/src/NadekoBot/Modules/NSFW/NSFW.cs index 6e72aefc..5f45af24 100644 --- a/src/NadekoBot/Modules/NSFW/NSFW.cs +++ b/src/NadekoBot/Modules/NSFW/NSFW.cs @@ -142,11 +142,11 @@ namespace NadekoBot.Modules.NSFW #endif [NadekoCommand, Usage, Description, Aliases] public Task Yandere([Remainder] string tag = null) - => InternalDapiCommand(Context.Message, tag, Searches.Searches.DapiSearchType.Yandere); + => InternalDapiCommand(tag, Searches.Searches.DapiSearchType.Yandere); [NadekoCommand, Usage, Description, Aliases] public Task Konachan([Remainder] string tag = null) - => InternalDapiCommand(Context.Message, tag, Searches.Searches.DapiSearchType.Konachan); + => InternalDapiCommand(tag, Searches.Searches.DapiSearchType.Konachan); [NadekoCommand, Usage, Description, Aliases] public async Task E621([Remainder] string tag = null) @@ -167,7 +167,7 @@ namespace NadekoBot.Modules.NSFW [NadekoCommand, Usage, Description, Aliases] public Task Rule34([Remainder] string tag = null) - => InternalDapiCommand(Context.Message, tag, Searches.Searches.DapiSearchType.Rule34); + => InternalDapiCommand(tag, Searches.Searches.DapiSearchType.Rule34); [NadekoCommand, Usage, Description, Aliases] public async Task Danbooru([Remainder] string tag = null) @@ -210,7 +210,7 @@ namespace NadekoBot.Modules.NSFW [NadekoCommand, Usage, Description, Aliases] public Task Gelbooru([Remainder] string tag = null) - => InternalDapiCommand(Context.Message, tag, Searches.Searches.DapiSearchType.Gelbooru); + => InternalDapiCommand(tag, Searches.Searches.DapiSearchType.Gelbooru); [NadekoCommand, Usage, Description, Aliases] public async Task Cp() @@ -288,19 +288,17 @@ namespace NadekoBot.Modules.NSFW public static Task GetGelbooruImageLink(string tag) => Searches.Searches.InternalDapiSearch(tag, Searches.Searches.DapiSearchType.Gelbooru); - public async Task InternalDapiCommand(IUserMessage umsg, string tag, Searches.Searches.DapiSearchType type) + public async Task InternalDapiCommand(string tag, Searches.Searches.DapiSearchType type) { - var channel = umsg.Channel; - tag = tag?.Trim() ?? ""; var url = await Searches.Searches.InternalDapiSearch(tag, type).ConfigureAwait(false); if (url == null) - await channel.SendErrorAsync(umsg.Author.Mention + " " + GetText("no_results")); + await ReplyErrorLocalized("not_found").ConfigureAwait(false); else - await channel.EmbedAsync(new EmbedBuilder().WithOkColor() - .WithDescription(umsg.Author.Mention + " " + tag) + await Context.Channel.EmbedAsync(new EmbedBuilder().WithOkColor() + .WithDescription(Context.User + " " + tag) .WithImageUrl(url) .WithFooter(efb => efb.WithText(type.ToString()))).ConfigureAwait(false); } From 07a0ff078bd832467705e96a51883323d6a70503 Mon Sep 17 00:00:00 2001 From: Rajath Ranganath Date: Fri, 3 Mar 2017 21:34:16 +0530 Subject: [PATCH 162/496] Fixed stuf --- src/NadekoBot/Resources/CommandStrings.resx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx index 49bd76e8..3d01eb34 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -124,7 +124,7 @@ Either shows a help for a single command, or DMs you help link if no arguments are specified. - `{0}h -cmds` or `{0}h` + `{0}h {0}cmds` or `{0}h` hgit @@ -958,7 +958,7 @@ srvrfilterwords sfw - Toggles automatic deleting of messages containing filtered words on the server. Does not affect the Bot Owner. + Toggles automatic deletion of messages containing filtered words on the server. Does not affect the Bot Owner. `{0}sfw` @@ -967,7 +967,7 @@ permrole pr - Sets a role which can change permissions. Supply no parameters to find out the current one. Default is 'Nadeko'. + Sets a role which can change permissions. Supply no parameters to see the current one. Default is 'Nadeko'. `{0}pr role` From 2ae7fbcab580519d5f9ee85f6ad28b10f3e775fb Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 3 Mar 2017 18:45:59 +0100 Subject: [PATCH 163/496] Changed a string --- src/NadekoBot/Resources/ResponseStrings.Designer.cs | 2 +- src/NadekoBot/Resources/ResponseStrings.resx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index c3d3a842..c91f93cb 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -1794,7 +1794,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Claim from @{0} for a war against {1} has expired.. + /// Looks up a localized string similar to Claim from @{0} in a war against {1} has expired.. /// public static string clashofclans_claim_expired { get { diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index c89a5084..a1674f52 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -139,7 +139,7 @@ @{0} You already claimed base #{1}. You can't claim a new one. - Claim from @{0} for a war against {1} has expired. + Claim from @{0} in a war against {1} has expired. Enemy From 02963151be39f8f93b885062256d763bca8a6969 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 4 Mar 2017 00:32:16 +0100 Subject: [PATCH 164/496] moveorstay gambling game implemented but too profitable, commented out. --- .../Modules/Gambling/Commands/MoveOrStay.cs | 167 ++++++++++++++++++ 1 file changed, 167 insertions(+) create mode 100644 src/NadekoBot/Modules/Gambling/Commands/MoveOrStay.cs diff --git a/src/NadekoBot/Modules/Gambling/Commands/MoveOrStay.cs b/src/NadekoBot/Modules/Gambling/Commands/MoveOrStay.cs new file mode 100644 index 00000000..e7ca6434 --- /dev/null +++ b/src/NadekoBot/Modules/Gambling/Commands/MoveOrStay.cs @@ -0,0 +1,167 @@ +using System.Collections.Concurrent; +using System.Collections.Immutable; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Discord.Commands; +using Discord; +using NadekoBot.Attributes; +using NadekoBot.Extensions; +using NadekoBot.Services; + +namespace NadekoBot.Modules.Gambling +{ + //public partial class Gambling + //{ + // [Group] + // public class MoveOrStayCommands : NadekoSubmodule + // { + // [NadekoCommand, Usage, Description, Aliases] + // [RequireContext(ContextType.Guild)] + // [OwnerOnly] + // public async Task MoveOrStayTest() + // { + // //test 1, just stop on second one + + // //test 2, stop when winning + + // } + + // private static readonly ConcurrentDictionary _games = new ConcurrentDictionary(); + + // [NadekoCommand, Usage, Description, Aliases] + // [RequireContext(ContextType.Guild)] + // public async Task MoveOrStay(int bet) + // { + // if (bet < 4) + // return; + // var game = new MoveOrStayGame(bet); + // if (!_games.TryAdd(Context.User.Id, game)) + // { + // await ReplyAsync("You're already betting on move or stay.").ConfigureAwait(false); + // return; + // } + + // if (!await CurrencyHandler.RemoveCurrencyAsync(Context.User, "MoveOrStay bet", bet, false)) + // { + // await ReplyAsync("You don't have enough money"); + // return; + // } + // await Context.Channel.EmbedAsync(GetGameState(game), + // string.Format("{0} rolled {1}.", Context.User, game.Rolled)).ConfigureAwait(false); + // } + + // public enum Mors + // { + // Move = 1, + // M = 1, + // Stay = 2, + // S = 2 + // } + + // [NadekoCommand, Usage, Description, Aliases] + // [RequireContext(ContextType.Guild)] + // public async Task MoveOrStay(Mors action) + // { + // MoveOrStayGame game; + // if (!_games.TryGetValue(Context.User.Id, out game)) + // { + // await ReplyAsync("You're not betting on move or stay.").ConfigureAwait(false); + // return; + // } + + // if (action == Mors.Move) + // { + // game.Move(); + // await Context.Channel.EmbedAsync(GetGameState(game), string.Format("{0} rolled {1}.", Context.User, game.Rolled)).ConfigureAwait(false); if (game.Ended) + // _games.TryRemove(Context.User.Id, out game); + // } + // else if (action == Mors.Stay) + // { + // var won = game.Stay(); + // await CurrencyHandler.AddCurrencyAsync(Context.User, "MoveOrStay stay", won, false) + // .ConfigureAwait(false); + // _games.TryRemove(Context.User.Id, out game); + // await ReplyAsync(string.Format("You've finished with {0}", + // won + CurrencySign)) + // .ConfigureAwait(false); + // } + + + // } + + // private EmbedBuilder GetGameState(MoveOrStayGame game) + // { + // var arr = MoveOrStayGame.Winnings.ToArray(); + // var sb = new StringBuilder(); + // for (var i = 0; i < arr.Length; i++) + // { + // if (i == game.CurrentPosition) + // { + // sb.Append("[" + arr[i] + "]"); + // } + // else + // { + // sb.Append(arr[i].ToString()); + // } + + // if (i != arr.Length - 1) + // sb.Append(' '); + // } + + // return new EmbedBuilder().WithOkColor() + // .WithTitle("Move or Stay") + // .WithDescription(sb.ToString()) + // .AddField(efb => efb.WithName("Bet") + // .WithValue(game.Bet.ToString()) + // .WithIsInline(true)) + // .AddField(efb => efb.WithName("Current Value") + // .WithValue((game.CurrentMultiplier * game.Bet).ToString(_cultureInfo)) + // .WithIsInline(true)); + // } + // } + + // public class MoveOrStayGame + // { + // public int Bet { get; } + // public bool Ended { get; private set; } + // public int PreviousPosition { get; private set; } + // public int CurrentPosition { get; private set; } = -1; + // public int Rolled { get; private set; } + // public float CurrentMultiplier => Winnings[CurrentPosition]; + // private readonly NadekoRandom _rng = new NadekoRandom(); + + // public static readonly ImmutableArray Winnings = new[] + // { + // 1.5f, 0.75f, 1f, 0.5f, 0.25f, 0.25f, 2.5f, 0f, 0f + // }.ToImmutableArray(); + + // public MoveOrStayGame(int bet) + // { + // Bet = bet; + // Move(); + // } + + // public void Move() + // { + // if (Ended) + // return; + // PreviousPosition = CurrentPosition; + // Rolled = _rng.Next(1, 4); + // CurrentPosition += Rolled; + + // if (CurrentPosition >= 7) + // Ended = true; + // } + + // public int Stay() + // { + // if (Ended) + // return 0; + + // Ended = true; + // return (int) (CurrentMultiplier * Bet); + // } + // } + //} +} From 0be6f8c86c87e763ce396497041f0ffee481224c Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 4 Mar 2017 01:38:01 +0100 Subject: [PATCH 165/496] commandlist updated --- docs/Commands List.md | 250 +++++++++++++++++++++--------------------- 1 file changed, 128 insertions(+), 122 deletions(-) diff --git a/docs/Commands List.md b/docs/Commands List.md index d73852f3..1317f263 100644 --- a/docs/Commands List.md +++ b/docs/Commands List.md @@ -1,4 +1,4 @@ -You can support the project on patreon: or paypal: +You can support the project on patreon: or paypal: ##Table Of Contents - [Help](#help) @@ -18,11 +18,11 @@ You can support the project on patreon: or paypa ### Administration Command and aliases | Description | Usage ----------------|--------------|------- -`.resetperms` | Resets BOT's permissions module on this server to the default value. **Requires Administrator server permission.** | `.resetperms` -`.delmsgoncmd` | Toggles the automatic deletion of user's successful command message to prevent chat flood. **Requires Administrator server permission.** | `.delmsgoncmd` +`.resetperms` | Resets the bot's permissions module on this server to the default value. **Requires Administrator server permission.** | `.resetperms` +`.delmsgoncmd` | Toggles the automatic deletion of the user's successful command message to prevent chat flood. **Requires Administrator server permission.** | `.delmsgoncmd` `.setrole` `.sr` | Sets a role for a given user. **Requires ManageRoles server permission.** | `.sr @User Guest` `.removerole` `.rr` | Removes a role from a given user. **Requires ManageRoles server permission.** | `.rr @User Admin` -`.renamerole` `.renr` | Renames a role. Roles you are renaming must be lower than bot's highest role. **Requires ManageRoles server permission.** | `.renr "First role" SecondRole` +`.renamerole` `.renr` | Renames a role. The role you are renaming must be lower than bot's highest role. **Requires ManageRoles server permission.** | `.renr "First role" SecondRole` `.removeallroles` `.rar` | Removes all roles from a mentioned user. **Requires ManageRoles server permission.** | `.rar @User` `.createrole` `.cr` | Creates a role with a given name. **Requires ManageRoles server permission.** | `.cr Awesome Role` `.rolecolor` `.rc` | Set a role's color to the hex or 0-255 rgb color value provided. **Requires ManageRoles server permission.** | `.rc Admin 255 200 100` or `.rc Admin ffba55` @@ -37,18 +37,19 @@ Command and aliases | Description | Usage `.creatxtchanl` `.ctch` | Creates a new text channel with a given name. **Requires ManageChannels server permission.** | `.ctch TextChannelName` `.settopic` `.st` | Sets a topic on the current channel. **Requires ManageChannels server permission.** | `.st My new topic` `.setchanlname` `.schn` | Changes the name of the current channel. **Requires ManageChannels server permission.** | `.schn NewName` -`.prune` `.clr` | `.prune` removes all nadeko's messages in the last 100 messages.`.prune X` removes last X messages from the channel (up to 100)`.prune @Someone` removes all Someone's messages in the last 100 messages.`.prune @Someone X` removes last X 'Someone's' messages in the channel. | `.prune` or `.prune 5` or `.prune @Someone` or `.prune @Someone X` -`.mentionrole` `.menro` | Mentions every person from the provided role or roles (separated by a ',') on this server. Requires you to have mention everyone permission. **Requires MentionEveryone server permission.** | `.menro RoleName` -`.donators` | List of lovely people who donated to keep this project alive. | `.donators` -`.donadd` | Add a donator to the database. **Bot Owner only.** | `.donadd Donate Amount` +`.prune` `.clr` | `.prune` removes all Nadeko's messages in the last 100 messages. `.prune X` removes last `X` number of messages from the channel (up to 100). `.prune @Someone` removes all Someone's messages in the last 100 messages. `.prune @Someone X` removes last `X` number of 'Someone's' messages in the channel. | `.prune` or `.prune 5` or `.prune @Someone` or `.prune @Someone X` +`.mentionrole` `.menro` | Mentions every person from the provided role or roles (separated by a ',') on this server. Requires you to have the mention everyone permission. **Requires MentionEveryone server permission.** | `.menro RoleName` +`.donators` | List of the lovely people who donated to keep this project alive. | `.donators` +`.donadd` | Add a donator to the database. **Bot Owner Only** | `.donadd Donate Amount` `.autoassignrole` `.aar` | Automaticaly assigns a specified role to every user who joins the server. **Requires ManageRoles server permission.** | `.aar` to disable, `.aar Role Name` to enable -`.fwmsgs` | Toggles forwarding of non-command messages sent to bot's DM to the bot owners **Bot Owner only.** | `.fwmsgs` -`.fwtoall` | Toggles whether messages will be forwarded to all bot owners or only to the first one specified in the credentials.json **Bot Owner only.** | `.fwtoall` -`.logserver` | Enables or Disables ALL log events. If enabled, all log events will log to this channel. **Requires Administrator server permission.** **Bot Owner only.** | `.logserver enable` or `.logserver disable` -`.logignore` | Toggles whether the .logserver command ignores this channel. Useful if you have hidden admin channel and public log channel. **Requires Administrator server permission.** **Bot Owner only.** | `.logignore` -`.logevents` | Shows a list of all events you can subscribe to with `.log` **Requires Administrator server permission.** **Bot Owner only.** | `.logevents` -`.log` | Toggles logging event. Disables it if it's active anywhere on the server. Enables if it's not active. Use `.logevents` to see a list of all events you can subscribe to. **Requires Administrator server permission.** **Bot Owner only.** | `.log userpresence` or `.log userbanned` -`.migratedata` | Migrate data from old bot configuration **Bot Owner only.** | `.migratedata` +`.languageset` `.langset` | 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. | `.langset de-DE ` or `.langset default` +`.langsetdefault` `.langsetd` | 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. | `.langsetd en-US` or `.langsetd default` +`.languageslist` `.langli` | List of languages for which translation (or part of it) exist atm. | `.langli` +`.logserver` | Enables or Disables ALL log events. If enabled, all log events will log to this channel. **Requires Administrator server permission.** **Bot Owner Only** | `.logserver enable` or `.logserver disable` +`.logignore` | Toggles whether the `.logserver` command ignores this channel. Useful if you have hidden admin channel and public log channel. **Requires Administrator server permission.** **Bot Owner Only** | `.logignore` +`.logevents` | Shows a list of all events you can subscribe to with `.log` **Requires Administrator server permission.** **Bot Owner Only** | `.logevents` +`.log` | Toggles logging event. Disables it if it is active anywhere on the server. Enables if it isn't active. Use `.logevents` to see a list of all events you can subscribe to. **Requires Administrator server permission.** **Bot Owner Only** | `.log userpresence` or `.log userbanned` +`.migratedata` | Migrate data from old bot configuration **Bot Owner Only** | `.migratedata` `.setmuterole` | Sets a name of the role which will be assigned to people who should be muted. Default is nadeko-mute. **Requires ManageRoles server permission.** | `.setmuterole Silenced` `.mute` | Mutes a mentioned user both from speaking and chatting. **Requires ManageRoles server permission.** **Requires MuteMembers server permission.** | `.mute @Someone` `.unmute` | Unmutes a mentioned user previously muted with `.mute` command. **Requires ManageRoles server permission.** **Requires MuteMembers server permission.** | `.unmute @Someone` @@ -56,51 +57,54 @@ Command and aliases | Description | Usage `.chatunmute` | Removes a mute role previously set on a mentioned user with `.chatmute` which prevented him from chatting in text channels. **Requires ManageRoles server permission.** | `.chatunmute @Someone` `.voicemute` | Prevents a mentioned user from speaking in voice channels. **Requires MuteMembers server permission.** | `.voicemute @Someone` `.voiceunmute` | Gives a previously voice-muted user a permission to speak. **Requires MuteMembers server permission.** | `.voiceunmute @Someguy` -`.rotateplaying` `.ropl` | Toggles rotation of playing status of the dynamic strings you previously specified. **Bot Owner only.** | `.ropl` -`.addplaying` `.adpl` | Adds a specified string to the list of playing strings to rotate. Supported placeholders: %servers%, %users%, %playing%, %queued%, %time%,%shardid%,%shardcount%, %shardguilds% **Bot Owner only.** | `.adpl` -`.listplaying` `.lipl` | Lists all playing statuses with their corresponding number. **Bot Owner only.** | `.lipl` -`.removeplaying` `.rmpl` `.repl` | Removes a playing string on a given number. **Bot Owner only.** | `.rmpl` +`.rotateplaying` `.ropl` | Toggles rotation of playing status of the dynamic strings you previously specified. **Bot Owner Only** | `.ropl` +`.addplaying` `.adpl` | Adds a specified string to the list of playing strings to rotate. Supported placeholders: `%servers%`, `%users%`, `%playing%`, `%queued%`, `%time%`, `%shardid%`, `%shardcount%`, `%shardguilds%`. **Bot Owner Only** | `.adpl` +`.listplaying` `.lipl` | Lists all playing statuses with their corresponding number. **Bot Owner Only** | `.lipl` +`.removeplaying` `.rmpl` `.repl` | Removes a playing string on a given number. **Bot Owner Only** | `.rmpl` `.antiraid` | Sets an anti-raid protection on the server. First argument is number of people which will trigger the protection. Second one is a time interval in which that number of people needs to join in order to trigger the protection, and third argument is punishment for those people (Kick, Ban, Mute) **Requires Administrator server permission.** | `.antiraid 5 20 Kick` -`.antispam` | Stops people from repeating same message X times in a row. You can specify to either mute, kick or ban the offenders. **Requires Administrator server permission.** | `.antispam 3 Mute` or `.antispam 4 Kick` or `.antispam 6 Ban` +`.antispam` | Stops people from repeating same message X times in a row. You can specify to either mute, kick or ban the offenders. Max message count is 10. **Requires Administrator server permission.** | `.antispam 3 Mute` or `.antispam 4 Kick` or `.antispam 6 Ban` `.antispamignore` | Toggles whether antispam ignores current channel. Antispam must be enabled. | `.antispamignore` `.antilist` `.antilst` | Shows currently enabled protection features. | `.antilist` `.slowmode` | Toggles slowmode. Disable by specifying no parameters. To enable, specify a number of messages each user can send, and an interval in seconds. For example 1 message every 5 seconds. **Requires ManageMessages server permission.** | `.slowmode 1 5` or `.slowmode` -`.adsarm` | Toggles the automatic deletion of confirmations for .iam and .iamn commands. **Requires ManageMessages server permission.** | `.adsarm` +`.adsarm` | Toggles the automatic deletion of confirmations for `.iam` and `.iamn` commands. **Requires ManageMessages server permission.** | `.adsarm` `.asar` | Adds a role to the list of self-assignable roles. **Requires ManageRoles server permission.** | `.asar Gamer` `.rsar` | Removes a specified role from the list of self-assignable roles. **Requires ManageRoles server permission.** | `.rsar` `.lsar` | Lists all self-assignable roles. | `.lsar` `.togglexclsar` `.tesar` | Toggles whether the self-assigned roles are exclusive. (So that any person can have only one of the self assignable roles) **Requires ManageRoles server permission.** | `.tesar` `.iam` | Adds a role to you that you choose. Role must be on a list of self-assignable roles. | `.iam Gamer` `.iamnot` `.iamn` | Removes a role to you that you choose. Role must be on a list of self-assignable roles. | `.iamn Gamer` -`.leave` | Makes Nadeko leave the server. Either name or id required. **Bot Owner only.** | `.leave 123123123331` -`.die` | Shuts the bot down. **Bot Owner only.** | `.die` -`.setname` `.newnm` | Gives the bot a new name. **Bot Owner only.** | `.newnm BotName` -`.setstatus` | Sets the bot's status. (Online/Idle/Dnd/Invisible) **Bot Owner only.** | `.setstatus Idle` -`.setavatar` `.setav` | Sets a new avatar image for the NadekoBot. Argument is a direct link to an image. **Bot Owner only.** | `.setav http://i.imgur.com/xTG3a1I.jpg` -`.setgame` | Sets the bots game. **Bot Owner only.** | `.setgame with snakes` -`.setstream` | Sets the bots stream. First argument is the twitch link, second argument is stream name. **Bot Owner only.** | `.setstream TWITCHLINK Hello` -`.send` | Sends a message to someone on a different server through the bot. Separate server and channel/user ids with `|` and prepend channel id with `c:` and user id with `u:`. **Bot Owner only.** | `.send serverid|c:channelid message` or `.send serverid|u:userid message` -`.announce` | Sends a message to all servers' general channel bot is connected to. **Bot Owner only.** | `.announce Useless spam` -`.reloadimages` | Reloads images bot is using. Safe to use even when bot is being used heavily. **Bot Owner only.** | `.reloadimages` -`.greetdel` `.grdel` | Sets the time it takes (in seconds) for greet messages to be auto-deleted. Set 0 to disable automatic deletion. **Requires ManageServer server permission.** | `.greetdel 0` or `.greetdel 30` +`.fwmsgs` | Toggles forwarding of non-command messages sent to bot's DM to the bot owners **Bot Owner Only** | `.fwmsgs` +`.fwtoall` | Toggles whether messages will be forwarded to all bot owners or only to the first one specified in the credentials.json file **Bot Owner Only** | `.fwtoall` +`.connectshard` | Try (re)connecting a shard with a certain shardid when it dies. No one knows will it work. Keep an eye on the console for errors. **Bot Owner Only** | `.connectshard 2` +`.leave` | Makes Nadeko leave the server. Either server name or server ID is required. **Bot Owner Only** | `.leave 123123123331` +`.die` | Shuts the bot down. **Bot Owner Only** | `.die` +`.setname` `.newnm` | Gives the bot a new name. **Bot Owner Only** | `.newnm BotName` +`.setstatus` | Sets the bot's status. (Online/Idle/Dnd/Invisible) **Bot Owner Only** | `.setstatus Idle` +`.setavatar` `.setav` | Sets a new avatar image for the NadekoBot. Argument is a direct link to an image. **Bot Owner Only** | `.setav http://i.imgur.com/xTG3a1I.jpg` +`.setgame` | Sets the bots game. **Bot Owner Only** | `.setgame with snakes` +`.setstream` | Sets the bots stream. First argument is the twitch link, second argument is stream name. **Bot Owner Only** | `.setstream TWITCHLINK Hello` +`.send` | Sends a message to someone on a different server through the bot. Separate server and channel/user ids with `|` and prefix the channel id with `c:` and the user id with `u:`. **Bot Owner Only** | `.send serverid|c:channelid message` or `.send serverid|u:userid message` +`.announce` | Sends a message to all servers' default channel that bot is connected to. **Bot Owner Only** | `.announce Useless spam` +`.reloadimages` | Reloads images bot is using. Safe to use even when bot is being used heavily. **Bot Owner Only** | `.reloadimages` +`.greetdel` `.grdel` | Sets the time it takes (in seconds) for greet messages to be auto-deleted. Set it to 0 to disable automatic deletion. **Requires ManageServer server permission.** | `.greetdel 0` or `.greetdel 30` `.greet` | Toggles anouncements on the current channel when someone joins the server. **Requires ManageServer server permission.** | `.greet` -`.greetmsg` | Sets a new join announcement message which will be shown in the server's channel. Type %user% if you want to mention the new member. Using it with no message will show the current greet message. **Requires ManageServer server permission.** | `.greetmsg Welcome, %user%.` +`.greetmsg` | Sets a new join announcement message which will be shown in the server's channel. Type `%user%` if you want to mention the new member. Using it with no message will show the current greet message. You can use embed json from instead of a regular text, if you want the message to be embedded. **Requires ManageServer server permission.** | `.greetmsg Welcome, %user%.` `.greetdm` | Toggles whether the greet messages will be sent in a DM (This is separate from greet - you can have both, any or neither enabled). **Requires ManageServer server permission.** | `.greetdm` -`.greetdmmsg` | Sets a new join announcement message which will be sent to the user who joined. Type %user% if you want to mention the new member. Using it with no message will show the current DM greet message. **Requires ManageServer server permission.** | `.greetdmmsg Welcome to the server, %user%`. +`.greetdmmsg` | Sets a new join announcement message which will be sent to the user who joined. Type `%user%` if you want to mention the new member. Using it with no message will show the current DM greet message. You can use embed json from instead of a regular text, if you want the message to be embedded. **Requires ManageServer server permission.** | `.greetdmmsg Welcome to the server, %user%`. `.bye` | Toggles anouncements on the current channel when someone leaves the server. **Requires ManageServer server permission.** | `.bye` -`.byemsg` | Sets a new leave announcement message. Type %user% if you want to show the name the user who left. Type %id% to show id. Using this command with no message will show the current bye message. **Requires ManageServer server permission.** | `.byemsg %user% has left.` -`.byedel` | Sets the time it takes (in seconds) for bye messages to be auto-deleted. Set 0 to disable automatic deletion. **Requires ManageServer server permission.** | `.byedel 0` or `.byedel 30` -`.voice+text` `.v+t` | Creates a text channel for each voice channel only users in that voice channel can see.If you are server owner, keep in mind you will see them all the time regardless. **Requires ManageRoles server permission.** **Requires ManageChannels server permission.** | `.v+t` +`.byemsg` | Sets a new leave announcement message. Type `%user%` if you want to show the name the user who left. Type `%id%` to show id. Using this command with no message will show the current bye message. You can use embed json from instead of a regular text, if you want the message to be embedded. **Requires ManageServer server permission.** | `.byemsg %user% has left.` +`.byedel` | Sets the time it takes (in seconds) for bye messages to be auto-deleted. Set it to `0` to disable automatic deletion. **Requires ManageServer server permission.** | `.byedel 0` or `.byedel 30` +`.voice+text` `.v+t` | Creates a text channel for each voice channel only users in that voice channel can see. If you are server owner, keep in mind you will see them all the time regardless. **Requires ManageRoles server permission.** **Requires ManageChannels server permission.** | `.v+t` `.cleanvplust` `.cv+t` | Deletes all text channels ending in `-voice` for which voicechannels are not found. Use at your own risk. **Requires ManageChannels server permission.** **Requires ManageRoles server permission.** | `.cleanv+t` -###### [Back to TOC](#table-of-contents) +###### [Back to ToC](#table-of-contents) ### ClashOfClans Command and aliases | Description | Usage ----------------|--------------|------- -`,createwar` `,cw` | Creates a new war by specifying a size (>10 and multiple of 5) and enemy clan name. | `,cw 15 The Enemy Clan` +`,createwar` `,cw` | Creates a new war by specifying a size (>10 and multiple of 5) and enemy clan name. **Requires ManageMessages server permission.** | `,cw 15 The Enemy Clan` `,startwar` `,sw` | Starts a war with a given number. | `,sw 15` -`,listwar` `,lw` | Shows the active war claims by a number. Shows all wars in a short way if no number is specified. | `,lw [war_number] or ,lw` +`,listwar` `,lw` | Shows the active war claims by a number. Shows all wars in a short way if no number is specified. | `,lw [war_number]` or `,lw` `,claim` `,call` `,c` | Claims a certain base from a certain war. You can supply a name in the third optional argument to claim in someone else's place. | `,call [war_number] [base_number] [optional_other_name]` `,claimfinish1` `,cf1` | Finish your claim with 1 star if you destroyed a base. First argument is the war number, optional second argument is a base number if you want to finish for someone else. | `,cf1 1` or `,cf1 1 5` `,claimfinish2` `,cf2` | Finish your claim with 2 stars if you destroyed a base. First argument is the war number, optional second argument is a base number if you want to finish for someone else. | `,cf2 1` or `,cf2 1 5` @@ -108,20 +112,20 @@ Command and aliases | Description | Usage `,endwar` `,ew` | Ends the war with a given index. | `,ew [war_number]` `,unclaim` `,ucall` `,uc` | Removes your claim from a certain war. Optional second argument denotes a person in whose place to unclaim | `,uc [war_number] [optional_other_name]` -###### [Back to TOC](#table-of-contents) +###### [Back to ToC](#table-of-contents) ### CustomReactions Command and aliases | Description | Usage ----------------|--------------|------- -`.addcustreact` `.acr` | Add a custom reaction with a trigger and a response. Running this command in server requires Administration permission. Running this command in DM is Bot Owner only and adds a new global custom reaction. Guide here: | `.acr "hello" Hi there %user%` +`.addcustreact` `.acr` | Add a custom reaction with a trigger and a response. Running this command in server requires the Administration permission. Running this command in DM is Bot Owner only and adds a new global custom reaction. Guide here: | `.acr "hello" Hi there %user%` `.listcustreact` `.lcr` | Lists global or server custom reactions (20 commands per page). Running the command in DM will list global custom reactions, while running it in server will list that server's custom reactions. Specifying `all` argument instead of the number will DM you a text file with a list of all custom reactions. | `.lcr 1` or `.lcr all` `.listcustreactg` `.lcrg` | Lists global or server custom reactions (20 commands per page) grouped by trigger, and show a number of responses for each. Running the command in DM will list global custom reactions, while running it in server will list that server's custom reactions. | `.lcrg 1` `.showcustreact` `.scr` | Shows a custom reaction's response on a given ID. | `.scr 1` -`.delcustreact` `.dcr` | Deletes a custom reaction on a specific index. If ran in DM, it is bot owner only and deletes a global custom reaction. If ran in a server, it requires Administration priviledges and removes server custom reaction. | `.dcr 5` -`.crstatsclear` | Resets the counters on `.crstats`. You can specify a trigger to clear stats only for that trigger. **Bot Owner only.** | `.crstatsclear` or `.crstatsclear rng` +`.delcustreact` `.dcr` | Deletes a custom reaction on a specific index. If ran in DM, it is bot owner only and deletes a global custom reaction. If ran in a server, it requires Administration privileges and removes server custom reaction. | `.dcr 5` +`.crstatsclear` | Resets the counters on `.crstats`. You can specify a trigger to clear stats only for that trigger. **Bot Owner Only** | `.crstatsclear` or `.crstatsclear rng` `.crstats` | Shows a list of custom reactions and the number of times they have been executed. Paginated with 10 per page. Use `.crstatsclear` to reset the counters. | `.crstats` or `.crstats 3` -###### [Back to TOC](#table-of-contents) +###### [Back to ToC](#table-of-contents) ### Gambling Command and aliases | Description | Usage @@ -129,22 +133,22 @@ Command and aliases | Description | Usage `$raffle` | Prints a name and ID of a random user from the online list from the (optional) role. | `$raffle` or `$raffle RoleName` `$cash` `$$$` | Check how much currency a person has. (Defaults to yourself) | `$$$` or `$$$ @SomeGuy` `$give` | Give someone a certain amount of currency. | `$give 1 "@SomeGuy"` -`$award` | Awards someone a certain amount of currency. You can also specify a role name to award currency to all users in a role. **Bot Owner only.** | `$award 100 @person` or `$award 5 Role Of Gamblers` -`$take` | Takes a certain amount of currency from someone. **Bot Owner only.** | `$take 1 "@someguy"` -`$betroll` `$br` | Bets a certain amount of currency and rolls a dice. Rolling over 66 yields x2 of your currency, over 90 - x3 and 100 x10. | `$br 5` -`$leaderboard` `$lb` | Displays bot currency leaderboard. | `$lb` +`$award` | Awards someone a certain amount of currency. You can also specify a role name to award currency to all users in a role. **Bot Owner Only** | `$award 100 @person` or `$award 5 Role Of Gamblers` +`$take` | Takes a certain amount of currency from someone. **Bot Owner Only** | `$take 1 "@someguy"` +`$betroll` `$br` | Bets a certain amount of currency and rolls a dice. Rolling over 66 yields x2 of your currency, over 90 - x4 and 100 x10. | `$br 5` +`$leaderboard` `$lb` | Displays the bot's currency leaderboard. | `$lb` `$race` | Starts a new animal race. | `$race` `$joinrace` `$jr` | Joins a new race. You can specify an amount of currency for betting (optional). You will get YourBet*(participants-1) back if you win. | `$jr` or `$jr 5` -`$startevent` | Starts one of the events seen on public nadeko. **Bot Owner only.** | `$startevent flowerreaction` -`$roll` | Rolls 0-100. If you supply a number [x] it rolls up to 30 normal dice. If you split 2 numbers with letter d (xdy) it will roll x dice from 1 to y. Y can be a letter 'F' if you want to roll fate dice instead of dnd. | `$roll` or `$roll 7` or `$roll 3d5` or `$roll 5dF` -`$rolluo` | Rolls X normal dice (up to 30) unordered. If you split 2 numbers with letter d (xdy) it will roll x dice from 1 to y. | `$rolluo` or `$rolluo 7` or `$rolluo 3d5` +`$startevent` | Starts one of the events seen on public nadeko. **Bot Owner Only** | `$startevent flowerreaction` +`$roll` | Rolls 0-100. If you supply a number `X` it rolls up to 30 normal dice. If you split 2 numbers with letter `d` (`xdy`) it will roll `X` dice from 1 to `y`. `Y` can be a letter 'F' if you want to roll fate dice instead of dnd. | `$roll` or `$roll 7` or `$roll 3d5` or `$roll 5dF` +`$rolluo` | Rolls `X` normal dice (up to 30) unordered. If you split 2 numbers with letter `d` (`xdy`) it will roll `X` dice from 1 to `y`. | `$rolluo` or `$rolluo 7` or `$rolluo 3d5` `$nroll` | Rolls in a given range. | `$nroll 5` (rolls 0-5) or `$nroll 5-15` `$draw` | Draws a card from the deck.If you supply number X, she draws up to 5 cards from the deck. | `$draw` or `$draw 5` `$shuffle` `$sh` | Reshuffles all cards back into the deck. | `$sh` `$flip` | Flips coin(s) - heads or tails, and shows an image. | `$flip` or `$flip 3` `$betflip` `$bf` | Bet to guess will the result be heads or tails. Guessing awards you 1.95x the currency you've bet (rounded up). Multiplier can be changed by the bot owner. | `$bf 5 heads` or `$bf 3 t` -`$slotstats` | Shows the total stats of the slot command for this bot's session. **Bot Owner only.** | `$slotstats` -`$slottest` | Tests to see how much slots payout for X number of plays. **Bot Owner only.** | `$slottest 1000` +`$slotstats` | Shows the total stats of the slot command for this bot's session. **Bot Owner Only** | `$slotstats` +`$slottest` | Tests to see how much slots payout for X number of plays. **Bot Owner Only** | `$slottest 1000` `$slot` | Play Nadeko slots. Max bet is 999. 3 seconds cooldown per user. | `$slot 5` `$claimwaifu` `$claim` | Claim a waifu for yourself by spending currency. You must spend atleast 10% more than her current value unless she set `$affinity` towards you. | `$claim 50 @Himesama` `$divorce` | Releases your claim on a specific waifu. You will get some of the money you've spent back unless that waifu has an affinity towards you. 6 hours cooldown. | `$divorce @CheatingSloot` @@ -152,14 +156,15 @@ Command and aliases | Description | Usage `$waifus` `$waifulb` | Shows top 9 waifus. | `$waifus` `$waifuinfo` `$waifustats` | Shows waifu stats for a target person. Defaults to you if no user is provided. | `$waifuinfo @MyCrush` or `$waifuinfo` -###### [Back to TOC](#table-of-contents) +###### [Back to ToC](#table-of-contents) ### Games Command and aliases | Description | Usage ----------------|--------------|------- `>choose` | Chooses a thing from a list of things | `>choose Get up;Sleep;Sleep more` `>8ball` | Ask the 8ball a yes/no question. | `>8ball should I do something` -`>rps` | Play a game of rocket paperclip scissors with Nadeko. | `>rps scissors` +`>rps` | Play a game of Rocket-Paperclip-Scissors with Nadeko. | `>rps scissors` +`>rategirl` | Use the universal hot-crazy wife zone matrix to determine the girl's worth. It is everything young men need to know about women. At any moment in time, any woman you have previously located on this chart can vanish from that location and appear anywhere else on the chart. | `>rategirl @SomeGurl` `>linux` | Prints a customizable Linux interjection | `>linux Spyware Windows` `>leet` | Converts a text to leetspeak with 6 (1-6) severity levels | `>leet 3 Hello` `>acrophobia` `>acro` | Starts an Acrophobia game. Second argment is optional round length in seconds. (default is 60) | `>acro` or `>acro 30` @@ -175,26 +180,27 @@ Command and aliases | Description | Usage `>pollend` | Stops active poll on this server and prints the results in this channel. **Requires ManageMessages server permission.** | `>pollend` `>typestart` | Starts a typing contest. | `>typestart` `>typestop` | Stops a typing contest on the current channel. | `>typestop` -`>typeadd` | Adds a new article to the typing contest. **Bot Owner only.** | `>typeadd wordswords` +`>typeadd` | Adds a new article to the typing contest. **Bot Owner Only** | `>typeadd wordswords` `>typelist` | Lists added typing articles with their IDs. 15 per page. | `>typelist` or `>typelist 3` -`>typedel` | Deletes a typing article given the ID. **Bot Owner only.** | `>typedel 3` -`>trivia` `>t` | Starts a game of trivia. You can add nohint to prevent hints.First player to get to 10 points wins by default. You can specify a different number. 30 seconds per question. | `>t` or `>t 5 nohint` +`>typedel` | Deletes a typing article given the ID. **Bot Owner Only** | `>typedel 3` +`>tictactoe` `>ttt` | Starts a game of tic tac toe. Another user must run the command in the same channel in order to accept the challenge. Use numbers 1-9 to play. 15 seconds per move. | >ttt +`>trivia` `>t` | Starts a game of trivia. You can add `nohint` to prevent hints. First player to get to 10 points wins by default. You can specify a different number. 30 seconds per question. | `>t` or `>t 5 nohint` `>tl` | Shows a current trivia leaderboard. | `>tl` `>tq` | Quits current trivia after current question. | `>tq` -###### [Back to TOC](#table-of-contents) +###### [Back to ToC](#table-of-contents) ### Help Command and aliases | Description | Usage ----------------|--------------|------- `-modules` `-mdls` | Lists all bot modules. | `-modules` -`-commands` `-cmds` | List all of the bot's commands from a certain module. You can either specify full, or only first few letters of the module name. | `-commands Administration` or `-cmds Admin` -`-help` `-h` | Either shows a help for a single command, or DMs you help link if no arguments are specified. | `-h !!q` or `-h` -`-hgit` | Generates the commandlist.md file. **Bot Owner only.** | `-hgit` +`-commands` `-cmds` | List all of the bot's commands from a certain module. You can either specify the full name or only the first few letters of the module name. | `-commands Administration` or `-cmds Admin` +`-help` `-h` | Either shows a help for a single command, or DMs you help link if no arguments are specified. | `-h -cmds` or `-h` +`-hgit` | Generates the commandlist.md file. **Bot Owner Only** | `-hgit` `-readme` `-guide` | Sends a readme and a guide links to the channel. | `-readme` or `-guide` `-donate` | Instructions for helping the project financially. | `-donate` -###### [Back to TOC](#table-of-contents) +###### [Back to ToC](#table-of-contents) ### Music Command and aliases | Description | Usage @@ -203,34 +209,34 @@ Command and aliases | Description | Usage `!!stop` `!!s` | Stops the music and clears the playlist. Stays in the channel. | `!!s` `!!destroy` `!!d` | Completely stops the music and unbinds the bot from the channel. (may cause weird behaviour) | `!!d` `!!pause` `!!p` | Pauses or Unpauses the song. | `!!p` -`!!fairplay` `!!fp` | Toggles fairplay. While enabled, music player will prioritize songs from users who didn't have their song recently played instead of the song's position in the queue. | `!!fp` -`!!queue` `!!q` `!!yq` | Queue a song using keywords or a link. Bot will join your voice channel.**You must be in a voice channel**. | `!!q Dream Of Venice` -`!!soundcloudqueue` `!!sq` | Queue a soundcloud song using keywords. Bot will join your voice channel.**You must be in a voice channel**. | `!!sq Dream Of Venice` +`!!fairplay` `!!fp` | Toggles fairplay. While enabled, the bot will prioritize songs from users who didn't have their song recently played instead of the song's position in the queue. | `!!fp` +`!!queue` `!!q` `!!yq` | Queue a song using keywords or a link. Bot will join your voice channel. **You must be in a voice channel**. | `!!q Dream Of Venice` +`!!soundcloudqueue` `!!sq` | Queue a soundcloud song using keywords. Bot will join your voice channel. **You must be in a voice channel**. | `!!sq Dream Of Venice` `!!listqueue` `!!lq` | Lists 15 currently queued songs per page. Default page is 1. | `!!lq` or `!!lq 2` -`!!nowplaying` `!!np` | Shows the song currently playing. | `!!np` -`!!volume` `!!vol` | Sets the music volume 0-100% | `!!vol 50` +`!!nowplaying` `!!np` | Shows the song that the bot is currently playing. | `!!np` +`!!volume` `!!vol` | Sets the music playback volume (0-100%) | `!!vol 50` `!!defvol` `!!dv` | Sets the default music volume when music playback is started (0-100). Persists through restarts. | `!!dv 80` `!!shuffle` `!!sh` | Shuffles the current playlist. | `!!sh` `!!playlist` `!!pl` | Queues up to 500 songs from a youtube playlist specified by a link, or keywords. | `!!pl playlist link or name` -`!!soundcloudpl` `!!scpl` | Queue a soundcloud playlist using a link. | `!!scpl soundcloudseturl` -`!!localplaylst` `!!lopl` | Queues all songs from a directory. **Bot Owner only.** | `!!lopl C:/music/classical` +`!!soundcloudpl` `!!scpl` | Queue a Soundcloud playlist using a link. | `!!scpl soundcloudseturl` +`!!localplaylst` `!!lopl` | Queues all songs from a directory. **Bot Owner Only** | `!!lopl C:/music/classical` `!!radio` `!!ra` | Queues a radio stream from a link. It can be a direct mp3 radio stream, .m3u, .pls .asx or .xspf (Usage Video: ) | `!!ra radio link here` -`!!local` `!!lo` | Queues a local file by specifying a full path. **Bot Owner only.** | `!!lo C:/music/mysong.mp3` +`!!local` `!!lo` | Queues a local file by specifying a full path. **Bot Owner Only** | `!!lo C:/music/mysong.mp3` `!!remove` `!!rm` | Remove a song by its # in the queue, or 'all' to remove whole queue. | `!!rm 5` `!!movesong` `!!ms` | Moves a song from one position to another. | `!!ms 5>3` `!!setmaxqueue` `!!smq` | Sets a maximum queue size. Supply 0 or no argument to have no limit. | `!!smq 50` or `!!smq` `!!setmaxplaytime` `!!smp` | Sets a maximum number of seconds (>14) a song can run before being skipped automatically. Set 0 to have no limit. | `!!smp 0` or `!!smp 270` `!!reptcursong` `!!rcs` | Toggles repeat of current song. | `!!rcs` `!!rpeatplaylst` `!!rpl` | Toggles repeat of all songs in the queue (every song that finishes is added to the end of the queue). | `!!rpl` -`!!save` | Saves a playlist under a certain name. Name must be no longer than 20 characters and mustn't contain dashes. | `!!save classical1` -`!!load` | Loads a saved playlist using it's ID. Use `!!pls` to list all saved playlists and !!save to save new ones. | `!!load 5` -`!!playlists` `!!pls` | Lists all playlists. Paginated. 20 per page. Default page is 0. | `!!pls 1` -`!!deleteplaylist` `!!delpls` | Deletes a saved playlist. Only if you made it or if you are the bot owner. | `!!delpls animu-5` +`!!save` | Saves a playlist under a certain name. Playlist name must be no longer than 20 characters and must not contain dashes. | `!!save classical1` +`!!load` | Loads a saved playlist using its ID. Use `!!pls` to list all saved playlists and `!!save` to save new ones. | `!!load 5` +`!!playlists` `!!pls` | Lists all playlists. Paginated, 20 per page. Default page is 0. | `!!pls 1` +`!!deleteplaylist` `!!delpls` | Deletes a saved playlist. Works only if you made it or if you are the bot owner. | `!!delpls animu-5` `!!goto` | Goes to a specific time in seconds in a song. | `!!goto 30` -`!!autoplay` `!!ap` | Toggles autoplay - When the song is finished, automatically queue a related youtube song. (Works only for youtube songs and when queue is empty) | `!!ap` +`!!autoplay` `!!ap` | Toggles autoplay - When the song is finished, automatically queue a related Youtube song. (Works only for Youtube songs and when queue is empty) | `!!ap` `!!setmusicchannel` `!!smch` | Sets the current channel as the default music output channel. This will output playing, finished, paused and removed songs to that channel instead of the channel where the first song was queued in. **Requires ManageMessages server permission.** | `!!smch` -###### [Back to TOC](#table-of-contents) +###### [Back to ToC](#table-of-contents) ### NSFW Command and aliases | Description | Usage @@ -240,24 +246,24 @@ Command and aliases | Description | Usage `~hentaibomb` | Shows a total 5 images (from gelbooru, danbooru, konachan, yandere and atfbooru). Tag is optional but preferred. | `~hentaibomb yuri` `~yandere` | Shows a random image from yandere with a given tag. Tag is optional but preferred. (multiple tags are appended with +) | `~yandere tag1+tag2` `~konachan` | Shows a random hentai image from konachan with a given tag. Tag is optional but preferred. | `~konachan yuri` -`~rule34` | Shows a random image from rule34.xx with a given tag. Tag is optional but preferred. (multiple tags are appended with +) | `~rule34 yuri+kissing` `~e621` | Shows a random hentai image from e621.net with a given tag. Tag is optional but preferred. Use spaces for multiple tags. | `~e621 yuri kissing` +`~rule34` | Shows a random image from rule34.xx with a given tag. Tag is optional but preferred. (multiple tags are appended with +) | `~rule34 yuri+kissing` `~danbooru` | Shows a random hentai image from danbooru with a given tag. Tag is optional but preferred. (multiple tags are appended with +) | `~danbooru yuri+kissing` `~gelbooru` | Shows a random hentai image from gelbooru with a given tag. Tag is optional but preferred. (multiple tags are appended with +) | `~gelbooru yuri+kissing` `~cp` | We all know where this will lead you to. | `~cp` `~boobs` | Real adult content. | `~boobs` `~butts` `~ass` `~butt` | Real adult content. | `~butts` or `~ass` -###### [Back to TOC](#table-of-contents) +###### [Back to ToC](#table-of-contents) ### Permissions Command and aliases | Description | Usage ----------------|--------------|------- `;verbose` `;v` | Sets whether to show when a command/module is blocked. | `;verbose true` -`;permrole` `;pr` | Sets a role which can change permissions. Or supply no parameters to find out the current one. Default one is 'Nadeko'. | `;pr role` +`;permrole` `;pr` | Sets a role which can change permissions. Supply no parameters to see the current one. Default is 'Nadeko'. | `;pr role` `;listperms` `;lp` | Lists whole permission chain with their indexes. You can specify an optional page number if there are a lot of permissions. | `;lp` or `;lp 3` -`;removeperm` `;rp` | Removes a permission from a given position in Permissions list. | `;rp 1` -`;moveperm` `;mp` | Moves permission from one position to another in Permissions list. | `;mp 2 4` +`;removeperm` `;rp` | Removes a permission from a given position in the Permissions list. | `;rp 1` +`;moveperm` `;mp` | Moves permission from one position to another in the Permissions list. | `;mp 2 4` `;srvrcmd` `;sc` | Sets a command's permission at the server level. | `;sc "command name" disable` `;srvrmdl` `;sm` | Sets a module's permission at the server level. | `;sm ModuleName enable` `;usrcmd` `;uc` | Sets a command's permission at the user level. | `;uc "command name" enable SomeUsername` @@ -270,31 +276,30 @@ Command and aliases | Description | Usage `;allrolemdls` `;arm` | Enable or disable all modules for a specific role. | `;arm [enable/disable] MyRole` `;allusrmdls` `;aum` | Enable or disable all modules for a specific user. | `;aum enable @someone` `;allsrvrmdls` `;asm` | Enable or disable all modules for your server. | `;asm [enable/disable]` -`;ubl` | Either [add]s or [rem]oves a user specified by a mention or ID from a blacklist. **Bot Owner only.** | `;ubl add @SomeUser` or `;ubl rem 12312312313` -`;cbl` | Either [add]s or [rem]oves a channel specified by an ID from a blacklist. **Bot Owner only.** | `;cbl rem 12312312312` -`;sbl` | Either [add]s or [rem]oves a server specified by a Name or ID from a blacklist. **Bot Owner only.** | `;sbl add 12312321312` or `;sbl rem SomeTrashServer` -`;cmdcooldown` `;cmdcd` | Sets a cooldown per user for a command. Set to 0 to remove the cooldown. | `;cmdcd "some cmd" 5` +`;ubl` | Either [add]s or [rem]oves a user specified by a Mention or an ID from a blacklist. **Bot Owner Only** | `;ubl add @SomeUser` or `;ubl rem 12312312313` +`;cbl` | Either [add]s or [rem]oves a channel specified by an ID from a blacklist. **Bot Owner Only** | `;cbl rem 12312312312` +`;sbl` | Either [add]s or [rem]oves a server specified by a Name or an ID from a blacklist. **Bot Owner Only** | `;sbl add 12312321312` or `;sbl rem SomeTrashServer` +`;cmdcooldown` `;cmdcd` | Sets a cooldown per user for a command. Set it to 0 to remove the cooldown. | `;cmdcd "some cmd" 5` `;allcmdcooldowns` `;acmdcds` | Shows a list of all commands and their respective cooldowns. | `;acmdcds` -`;cmdcosts` | Shows a list of command costs. Paginated with 9 command per page. | `;cmdcosts` or `;cmdcosts 2` -`;srvrfilterinv` `;sfi` | Toggles automatic deleting of invites posted in the server. Does not affect Bot Owner. | `;sfi` -`;chnlfilterinv` `;cfi` | Toggles automatic deleting of invites posted in the channel. Does not negate the ;srvrfilterinv enabled setting. Does not affect Bot Owner. | `;cfi` -`;srvrfilterwords` `;sfw` | Toggles automatic deleting of messages containing forbidden words on the server. Does not affect Bot Owner. | `;sfw` -`;chnlfilterwords` `;cfw` | Toggles automatic deleting of messages containing banned words on the channel. Does not negate the ;srvrfilterwords enabled setting. Does not affect bot owner. | `;cfw` +`;srvrfilterinv` `;sfi` | Toggles automatic deletion of invites posted in the server. Does not affect the Bot Owner. | `;sfi` +`;chnlfilterinv` `;cfi` | Toggles automatic deletion of invites posted in the channel. Does not negate the `;srvrfilterinv` enabled setting. Does not affect the Bot Owner. | `;cfi` +`;srvrfilterwords` `;sfw` | Toggles automatic deletion of messages containing filtered words on the server. Does not affect the Bot Owner. | `;sfw` +`;chnlfilterwords` `;cfw` | Toggles automatic deletion of messages containing filtered words on the channel. Does not negate the `;srvrfilterwords` enabled setting. Does not affect the Bot Owner. | `;cfw` `;fw` | Adds or removes (if it exists) a word from the list of filtered words. Use`;sfw` or `;cfw` to toggle filtering. | `;fw poop` `;lstfilterwords` `;lfw` | Shows a list of filtered words. | `;lfw` -###### [Back to TOC](#table-of-contents) +###### [Back to ToC](#table-of-contents) ### Pokemon Command and aliases | Description | Usage ----------------|--------------|------- `>attack` | Attacks a target with the given move. Use `>movelist` to see a list of moves your type can use. | `>attack "vine whip" @someguy` `>movelist` `>ml` | Lists the moves you are able to use | `>ml` -`>heal` | Heals someone. Revives those who fainted. Costs a NadekoFlower | `>heal @someone` +`>heal` | Heals someone. Revives those who fainted. Costs a NadekoFlower. | `>heal @someone` `>type` | Get the poketype of the target. | `>type @someone` `>settype` | Set your poketype. Costs a NadekoFlower. Provide no arguments to see a list of available types. | `>settype fire` or `>settype` -###### [Back to TOC](#table-of-contents) +###### [Back to ToC](#table-of-contents) ### Searches Command and aliases | Description | Usage @@ -304,39 +309,37 @@ Command and aliases | Description | Usage `~imdb` `~omdb` | Queries omdb for movies or series, show first result. | `~imdb Batman vs Superman` `~randomcat` `~meow` | Shows a random cat image. | `~meow` `~randomdog` `~woof` | Shows a random dog image. | `~woof` -`~image` `~img` | Pulls the first image found using a search parameter. Use ~rimg for different results. | `~img cute kitten` +`~image` `~img` | Pulls the first image found using a search parameter. Use `~rimg` for different results. | `~img cute kitten` `~randomimage` `~rimg` | Pulls a random image using a search parameter. | `~rimg cute kitten` `~lmgtfy` | Google something for an idiot. | `~lmgtfy query` `~shorten` | Attempts to shorten an URL, if it fails, returns the input URL. | `~shorten https://google.com` -`~google` `~g` | Get a google search link for some terms. | `~google query` +`~google` `~g` | Get a Google search link for some terms. | `~google query` `~magicthegathering` `~mtg` | Searches for a Magic The Gathering card. | `~magicthegathering about face` or `~mtg about face` `~hearthstone` `~hs` | Searches for a Hearthstone card and shows its image. Takes a while to complete. | `~hs Ysera` -`~yodify` `~yoda` | Translates your normal sentences into Yoda styled sentences! | ~yodify I was once an adventurer like you` or `~yoda my feelings hurt` +`~yodify` `~yoda` | Translates your normal sentences into Yoda styled sentences! | `~yoda my feelings hurt` `~urbandict` `~ud` | Searches Urban Dictionary for a word. | `~ud Pineapple` `~define` `~def` | Finds a definition of a word. | `~def heresy` `~#` | Searches Tagdef.com for a hashtag. | `~# ff` `~catfact` | Shows a random catfact from | `~catfact` -`~revav` | Returns a google reverse image search for someone's avatar. | `~revav "@SomeGuy"` -`~revimg` | Returns a google reverse image search for an image from a link. | `~revimg Image link` +`~revav` | Returns a Google reverse image search for someone's avatar. | `~revav "@SomeGuy"` +`~revimg` | Returns a Google reverse image search for an image from a link. | `~revimg Image link` `~safebooru` | Shows a random image from safebooru with a given tag. Tag is optional but preferred. (multiple tags are appended with +) | `~safebooru yuri+kissing` `~wikipedia` `~wiki` | Gives you back a wikipedia link | `~wiki query` `~color` `~clr` | Shows you what color corresponds to that hex. | `~clr 00ff00` `~videocall` | Creates a private video call link for you and other mentioned people. The link is sent to mentioned people via a private message. | `~videocall "@SomeGuy"` `~avatar` `~av` | Shows a mentioned person's avatar. | `~av "@SomeGuy"` `~wikia` | Gives you back a wikia link | `~wikia mtg Vigilance` or `~wikia mlp Dashy` -`~minecraftping` `~mcping` | Pings a minecraft server. | `~mcping 127.0.0.1:25565` -`~minecraftquery` `~mcq` | Finds information about a minecraft server. | `~mcq server:ip` `~lolban` | Shows top banned champions ordered by ban rate. | `~lolban` -`~memelist` | Pulls a list of memes you can use with `~memegen` from http://memegen.link/templates/ | `~memelist` -`~memegen` | Generates a meme from memelist with top and bottom text. | `~memegen biw "gets iced coffee" "in the winter"` -`~mal` | Shows basic info from myanimelist profile. | `~mal straysocks` +`~mal` | Shows basic info from a MyAnimeList profile. | `~mal straysocks` `~anime` `~ani` `~aq` | Queries anilist for an anime and shows the first result. | `~ani aquarion evol` `~manga` `~mang` `~mq` | Queries anilist for a manga and shows the first result. | `~mq Shingeki no kyojin` `~yomama` `~ym` | Shows a random joke from | `~ym` `~randjoke` `~rj` | Shows a random joke from | `~rj` -`~chucknorris` `~cn` | Shows a random chucknorris joke from | `~cn` +`~chucknorris` `~cn` | Shows a random Chuck Norris joke from | `~cn` `~wowjoke` | Get one of Kwoth's penultimate WoW jokes. | `~wowjoke` -`~magicitem` `~mi` | Shows a random magicitem from | `~mi` +`~magicitem` `~mi` | Shows a random magic item from | `~mi` +`~memelist` | Pulls a list of memes you can use with `~memegen` from http://memegen.link/templates/ | `~memelist` +`~memegen` | Generates a meme from memelist with top and bottom text. | `~memegen biw "gets iced coffee" "in the winter"` `~osu` | Shows osu stats for a player. | `~osu Name` or `~osu Name taiko` `~osub` | Shows information about an osu beatmap. | `~osub https://osu.ppy.sh/s/127712` `~osu5` | Displays a user's top 5 plays. | `~osu5 Name` @@ -352,50 +355,53 @@ Command and aliases | Description | Usage `~removestream` `~rms` | Removes notifications of a certain streamer from a certain platform on this channel. **Requires ManageMessages server permission.** | `~rms Twitch SomeGuy` or `~rms Beam SomeOtherGuy` `~checkstream` `~cs` | Checks if a user is online on a certain streaming platform. | `~cs twitch MyFavStreamer` `~translate` `~trans` | Translates from>to text. From the given language to the destination language. | `~trans en>fr Hello` -`~autotrans` `~at` | Starts automatic translation of all messages by users who set their `~atl` in this channel. You can set "del" argument to automatically delete all translated user messages. **Requires Administrator server permission.** **Bot Owner only.** | `~at` or `~at del` -`~autotranslang` `~atl` | `~atl en>fr` | Sets your source and target language to be used with `~at`. Specify no arguments to remove previously set value. +`~autotrans` `~at` | Starts automatic translation of all messages by users who set their `~atl` in this channel. You can set "del" argument to automatically delete all translated user messages. **Requires Administrator server permission.** **Bot Owner Only** | `~at` or `~at del` +`~autotranslang` `~atl` | Sets your source and target language to be used with `~at`. Specify no arguments to remove previously set value. | `~atl en>fr` `~translangs` | Lists the valid languages for translation. | `~translangs` `~xkcd` | Shows a XKCD comic. No arguments will retrieve random one. Number argument will retrieve a specific comic, and "latest" will get the latest one. | `~xkcd` or `~xkcd 1400` or `~xkcd latest` -###### [Back to TOC](#table-of-contents) +###### [Back to ToC](#table-of-contents) ### Utility Command and aliases | Description | Usage ----------------|--------------|------- -`.rotaterolecolor` `.rrc` | Rotates a roles color on an interval with a list of supplied colors. First argument is interval in seconds (Minimum 60). Second argument is a role, followed by a space-separated list of colors in hex. Provide a rolename with a 0 interval to disable. **Requires ManageRoles server permission.** **Bot Owner only.** | `.rrc 60 MyLsdRole #ff0000 #00ff00 #0000ff` or `.rrc 0 MyLsdRole` +`.rotaterolecolor` `.rrc` | Rotates a roles color on an interval with a list of supplied colors. First argument is interval in seconds (Minimum 60). Second argument is a role, followed by a space-separated list of colors in hex. Provide a rolename with a 0 interval to disable. **Requires ManageRoles server permission.** **Bot Owner Only** | `.rrc 60 MyLsdRole #ff0000 #00ff00 #0000ff` or `.rrc 0 MyLsdRole` `.togethertube` `.totube` | Creates a new room on and shows the link in the chat. | `.totube` `.whosplaying` `.whpl` | Shows a list of users who are playing the specified game. | `.whpl Overwatch` -`.inrole` | Lists every person from the provided role or roles (separated by a ',') on this server. If the list is too long for 1 message, you must have Manage Messages permission. | `.inrole Role` +`.inrole` | Lists every person from the provided role or roles, separated with space, on this server. You can use role IDs, role names (in quotes if it has multiple words), or role mention If the list is too long for 1 message, you must have Manage Messages permission. | `.inrole Role` or `.inrole Role1 "Role 2" @role3` `.checkmyperms` | Checks your user-specific permissions on this channel. | `.checkmyperms` `.userid` `.uid` | Shows user ID. | `.uid` or `.uid "@SomeGuy"` `.channelid` `.cid` | Shows current channel ID. | `.cid` `.serverid` `.sid` | Shows current server ID. | `.sid` -`.roles` | List roles on this server or a roles of a specific user if specified. Paginated. 20 roles per page. | `.roles 2` or `.roles @Someone` +`.roles` | List roles on this server or a roles of a specific user if specified. Paginated, 20 roles per page. | `.roles 2` or `.roles @Someone` `.channeltopic` `.ct` | Sends current channel's topic as a message. | `.ct` `.createinvite` `.crinv` | Creates a new invite which has infinite max uses and never expires. **Requires CreateInstantInvite channel permission.** | `.crinv` +`.shardstats` | Stats for shards. Paginated with 25 shards per page. | `.shardstats` or `.shardstats 2` +`.shardid` | Shows which shard is a certain guild on, by guildid. | `.shardid 117523346618318850` `.stats` | Shows some basic stats for Nadeko. | `.stats` `.showemojis` `.se` | Shows a name and a link to every SPECIAL emoji in the message. | `.se A message full of SPECIAL emojis` -`.listservers` | Lists servers the bot is on with some basic info. 15 per page. **Bot Owner only.** | `.listservers 3` -`.savechat` | Saves a number of messages to a text file and sends it to you. **Bot Owner only.** | `.savechat 150` -`.activity` | Checks for spammers. **Bot Owner only.** | `.activity` +`.listservers` | Lists servers the bot is on with some basic info. 15 per page. **Bot Owner Only** | `.listservers 3` +`.savechat` | Saves a number of messages to a text file and sends it to you. **Bot Owner Only** | `.savechat 150` +`.activity` | Checks for spammers. **Bot Owner Only** | `.activity` `.calculate` `.calc` | Evaluate a mathematical expression. | `.calc 1+1` -`.calcops` | Shows all available operations in .calc command | `.calcops` -`.scsc` | Starts an instance of cross server channel. You will get a token as a DM that other people will use to tune in to the same instance. **Bot Owner only.** | `.scsc` +`.calcops` | Shows all available operations in the `.calc` command | `.calcops` +`.scsc` | Starts an instance of cross server channel. You will get a token as a DM that other people will use to tune in to the same instance. **Bot Owner Only** | `.scsc` `.jcsc` | Joins current channel to an instance of cross server channel using the token. **Requires ManageServer server permission.** | `.jcsc TokenHere` -`.lcsc` | Leaves Cross server channel instance from this channel. **Requires ManageServer server permission.** | `.lcsc` +`.lcsc` | Leaves a cross server channel instance from this channel. **Requires ManageServer server permission.** | `.lcsc` `.serverinfo` `.sinfo` | Shows info about the server the bot is on. If no channel is supplied, it defaults to current one. | `.sinfo Some Server` `.channelinfo` `.cinfo` | Shows info about the channel. If no channel is supplied, it defaults to current one. | `.cinfo #some-channel` `.userinfo` `.uinfo` | Shows info about the user. If no user is supplied, it defaults a user running the command. | `.uinfo @SomeUser` `.repeatinvoke` `.repinv` | Immediately shows the repeat message on a certain index and restarts its timer. **Requires ManageMessages server permission.** | `.repinv 1` `.repeatremove` `.reprm` | Removes a repeating message on a specified index. Use `.repeatlist` to see indexes. **Requires ManageMessages server permission.** | `.reprm 2` -`.repeat` | Repeat a message every X minutes in the current channel. You can have up to 5 repeating messages on the server in total. **Requires ManageMessages server permission.** | `.repeat 5 Hello there` +`.repeat` | Repeat a message every `X` minutes in the current channel. You can have up to 5 repeating messages on the server in total. **Requires ManageMessages server permission.** | `.repeat 5 Hello there` `.repeatlist` `.replst` | Shows currently repeating messages and their indexes. **Requires ManageMessages server permission.** | `.repeatlist` `.listquotes` `.liqu` | `.liqu` or `.liqu 3` | Lists all quotes on the server ordered alphabetically. 15 Per page. `...` | Shows a random quote with a specified name. | `... abc` +`.qsearch` | Shows a random quote for a keyword that contains any text specified in the search. | `.qsearch keyword text` `..` | Adds a new quote with the specified name and message. | `.. sayhi Hi` `.deletequote` `.delq` | Deletes a random quote with the specified keyword. You have to either be server Administrator or the creator of the quote to delete it. | `.delq abc` `.delallq` `.daq` | Deletes all quotes on a specified keyword. **Requires Administrator server permission.** | `.delallq kek` -`.remind` | Sends a message to you or a channel after certain amount of time. First argument is me/here/'channelname'. Second argument is time in a descending order (mo>w>d>h>m) example: 1w5d3h10m. Third argument is a (multiword)message. | `.remind me 1d5h Do something` or `.remind #general 1m Start now!` -`.remindtemplate` | Sets message for when the remind is triggered. Available placeholders are %user% - user who ran the command, %message% - Message specified in the remind, %target% - target channel of the remind. **Bot Owner only.** | `.remindtemplate %user%, do %message%!` +`.remind` | Sends a message to you or a channel after certain amount of time. First argument is `me`/`here`/'channelname'. Second argument is time in a descending order (mo>w>d>h>m) example: 1w5d3h10m. Third argument is a (multiword) message. | `.remind me 1d5h Do something` or `.remind #general 1m Start now!` +`.remindtemplate` | Sets message for when the remind is triggered. Available placeholders are `%user%` - user who ran the command, `%message%` - Message specified in the remind, `%target%` - target channel of the remind. **Bot Owner Only** | `.remindtemplate %user%, do %message%!` `.convertlist` | List of the convertible dimensions and currencies. | `.convertlist` `.convert` | Convert quantities. Use `.convertlist` to see supported dimensions and currencies. | `.convert m km 1000` From 751bd85b3ee387360399acb54d8fbfdf15618dca Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 4 Mar 2017 03:15:31 +0100 Subject: [PATCH 166/496] move or stay almost complete --- .../Modules/Gambling/Commands/MoveOrStay.cs | 90 +++++--- .../Resources/CommandStrings.Designer.cs | 194 +++++++++++------- src/NadekoBot/Resources/CommandStrings.resx | 20 +- 3 files changed, 203 insertions(+), 101 deletions(-) diff --git a/src/NadekoBot/Modules/Gambling/Commands/MoveOrStay.cs b/src/NadekoBot/Modules/Gambling/Commands/MoveOrStay.cs index e7ca6434..04120aa6 100644 --- a/src/NadekoBot/Modules/Gambling/Commands/MoveOrStay.cs +++ b/src/NadekoBot/Modules/Gambling/Commands/MoveOrStay.cs @@ -1,4 +1,5 @@ using System.Collections.Concurrent; +using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; using System.Text; @@ -14,28 +15,54 @@ namespace NadekoBot.Modules.Gambling //public partial class Gambling //{ // [Group] - // public class MoveOrStayCommands : NadekoSubmodule + // public class Lucky7Commands : NadekoSubmodule // { // [NadekoCommand, Usage, Description, Aliases] // [RequireContext(ContextType.Guild)] // [OwnerOnly] - // public async Task MoveOrStayTest() + // public async Task Lucky7Test(uint tests) // { - // //test 1, just stop on second one + // if (tests <= 0) + // return; - // //test 2, stop when winning + // var dict = new Dictionary(); + // var totalWon = 0; + // for (var i = 0; i < tests; i++) + // { + // var g = new Lucky7Game(10); + // while (!g.Ended) + // { + // if (g.CurrentPosition == 0) + // g.Stay(); + // else + // g.Move(); + // } + // totalWon += (int)(g.CurrentMultiplier * g.Bet); + // if (!dict.ContainsKey(g.CurrentMultiplier)) + // dict.Add(g.CurrentMultiplier, 0); + // dict[g.CurrentMultiplier] ++; + + // } + + // await Context.Channel.EmbedAsync(new EmbedBuilder().WithOkColor() + // .WithTitle("Move Or Stay test") + // .WithDescription(string.Join("\n", + // dict.Select(x => $"x{x.Key} occured {x.Value} times {x.Value * 1.0f / tests * 100:F2}%"))) + // .WithFooter( + // efb => efb.WithText($"Total Bet: {tests * 10} | Payout: {totalWon} | {totalWon *1.0f / tests * 10}%"))); // } - // private static readonly ConcurrentDictionary _games = new ConcurrentDictionary(); + // private static readonly ConcurrentDictionary _games = + // new ConcurrentDictionary(); // [NadekoCommand, Usage, Description, Aliases] // [RequireContext(ContextType.Guild)] - // public async Task MoveOrStay(int bet) + // public async Task Lucky7(int bet) // { // if (bet < 4) // return; - // var game = new MoveOrStayGame(bet); + // var game = new Lucky7Game(bet); // if (!_games.TryAdd(Context.User.Id, game)) // { // await ReplyAsync("You're already betting on move or stay.").ConfigureAwait(false); @@ -44,14 +71,15 @@ namespace NadekoBot.Modules.Gambling // if (!await CurrencyHandler.RemoveCurrencyAsync(Context.User, "MoveOrStay bet", bet, false)) // { - // await ReplyAsync("You don't have enough money"); + // _games.TryRemove(Context.User.Id, out game); + // await ReplyConfirmLocalized("not_enough", CurrencySign).ConfigureAwait(false); // return; // } - // await Context.Channel.EmbedAsync(GetGameState(game), + // await Context.Channel.EmbedAsync(GetGameState(game), // string.Format("{0} rolled {1}.", Context.User, game.Rolled)).ConfigureAwait(false); // } - // public enum Mors + // public enum MoveOrStay // { // Move = 1, // M = 1, @@ -61,38 +89,40 @@ namespace NadekoBot.Modules.Gambling // [NadekoCommand, Usage, Description, Aliases] // [RequireContext(ContextType.Guild)] - // public async Task MoveOrStay(Mors action) + // public async Task Lucky7(MoveOrStay action) // { - // MoveOrStayGame game; + // Lucky7Game game; // if (!_games.TryGetValue(Context.User.Id, out game)) // { // await ReplyAsync("You're not betting on move or stay.").ConfigureAwait(false); // return; // } - // if (action == Mors.Move) + // if (action == MoveOrStay.Move) // { // game.Move(); - // await Context.Channel.EmbedAsync(GetGameState(game), string.Format("{0} rolled {1}.", Context.User, game.Rolled)).ConfigureAwait(false); if (game.Ended) + // await Context.Channel.EmbedAsync(GetGameState(game), + // string.Format("{0} rolled {1}.", Context.User, game.Rolled)).ConfigureAwait(false); + // if (game.Ended) // _games.TryRemove(Context.User.Id, out game); // } - // else if (action == Mors.Stay) + // else if (action == MoveOrStay.Stay) // { // var won = game.Stay(); // await CurrencyHandler.AddCurrencyAsync(Context.User, "MoveOrStay stay", won, false) // .ConfigureAwait(false); // _games.TryRemove(Context.User.Id, out game); - // await ReplyAsync(string.Format("You've finished with {0}", - // won + CurrencySign)) + // await ReplyAsync(string.Format("You've finished with {0}", + // won + CurrencySign)) // .ConfigureAwait(false); // } - + // } - // private EmbedBuilder GetGameState(MoveOrStayGame game) + // private EmbedBuilder GetGameState(Lucky7Game game) // { - // var arr = MoveOrStayGame.Winnings.ToArray(); + // var arr = Lucky7Game.Winnings.ToArray(); // var sb = new StringBuilder(); // for (var i = 0; i < arr.Length; i++) // { @@ -110,18 +140,18 @@ namespace NadekoBot.Modules.Gambling // } // return new EmbedBuilder().WithOkColor() - // .WithTitle("Move or Stay") + // .WithTitle("Lucky7") // .WithDescription(sb.ToString()) // .AddField(efb => efb.WithName("Bet") - // .WithValue(game.Bet.ToString()) - // .WithIsInline(true)) + // .WithValue(game.Bet.ToString()) + // .WithIsInline(true)) // .AddField(efb => efb.WithName("Current Value") - // .WithValue((game.CurrentMultiplier * game.Bet).ToString(_cultureInfo)) - // .WithIsInline(true)); + // .WithValue((game.CurrentMultiplier * game.Bet).ToString(_cultureInfo)) + // .WithIsInline(true)); // } // } - // public class MoveOrStayGame + // public class Lucky7Game // { // public int Bet { get; } // public bool Ended { get; private set; } @@ -130,13 +160,13 @@ namespace NadekoBot.Modules.Gambling // public int Rolled { get; private set; } // public float CurrentMultiplier => Winnings[CurrentPosition]; // private readonly NadekoRandom _rng = new NadekoRandom(); - + // public static readonly ImmutableArray Winnings = new[] // { - // 1.5f, 0.75f, 1f, 0.5f, 0.25f, 0.25f, 2.5f, 0f, 0f + // 1.2f, 0.8f, 0.75f, 0.90f, 0.7f, 0.5f, 1.8f, 0f, 0f // }.ToImmutableArray(); - // public MoveOrStayGame(int bet) + // public Lucky7Game(int bet) // { // Bet = bet; // Move(); @@ -150,7 +180,7 @@ namespace NadekoBot.Modules.Gambling // Rolled = _rng.Next(1, 4); // CurrentPosition += Rolled; - // if (CurrentPosition >= 7) + // if (CurrentPosition >= 6) // Ended = true; // } diff --git a/src/NadekoBot/Resources/CommandStrings.Designer.cs b/src/NadekoBot/Resources/CommandStrings.Designer.cs index 2ea37420..41965836 100644 --- a/src/NadekoBot/Resources/CommandStrings.Designer.cs +++ b/src/NadekoBot/Resources/CommandStrings.Designer.cs @@ -150,7 +150,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Add a custom reaction with a trigger and a response. Running this command in server requires Administration permission. Running this command in DM is Bot Owner only and adds a new global custom reaction. Guide here: <http://nadekobot.readthedocs.io/en/latest/Custom%20Reactions/>. + /// Looks up a localized string similar to Add a custom reaction with a trigger and a response. Running this command in server requires the Administration permission. Running this command in DM is Bot Owner only and adds a new global custom reaction. Guide here: <http://nadekobot.readthedocs.io/en/latest/Custom%20Reactions/>. /// public static string addcustreact_desc { get { @@ -177,7 +177,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Adds a specified string to the list of playing strings to rotate. Supported placeholders: %servers%, %users%, %playing%, %queued%, %time%,%shardid%,%shardcount%, %shardguilds%. + /// Looks up a localized string similar to Adds a specified string to the list of playing strings to rotate. Supported placeholders: `%servers%`, `%users%`, `%playing%`, `%queued%`, `%time%`, `%shardid%`, `%shardcount%`, `%shardguilds%`.. /// public static string addplaying_desc { get { @@ -231,7 +231,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Toggles the automatic deletion of confirmations for {0}iam and {0}iamn commands.. + /// Looks up a localized string similar to Toggles the automatic deletion of confirmations for `{0}iam` and `{0}iamn` commands.. /// public static string adsarm_desc { get { @@ -420,7 +420,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Sends a message to all servers' general channel bot is connected to.. + /// Looks up a localized string similar to Sends a message to all servers' default channel that bot is connected to.. /// public static string announce_desc { get { @@ -501,7 +501,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Stops people from repeating same message X times in a row. You can specify to either mute, kick or ban the offenders. Max message count is 10.. + /// Looks up a localized string similar to Stops people from repeating same message X times in a row. You can specify to either mute, kick or ban the offenders. Max message count is 10.. /// public static string antispam_desc { get { @@ -690,7 +690,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Toggles autoplay - When the song is finished, automatically queue a related youtube song. (Works only for youtube songs and when queue is empty). + /// Looks up a localized string similar to Toggles autoplay - When the song is finished, automatically queue a related Youtube song. (Works only for Youtube songs and when queue is empty). /// public static string autoplay_desc { get { @@ -1014,7 +1014,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Sets the time it takes (in seconds) for bye messages to be auto-deleted. Set 0 to disable automatic deletion.. + /// Looks up a localized string similar to Sets the time it takes (in seconds) for bye messages to be auto-deleted. Set it to `0` to disable automatic deletion.. /// public static string byedel_desc { get { @@ -1041,7 +1041,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Sets a new leave announcement message. Type %user% if you want to show the name the user who left. Type %id% to show id. Using this command with no message will show the current bye message. You can use embed json from <http://nadekobot.xyz/embedbuilder/> instead of a regular text, if you want the message to be embedded.. + /// Looks up a localized string similar to Sets a new leave announcement message. Type `%user%` if you want to show the name the user who left. Type `%id%` to show id. Using this command with no message will show the current bye message. You can use embed json from <http://nadekobot.xyz/embedbuilder/> instead of a regular text, if you want the message to be embedded.. /// public static string byemsg_desc { get { @@ -1068,7 +1068,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Shows all available operations in {0}calc command. + /// Looks up a localized string similar to Shows all available operations in the `{0}calc` command. /// public static string calcops_desc { get { @@ -1419,7 +1419,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Toggles automatic deleting of invites posted in the channel. Does not negate the {0}srvrfilterinv enabled setting. Does not affect Bot Owner.. + /// Looks up a localized string similar to Toggles automatic deletion of invites posted in the channel. Does not negate the `{0}srvrfilterinv` enabled setting. Does not affect the Bot Owner.. /// public static string chnlfilterinv_desc { get { @@ -1446,7 +1446,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Toggles automatic deleting of messages containing banned words on the channel. Does not negate the {0}srvrfilterwords enabled setting. Does not affect bot owner.. + /// Looks up a localized string similar to Toggles automatic deletion of messages containing filtered words on the channel. Does not negate the `{0}srvrfilterwords` enabled setting. Does not affect the Bot Owner.. /// public static string chnlfilterwords_desc { get { @@ -1527,7 +1527,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Shows a random chucknorris joke from <http://tambal.azurewebsites.net/joke/random>. + /// Looks up a localized string similar to Shows a random Chuck Norris joke from <http://tambal.azurewebsites.net/joke/random>. /// public static string chucknorris_desc { get { @@ -1743,7 +1743,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Sets a cooldown per user for a command. Set to 0 to remove the cooldown.. + /// Looks up a localized string similar to Sets a cooldown per user for a command. Set it to 0 to remove the cooldown.. /// public static string cmdcooldown_desc { get { @@ -1770,7 +1770,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Shows a list of command costs. Paginated with 9 command per page.. + /// Looks up a localized string similar to Shows a list of command costs. Paginated with 9 commands per page.. /// public static string cmdcosts_desc { get { @@ -1851,7 +1851,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to List all of the bot's commands from a certain module. You can either specify full, or only first few letters of the module name.. + /// Looks up a localized string similar to List all of the bot's commands from a certain module. You can either specify the full name or only the first few letters of the module name.. /// public static string commands_desc { get { @@ -2310,7 +2310,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Deletes a custom reaction on a specific index. If ran in DM, it is bot owner only and deletes a global custom reaction. If ran in a server, it requires Administration priviledges and removes server custom reaction.. + /// Looks up a localized string similar to Deletes a custom reaction on a specific index. If ran in DM, it is bot owner only and deletes a global custom reaction. If ran in a server, it requires Administration privileges and removes server custom reaction.. /// public static string delcustreact_desc { get { @@ -2337,7 +2337,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Deletes a saved playlist. Only if you made it or if you are the bot owner.. + /// Looks up a localized string similar to Deletes a saved playlist. Works only if you made it or if you are the bot owner.. /// public static string deleteplaylist_desc { get { @@ -2391,7 +2391,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Toggles the automatic deletion of user's successful command message to prevent chat flood.. + /// Looks up a localized string similar to Toggles the automatic deletion of the user's successful command message to prevent chat flood.. /// public static string delmsgoncmd_desc { get { @@ -2607,7 +2607,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to List of lovely people who donated to keep this project alive.. + /// Looks up a localized string similar to List of the lovely people who donated to keep this project alive.. /// public static string donators_desc { get { @@ -2715,7 +2715,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Toggles fairplay. While enabled, music player will prioritize songs from users who didn't have their song recently played instead of the song's position in the queue.. + /// Looks up a localized string similar to Toggles fairplay. While enabled, the bot will prioritize songs from users who didn't have their song recently played instead of the song's position in the queue.. /// public static string fairplay_desc { get { @@ -2823,7 +2823,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Toggles whether messages will be forwarded to all bot owners or only to the first one specified in the credentials.json. + /// Looks up a localized string similar to Toggles whether messages will be forwarded to all bot owners or only to the first one specified in the credentials.json file. /// public static string forwardtoall_desc { get { @@ -2931,7 +2931,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Get a google search link for some terms.. + /// Looks up a localized string similar to Get a Google search link for some terms.. /// public static string google_desc { get { @@ -3012,7 +3012,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Sets the time it takes (in seconds) for greet messages to be auto-deleted. Set 0 to disable automatic deletion.. + /// Looks up a localized string similar to Sets the time it takes (in seconds) for greet messages to be auto-deleted. Set it to 0 to disable automatic deletion.. /// public static string greetdel_desc { get { @@ -3066,7 +3066,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Sets a new join announcement message which will be sent to the user who joined. Type %user% if you want to mention the new member. Using it with no message will show the current DM greet message. You can use embed json from <http://nadekobot.xyz/embedbuilder/> instead of a regular text, if you want the message to be embedded.. + /// Looks up a localized string similar to Sets a new join announcement message which will be sent to the user who joined. Type `%user%` if you want to mention the new member. Using it with no message will show the current DM greet message. You can use embed json from <http://nadekobot.xyz/embedbuilder/> instead of a regular text, if you want the message to be embedded.. /// public static string greetdmmsg_desc { get { @@ -3093,7 +3093,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Sets a new join announcement message which will be shown in the server's channel. Type %user% if you want to mention the new member. Using it with no message will show the current greet message. You can use embed json from <http://nadekobot.xyz/embedbuilder/> instead of a regular text, if you want the message to be embedded.. + /// Looks up a localized string similar to Sets a new join announcement message which will be shown in the server's channel. Type `%user%` if you want to mention the new member. Using it with no message will show the current greet message. You can use embed json from <http://nadekobot.xyz/embedbuilder/> instead of a regular text, if you want the message to be embedded.. /// public static string greetmsg_desc { get { @@ -3156,7 +3156,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to `{0}h !!q` or `{0}h`. + /// Looks up a localized string similar to `{0}h {0}cmds` or `{0}h`. /// public static string h_usage { get { @@ -3174,7 +3174,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Sets the music volume to 50%.. + /// Looks up a localized string similar to Sets the music playback volume to 50%.. /// public static string half_desc { get { @@ -3282,7 +3282,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Heals someone. Revives those who fainted. Costs a NadekoFlower. + /// Looks up a localized string similar to Heals someone. Revives those who fainted. Costs a NadekoFlower. . /// public static string heal_desc { get { @@ -3498,7 +3498,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Pulls the first image found using a search parameter. Use {0}rimg for different results.. + /// Looks up a localized string similar to Pulls the first image found using a search parameter. Use `{0}rimg` for different results.. /// public static string image_desc { get { @@ -3687,7 +3687,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to 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.. + /// Looks up a localized string similar to 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.. /// public static string languageset_desc { get { @@ -3768,7 +3768,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Leaves Cross server channel instance from this channel.. + /// Looks up a localized string similar to Leaves a cross server channel instance from this channel.. /// public static string lcsc_desc { get { @@ -3795,7 +3795,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Displays bot currency leaderboard.. + /// Looks up a localized string similar to Displays the bot's currency leaderboard.. /// public static string leaderboard_desc { get { @@ -3822,7 +3822,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Makes Nadeko leave the server. Either name or id required.. + /// Looks up a localized string similar to Makes Nadeko leave the server. Either server name or server ID is required.. /// public static string leave_desc { get { @@ -4128,7 +4128,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to `{0}lw [war_number] or {0}lw`. + /// Looks up a localized string similar to `{0}lw [war_number]` or `{0}lw`. /// public static string listwar_usage { get { @@ -4173,7 +4173,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Loads a saved playlist using it's ID. Use `{0}pls` to list all saved playlists and {0}save to save new ones.. + /// Looks up a localized string similar to Loads a saved playlist using its ID. Use `{0}pls` to list all saved playlists and `{0}save` to save new ones.. /// public static string load_desc { get { @@ -4254,7 +4254,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Toggles logging event. Disables it if it's active anywhere on the server. Enables if it's not active. Use `{0}logevents` to see a list of all events you can subscribe to.. + /// Looks up a localized string similar to Toggles logging event. Disables it if it is active anywhere on the server. Enables if it isn't active. Use `{0}logevents` to see a list of all events you can subscribe to.. /// public static string log_desc { get { @@ -4308,7 +4308,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Toggles whether the .logserver command ignores this channel. Useful if you have hidden admin channel and public log channel.. + /// Looks up a localized string similar to Toggles whether the `.logserver` command ignores this channel. Useful if you have hidden admin channel and public log channel.. /// public static string logignore_desc { get { @@ -4460,6 +4460,60 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to lucky7 l7. + /// + public static string lucky7_cmd { + get { + return ResourceManager.GetString("lucky7_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Bet currency on the game and start rolling 3 sided dice. At any point you can choose to [m]ove (roll again) or [s]tay (get the amount bet times the current multiplier).. + /// + public static string lucky7_desc { + get { + return ResourceManager.GetString("lucky7_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}l7 10` or `{0}l7 move` or `{0}l7 s`. + /// + public static string lucky7_usage { + get { + return ResourceManager.GetString("lucky7_usage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to lucky7test l7t. + /// + public static string lucky7test_cmd { + get { + return ResourceManager.GetString("lucky7test_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Tests the l7 command.. + /// + public static string lucky7test_desc { + get { + return ResourceManager.GetString("lucky7test_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}l7t 10000`. + /// + public static string lucky7test_usage { + get { + return ResourceManager.GetString("lucky7test_usage", resourceCulture); + } + } + /// /// Looks up a localized string similar to magicitem mi. /// @@ -4470,7 +4524,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Shows a random magicitem from <https://1d4chan.org/wiki/List_of_/tg/%27s_magic_items>. + /// Looks up a localized string similar to Shows a random magic item from <https://1d4chan.org/wiki/List_of_/tg/%27s_magic_items>. /// public static string magicitem_desc { get { @@ -4524,7 +4578,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Shows basic info from myanimelist profile.. + /// Looks up a localized string similar to Shows basic info from a MyAnimeList profile.. /// public static string mal_desc { get { @@ -4578,7 +4632,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Sets the music volume to 100%.. + /// Looks up a localized string similar to Sets the music playback volume to 100%.. /// public static string max_desc { get { @@ -4713,7 +4767,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Mentions every person from the provided role or roles (separated by a ',') on this server. Requires you to have mention everyone permission.. + /// Looks up a localized string similar to Mentions every person from the provided role or roles (separated by a ',') on this server. Requires you to have the mention everyone permission.. /// public static string mentionrole_desc { get { @@ -4848,7 +4902,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Moves permission from one position to another in Permissions list.. + /// Looks up a localized string similar to Moves permission from one position to another in the Permissions list.. /// public static string moveperm_desc { get { @@ -4956,7 +5010,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Shows the song currently playing.. + /// Looks up a localized string similar to Shows the song that the bot is currently playing.. /// public static string nowplaying_desc { get { @@ -5145,7 +5199,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Sets a role which can change permissions. Or supply no parameters to find out the current one. Default one is 'Nadeko'.. + /// Looks up a localized string similar to Sets a role which can change permissions. Supply no parameters to see the current one. Default is 'Nadeko'.. /// public static string permrole_desc { get { @@ -5307,7 +5361,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Lists all playlists. Paginated. 20 per page. Default page is 0.. + /// Looks up a localized string similar to Lists all playlists. Paginated, 20 per page. Default page is 0.. /// public static string playlists_desc { get { @@ -5469,7 +5523,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to `{0}prune` removes all nadeko's messages in the last 100 messages.`{0}prune X` removes last X messages from the channel (up to 100)`{0}prune @Someone` removes all Someone's messages in the last 100 messages.`{0}prune @Someone X` removes last X 'Someone's' messages in the channel.. + /// Looks up a localized string similar to `{0}prune` removes all Nadeko's messages in the last 100 messages. `{0}prune X` removes last `X` number of messages from the channel (up to 100). `{0}prune @Someone` removes all Someone's messages in the last 100 messages. `{0}prune @Someone X` removes last `X` number of 'Someone's' messages in the channel.. /// public static string prune_desc { get { @@ -5523,7 +5577,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Queue a song using keywords or a link. Bot will join your voice channel.**You must be in a voice channel**.. + /// Looks up a localized string similar to Queue a song using keywords or a link. Bot will join your voice channel. **You must be in a voice channel**.. /// public static string queue_desc { get { @@ -5793,7 +5847,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Sends a message to you or a channel after certain amount of time. First argument is me/here/'channelname'. Second argument is time in a descending order (mo>w>d>h>m) example: 1w5d3h10m. Third argument is a (multiword)message.. + /// Looks up a localized string similar to Sends a message to you or a channel after certain amount of time. First argument is `me`/`here`/'channelname'. Second argument is time in a descending order (mo>w>d>h>m) example: 1w5d3h10m. Third argument is a (multiword) message.. /// public static string remind_desc { get { @@ -5820,7 +5874,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Sets message for when the remind is triggered. Available placeholders are %user% - user who ran the command, %message% - Message specified in the remind, %target% - target channel of the remind.. + /// Looks up a localized string similar to Sets message for when the remind is triggered. Available placeholders are `%user%` - user who ran the command, `%message%` - Message specified in the remind, `%target%` - target channel of the remind.. /// public static string remindtemplate_desc { get { @@ -5901,7 +5955,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Removes a permission from a given position in Permissions list.. + /// Looks up a localized string similar to Removes a permission from a given position in the Permissions list.. /// public static string removeperm_desc { get { @@ -6009,7 +6063,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Renames a role. Roles you are renaming must be lower than bot's highest role.. + /// Looks up a localized string similar to Renames a role. The role you are renaming must be lower than bot's highest role.. /// public static string renamerole_desc { get { @@ -6036,7 +6090,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Repeat a message every X minutes in the current channel. You can have up to 5 repeating messages on the server in total.. + /// Looks up a localized string similar to Repeat a message every `X` minutes in the current channel. You can have up to 5 repeating messages on the server in total.. /// public static string repeat_desc { get { @@ -6198,7 +6252,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Resets BOT's permissions module on this server to the default value.. + /// Looks up a localized string similar to Resets the bot's permissions module on this server to the default value.. /// public static string resetpermissions_desc { get { @@ -6252,7 +6306,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Returns a google reverse image search for someone's avatar.. + /// Looks up a localized string similar to Returns a Google reverse image search for someone's avatar.. /// public static string revav_desc { get { @@ -6279,7 +6333,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Returns a google reverse image search for an image from a link.. + /// Looks up a localized string similar to Returns a Google reverse image search for an image from a link.. /// public static string revimg_desc { get { @@ -6387,7 +6441,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to List roles on this server or a roles of a specific user if specified. Paginated. 20 roles per page.. + /// Looks up a localized string similar to List roles on this server or a roles of a specific user if specified. Paginated, 20 roles per page.. /// public static string roles_desc { get { @@ -6414,7 +6468,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Rolls 0-100. If you supply a number [x] it rolls up to 30 normal dice. If you split 2 numbers with letter d (xdy) it will roll x dice from 1 to y. Y can be a letter 'F' if you want to roll fate dice instead of dnd.. + /// Looks up a localized string similar to Rolls 0-100. If you supply a number `X` it rolls up to 30 normal dice. If you split 2 numbers with letter `d` (`xdy`) it will roll `X` dice from 1 to `y`. `Y` can be a letter 'F' if you want to roll fate dice instead of dnd.. /// public static string roll_desc { get { @@ -6441,7 +6495,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Rolls X normal dice (up to 30) unordered. If you split 2 numbers with letter d (xdy) it will roll x dice from 1 to y.. + /// Looks up a localized string similar to Rolls `X` normal dice (up to 30) unordered. If you split 2 numbers with letter `d` (`xdy`) it will roll `X` dice from 1 to `y`.. /// public static string rolluo_desc { get { @@ -6522,7 +6576,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Play a game of rocket paperclip scissors with Nadeko.. + /// Looks up a localized string similar to Play a game of Rocket-Paperclip-Scissors with Nadeko.. /// public static string rps_desc { get { @@ -6630,7 +6684,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Saves a playlist under a certain name. Name must be no longer than 20 characters and mustn't contain dashes.. + /// Looks up a localized string similar to Saves a playlist under a certain name. Playlist name must be no longer than 20 characters and must not contain dashes.. /// public static string save_desc { get { @@ -6738,7 +6792,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Sends a message to someone on a different server through the bot. Separate server and channel/user ids with `|` and prepend channel id with `c:` and user id with `u:`.. + /// Looks up a localized string similar to Sends a message to someone on a different server through the bot. Separate server and channel/user ids with `|` and prefix the channel id with `c:` and the user id with `u:`.. /// public static string send_desc { get { @@ -6765,7 +6819,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Either [add]s or [rem]oves a server specified by a Name or ID from a blacklist.. + /// Looks up a localized string similar to Either [add]s or [rem]oves a server specified by a Name or an ID from a blacklist.. /// public static string serverblacklist_desc { get { @@ -7548,7 +7602,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Queue a soundcloud playlist using a link.. + /// Looks up a localized string similar to Queue a Soundcloud playlist using a link.. /// public static string soundcloudpl_desc { get { @@ -7575,7 +7629,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Queue a soundcloud song using keywords. Bot will join your voice channel.**You must be in a voice channel**.. + /// Looks up a localized string similar to Queue a soundcloud song using keywords. Bot will join your voice channel. **You must be in a voice channel**.. /// public static string soundcloudqueue_desc { get { @@ -7629,7 +7683,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Toggles automatic deleting of invites posted in the server. Does not affect Bot Owner.. + /// Looks up a localized string similar to Toggles automatic deletion of invites posted in the server. Does not affect the Bot Owner.. /// public static string srvrfilterinv_desc { get { @@ -7656,7 +7710,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Toggles automatic deleting of messages containing forbidden words on the server. Does not affect Bot Owner.. + /// Looks up a localized string similar to Toggles automatic deletion of messages containing filtered words on the server. Does not affect the Bot Owner.. /// public static string srvrfilterwords_desc { get { @@ -8088,7 +8142,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Starts a game of trivia. You can add nohint to prevent hints.First player to get to 10 points wins by default. You can specify a different number. 30 seconds per question.. + /// Looks up a localized string similar to Starts a game of trivia. You can add `nohint` to prevent hints. First player to get to 10 points wins by default. You can specify a different number. 30 seconds per question.. /// public static string trivia_desc { get { @@ -8439,7 +8493,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Either [add]s or [rem]oves a user specified by a mention or ID from a blacklist.. + /// Looks up a localized string similar to Either [add]s or [rem]oves a user specified by a Mention or an ID from a blacklist.. /// public static string userblacklist_desc { get { @@ -8682,7 +8736,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Creates a text channel for each voice channel only users in that voice channel can see.If you are server owner, keep in mind you will see them all the time regardless.. + /// Looks up a localized string similar to Creates a text channel for each voice channel only users in that voice channel can see. If you are server owner, keep in mind you will see them all the time regardless.. /// public static string voiceplustext_desc { get { @@ -8763,7 +8817,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Sets the music volume 0-100%. + /// Looks up a localized string similar to Sets the music playback volume (0-100%). /// public static string volume_desc { get { diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx index 3d01eb34..3379b98b 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -3150,4 +3150,22 @@ `{0}rategirl @SomeGurl` - + + lucky7test l7t + + + Tests the l7 command. + + + `{0}l7t 10000` + + + lucky7 l7 + + + Bet currency on the game and start rolling 3 sided dice. At any point you can choose to [m]ove (roll again) or [s]tay (get the amount bet times the current multiplier). + + + `{0}l7 10` or `{0}l7 move` or `{0}l7 s` + + \ No newline at end of file From f37a2c4db9469b92f83d7d6f8fa661c5ab43a061 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 4 Mar 2017 17:02:25 +0100 Subject: [PATCH 167/496] added zh-CN --- .../Commands/LocalizationCommands.cs | 1 + .../{MoveOrStay.cs => Lucky7Commands.cs} | 0 .../Resources/ResponseStrings.zh-CN.resx | 2193 +++++++++++++++++ 3 files changed, 2194 insertions(+) rename src/NadekoBot/Modules/Gambling/Commands/{MoveOrStay.cs => Lucky7Commands.cs} (100%) create mode 100644 src/NadekoBot/Resources/ResponseStrings.zh-CN.resx diff --git a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs index 45dedc1d..c02a828c 100644 --- a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs +++ b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs @@ -25,6 +25,7 @@ namespace NadekoBot.Modules.Administration //{"nl-NL", "Dutch, Netherlands"}, //{"ja-JP", "Japanese, Japan"}, {"pt-BR", "Portuguese, Brazil"}, + {"zh-CN", "Chinese (Simplified), China"} //{"sr-Cyrl-RS", "Serbian, Serbia - Cyrillic"} }.ToImmutableDictionary(); diff --git a/src/NadekoBot/Modules/Gambling/Commands/MoveOrStay.cs b/src/NadekoBot/Modules/Gambling/Commands/Lucky7Commands.cs similarity index 100% rename from src/NadekoBot/Modules/Gambling/Commands/MoveOrStay.cs rename to src/NadekoBot/Modules/Gambling/Commands/Lucky7Commands.cs diff --git a/src/NadekoBot/Resources/ResponseStrings.zh-CN.resx b/src/NadekoBot/Resources/ResponseStrings.zh-CN.resx new file mode 100644 index 00000000..f9185084 --- /dev/null +++ b/src/NadekoBot/Resources/ResponseStrings.zh-CN.resx @@ -0,0 +1,2193 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 此基地已被认领或毁坏。 + + + 此基地已被毁坏 + + + + 此基地还未被认领 + + + 在与{1} 对战时**毁坏**基地 #{0} + + + {0} 在与 {2} 对战时 **取消认领** 基地 #{1} + + + {0} 在与 {2} 对战时 **认领** 基地 #{1} + + + @{0} 您已认领基地 #{1}。您不能认领一个新的。 + + + @{0} 在与 {1} 对战后认领的基地已过期。 + + + 敌人 + + + 与{0} 对战的信息 + + + 此基地号码无效。 + + + 此战争大小无效 + + + 现进行的战争列表 + + + 未被认领 + + + 您并未参与此战争。 + + + @{0} 您并未参与此战争或此基地已被毁坏。 + + + 现无战争进行。 + + + 大小 + + + 与{0}的战争已开始。 + + + 与{0}的战争已创建。 + + + 与{0}的战争已结束。 + + + 此战争不存在。 + + + 与{0}的对战已开始！ + + + 所有定制反应清除。 + + + 定制反应删除 + + + 权限不足。通用定制反应需要机器人主人之权限而服务器定制反应需要管理员之权限。 + + + 列出所有定制反应 + + + 定制反应 + + + 新定制反应 + + + 没有找到定制反应。 + + + 于此用户标识相联系的定制反应并未找到。 + + + 回应 + + + 定制反应数据 + + + {0} 定制反应数据清除。 + + + 此触发器并无数据， 因此无行动。 + + + 触发器 + + + 自动变态模式停止。 + + + 没有结果。 + + + {0} 已昏厥。 + + + {0} 气血已满。 + + + 您的属性已是 {0} + + + 对 {2}{3} 使出{0}{1} 而造成 {4}伤害。 + Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage. + + + 您不能在对方未反击之前再次攻击！ + + + 您不能攻击自己。 + + + {0} 已昏厥！ + + + 用 {1} 医好 {0} + + + {0} 还剩余 {1} 生命值。 + + + 您不能使用{0}. 输入`{1}ml` 观看您能用的招式。 + + + {0} 属性的招式列表 + + + 没有效果。 + + + 你并没有足够的 {0} + + + 使用 {1} 复活 {0} + + + 您使用 {0} 复活自己 + + + 您的属性已从 {0} 改成了 {1} + + + 效果不理想。 + + + 效果绝佳！ + + + 您已一连使用太多招式，所以您不能行动！ + + + {0} 的属性是 {1} + + + 该用户不存在。 + + + 您已昏厥所以不能移动！ + + + **已解除**.为刚加入的用户 **自动指派身份** 的功能。 + + + **已启动**.为刚加入的用户 **自动指派身份** 的功能。 + + + 附件 + + + 头像更换成功。 + + + 你已经被{0}服务器封号。 +原因： {1} + + + 你被禁止了 + PLURAL + + + 用户禁止 + + + 机器人名改成{0} + + + 机器人状态换成{0} + + + 自动告别消息关闭。 + + + 告别消息将在{0}秒钟内删除。 + + + 现在告别消息: {0} + + + 输入{0}以启用告别消息 + + + 新告别消息设定。 + + + 告别公告被关掉。 + + + 此频道启用告别公告。 + + + 频道名字已改 + + + 旧名 + + + 频道主题已改 + + + 清理完毕。 + + + 内容 + + + 身份 {0} 成功创立 + + + 文字频道 {0} 成功创立 + + + 语音频道 {0} 成功创立 + + + 静音成功 + + + 服务器 {0} 已被删除 + + + 自动删除已处理指令已被停止 + + + 自动删除已处理指令已被启动 + + + 文字频道 {0} 成功删除 + + + 语音频道 {0} 成功删除 + + + 私人信息来自 + + + 成功添加新的捐赠者. 此用户总共捐赠了: {0} + + + 感谢下面列出的人们使这个项目发生！ + + + 我会将DM转发给所有业主。 + + + 我会将DM转发给第一个业主。 + + + 我将从现在起转发DMs。 + + + 从现在开始我将停止转发DMs。 + + + 已关闭自动删除欢迎消息。 + + + 欢迎消息将在{0}秒后删除。 + + + 现DM欢迎消息：{0} + + + 输入{0}启用DM欢迎消息 + + + 新DM欢迎消息设定成功。 + + + DM欢迎公告关闭。 + + + DM欢迎公告启用。 + + + 当前欢迎消息是：{0} + + + 输入{0}来启用欢迎消息 + + + 新欢迎消息设定成功。 + + + 欢迎公告关闭。 + + + 欢迎公告在此频道开启。 + + + 您不能对身份层次结构中身份高于或等于您的身份的用户使用此命令。 + + + {0}秒后加载图片！ + + + 输入格式不正确。 + + + 参数不正确。 + + + {0} 加入了 {1} + + + 你被踢出{0}的服务器。 +理由：{1} + + + 用户已被踢出 + + + 语言列表 +{0} + + + 您的服务器的语言设置现在为{0} - {1} + + + 机器人的默认语言环境现在是{0} - {1} + + + 机器人的语言设置为{0} - {1} + + + 设置语言设置失败。 重新访问此命令帮助。 + + + 此服务器的语言设置为{0} - {1} + + + {0}已离开{1} + + + 离开服务器{0} + + + 在此频道中记录{0}事件。 + + + 记录频道中所有事件 + + + 记录功能取消 + + + 您可以设定的记录项目： + + + 记录会忽略{0} + + + 记录不会忽略{0} + + + 已停止记录{0}事件。 + + + {0}已经提到了以下身份 + + + 来自{0}`[机器人主人]’的消息： + + + 消息已发. + + + {0}被移动由{1}到{2} + + + 在＃{0}中删除讯息 + + + 讯息在＃{0}中被更新 + + + 已静音 + PLURAL (users have been muted) + + + 已静音 + singular "User muted." + + + 权限不够执行此命令 + + + 新的静音角色设定成功。 + + + 我需要**管理**权限才能做那个。 + + + 新消息 + + + 新昵称 + + + 新主题 + + + 昵称成功更换 + + + 找不到该服务器 + + + 找不到具有该ID的分片。 + + + 旧信息 + + + 旧昵称 + + + 旧题目 + + + 失败。很可能我没有足够的权限。 + + + 重置此服务器的权限。 + + + 主动保护 + + + {0}已在此服务器禁用。 + + + {0}已启用。 + + + 失败。 我需要 ManageRoles 权限 + + + 未启用保护项目。 + + + 用户阈值必须介于{0}和{1}之间。 + + + 如果{0}或更多用户在{1}秒内加入，我将{2}他们。 + + + 时间必须在{0}和{1}秒之间。 + + + 已成功从用户{0}中移除所有身份 + + + 无法移除身份。 我没有足够的权限。 + + + {0}身份的颜色已更改。 + + + 那个身份不存在。 + + + 指定的参数错误。 + + + 由于颜色无效或权限不足而发生错误。 + + + 已成功从用户{1}中删除身份{0} + + + 无法移除身份。 我没有足够的权限。 + + + 身份名已改 + + + 身份重命名失败。我的权限不足。 + + + 您不能编辑比你 + + + 已移除游玩消息：{0} + + + 身份{0}已添加到列表中。 + + + {0}未找到。已清理。 + + + 身份{0}已在列表中。 + + + 添加成功. + + + 旋转游玩状态关闭。 + + + 旋转游玩状态开启。 + + + 以下是旋转状态列表： +{0} + + + 未设置旋转游戏状态。 + + + 您已经拥有{0}身份。 + + + 您已拥有{0}独占的自行分配。 + + + 自行分配身份现在是独家！ + + + 有{0}个可自行分配身份 + + + 这个身份是不可自行分配的。 + + + 您没有{0}身份。 + + + 自我分配的身份现在不是独家的！ + + + 我无法向您添加该身份。 ‘我不能向身份层次结构中我身份以外的所有者或其他身份添加身份。’ + + + {0}已从可自我分配身份列表中删除。 + + + 您不再拥有{0}身份。 + + + 您现在拥有{0}身份。 + + + 已成功将身份{0}添加到用户{1} + + + 无法添加身份。 我没有足够的权限。 + + + 新头像集！ + + + 新频道名称设定。 + + + 新游戏设定！ + + + 新直播设定！ + + + 新频道主题集。 + + + 分段{0}已重新连接。 + + + 分段{0}重新连接中。 + + + 关闭中 + + + 用户不能在{1}秒内发送超过{0}条消息。 + + + 慢速模式关闭。 + + + 慢速模式启动 + + + 软禁（踢出） + PLURAL + + + {0}将忽略此通道。 + + + 0}将不再忽略此通道。 + + + 如果用户发布{0}个相同的消息，我会{1}他们。 +     __IgnoredChannels__：{2} + + + 新文字频道成立 + + + 文字频道已删除 + + + Undeafen成功。 + + + 已取消静音 + singular + + + 用户名 + + + 用户名已更改 + + + 用户 + + + 用户被禁止 + + + {0}已从聊天内被静音**。 + + + {0}已从聊天内**取消静音**。 + + + 用户已加入 + + + 用户离开了 + + + {0} 已被文字与语音静音了 + + + 用户身份添加成功 + + + 用户身份移除了 + + + {0} 改成了 {1} + + + {0}已从文字和语音频道中取消静音**。 + + + {0}已加入{1}语音通道。 + + + {0}已离开{1}语音通道。 + + + {0}已从{1}移至{2}语音通道。 + + + {0}已被**静音**。 + + + {0}已被**取消静音**。 + + + 语音频道已创建 + + + 语音通道已被毁 + + + 已停用语音+文字功能。 + + + 启用语音+文字功能。 + + + 我没有**管理身份**和/或**管理频道**权限，所以我不能在{0}服务器上运行`语音+文字`。 + + + 您正在启用/禁用此功能，并且**我没有ADMINISTRATOR权限**。 这可能会导致一些问题，您必须自己清理文本频道。 + + + 我需要至少**管理身份**和**管理频道**权限，以启用此功能。 （优先管理权限） + + + 用户{0}来自文字频道 + + + 用户{0}来自文字和语音频道 + + + 用户{0}来自语音频道 + + + 您已从{0}服务器软禁止。 +原因：{1} + + + 用户已取消禁止 + + + 迁移完成！ + + + 在迁移时出错，请检查机器人的控制台以获取更多信息。 + + + 在线状态更新 + + + 用户被软禁用 + + + 已将{0}奖励给{1} + + + 下一次好运^ _ ^ + + + 恭喜！ 您赢得{0}因为您滚{1}或以上 + + + 卡牌改组。 + + + 抛了{0}。 + User flipped tails. + + + 你猜到了！ 您赢得了{0} + + + 指定的数字无效。 你可以抛1到{0}钱币。 + + + 将{0}反应添加到此消息以获取{1} + + + 此活动在{0}小时内有效。 + + + 花反应活动开始了！ + + + 给了{1}{0} + X has gifted 15 flowers to Y + + + {0}拥有{1} + X has Y flowers + + + 头 + + + 排行榜 + + + 从{2}身份授予{0}至{1}名用户。 + + + 您赌注不能超过{0} + + + 您赌注不能低于{0} + + + 您没有足够的{0} + + + 卡牌组中没有更多的牌。 + + + 抽奖用户 + + + 您抛了{0}。 + + + 赌注 + + + 哇啊啊啊啊啊啊！ 恭喜！ x {0} + + + 单个{0}，x {1} + + + 哇！好运！ 三个相同！ x {0} + + + 做得好！ 两个{0} - 投注x {1} + + + 胜利 + + + 用户必须键入密码才能获取{0}。 +持续{1}秒。 嘘~别跟任何人说。 + + + SneakyGame事件结束。 {0}个用户收到了奖励。 + + + SneakyGameStatus事件已启动 + + + 尾 + + + 已成功从{1}取得{0} + + + 无法从{1}取得{0}，因为用户没有那么多{2}！ + + + 返回ToC + + + 仅限Bot Owner + + + 需要{0}频道权限。 + + + 您可以在patreon上支持项目：<{0}>或paypal：<{1}> + + + 命令和别名 + + + 命令列表已重新生成。 + + + 输入`{0} h CommandName`可查看该指定命令的帮助。 例如 `{0} h> 8ball` + + + 我找不到该命令。 请再次尝试之前验证该命令是否存在。 + + + 描述 + + + 您可以在： +Patreon <{0}>或 +Paypal <{1}> +上支持NadekoBot +不要忘记在邮件中留下您的不和名字或ID。 + +**谢谢**♥️ + + + **命令列表**：<{0}> +**主机指南和文档可以在这里找到**：<{1}> + + + 命令列表 + + + 组件列表 + + + 输入“{0} cmds ModuleName”以获取该组件中的命令列表。 例如`{0} cmds games` + + + 该组件不存在。 + + + 需要{0}服务器权限。 + + + 目录 + + + 用法 + + + 自动hentai启动。 使用以下标记之一重新排列每个{0}： +{1} + + + 标签 + + + 动物竞赛 + + + 启动失败，因为没有足够的参与者。 + + + 竞赛已满！ 立即开始。 + + + {0}加入为{1} + + + {0}加入为{1}，赌注{2}！ + + + 输入{0} jr 以加入竞赛。 + + + 在20内秒或当房间满后开始。 + + + {0}个参与者开始。 + + + {0}为{1}赢得竞赛！ + + + 0}为{1}赢得竞赛，和赢得{2}！ + + + 指定的数字无效。 您可以一次滚动{0} - {1}骰子。 + + + 掷了{0} + Someone rolled 35 + + + 掷骰子：{0} + Dice Rolled: 5 + + + 竞赛启动失败。 另一个比赛可能正在运行。 + + + 此服务器上不存在竞赛 + + + 第二个数字必须大于第一个数字。 + + + 爱被改变 + + + 声称 + + + 离婚 + + + 喜欢 + + + 价钱 + + + 没有waifus被要求。 + + + 最佳Waifus + + + 您的兴趣已设置为该waifu，或者您尝试在没有兴趣的情况下删除您的兴趣。 + + + 将把兴趣从{0}更改为{1}。 + +*这在道德上是有问题的*🤔 + Make sure to get the formatting right, and leave the thinking emoji + + + 您必须等待{0}小时和{1}分钟才能再次更改您的兴趣。 + + + 您的兴趣已重置。 你不再有你喜欢的人。 + + + 想成为{0}的waifu。哇非常可爱<3 + + + 声明{0}为他的waifu，花了{1}！ + + + 你已经离婚了一个喜欢你的waifu。 你无情的怪物。 +{0}收到了{1}作为补偿。 + + + 你不能设置兴趣自己，你好自卑。 + + + 🎉他的爱实现！ 🎉 +{0}的新值为{1}！ + + + 没有waifu那么便宜。 您必须至少支付{0}才能获得waifu，即使他们的实际价值较低。 + + + 您必须支付{0}或更多才能认领那个waifu！ + + + 那waifu不是你的。 + + + 你不能认领自己。 + + + 你最近离婚了。 您必须等待{0}小时和{1}分钟再次离婚。 + + + 没人 + + + 你离婚了一个不喜欢你的waifu。 您收到了{0}。 + + + 8ball + + + 恐惧症游戏 + + + 游戏结束，没人提交。 + + + 没人投票。 游戏结束，没有赢家。 + + + 首字母缩写是{0}。 + + + 恐惧症游戏已经在这个频道中运行。 + + + 游戏开始。 创建具有以下首字母缩写的句子：{0}。 + + + 您有{0}秒的时间提交。 + + + {0}提交了他的判决。 （总{1}个） + + + 通过输入提交数字投票 + + + {0}投了票！ + + + 获胜者{0}获得{1}分。 + + + {0}赢了因为是唯一的提交用户！ + + + 题 + + + 平局！ 两个都挑了{0} + + + {0}赢了！ {1} 打赢了 {2} + + + 提交关闭 + + + 动物竞赛已经运行。 + + + 总计：{0} 平均：{1} + + + 类别 + + + 在此服务器上禁用cleverbot。 + + + 在此服务器上启用cleverbot。 + + + 在此频道上停用的货币生成功能。 + + + 在此频道上启用的货币生成功能。 + + + {0} 个 {1}出现了！ 通过输入`{2} pick'来拾取 + plural + + + 一个{0}出现了！ 通过输入`{1} pick`来拾取 + + + 加载问题失败。 + + + 游戏开始 + + + Hangman游戏开始了 + + + Hangman游戏已在此频道上打开。 + + + 启动hangman错误。 + + + “{0} hangman”字词类型列表： + + + 排行榜 + + + 您没有足够的{0} + + + 没有结果 + + + 采了{0} + Kwoth picked 5* + + + {0}种了{1} + Kwoth planted 5* + + + 琐事游戏已经在这个服务器上运行。 + + + 琐事游戏 + + + {0}猜对了！ 答案是：{1} + + + 此服务器上没有运行琐事游戏。 + + + {0}有{1}分 + + + 这个问题后停止。 + + + 时间到！ 正确的答案是{0} + + + {0}猜到了，赢得了游戏！ 答案是：{1} + + + 你不能对自己玩。 + + + TicTacToe游戏已在此频道中运行。 + + + 平局！ + + + 开始了一局TicTacToe游戏。 + + + {0}赢了！ + + + 相配了三个 + + + 没有地方动了！ + + + 时间已过！ + + + 轮到{0}了 + + + {0}对{1} + + + 正在排{0}首歌... + + + 已停用自动播放。 + + + 已启用自动播放。 + + + 默认音量设置为{0}％ + + + 目录队列完成。 + + + 公平播放 + + + 完成歌曲 + + + 停用公平播放。 + + + 启用公平播放。 + + + 从位置 + + + ID + + + 输入错误。 + + + 最大播放时间没有限制移除。 + + + 最大播放时间设置为{0}秒。 + + + 最大音乐队列大小设置为无限。 + + + 最大音乐队列大小设置为{0}首。 + + + 您需要在此服务器上加入语音频道。 + + + 名 + + + 现在播放 + + + 没有活动音乐播放器。 + + + + 没有搜索结果。 + + + 音乐播放暂停。 + + + 播放器队列 - {0} / {1}页 + + + 正在播放 + + + `＃{0}` - ** {1} ** by * {2} *（{3}首歌） + + + 有保存{0}页的播放列表 + + + 播放列表已删除。 + + + 无法删除该播放列表。 它不存在，或者你不是它的作者。 + + + 具有该ID的播放列表不存在。 + + + 播放列表队列完成。 + + + 播放列表已保存 + + + {0}秒限制 + + + 队列 + + + 歌加入队列 + + + 音乐队列已清除。 + + + 队列已满{0} / {0}。 + + + 歌被移除 + context: "removed song #5" + + + 重复播放当前歌曲 + + + 重复播放列表 + + + 重复曲目 + + + 当前曲目停止重复。 + + + 音乐播放已恢复。 + + + 禁用重复播放列表 + + + 重复播放列表已启用。 + + + 我现在将在此频道里输出播放，完成，暂停和删除歌曲。 + + + 跳到‘{0}：{1}’ + + + 歌播放列表曲被随机。 + + + 歌曲被移动 + + + {0}小时 {1}分钟 {2}秒 + + + 到位置 + + + 无限 + + + 音量必须介于0和100之间 + + + 音量设置为{0}％ + + + 在{0}频道上禁止所有组件的使用。 + + + 在{0}频道上允许启用所有组件。 + + + 允许 + + + {0}身份的所有组件被禁止使用。 + + + {0}身份的所有组件被允许使用。 + + + 在此服务器上禁止所有组件的使用。 + + + 在此服务器上允许所有组件的使用。 + + + {0}用户的所有模块被禁止使用。 + + + {0}用户的所有模块被允许使用。 + + + ID为{1}被加入黑名单{0} + + + 命令{0}冷却时间现有{1}秒。 + + + 命令{0}没有冷却时间了，现有所有的冷却时间已被清除。 + + + 没有设置命令冷却时间。 + + + 命令成本 + + + {2}频道上已停用{0} {1}。 + + + 已在{2}频道上启用{0} {1}的使用。 + + + 被拒绝 + + + 以巴{0}添加到已过滤字词列表中。 + + + 被过滤的词列表 + + + 已从过滤字词列表中删除{0}。 + + + 第二个参数无效（必须是{0}和{1}之间的数字） + + + 在此频道上停用邀请过滤功能。 + + + 在此频道上启用邀请过滤。 + + + 在此服务器上停用邀请过滤功能。 + + + 在此服务器上启用邀请过滤功能。 + + + 已将权限{0}从＃{1}移至＃{2} + + + 在索引＃{0}找不到权限 + + + 未设置费用。 + + + 命令 + Gen (of command) + + + 组件 + Gen. (of module) + + + 权限页面第{0}页 + + + 当前权限身份为{0}。 + + + 用户现在需要{0}身份才能编辑权限。 + + + 在该索引中找不到权限。 + + + 已删除权限＃{0} - {1} + + + 禁止{2}身份使用{0} {1}。 + + + 允许{2}身份使用{0} {1}。 + + + 秒 + Short of seconds. + + + 此服务器上的{0} {1}已被禁止使用。 + + + 此服务器上的{0} {1}已被允许使用。 + + + ID为{1}的{0}从黑名单上移除 + + + 不可编辑 + + + {2}用户的{0} {1}已被禁止使用。 + + + {2}用户的{0} {1}已允许使用。 + + + 我将不再显示权限警告。 + + + 我现在将显示权限警告。 + + + 此频道上的字过滤已停用。 + + + 此频道上的字过滤已启用。 + + + 此服务器上的字过滤已停用。 + + + 此服务器上的字过滤已启用。 + + + 能力 + + + 没有最喜爱的动漫 + + + 开始自动翻译此频道上的消息。 用户消息将被自动删除。 + + + 您的自动翻译语言已删除。 + + + 您的自动翻译语言已设置为{0}> {1} + + + 开始自动翻译此频道上的消息。 + + + 停止自动翻译此频道上的消息。 + + + 错误格式或出现错误。 + + + 找不到该卡。 + + + 实 + + + 章 + + + 漫画＃ + + + 竞争模式失败次数 + + + 竞争模式玩次数 + + + 竞争模式排名 + + + 竞争模式胜利次数 + + + 完成 + + + 条件 + + + 花费 + + + 日期 + + + 定义： + + + 放掉 + + + 剧集 + + + 发生了错误。 + + + 例子 + + + 找不到那个动画。 + + + 找不到漫画。 + + + 类型 + + + 未能找到该标记的定义。 + + + 身高/体重 + + + {0} m / {1} kg + + + 湿度 + + + 图片搜索： + + + 找不到该电影。 + + + 来源或目标语言错误。 + + + 笑话没加载。 + + + 纬度/经度 + + + 等级 + + + {0}地方标记列表 + Don't translate {0}place + + + 地点 + + + 未加载魔术项目。 + + + {0}的MAL个人资料 + + + 机器人的业主没有指定MashapeApiKey。 您不能使用此功能。 + + + 最小/最大 + + + 找不到频道。 + + + 没找到结果。 + + + 等候接听 + + + 原始网址 + + + 需要osu！API密钥。 + + + 无法检索osu！ 线索。 + + + 找到{0}张图片。 显示随机{0}。 + + + 找不到用户！ 请再次前检查区域和BattleTag。 + + + 计划看 + + + 平台 + + + 找不到能力。 + + + 找不到宠物小精灵。 + + + 个人资料链接： + + + 质量： + + + 快速游戏时间 + + + 快赢 + + + 评分 + + + 得分： + + + 搜索： + + + 无法缩短该链接。 + + + 短链接 + + + 出了些问题。 + + + 请指定搜索参数。 + + + 状态 + + + 储存链接 + + + 直播台{0}已离线。 + + + 直播台{0}在线有{1}个观众。 + + + 您在此服务器上关注{0}个直播台 + + + 您未在此服务器上关注任何直播台。 + + + 没有这个直播台。 + + + 直播台可能不存在。 + + + 已从（{1}）的通知中移除{0}的直播台 + + + 状态更改时，我会通知此频道。 + + + 日出 + + + 日落 + + + 温度 + + + 标题： + + + 3个最喜欢的动画： + + + 翻译： + + + 类型 + + + 未能找到该字词的定义。 + + + 链接 + + + 观众 + + + 观看 + + + 无法在指定的维基上找到该字词。 + + + 请输入目标维基，然后搜索查询。 + + + 找不到网页。 + + + 风速 + + + {0}个被禁止最多的英雄 + + + 无法yodify您的句子。 + + + 加入 + + + `{0} .` {1} [{2：F2} / s] - {3}总计 + /s and total need to be localized to fit the context - +`1.` + + + 活动页面＃{0} + + + {0}个用户。 + + + 作者 + + + 机器ID + + + {0} calc命令功能列表 + + + 此频道的{0}是{1} + + + 频道主题 + + + 执行命令 + + + {0} {1}等于{2} {3} + + + 转换器可以使用的单位 + + + 无法将{0}转换为{1}：找不到单位 + + + 无法将{0}转换为{1}：单位类型不相等 + + + 创建于 + + + 加入跨服务器频道。 + + + 离开跨服务器频道。 + + + 这是您的CSC令牌 + + + 自定义Emojis + + + 错误 + + + 特征 + + + + ID + + + 索引超出范围。 + + + 以下是这个身份的用户列表： + + + 您不能对其中有用户很多的身份使用此命令来防止滥用。 + + + 值{0}错误。 + Invalid months value/ Invalid hours value + + + 加入Discord + + + 加入服务器 + + + ID：{0} +会员数：{1} +业主ID：{2} + + + 在该网页上找不到服务器。 + + + 重复列表 + + + 会员 + + + 存储 + + + 讯息 + + + 消息重复功能 + + + 名字 + + + 昵称 + + + 没有人在玩那个游戏 + + + 没有活动重复功能。 + + + 此页面上没有身份。 + + + 此页面上没有分片。 + + + 没有主题设置。 + + + 业主 + + + 业主IDs + + + 状态 + + + {0}个服务器 +{1}个文字频道 +{2}个语音频道 + + + 删除所有引号使用{0}关键字。 + + + {0}页引号 + + + 此页面上没有引用。 + + + 没有您可以删除的引用。 + + + 引用被添加 + + + 删除了随机引用。 + + + 区域 + + + 注册日 + + + 我将在{2}`（{3：d.M.yyyy。}的{4：HH：mm}）提醒{0}关于{1} + + + 无效时间格式。 检查命令列表。 + + + 新的提醒模板被设定。 + + + 会每{1}天{2}小时{3}分钟重复{0}。 + + + 重复列表 + + + 此服务器上没有运行重复消息。 + + + ＃{0}已停止。 + + + 此服务器上没有找到被重复的消息。 + + + 结果 + + + 身份 + + + 此服务器上所有身份第{0}页： + + + {1}身份的第{0}页 + + + 颜色的格式不正确。 例如，使用‘＃00ff00’。 + + + 开始轮流{0}身份的颜色。 + + + 停止{0}身份颜色轮流 + + + 此服务器的{0}是{1} + + + 服务器信息 + + + 分片 + + + 分片统计 + + + 分片**＃{0} **处于{1}状态与{2}台服务器 + + + **名称：** {0} **链接：** {1} + + + 没有找到特殊的emojis。 + + + 正在播放{0}首歌，{1}首等待播放。 + + + 文字频道 + + + 这是你的房间链接： + + + 正常运行时间 + + + 此用户 {1} 的{0} 是 {2} + Id of the user kwoth#1234 is 123123123123 + + + 用户 + + + 语音频道 + + + \ No newline at end of file From 023bf46ed7616e49e0da873cb70aabb284781c33 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Sat, 4 Mar 2017 17:04:37 +0100 Subject: [PATCH 168/496] Update ResponseStrings.nl-NL.resx (POEditor.com) --- .../Resources/ResponseStrings.nl-NL.resx | 335 +++++++++--------- 1 file changed, 175 insertions(+), 160 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.nl-NL.resx b/src/NadekoBot/Resources/ResponseStrings.nl-NL.resx index b8945702..1363046f 100644 --- a/src/NadekoBot/Resources/ResponseStrings.nl-NL.resx +++ b/src/NadekoBot/Resources/ResponseStrings.nl-NL.resx @@ -760,7 +760,7 @@ __IgnoredChannels__: {2} Tekst kanaal verwijderd. - + Ontdempen succesvol Ongedempt @@ -792,397 +792,411 @@ __IgnoredChannels__: {2} Gebruiker verlaten - Fuzzy - + {0} is **gedempt** van het tekst en stem kanaal. - Gebruiker's rol toegevoegd + Rol van gebruiker toegevoegd - Gebruiker's rol verwijderd + Rol van gebruiker verwijderd {0} is nu {1} - + {0} is **ongedempt** van het tekst en stem kanaal. - + {0} is {1} spraakkanaal toegetreden. - + {0} heeft {1} spraakkanaal verlaten. - + {0} heeft {1} naar {2} spraakkanaal verplaatst. - + {0} is **spraak gedempt** - + {0} is **spraak ongedempt** - + Spraakkanaal gemaakt - + Spraakkanaal vernietigd - + Spraak + tekst mogelijkheid uitgezet. - + Spraak + tekst mogelijkheid aangezet. - + Ik heb geen **Rol Beheering** en/of **Kanaal Beheering** toestemmingen, dus ik kan geen `stem+text` gebruiken op de {0} server. - + Deze eigenschap wordt door jou ingeschakelt/uitgeschakelt maar **Ik heb geen ADMINISTRATIEVE toestemmingen**. Hierdoor kunnen er mogelijk problemen ontstaan, en je zal daarna de tekst kanalen zelf moeten opruimen. - + Ik heb tenminste **Rol Beheering** en **Kanaal Beheering** toestemmingen nodig om deze eigenschap in te schakelen. (Geliefe adminstratieve rechten) - + Gebruiker {0} van tekstkanaal - + Gebruiker {0} van tekst- en spraakkanaal - + Gebruiker {0} van spraakkanaal - + Je bent zacht-verbannen van {0} server. +Reden: {1} - + Gebruiker niet meer verbannen - + Migratie gelukt! - + Fout tijdens het migreren, kijk in de bot's console voor meer informatie. - + Aanwezigheid Updates - + Gebruiker zacht-verbannen - + heeft {0} aan {1} gegeven - + Volgende keer beter ^_^ - + Gefeliciteerd! Je hebt {0} gewonnen voor het rollen boven de {1} - + Dek geschud. - + heeft de munt op {0} gegooid User flipped tails. - + Je hebt het goed gegokt! Je hebt {0} gewonnen - + Ongeldig nummer opgegeven. Je kan 1 tot {0} munten opgooien - + Voeg een {0} reactie toe aan dit bericht om {0} te krijgen - + Dit evenement blijft actief voor {0} uur. - + Bloemen reactie evenement gestart! - + heeft {0} aan {1} cadeau gegeven X has gifted 15 flowers to Y - + {0} heeft {1} X has Y flowers - + Kop - + Scoreboard - + {0} heeft {1} gebruikers beloont met {2} rol. - + Je kan niet meer dan {0} gokken - + Je kan niet minder dan {0} gokken - + Je hebt niet genoeg {0} - + Geen kaarten meer in het dek - + Verloten gebruiker - + Je hebt {0} gerold - + Inzet - + WOAAHHHHHH!!! Gefeliciteerd!!! x{0} - + Een enkele {0}, x{1} - + Wow! Gelukkig! Drie van dezelfde! x{0} - + Goed gedaan! Twee {0} - wed x{1} - + Gewonnen - + Gebruikers moeten een geheime code in typen om {0} te krijgen. +Duurt {1} seconden. Vertel het aan niemand. Shhh. - + SneakyGame evenement geeindigt. {0} gebruikers hebben een beloning ontvangen. - + SneakyGameStatus evenement gestart. - + Munt - + succesvol {0} van {1} genomen - + kon niet {0} van {1} nemen omdat de gebruiker niet zoveel {2} heeft! - + Terug naar de inhoudsopgave - + Alleen Voor Bot Eigenaren - + Heeft {0} kanaal rechten nodig. - + Je kan het project steunen op patreon: <{0}> of paypal: <{1}> - + Command en aliassen. - + Commandolijst Geregenereerd. - + Typ `{0}h CommandoNaam` om de hulp te zien voor die specifieke commando. b.v `{0}h >8bal` - + Ik kan die commando niet vinden. Verifiëren of die commando echt bestaat voor dat je het opnieuw probeert. - + Beschrijving - + Je kan het NadekoBot project steunen op +Patreon <{0}> of +Paypal <{1}> +Vergeet niet je discord naam en id in het bericht te zetten. + +**Hartelijk bedankt** ♥️ - + **Lijst met commando's**: <{0}> +**Hosting gidsen en documenten kunnen hier gevonden worden**: <{1}> - + Lijst Met Commando's - + Lijst Met Modules - + Typ `{0}cmds ModuleNaam` om een lijst van commando's te krijgen voor die module. bv `{0}cmds games` - + Deze module bestaat niet - + Heeft {0} server rechten nodig. - + Inhoudsopgave - + Gebruik - + Autohentai gestart. Elke {0}s word een foto geplaatst met de volgende labels: +{1} + Fuzzy - + Label - + Dieren race - + Gefaalt om te starten omdat er niet genoeg deelnemers zijn. - + De race is vol! De race wordt onmiddelijk gestart. - + {0} doet mee als een {1} - + {0} doet mee als een {1} en wed {2}! - + Typ {0}jr om mee te doen met de race. - + De race zal beginnen in 20 seconden of wanneer de kamer is vol. - + De race zal beginnen met {0} deelnemers. - + {0} heeft de race gewonnen als {1}! - + {0} heeft de race gewonnen als {1} en {2}! - + Ongeldig nummer ingevoerd. Je kan de dobbelsteen van {0}-{1} rollen. - + {0} gerold. Someone rolled 35 - + Dobbelsteen gerold: {0} Dice Rolled: 5 - + Gefaalt om de race te starten. Een andere race is waarschijnlijk bezig. - + Geen enkele race bestaat op deze server. - + Het tweede nummer moet groter zijn dan het eerste nummer. - + Verandering Van Het Hart - + Overwonnen door - + Scheidingen - + Leuk - + Prijs - + Nog geen waifus zijn overwonnen. - + Top Waifus - + Jouw affiniteit is al ingesteld op een waifu, of je probeert om je affiniteit weg te halen terwijl je geen hebt. - + Affiniteit verandert van {0} naar {1} + +Dit is moreel twijfelachtig🤔 Make sure to get the formatting right, and leave the thinking emoji - + Je moet {0} uren en {1} minuten wachten om je affiniteit weer te veranderen. - + Jouw affiniteit is gereset. Je hebt geen persoon meer die je leuk vindt. - + wil {0}'s waifu zijn. Aww <3 - + heeft {0} genomen als hun waifu voor {1}! - + Je bent gescheiden met een waifu die jou leuk vindt. Jij harteloze monster. +{0} ontvangen {1} als compensatie. - + Je kunt geen affiniteit zelf opzetten, jij opgeblazen egoist. - + 🎉Hun liefde overvloeit! 🎉 +{0} nieuwe waarde is {1}! - + Geen enkele waifu is zo goedkoop. Je moet tenminste {0} betalen om een waifu te krijgen, ook al is hun echte waarde lager. - + Je moet tenminste {0} betalen om die waifu te nemen! - + Die waifu is niet van jouw. - + Je kunt jezelf niet als waifu nemen. - + Je bent kort geleden gescheiden. Je moet {0} uren en {1} minuten wachten om weer te scheiden. - + Niemand - + Je bent gescheiden met een waifu die jou niet leuk vindt. Je krijgt {0} terug. - + 8bal - + Acrophobie - + Spel geëindigd zonder submissies. + Fuzzy - + Geen stemmen ingestuurdt. Spel geëindigd zonder winnaar. - + Afkorting was {0} - + Acrophobie spel is al bezig in dit kanaal. - + Game is gestart: maak een zin met de volgende afkorting: {0}. - + Je hebt {0} seconden om een inzending te maken. {0} heeft een zin ingezonden. ({1} in totaal) - + Stem door het nummer van een inzending te typen {0} heeft gestemd! @@ -1191,56 +1205,56 @@ __IgnoredChannels__: {2} De winnaar is {0} met {1} punten. - + {0} is de winnaar doordat deze als enige een inzending heeft gemaakt! - + Vraag - + Het is gelijkspel! Beiden hebben {0} gekozen - + {0} heeft gewonnen! {1} verslaat {2} - + Inzendingen gesloten. - + Dieren Race is al bezig. - + Totaal: {0} Gemiddelde: {1} - + Categorie - + Cleverbot is uitgeschakeld op deze server. - + Cleverbot is ingeschakeld op deze server. - + Valuta generatie is uitgeschakeld op dit kanaal. - + Valuta generatie is ingeschakeld op dit kanaal. - + {0} willekeurige {1} zijn verschenen! Pak ze op door `{2}pick` in te typen. plural - + Een willekeurige {0} is verschenen! Pak ze op door `{1}pick` in te typen. - + Het laden van de vraag is gefaalt. - + Spel gestart. - + Hangman @@ -2123,53 +2137,54 @@ __IgnoredChannels__: {2} - + Gestart met het routeren van kleuren voor de rol {0} + Fuzzy - + Gestopt met het routeren van kleuren voor de rol {0} - + {0} van deze server is {1} - + Server Informatie - + Shard - + Shard Statestieken - + Shard **#{0}** is in {1} status met {2} servers - + *Naam:** {0} **Link:** {1} - + Geen speciale emojis gevonden. - + {0} liedjes aan het spelen, {1} in de wachtrij - + Tekst Kanalen - + Hier is de link naar je sessie: - + {0} van de gebruker {1} is {2} Id of the user kwoth#1234 is 123123123123 - + Gebruikers - + Spraak Kanalen \ No newline at end of file From b8bb9dcddf33a68e8f3c1b4322d31f0ce98c6cd4 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Sat, 4 Mar 2017 17:04:39 +0100 Subject: [PATCH 169/496] Update ResponseStrings.fr-fr.resx (POEditor.com) From 47595dc92686dd9bec456a7c23ecebcaca20e4dd Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Sat, 4 Mar 2017 17:04:42 +0100 Subject: [PATCH 170/496] Update ResponseStrings.de-DE.resx (POEditor.com) --- .../Resources/ResponseStrings.de-DE.resx | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.de-DE.resx b/src/NadekoBot/Resources/ResponseStrings.de-DE.resx index 6b61e5f6..318404de 100644 --- a/src/NadekoBot/Resources/ResponseStrings.de-DE.resx +++ b/src/NadekoBot/Resources/ResponseStrings.de-DE.resx @@ -139,7 +139,7 @@ @{0} sie haben die Basis #{1} bereits beansprucht. Sie können keine weitere beanspruchen. - Einnahme von @{0} für den Krieg gegen {1} ist abgelaufen. + Beanspruchung von @{0} für den Krieg gegen {1} ist abgelaufen. Gegner @@ -474,7 +474,7 @@ Grund: {1} {0} - Ihr Servers Sprachumgebung ist jetzt {1} - {1} + Die Sprachumgebung des Servers ist jetzt {1} - {1} Die Sprachumgebung des Bots ist nun {0} - {1} @@ -486,7 +486,8 @@ Grund: {1} Setzen der Sprachumgebung fehlgeschlagen. Greifen Sie auf diesen Befehls hilfe erneut auf. - Dieser Servers Sprache wurde zu {0} - {1} gesetzt + Diese Servers Sprache wurde zu {0} - {1} gesetzt + Fuzzy {0} verließ {1} @@ -872,7 +873,7 @@ Grund: {1} Nutzer wurde gekickt - vegab {0} zu {1} + gab {0} an {1} Hoffentlich haben Sie beim nächsten Mal mehr Glück ^_^ @@ -1295,10 +1296,10 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Wird beendet nach dieser Frage. - Die Zeit is um! Die richtige Antwort war {0} + Die Zeit ist um! Die richtige Antwort war {0} - {0} erriet es und hat das spiel GEWONNEN! Die Antwort war: {1} + {0} erriet es und hat das Spiel GEWONNEN! Die Antwort war: {1} Sie können nicht gegen sich selber spielen. @@ -1443,7 +1444,7 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu context: "removed song #5" - Aktuelle Lied wird wiederholt + Aktuelles Lied wird wiederholt Playlist wird wiederholt @@ -1617,7 +1618,7 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu {0} mit ID {1} von Sperrliste entfernt - Nicht Bearbeitbar + Nicht editierbar Benutzung von {0} {1} wurde für Benutzer {2} verboten. @@ -1626,7 +1627,7 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Benutzung von {0} {1} wurde für Benutzer {2} erlaubt. - Ich werde nicht mehr Warnungen für Rechte anzeigen. + Ich werde keine Warnungen für Rechte mehr anzeigen. Ich werde jetzt Warnungen für Rechte anzeigen. @@ -1647,10 +1648,10 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Fähigkeiten - Keine favoritisierten anime + Keine favorisierten anime - Startete die Automatische Übersetzung der Nachrichten auf diesem kanal. Nachrichten von Benutzern werden automatisch gelöscht. + Startete die Automatische Übersetzung der Nachrichten auf diesem Kanal. Nachrichten von Benutzern werden automatisch gelöscht. Ihre Automatische-Übersetzungs Sprache wurde entfernt. @@ -1799,19 +1800,19 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Über {0} Bilder gefunden. Zeige zufälliges {0}. - Benutzer nicht gefunden! Bitte überprüfe die Region und den BattleTag before erneuten versuchen. + Benutzer nicht gefunden! Bitte überprüfe die Region und den BattleTag bevor erneuten Versuchen. Vermerkte - Platform + Plattform Keine Fähigkeit gefunden. - Kein pokemon gefunden. + Kein Pokemon gefunden. Profil Link: @@ -1859,7 +1860,7 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Streamer {0} ist online mit {1} Zuschauern. - Sie folgen {0} Streamer auf diesem Server. + Sie folgen {0} Streamern auf diesem Server. Sie folgen keinem Streamer auf diesem Server. From e891373316b3ab247687ee70292def532925e4dd Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Sat, 4 Mar 2017 17:04:45 +0100 Subject: [PATCH 171/496] Update ResponseStrings.pt-BR.resx (POEditor.com) From 6053886c57b6095a9985e0d628c99cf3956a5d95 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Sat, 4 Mar 2017 17:04:47 +0100 Subject: [PATCH 172/496] Update ResponseStrings.ru-RU.resx (POEditor.com) From 8fd145a0bb1614b549d259f80a5971831a1a1356 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Sat, 4 Mar 2017 17:04:50 +0100 Subject: [PATCH 173/496] Update ResponseStrings.zh-CN.resx (POEditor.com) --- .../Resources/ResponseStrings.zh-CN.resx | 234 +++++++++--------- 1 file changed, 117 insertions(+), 117 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.zh-CN.resx b/src/NadekoBot/Resources/ResponseStrings.zh-CN.resx index f9185084..3d0396c5 100644 --- a/src/NadekoBot/Resources/ResponseStrings.zh-CN.resx +++ b/src/NadekoBot/Resources/ResponseStrings.zh-CN.resx @@ -1,121 +1,121 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 此基地已被认领或毁坏。 From c4279d7f05da5e15caf4a8b73b7a4fee430ae4b5 Mon Sep 17 00:00:00 2001 From: samvaio Date: Sun, 5 Mar 2017 02:17:28 +0530 Subject: [PATCH 174/496] music cache always clears on update --- scripts/Latest.bat | 18 +++++++++++------- scripts/Stable.bat | 18 +++++++++++------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/scripts/Latest.bat b/scripts/Latest.bat index a4f9e15b..aee58b33 100644 --- a/scripts/Latest.bat +++ b/scripts/Latest.bat @@ -65,16 +65,19 @@ IF EXIST "%root%NadekoBot\" (GOTO :backupinstall) ROBOCOPY "%root%NadekoBot" "%root%NadekoBot_Old" /MIR >nul 2>&1 IF %ERRORLEVEL% GEQ 8 (GOTO :copyerror) ECHO. - ECHO Old files backed up to NadekoBot_Old + ECHO Old files backed up to NadekoBot_Old... ::Copies the credentials and database from the backed up data to the new folder COPY "%root%NadekoBot_Old\src\NadekoBot\credentials.json" "%installtemp%NadekoBot\src\NadekoBot\credentials.json" >nul 2>&1 IF %ERRORLEVEL% GEQ 8 (GOTO :copyerror) ECHO. - ECHO credentials.json copied to new folder + ECHO credentials.json copied... ROBOCOPY "%root%NadekoBot_Old\src\NadekoBot\bin" "%installtemp%NadekoBot\src\NadekoBot\bin" /E >nul 2>&1 IF %ERRORLEVEL% GEQ 8 (GOTO :copyerror) ECHO. - ECHO Old bin folder copied to new folder + ECHO bin folder copied... + DEL "%root%NadekoBot_Old\src\NadekoBot\data\musicdata" + ECHO. + ECHO music cache cleared... ROBOCOPY "%root%NadekoBot_Old\src\NadekoBot\data" "%installtemp%NadekoBot\src\NadekoBot\data" /E >nul 2>&1 IF %ERRORLEVEL% GEQ 8 (GOTO :copyerror) ECHO. @@ -136,10 +139,11 @@ ECHO opus.dll downloaded. GOTO end :end ::Normal execution of end of script - TITLE Installation complete! + TITLE NadekoBot Installation complete! CD /D "%root%" RMDIR /S /Q "%installtemp%" >nul 2>&1 ECHO. - ECHO Installation complete, press any key to close this window! - timeout /t 5 - del Latest.bat + ECHO Installation complete! + ECHO. + PAUSE + del Latest.bat \ No newline at end of file diff --git a/scripts/Stable.bat b/scripts/Stable.bat index f55fc958..40673f50 100644 --- a/scripts/Stable.bat +++ b/scripts/Stable.bat @@ -65,16 +65,19 @@ IF EXIST "%root%NadekoBot\" (GOTO :backupinstall) ROBOCOPY "%root%NadekoBot" "%root%NadekoBot_Old" /MIR >nul 2>&1 IF %ERRORLEVEL% GEQ 8 (GOTO :copyerror) ECHO. - ECHO Old files backed up to NadekoBot_Old + ECHO Old files backed up to NadekoBot_Old... ::Copies the credentials and database from the backed up data to the new folder COPY "%root%NadekoBot_Old\src\NadekoBot\credentials.json" "%installtemp%NadekoBot\src\NadekoBot\credentials.json" >nul 2>&1 IF %ERRORLEVEL% GEQ 8 (GOTO :copyerror) ECHO. - ECHO credentials.json copied to new folder + ECHO credentials.json copied... ROBOCOPY "%root%NadekoBot_Old\src\NadekoBot\bin" "%installtemp%NadekoBot\src\NadekoBot\bin" /E >nul 2>&1 IF %ERRORLEVEL% GEQ 8 (GOTO :copyerror) ECHO. - ECHO Old bin folder copied to new folder + ECHO bin folder copied... + DEL "%root%NadekoBot_Old\src\NadekoBot\data\musicdata" + ECHO. + ECHO music cache cleared... ROBOCOPY "%root%NadekoBot_Old\src\NadekoBot\data" "%installtemp%NadekoBot\src\NadekoBot\data" /E >nul 2>&1 IF %ERRORLEVEL% GEQ 8 (GOTO :copyerror) ECHO. @@ -136,10 +139,11 @@ ECHO opus.dll downloaded. GOTO end :end ::Normal execution of end of script - TITLE Installation complete! + TITLE NadekoBot Installation complete! CD /D "%root%" RMDIR /S /Q "%installtemp%" >nul 2>&1 ECHO. - ECHO Installation complete, press any key to close this window! - timeout /t 5 - del Stable.bat + ECHO Installation complete! + ECHO. + PAUSE + del Latest.bat \ No newline at end of file From ff243f42975cfbca0c8917516590174672c41e67 Mon Sep 17 00:00:00 2001 From: samvaio Date: Sun, 5 Mar 2017 03:34:35 +0530 Subject: [PATCH 175/496] installer updated, no longer uses bitsadmin --- scripts/Latest.bat | 10 ++++++---- scripts/NadekoAutoRun.bat | 10 ++++------ scripts/Stable.bat | 10 ++++++---- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/scripts/Latest.bat b/scripts/Latest.bat index aee58b33..01890d9a 100644 --- a/scripts/Latest.bat +++ b/scripts/Latest.bat @@ -75,13 +75,13 @@ IF EXIST "%root%NadekoBot\" (GOTO :backupinstall) IF %ERRORLEVEL% GEQ 8 (GOTO :copyerror) ECHO. ECHO bin folder copied... - DEL "%root%NadekoBot_Old\src\NadekoBot\data\musicdata" + RD /S /Q "%root%NadekoBot_Old\src\NadekoBot\data\musicdata" ECHO. ECHO music cache cleared... ROBOCOPY "%root%NadekoBot_Old\src\NadekoBot\data" "%installtemp%NadekoBot\src\NadekoBot\data" /E >nul 2>&1 IF %ERRORLEVEL% GEQ 8 (GOTO :copyerror) ECHO. - ECHO Old data folder copied to new folder + ECHO Old data folder copied... ::Moves the setup Nadeko folder RMDIR "%root%NadekoBot\" /S /Q >nul 2>&1 ROBOCOPY "%root%NadekoInstall_Temp" "%rootdir%" /E /MOVE >nul 2>&1 @@ -129,12 +129,14 @@ timeout /t 5 ECHO. ECHO Downloading libsodium.dll and opus.dll... SET "FILENAME=%~dp0\NadekoBot\src\NadekoBot\libsodium.dll" -bitsadmin.exe /transfer "Downloading libsodium.dll" /priority high https://github.com/Kwoth/NadekoBot/raw/dev/src/NadekoBot/_libs/32/libsodium.dll "%FILENAME%" +powershell -Command "Invoke-WebRequest https://github.com/Kwoth/NadekoBot/raw/dev/src/NadekoBot/_libs/32/libsodium.dll -OutFile %FILENAME%" +::bitsadmin.exe /transfer "Downloading libsodium.dll" /priority high https://github.com/Kwoth/NadekoBot/raw/dev/src/NadekoBot/_libs/32/libsodium.dll "%FILENAME%" ECHO libsodium.dll downloaded. ECHO. timeout /t 5 SET "FILENAME=%~dp0\NadekoBot\src\NadekoBot\opus.dll" -bitsadmin.exe /transfer "Downloading opus.dll" /priority high https://github.com/Kwoth/NadekoBot/raw/dev/src/NadekoBot/_libs/32/opus.dll "%FILENAME%" +powershell -Command "Invoke-WebRequest https://github.com/Kwoth/NadekoBot/raw/dev/src/NadekoBot/_libs/32/opus.dll -OutFile %FILENAME%" +::bitsadmin.exe /transfer "Downloading opus.dll" /priority high https://github.com/Kwoth/NadekoBot/raw/dev/src/NadekoBot/_libs/32/opus.dll "%FILENAME%" ECHO opus.dll downloaded. GOTO end :end diff --git a/scripts/NadekoAutoRun.bat b/scripts/NadekoAutoRun.bat index 90d88f4a..c9d37049 100644 --- a/scripts/NadekoAutoRun.bat +++ b/scripts/NadekoAutoRun.bat @@ -25,13 +25,12 @@ IF ERRORLEVEL 1 GOTO latestar :latestar ECHO Auto Restart and Update with Dev Build (latest) ECHO Bot will auto update on every restart! -timeout /t 3 CD /D %~dp0NadekoBot\src\NadekoBot dotnet run --configuration Release ECHO Updating... -timeout /t 3 SET "FILENAME=%~dp0\Latest.bat" -bitsadmin.exe /transfer "Downloading Nadeko (Latest)" /priority high https://github.com/Kwoth/NadekoBot/raw/master/scripts/Latest.bat "%FILENAME%" +powershell -Command "Invoke-WebRequest https://github.com/Kwoth/NadekoBot/raw/master/scripts/Latest.bat -OutFile %FILENAME%" +::bitsadmin.exe /transfer "Downloading Nadeko (Latest)" /priority high https://github.com/Kwoth/NadekoBot/raw/master/scripts/Latest.bat "%FILENAME%" ECHO NadekoBot Dev Build (latest) downloaded. SET root=%~dp0 CD /D %root% @@ -41,13 +40,12 @@ GOTO latestar :stablear ECHO Auto Restart and Update with Stable Build ECHO Bot will auto update on every restart! -timeout /t 3 CD /D %~dp0NadekoBot\src\NadekoBot dotnet run --configuration Release ECHO Updating... -timeout /t 3 SET "FILENAME=%~dp0\Stable.bat" -bitsadmin.exe /transfer "Downloading Nadeko (Stable)" /priority high https://github.com/Kwoth/NadekoBot/raw/master/scripts/Stable.bat "%FILENAME%" +powershell -Command "Invoke-WebRequest https://github.com/Kwoth/NadekoBot/raw/master/scripts/Stable.bat -OutFile %FILENAME%" +::bitsadmin.exe /transfer "Downloading Nadeko (Stable)" /priority high https://github.com/Kwoth/NadekoBot/raw/master/scripts/Stable.bat "%FILENAME%" ECHO NadekoBot Stable build downloaded. SET root=%~dp0 CD /D %root% diff --git a/scripts/Stable.bat b/scripts/Stable.bat index 40673f50..bde82049 100644 --- a/scripts/Stable.bat +++ b/scripts/Stable.bat @@ -75,13 +75,13 @@ IF EXIST "%root%NadekoBot\" (GOTO :backupinstall) IF %ERRORLEVEL% GEQ 8 (GOTO :copyerror) ECHO. ECHO bin folder copied... - DEL "%root%NadekoBot_Old\src\NadekoBot\data\musicdata" + RD /S /Q "%root%NadekoBot_Old\src\NadekoBot\data\musicdata" ECHO. ECHO music cache cleared... ROBOCOPY "%root%NadekoBot_Old\src\NadekoBot\data" "%installtemp%NadekoBot\src\NadekoBot\data" /E >nul 2>&1 IF %ERRORLEVEL% GEQ 8 (GOTO :copyerror) ECHO. - ECHO Old data folder copied to new folder + ECHO Old data folder copied... ::Moves the setup Nadeko folder RMDIR "%root%NadekoBot\" /S /Q >nul 2>&1 ROBOCOPY "%root%NadekoInstall_Temp" "%rootdir%" /E /MOVE >nul 2>&1 @@ -129,12 +129,14 @@ timeout /t 5 ECHO. ECHO Downloading libsodium.dll and opus.dll... SET "FILENAME=%~dp0\NadekoBot\src\NadekoBot\libsodium.dll" -bitsadmin.exe /transfer "Downloading libsodium.dll" /priority high https://github.com/Kwoth/NadekoBot/raw/dev/src/NadekoBot/_libs/32/libsodium.dll "%FILENAME%" +powershell -Command "Invoke-WebRequest https://github.com/Kwoth/NadekoBot/raw/dev/src/NadekoBot/_libs/32/libsodium.dll -OutFile %FILENAME%" +::bitsadmin.exe /transfer "Downloading libsodium.dll" /priority high https://github.com/Kwoth/NadekoBot/raw/dev/src/NadekoBot/_libs/32/libsodium.dll "%FILENAME%" ECHO libsodium.dll downloaded. ECHO. timeout /t 5 SET "FILENAME=%~dp0\NadekoBot\src\NadekoBot\opus.dll" -bitsadmin.exe /transfer "Downloading opus.dll" /priority high https://github.com/Kwoth/NadekoBot/raw/dev/src/NadekoBot/_libs/32/opus.dll "%FILENAME%" +powershell -Command "Invoke-WebRequest https://github.com/Kwoth/NadekoBot/raw/dev/src/NadekoBot/_libs/32/opus.dll -OutFile %FILENAME%" +::bitsadmin.exe /transfer "Downloading opus.dll" /priority high https://github.com/Kwoth/NadekoBot/raw/dev/src/NadekoBot/_libs/32/opus.dll "%FILENAME%" ECHO opus.dll downloaded. GOTO end :end From 9e4cfe2a32c5b4002c8c7dcc1ce5e8f79e861316 Mon Sep 17 00:00:00 2001 From: samvaio Date: Sun, 5 Mar 2017 04:35:55 +0530 Subject: [PATCH 176/496] cleaning --- scripts/Latest.bat | 6 ++---- scripts/NadekoAutoRun.bat | 6 ++---- scripts/Stable.bat | 6 ++---- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/scripts/Latest.bat b/scripts/Latest.bat index 01890d9a..6460a618 100644 --- a/scripts/Latest.bat +++ b/scripts/Latest.bat @@ -129,14 +129,12 @@ timeout /t 5 ECHO. ECHO Downloading libsodium.dll and opus.dll... SET "FILENAME=%~dp0\NadekoBot\src\NadekoBot\libsodium.dll" -powershell -Command "Invoke-WebRequest https://github.com/Kwoth/NadekoBot/raw/dev/src/NadekoBot/_libs/32/libsodium.dll -OutFile %FILENAME%" -::bitsadmin.exe /transfer "Downloading libsodium.dll" /priority high https://github.com/Kwoth/NadekoBot/raw/dev/src/NadekoBot/_libs/32/libsodium.dll "%FILENAME%" +powershell -Command "Invoke-WebRequest https://github.com/Kwoth/NadekoBot/raw/dev/src/NadekoBot/_libs/32/libsodium.dll -OutFile '%FILENAME%'" ECHO libsodium.dll downloaded. ECHO. timeout /t 5 SET "FILENAME=%~dp0\NadekoBot\src\NadekoBot\opus.dll" -powershell -Command "Invoke-WebRequest https://github.com/Kwoth/NadekoBot/raw/dev/src/NadekoBot/_libs/32/opus.dll -OutFile %FILENAME%" -::bitsadmin.exe /transfer "Downloading opus.dll" /priority high https://github.com/Kwoth/NadekoBot/raw/dev/src/NadekoBot/_libs/32/opus.dll "%FILENAME%" +powershell -Command "Invoke-WebRequest https://github.com/Kwoth/NadekoBot/raw/dev/src/NadekoBot/_libs/32/opus.dll -OutFile '%FILENAME%'" ECHO opus.dll downloaded. GOTO end :end diff --git a/scripts/NadekoAutoRun.bat b/scripts/NadekoAutoRun.bat index c9d37049..c1701c7c 100644 --- a/scripts/NadekoAutoRun.bat +++ b/scripts/NadekoAutoRun.bat @@ -29,8 +29,7 @@ CD /D %~dp0NadekoBot\src\NadekoBot dotnet run --configuration Release ECHO Updating... SET "FILENAME=%~dp0\Latest.bat" -powershell -Command "Invoke-WebRequest https://github.com/Kwoth/NadekoBot/raw/master/scripts/Latest.bat -OutFile %FILENAME%" -::bitsadmin.exe /transfer "Downloading Nadeko (Latest)" /priority high https://github.com/Kwoth/NadekoBot/raw/master/scripts/Latest.bat "%FILENAME%" +powershell -Command "Invoke-WebRequest https://github.com/Kwoth/NadekoBot/raw/master/scripts/Latest.bat -OutFile '%FILENAME%'" ECHO NadekoBot Dev Build (latest) downloaded. SET root=%~dp0 CD /D %root% @@ -44,8 +43,7 @@ CD /D %~dp0NadekoBot\src\NadekoBot dotnet run --configuration Release ECHO Updating... SET "FILENAME=%~dp0\Stable.bat" -powershell -Command "Invoke-WebRequest https://github.com/Kwoth/NadekoBot/raw/master/scripts/Stable.bat -OutFile %FILENAME%" -::bitsadmin.exe /transfer "Downloading Nadeko (Stable)" /priority high https://github.com/Kwoth/NadekoBot/raw/master/scripts/Stable.bat "%FILENAME%" +powershell -Command "Invoke-WebRequest https://github.com/Kwoth/NadekoBot/raw/master/scripts/Stable.bat -OutFile '%FILENAME%'" ECHO NadekoBot Stable build downloaded. SET root=%~dp0 CD /D %root% diff --git a/scripts/Stable.bat b/scripts/Stable.bat index bde82049..26c5c422 100644 --- a/scripts/Stable.bat +++ b/scripts/Stable.bat @@ -129,14 +129,12 @@ timeout /t 5 ECHO. ECHO Downloading libsodium.dll and opus.dll... SET "FILENAME=%~dp0\NadekoBot\src\NadekoBot\libsodium.dll" -powershell -Command "Invoke-WebRequest https://github.com/Kwoth/NadekoBot/raw/dev/src/NadekoBot/_libs/32/libsodium.dll -OutFile %FILENAME%" -::bitsadmin.exe /transfer "Downloading libsodium.dll" /priority high https://github.com/Kwoth/NadekoBot/raw/dev/src/NadekoBot/_libs/32/libsodium.dll "%FILENAME%" +powershell -Command "Invoke-WebRequest https://github.com/Kwoth/NadekoBot/raw/dev/src/NadekoBot/_libs/32/libsodium.dll -OutFile '%FILENAME%'" ECHO libsodium.dll downloaded. ECHO. timeout /t 5 SET "FILENAME=%~dp0\NadekoBot\src\NadekoBot\opus.dll" -powershell -Command "Invoke-WebRequest https://github.com/Kwoth/NadekoBot/raw/dev/src/NadekoBot/_libs/32/opus.dll -OutFile %FILENAME%" -::bitsadmin.exe /transfer "Downloading opus.dll" /priority high https://github.com/Kwoth/NadekoBot/raw/dev/src/NadekoBot/_libs/32/opus.dll "%FILENAME%" +powershell -Command "Invoke-WebRequest https://github.com/Kwoth/NadekoBot/raw/dev/src/NadekoBot/_libs/32/opus.dll -OutFile '%FILENAME%'" ECHO opus.dll downloaded. GOTO end :end From e44a2bd384f9903ad8d77eade3ddf9658dad0389 Mon Sep 17 00:00:00 2001 From: samvaio Date: Sun, 5 Mar 2017 05:37:05 +0530 Subject: [PATCH 177/496] fixo --- scripts/Stable.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Stable.bat b/scripts/Stable.bat index 26c5c422..b2f6a9eb 100644 --- a/scripts/Stable.bat +++ b/scripts/Stable.bat @@ -146,4 +146,4 @@ GOTO end ECHO Installation complete! ECHO. PAUSE - del Latest.bat \ No newline at end of file + del Stable.bat \ No newline at end of file From e741e84190c3a4a75be4bbf6aff0da9add466f9e Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sun, 5 Mar 2017 16:09:54 +0100 Subject: [PATCH 178/496] missing key --- .../Utility/Commands/PatreonCommands.cs | 78 +++++++++++++++++++ .../Modules/Utility/Models/PatreonData.cs | 37 +++++++++ .../Resources/ResponseStrings.Designer.cs | 9 +++ src/NadekoBot/Resources/ResponseStrings.resx | 3 + src/NadekoBot/Services/IBotCredentials.cs | 2 +- src/NadekoBot/Services/Impl/BotCredentials.cs | 5 +- src/NadekoBot/credentials_example.json | 3 +- 7 files changed, 133 insertions(+), 4 deletions(-) create mode 100644 src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs create mode 100644 src/NadekoBot/Modules/Utility/Models/PatreonData.cs diff --git a/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs b/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs new file mode 100644 index 00000000..b347330f --- /dev/null +++ b/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs @@ -0,0 +1,78 @@ +using System.Collections.Generic; +using System.Linq; +using System.Net.Http; +using System.Threading.Tasks; +using Discord.Commands; +using Discord; +using NadekoBot.Attributes; +using NadekoBot.Modules.Utility.Models; +using Newtonsoft.Json; + +namespace NadekoBot.Modules.Utility +{ + public partial class Utility + { + //[Group] + //public class PatreonCommands : NadekoSubmodule + //{ + // [NadekoCommand, Usage, Description, Aliases] + // [RequireContext(ContextType.Guild)] + // public async Task ClaimPatreonRewards([Remainder] string arg) + // { + // var pledges = await GetPledges2(); + // } + + // private static async Task GetPledges() + // { + // var pledges = new List(); + // using (var http = new HttpClient()) + // { + // http.DefaultRequestHeaders.Clear(); + // http.DefaultRequestHeaders.Add("Authorization", "Bearer " + NadekoBot.Credentials.PatreonAccessToken); + // var data = new PatreonData() + // { + // Links = new Links() + // { + // Next = "https://api.patreon.com/oauth2/api/campaigns/334038/pledges" + // } + // }; + // do + // { + // var res = + // await http.GetStringAsync(data.Links.Next) + // .ConfigureAwait(false); + // data = JsonConvert.DeserializeObject(res); + // pledges.AddRange(data.Data); + // } while (!string.IsNullOrWhiteSpace(data.Links.Next)); + // } + // return pledges.Where(x => string.IsNullOrWhiteSpace(x.Attributes.declined_since)).ToArray(); + // } + + // private static async Task GetPledges2() + // { + // var pledges = new List(); + // using (var http = new HttpClient()) + // { + // http.DefaultRequestHeaders.Clear(); + // http.DefaultRequestHeaders.Add("Authorization", "Bearer " + NadekoBot.Credentials.PatreonAccessToken); + // var data = new PatreonData() + // { + // Links = new Links() + // { + // Next = "https://api.patreon.com/oauth2/api/current_user/campaigns?include=pledges" + // } + // }; + // do + // { + // var res = + // await http.GetStringAsync(data.Links.Next) + // .ConfigureAwait(false); + // data = JsonConvert.DeserializeObject(res); + // pledges.AddRange(data.Data); + // } while (!string.IsNullOrWhiteSpace(data.Links.Next)); + // } + // return pledges.Where(x => string.IsNullOrWhiteSpace(x.Attributes.declined_since)).ToArray(); + // } + //} + } +} diff --git a/src/NadekoBot/Modules/Utility/Models/PatreonData.cs b/src/NadekoBot/Modules/Utility/Models/PatreonData.cs new file mode 100644 index 00000000..381666e8 --- /dev/null +++ b/src/NadekoBot/Modules/Utility/Models/PatreonData.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace NadekoBot.Modules.Utility.Models +{ + + public class PatreonData + { + public Pledge[] Data { get; set; } + public Links Links { get; set; } + } + + public class Attributes + { + public int amount_cents { get; set; } + public string created_at { get; set; } + public string declined_since { get; set; } + public bool is_twitch_pledge { get; set; } + public bool patron_pays_fees { get; set; } + public int pledge_cap_cents { get; set; } + } + + public class Pledge + { + public Attributes Attributes { get; set; } + public int Id { get; set; } + } + + public class Links + { + public string First { get; set; } + public string Next { get; set; } + } +} diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index c91f93cb..d1bef121 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -2081,6 +2081,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to You've already joined this race!. + /// + public static string gambling_animal_race_already_in { + get { + return ResourceManager.GetString("gambling_animal_race_already_in", resourceCulture); + } + } + /// /// Looks up a localized string similar to Animal Race is already running.. /// diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index a1674f52..9af8d41f 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -1218,6 +1218,9 @@ Don't forget to leave your discord name or id in the message. Animal Race is already running. + + You've already joined this race! + Total: {0} Average: {1} diff --git a/src/NadekoBot/Services/IBotCredentials.cs b/src/NadekoBot/Services/IBotCredentials.cs index a03c6db3..63bea8b8 100644 --- a/src/NadekoBot/Services/IBotCredentials.cs +++ b/src/NadekoBot/Services/IBotCredentials.cs @@ -7,13 +7,13 @@ namespace NadekoBot.Services public interface IBotCredentials { ulong ClientId { get; } - ulong BotId { get; } string Token { get; } string GoogleApiKey { get; } ImmutableHashSet OwnerIds { get; } string MashapeKey { get; } string LoLApiKey { get; } + string PatreonAccessToken { get; } DBConfig Db { get; } diff --git a/src/NadekoBot/Services/Impl/BotCredentials.cs b/src/NadekoBot/Services/Impl/BotCredentials.cs index 56851762..a0220778 100644 --- a/src/NadekoBot/Services/Impl/BotCredentials.cs +++ b/src/NadekoBot/Services/Impl/BotCredentials.cs @@ -5,7 +5,6 @@ using Discord; using System.Linq; using NLog; using Microsoft.Extensions.Configuration; -using System.Collections.Generic; using System.Collections.Immutable; namespace NadekoBot.Services.Impl @@ -15,7 +14,6 @@ namespace NadekoBot.Services.Impl private Logger _log; public ulong ClientId { get; } - public ulong BotId { get; } public string GoogleApiKey { get; } @@ -44,6 +42,7 @@ namespace NadekoBot.Services.Impl public string CarbonKey { get; } public string credsFileName { get; } = Path.Combine(Directory.GetCurrentDirectory(), "credentials.json"); + public string PatreonAccessToken { get; } public BotCredentials() { @@ -68,6 +67,7 @@ namespace NadekoBot.Services.Impl GoogleApiKey = data[nameof(GoogleApiKey)]; MashapeKey = data[nameof(MashapeKey)]; OsuApiKey = data[nameof(OsuApiKey)]; + PatreonAccessToken = data[nameof(PatreonAccessToken)]; int ts = 1; int.TryParse(data[nameof(TotalShards)], out ts); @@ -109,6 +109,7 @@ namespace NadekoBot.Services.Impl public string CarbonKey { get; set; } = ""; public DBConfig Db { get; set; } = new DBConfig("sqlite", "Filename=./data/NadekoBot.db"); public int TotalShards { get; set; } = 1; + public string PatreonAccessToken { get; set; } = ""; } private class DbModel diff --git a/src/NadekoBot/credentials_example.json b/src/NadekoBot/credentials_example.json index 240f9029..912b452a 100644 --- a/src/NadekoBot/credentials_example.json +++ b/src/NadekoBot/credentials_example.json @@ -14,5 +14,6 @@ "Type": "sqlite", "ConnectionString": "Filename=./data/NadekoBot.db" }, - "TotalShards": 1 + "TotalShards": 1, + "PatreonAccessToken": "" } \ No newline at end of file From 7d2264270494fb11390d027fa07b61aeb61ed07d Mon Sep 17 00:00:00 2001 From: Rajath Ranganath Date: Sun, 5 Mar 2017 21:22:40 +0530 Subject: [PATCH 179/496] Remove unnecessary capitalization --- src/NadekoBot/Resources/ResponseStrings.resx | 209 +++++++++---------- 1 file changed, 104 insertions(+), 105 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index 9af8d41f..1d74dc30 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -1,4 +1,4 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Den basen har allerede blitt tatt over eller ødelagt. + + + Den basen er allerede ødelagt. + + + Ingen har hevdet denne basen. + + + **ØDELAGT** base #{0} i en krig mot {1} + + + + + + {0} har hevdet en base #{1} i en krig mot {2} + + + @{0} Du har allerede hevdet basen #{1}. Du kan ikke kreve en ny. + + + Krav fra @{0} for en krig mot {1} har utløpt. + Fuzzy + + + Fiende + + + Info om krigen mot {0} + + + Ugyldig basenummer + + + Ikke en gyldig krigstørrelse + Fuzzy + + + Liste over aktive kriger + Fuzzy + + + ikke hevdet + + + Du er ikke en deltager i den krigen. + + + @{0} Du deltar enten ikke i denne krigen, eller basen er allerede ødelagt. + + + Ingen aktive kriger. + Fuzzy + + + Størrelse + + + Krig mot {0} har allerede begynt. + + + Krig mot {0} opprettet. + + + Krig mot {0} avsluttet. + + + Den krigen eksisterer ikke. + + + Krig mot {0} startet! + + + Alle tilpassede reaksjons-statistikker fjernet. + + + Tilpasset reaksjon fjernet + + + Utilstrekkelig tilgang. Krever Bot-eierskap for globale tilpassede reaksjoner, og Administrator for server reaksjoner. + + + Liste av alel tilpassede reaksjoner. + + + Tilpassede reaksjoner. + + + Ny tilpasset reaksjon + + + Ingen tilpasset reaksjon funnet. + Fuzzy + + + Ingen tilpasset reaksjon funnet med den ID'en. + + + Respons + + + Tilpassede reaksjon statistikker. + + + Statistikk fjernet for {0} reaksjon + + + Ingen statistikk funnet for den utløseren, ingen handling utført + + + Utløser + + + Autohentai stoppet + + + Ingen resultater. + + + {0} har allerede besvimt + + + {0} har allerede full helse + + + Din type er allerede {0} + + + brukte {0}{1} på {2}{3} for {4} skade. + Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage. + + + Du kan ikke angripe igjen uten motstanderens hevn. + Sjekk om Kwoth oppdaterer original setningen senere. Har sendt forslag om endring. + + + Du kan ikke angripe deg selv. + + + {0} har besvimt! + + + helbredet {0} med én {1} + + + {0} har {1} helse igjen + + + Du kan ikke bruke {0}. Skriv ´{1}ml` for å se en liste med angrep du kan bruke. + + + Angrep for {0} -type. + + + Det er ikke effektivt. + + + Du har ikke nok {0} + + + gjenopplivet {0} med én {1} + + + Du gjenopplivet deg selv med én {0} + + + Din type ble endret til {0} for èn {1} + + + Det er noe effektivt. + + + Det er super effektivt! + + + Du har gjort for mange angrep på rad, du kan nå ikke gjøre flere angrep! + + + {0} sin type er {1} + + + Bruker ikke funnet + + + Du besvimte, så du kan nå ikke bevege deg. + + + **Automatisk rollegivning** når brukere kommer inn er nå **deaktivert** + + + **Automatisk rollegivning** når brukere kommer inn er nå **aktivert** + + + Legg til filer + + + Profilbilde + + + Du har blitt utestengt fra {0} +Grunn: {1} + + + utestengt + PLURAL + + + Bruker ble utestengt + + + Bot navn endret til {0} + + + Bot status endret til {0} + + + Automatisk sletting av 'farvel'-meldinger er aktivert + + + Farvel-meldinger vil bli slettet etter {0} sekunder. + + + Nåværende 'farvel'-melding: {0} + + + Aktivér 'farvel'-meldinger ved å skrive {0} + + + Ny 'farvel'-melding satt. + + + 'farvel'-kunngjøringer deaktivert. + + + 'farvel'-kunngjøringer aktivert i denne kanalen. + + + Kanalnavn endret. + + + Gammelt navn + + + Kanalemne endret. + + + Ryddet opp. + + + Innhold + + + Rolle opprettet + + + Tekstkanal {0} laget. + + + Talekanal {0} laget. + + + Demping vellykket. + + + Slettet server {0} + + + Stoppet automatisk sletting av vellykkede kommando invokationer. + + + Sletter nå kommandomeldinger automatisk. + + + Tekstkanal {0} slettet. + + + Lydkanal {0} slettet. + + + DM fra + + + Vellykket i å legge til ny bidragsyter. Totalt bidratt av denne brukeren: {0} 👑 + + + Takk til folkene under som gjorde dette prosjektet mulig! + + + Jeg videresender de personlige meldingene til alle eierne. + + + Jeg vil bare vidresende de personlige meldingene til den første eieren. + + + Jeg vil videresende personlige meldinger fra nå. + + + Jeg slutter å videresende personlige meldinger fra nå. + + + Automatisk sletting av velkomstmeldinger har blitt deaktivert. + + + Velkomst meldinger blir slettet etter {0} sekunder. + + + Nåværende personlige velkomst melding: {0} + + + Aktiver personlig velkomstmelding ved å skrive {0} + + + Ny personlig velkomstmelding valgt. + + + Personlig velkomstmelding deaktivert. + + + Personlig velkomstmelding aktivert. + + + Nåværende velkomstmelding: {0} + + + Aktiver velkomstmeldinger ved å skrive {0} + + + Ny velkomstmelding satt. + + + Velkomst-kunngjøring deaktivert. + + + Velkomst-kunngjøring aktivert i denne kanalen. + + + Du kan ikke bruke denne kommandoen på brukere som har en rolle høyere eller på samme nivå som deg i hierarkiet. + + + Bilder lastet etter {0} sekunder! + + + Ugyldig tilførings format. + + + Ugyldige parametere + + + {0} ble med i {1} + + + Du har blitt sparket fra {0} +Grunn: {1} + + + Bruker sparket + Fuzzy + + + Liste over språk {0} + Fuzzy + + + Din servers' lokasjon er nå {0} - {1} + + + Bot'ens standard språk er satt til {1} - {1} + + + Bot'ens språk er satt til {0} - {1} + + + Kunne ikke sette språk. Vennligst sjekk denne kommandoens bruksinformasjon. + + + Denne serverens språk er satt til {0} - {1} + + + {0} har forlatt {1} + + + Forlot server {0} + + + Logger {0} hendelse på denne kanalen. + + + Logger alle hendelser i denne kanalen. + + + Logging deaktivert. + + + Logg hendelser du kan abonnere på: + + + Logging vil ignorere {0} + + + Logging vil ikke ignorere {0} + + + Sluttet å logge {0} hendelse. + + + {0} har påkalt en nevnelse av følgende roller + + + Melding fra {0} '[Bot Eier]': + + + Melding sendt. + + + {0} flyttet fra {1} til {2} + + + Melding slettet i #{0} + Fuzzy + + + Melding oppdatert i #{0} + Fuzzy + + + Dempet + PLURAL (users have been muted) + + + Dempet + singular "User muted." + + + Jeg har mest sannsynlig ikke de nødvendige tillatelsene til det. + + + Ny 'dempet'-rolle satt. + + + Jeg trenger **Administrasjon** tillatelse til å gjøre det. + + + Ny Melding + Fuzzy + + + Nytt kallenavn + Fuzzy + + + Nytt emne + Fuzzy + + + Kallenavn endret. + Fuzzy + + + Kan ikke finne den serveren + + + Ingen shard med den IDen funnet. + + + Gammel melding + Fuzzy + + + Gammelt kallenavn + Fuzzy + + + Gammelt emne + Fuzzy + + + Feil. Mest sansynlig har jeg ikke tilstrekkelige tillatelser. + + + Tillatelsene til denne serveren er nullstilt. + + + Aktive Beskyttelser + Fuzzy + + + {0} har blitt **deaktivert** på denne serveren. + + + {0} aktivert + + + Feil. Jeg trenger "Behandle roller" tillatelse. + + + Ingen beskyttelser aktivert + Fuzzy + + + Bruker terskelen må være mellom {0} og {1} + + + Hvis {0} eller flere brukere kommer inn i løpet av {1} sekunder, blir de {2} + + + Tiden må være mellom {1} og {1} sekunder. + + + Fjernet alle roller fra {0} + + + Kunne ikke fjerne roller. Jeg har ikke de rette tillatelsene. + + + Rollen {0} sin farge er blitt endret. + + + Den rollen eksisterer ikke. + + + Gitte parametere er ikke gyldige. + + + En feil oppstod, grunnet ugyldig fargekode, eller ikke tilstrekkelig med tillatelser. + + + Fjernet rollen {0} fra {1} + + + Kunne ikke fjerne rollen. Jeg har ikke tilstrekkelig med tillatelser + + + Endret navn på rolle. + + + Kunne ikke endre navn på rolle. Jeg har ikke tilstrekkelig med tillatelser. + + + Du kan ikke endre på roller som er høyere enn din i hierarkiet. + + + Fjernet 'Spiller'-melding: {0} + + + Roller {0} er lagt til i listen + + + {0} ikke funnet. Renset opp. + + + Rolle {0} er allerede i listen + + + Lagt til. + + + Roterende 'spiller'-status deaktivert. + + + Roterende 'spiller'-status aktivert. + + + Liste med roterende statuser: +{0} + + + Ingen roterende statuser er satt. + + + Du har allerede rollen {0} + + + Du har allerede en eksklusiv rolle: {0} + + + Selvsettende roller er nå eksklusive! + + + Det er nå {0} selvsettende roller. + + + Den rollen er ikke selvsettende. + + + Du har ikke rollen {0}. + + + Selvsettende roller er nå ikke eksklusive! + + + Jeg kan ikke gi deg den rollen. +`Jeg kan ikke gi roller til eiere eller brukere som har en rolle høyere enn min egen i hierarkiet` + + + {0} ble fjernet fra listen over selvsettende roller. + + + Du har ikke lenger rollen {0} + + + Du har nå rollen {0} + + + Gav rollen {0} til {1} + + + Kunne ikke legge til rolle. Jeg har ikke de rette tillatelsene. + + + Nytt profilbilde er satt! + + + Nytt kanalnavn satt. + + + Nytt spill satt. + + + Ny strøm satt. + + + Nytt kanalemne satt + + + Shard {0} gjentilkoblet. + + + Kobler til shard {0} på nytt + + + Avslutter + + + Brukere kan ikke sende flere enn {0} meldinger i løpet av {1} sekunder. + + + Sakte modus deaktivert + + + Sakte modus aktivert + + + soft-banned (sparket) + PLURAL + + + {0} vil nå ignorere denne kanalen. + + + {0} vil ikke lenger ignorere denne kanalen. + + + Hvis en bruker sender {0} like meldinger på rad, vil de bli {1}. +__IgnoredChannels__: {2} + + + Tekstkanal opprettet + Fuzzy + + + Tekstkanal fjernet + Fuzzy + + + Demping fjernet + + + Fjernet demping + singular + + + Brukernavn + + + Brukernavn endret + Fuzzy + + + Brukere + + + Bruker utestengt + Fuzzy + + + {0} har blit **dempet** fra å chatte. + + + Fjernet demping på {0} for chatting. + + + Bruker ble med i samtalen. + Fuzzy + + + Bruker Forlatt. + Fuzzy + + + {0} har blitt **dempet** fra tekst og talekanaler. + + + Brukerrolle lagt til + Fuzzy + + + Brukerrolle fjernet + Fuzzy + + + {0} er nå {1} + + + {0} er ikke lenger dempet fra tekst og tale. + + + {0} har blitt med i {1} + + + {0} har forlatt {1} + + + {0} flyttet fra {1} til {2} + + + {0} har blitt **tale dempet*** + + + {0} er ikke lenger **taledempet** + + + Talekanal laget + Fuzzy + + + Talekanal fjernet + Fuzzy + + + Deaktivert tale + tekst funksjon. + + + Aktivert lyd + tekst funksjon. + + + Jeg har ikke ** + + + Du aktiverer/deaktiverer denne funksjonen og **jeg ikke har administratorrettigheter**. Dette kan føre til noen problemer, og du blir nødt til å rydde opp i tekst kanaler selv etterpå. + + + Jeg trenger **Behandle roller** og **Administrer kanaler** tillatelser for å aktivere denne egenskapen. (Administrator er foretrukket) + + + Bruker {0} fra tekst-chat + + + Bruker {0} fra tekst og tale chat + + + Bruker {0} fra stemmechat + + + Du har blitt 'soft-banned' fra {0} server. +Grunn: {1} + + + Fjernet bruker fra utestenging + + + Migrering fullført! + + + Feil under migrering, sjekk botens konsoll for mer informasjon. + + + Oppdatering av tilstedeværelse + + + Bruker soft-banned + + + har tildelt {0} til {1} + + + Bedre hell neste gang :3 + + + Gratulerer! Du vant {0} for å rulle høyere enn {1} + + + Kortstokk stokket. + + + kastet {0}. + User flipped tails. + + + Du gjettet det! Du vant {0} + + + Ugyldig nummer spesifisert. Du kan kaste 1 til {0} mynter. + + + Legg {0} reaksjon på denne meldingen for å få {1} + + + Denne hendelsen er aktiv i opptil {0} timer. + + + Blomster reaksjonshendelse startet! + + + har gitt {0} til {1} + X has gifted 15 flowers to Y + + + {0} har {1} + X has Y flowers + + + Mynt + Fuzzy + + + Resultattavle + + + Tildelt {0} til {1} brukere fra {2} rollen. + + + Du kan ikke vedde mer enn {0} + + + Du kan ikke vedde mindre enn {0} + + + Du har ikke nok {0} + + + Ikke flere kort i kortstokken. + + + Trakk bruker + + + Du rullet {0}. + + + Vedde + + + WOAAHHHHHH!!! Gratulerer!!! x{0} + + + En enkel {0}, x{1} + + + Wow! Heldig! Tre like! x{0} + + + Godt jobbet! To {0} - veddemål x{1} + + + Vant + + + Brukere må skrive et hemmelig kodeord for å få {0}. +Varer i {1} sekunder. Ikke si det til noen. Shhh. + + + SneakyGame hendelse avsluttet. {0} brukere fikk belønning. + + + SneakyGameStatus hendelse startet + + + Kron + Fuzzy + + + vellykket i og ta {0} fra {1} + + + Kunne ikke ta {0} fra {1} fordi brukeren hadde ikke så mye {2}! + + + Tilbake til innholdsfortegnelsen + + + Kun boteier + Fuzzy + + + Krever {0} kanal tillatelse. + + + Du kan støtte prosjektet på Patreon: <{0}> eller paypal: <{1}> + + + Kommandoer og aliaser + + + Kommandoliste regenerert. + + + Skriv `{0}h Kommandonavn` å se hjelpen for den oppgitte kommandoen. f.eks `{0}h >8ball` + + + Jeg kan ikke finne den kommandoen. Kontroller at kommandoen finnes før du prøver igjen. + + + Beskrivelse + + + Du kan støtte NadekoBot prosjektet på +Patreon <{0}> eller +Paypal <{1}> +Ikke glem å skrive Discord navnet eller ID i meldingen. + +** Takk ** ♥ ️ + + + ** Liste over kommandoer **: <{0}> +** Hosting guider og dokumenter finner du her **: <{1}> + + + Liste av kommandoer + Fuzzy + + + Liste av moduler + Fuzzy + + + + + + Den modulen finnes ikke. + + + Krever {0} servertillatelse. + + + Innholdsfortegnelse + Fuzzy + + + Bruk + + + Autohentai startet. Poster hvert {0}s med følgende stikkord: {1} + + + Stikkord + + + Veddeløp med dyr + + + Kunne ikke starte siden det ikke var nok deltakere + + + Løpet er fullt. Starter nå. + + + {0} ble med som {1} + + + {0} ble med som {1} og veddet {2}! + + + Skriv {0}jr for og bli med i løpet. + + + Starter om 20 sekunder eller når rommet er fullt. + + + Starter med {0} deltakere. + + + {0} som {1} vant løpet! + + + {0} som {1} vant løpet og {2}! + + + Ugyldig nummer spesifisert. Du kan rulle {0}-{1} terninger på en gang. + + + rullet {0} + Someone rolled 35 + + + Terning rullet: {0} + Dice Rolled: 5 + + + Kunne ikke starte løpet. Et annet løp er sannsynligvis igang. + + + Ingen løp eksisterer på denne serveren + + + Det andre tallet må være større enn det første + + + Ombestemmelser + Fuzzy + + + Hevdet av + Fuzzy + + + Skilsmisser + + + Liker + + + Pris + + + Ingen waifus har blitt hevdet enda. + + + Topp Waifus + + + Din affinitet er allerede satt til den waifuen eller så prøver du å fjerne din egen affinitet uten å ha en. + + + byttet affinitet fra {0} til {1}. + +*Dette er moralsk tvilsomt.* + Make sure to get the formatting right, and leave the thinking emoji + + + Du må vente {0} timer og {1} minutt for å bytte affinitet igjen. + + + Affiniteten din er tilbakestillt. Du liker ingen. + + + ønsker å bli {0} sin waifu. Aww <3 + + + hevdet {0} som sin waifu for {1}! + + + Du har skillt deg fra en waifu som liker deg, ditt hjerteløse monster! +{0} fikk {1} som kompensation. + + + du kan ikke sette affiniteten din til deg selv, ditt egoistiske monster! + + + 🎉 Deres kjærlighet er oppfylt 🎉 +{0} sin nye verdi er {1}! + + + Ingen waifu er så billig. Du må betale minst {0} for å få en waifu, selv om deres verdi egentlig er lavere. + + + Du må betale {0} eller mer for å hevde den waifuen! + + + Den waifuen er ikke din. + + + Du kan ikke hevde deg selv. + + + Du er nylig skilt. Du må vente {0} timer og {1} minutter for å kunne skille deg igjen. + + + Ingen + + + Du har skilt deg fra en waifu som ikke liker deg. Du fikk {0} tilbake. + + + 8ball + + + Acrophobia + + + Spill avsluttet uten innleveringer. + + + Ingen stemmer telt. Spillet avsluttet med ingen vinnere. + + + Akronymet var {0}. + + + Acrophobia-spill er allerede i gang i denne kanalen. + + + Spill startet. Lag en setning med det følgende akronymet: {0}. + + + Du har {0} sekunder å levere inn på. + + + {0} leverte inn sin setning. ({1} total) + + + Stem ved å skrive nummer til innleveringen. + + + {0} avga sin stemme! + + + Vinneren er {0} med {1} poeng. + + + {0} er vinneren fordi han hadde den eneste innleveringen + + + Spørsmål + + + Det er uavgjort! Begge valgte {0} + + + {0} vant! {1} slår {2} + + + Innleveringer avluttet. + Fuzzy + + + Veddeløp med dyr er allerede igang. + + + Totalt: {0} Gjennomsnitt: {1} + + + Kategori + + + Deaktivert Cleverbot på denne serveren. + + + Aktivert Cleverbot på denne serveren. + + + Valuta generering har blitt deaktivert på denne kanalen. + + + Valuta generering har blitt aktivert på denne kanalen. + + + {0} tilfeldig {1} dukket opp! Plukk dem opp ved og skrive'{2}pick' + plural + + + En tilfeldig {0} dukket opp! Plukk den opp ved og skrive '{1}pick' + + + Kunne ikke laste inn spørsmål. + + + Spill startet + Fuzzy + + + Hangman spill startet + + + Hangman spill kjører allerede i denne kanalen. + + + Kunne ikke starte Hangman + + + Liste av "{0}hangman" begrepstyper: + + + Resultattavle + + + Du har ikke nok {0} + + + Ingen resultater + + + Plukket {0} + Kwoth picked 5* + + + {0} plantet {1} + Kwoth planted 5* + + + Trivia kjører allerede på denne serveren. + + + Trivia spill + + + {0} gjettet det! Svaret var: {1} + + + Ingen trivia-spill gående på serveren. + + + {0} har {1} poeng + + + Stopper etter dette spørsmålet + + + Tiden er ute! Det riktige svaret var {0} + + + {0} gjettet det og VANT spillet! Svaret var: {1} + + + Du kan ikke spille mot deg selv. + + + Bondesjakk kjører allerede i denne kanalen. + + + Uavgjort! + + + har startet et spill med bondesjakk + + + {0} har vunnet! + Fuzzy + + + Matchet tre + Fuzzy + + + Ingen bevegelser igjen! + + + Tiden er ute! + Fuzzy + + + {0} sin tur + + + {0} mot {1} + + + + + + Automatisk avspilling deaktivert + + + Automatisk spilling aktivert. + + + Standard volume satt til {0}% + + + + + + + + + Sang ferdig + Fuzzy + + + + + + + + + Fra possisjon + + + Id + + + Ugyldig tilføring. + + + Max spilletid har ingen grenser nå. + + + Max spilletid satt til {0} sekund(er). + + + Max musikkkø størrelse satt til uendelig. + + + Max musikkkø størrelse satt til {0} sang(er). + + + Du må være i en talekanal på denne serveren. + + + Navn + + + Spiller + Fuzzy + + + Ingen aktive musikkspillere. + + + Ingen søkeresultater. + + + Musikkavspilling pauset + + + Spilleliste - Side {0}/{1} + Fuzzy + + + Spiller sang + Fuzzy + + + #{0}` - **{1}** av *{2}* ({3} sanger) + + + Side {0} av lagrede spillelister + Fuzzy + + + Spilleliste slettet. + + + Klarte ikke og slette spillelisten. Enten eksisterer den ikke, eller så var det ikke du som lagde den. + + + Spilleliste med den IDen eksisterer ikke. + + + Spilleliste-kø komplett. + + + Spilleliste lagret + Fuzzy + + + {0}er grense + + + Kø + + + Sang i kø + Fuzzy + + + Musikk-kø tømt. + + + Køen er full {0}/{0}- + + + Fjernet sang + context: "removed song #5" + + + + + + + + + + + + + + + Musikk-avspilling startet + + + + + + + + + + + + Skippet til '{0}:{1}' + + + Sanger stokket + + + Sang flyttet + Fuzzy + + + {0}t {1}m {2}s + + + Til posisjon + + + Ubegrenset + + + Lyden må være mellom 0 og 100 + + + Volum satt til {0}% + + + Deaktivert bruk av ALLE MODULER på {0} kanalen. + Fuzzy + + + Aktivert bruk av ALLE MODULER på {0} kanalen. + Fuzzy + + + Tillatt + + + Deaktivert bruk av ALLE MODULER for {0} rolle. + + + Aktivert bruk av ALLE MODULER for {0} rolle. + + + Deaktivert bruk av ALLE MODULER på denne serveren. + + + Aktivert bruk av ALLE MODULER på denne serveren. + + + Deaktivert bruk av ALLE MODULER for {0} bruker. + + + Aktivert bruk av ALLE MODULER for {0} bruker. + + + Svartelistet {0} med ID {1} + + + Kommando {0} har nå en {1}'s ventetid. + + + Kommando {0} har ingen ventetid nå og alle eksisterende ventetider har blitt fjernet. + + + Ingen kommando-ventetid satt. + + + Kommando kostnader + + + Deaktivert bruk av {0} {1} i kanal {2}. + + + Aktivert bruk av {0} {1} i kanal {2}. + + + Benektet + + + La til ordet {0} til listen av filtrerte ord. + + + Liste over filtrerte ord + + + Fjernet ord {0} fra listen over filtrerte ord. + + + Ugyldig andre parameter. (Må være et tall mellom {0} og {1}) + + + Invitasjons-filtrering deaktivert i denne kanalen. + + + Invitasjons-filtrering aktivert i denne kanalen. + + + Invitasjons-filtrering deaktivert på denne serveren. + + + Invitasjons-filtrering aktivert på denne serveren. + + + Flyttet tillatelse {0} fra #{1} til #{2} + + + Finner ikke tillatelse til index #{0} + + + Ingen kostnader satt. + + + kommando + Gen (of command) + + + modul + Gen. (of module) + + + Rettigheter side {0} + + + Nåværende rettighets-rolle er {0}. + + + Brukere må nå ha {0} rollen for og endre rettigheter. + + + Ingen tillatelse funnet på denne indeksen. + + + fjernet rettighet #{0} - {1} + + + Deaktivert bruk av {0} {1} for {2} rollen. + + + Aktivert bruk av {0} {1} for {2} rollen. + + + + Short of seconds. + + + Deaktivert bruk av {0} {1} på denne serveren. + + + Aktivert bruk av {0} {1} på denne serveren. + + + + + + uredigerbar + + + Deaktivert bruk av {0} {1} for {2} bruker. + + + Aktivert bruk av {0} {1} for {2} bruker. + + + Jeg vil ikke lenger vise tillatelse advarsler. + + + Jeg vil nå vise rettighets-advarsler. + + + Ord filtrering er deaktivert i denne kanalen. + + + Ord filtrering aktivert på denne kanalen. + + + Ord filtrering deaktivert på denne serveren. + + + Ord filtrering aktivert på denne serveren. + + + Ferdigheter + + + + + + Startet automatisk oversettelse av meldinger i denne kanalen. Bruker-meldinger vil bli slettet automatisk. + + + + + + + + + Startet automatisk oversettelse av meldinger i denne kanalen. + + + Stoppet automatisk oversettelse av meldinger i denne kanalen. + + + Feil tilførings format, eller noe gikk galt + + + Kunne ikke finne det kortet. + + + fakta + + + Kapittel + + + Tegneserie # + + + Konkurerende tap + + + Konkurranser spillt + + + Konkurrerende rangering + + + + + + Fullført + + + Betingelse + + + Kostnader + + + Dato + + + Definer: + + + Droppet + + + Episoder + + + Feil oppsto. + + + Eksempel + + + + + + + + + Sjangere + + + + + + Høyde/vekt + + + {0}m/{1}kg + + + Luftfuktighet + + + Bildesøk for: + + + Kunne ikke finne den filmen. + + + Ugyldig kilde- eller målspråk. + + + Vitser ikke lastet. + + + + + + Nivå + + + + Don't translate {0}place + + + Plassering + + + + + + + + + Bot eieren ikke spesifisere MashapeApiKey. Du kan ikke bruke denne funksjonaliteten. + + + Min/Max + + + Ingen kanal funnet. + + + Ingen resultater funnet. + + + På vent + + + Original url + + + En 'osu!' API-nøkkel er nødvendig. + + + Kunne ikke hente 'osu!' signatur. + + + Fant mer enn {0} bilder. Viser tilfeldig {0}. + + + Bruker ikke funnet! Vennligst sjekk regionen og BattleTag før du prøver igjen. + + + Planlegg å se + + + Plattform + + + Ingen evne funnet. + + + Ingen pokemon funnet. + + + Profil link: + + + Kvalitet: + + + Rask spilletid + + + Rask vinner + + + Vurdering + + + + + + Søk etter: + + + Kunne forkorte den URLen. + + + Kort url + + + Noe gikk galt. + + + Vennligst oppgi søkeparametere. + + + Status + + + Butikk url + + + Streamer {0} er frakoblet. + + + Streamer {0} er online med {1} seere. + + + Du følger {0} strømmer på denne serveren. + + + Du følger ikke noen strømmer på denne serveren. + + + Ingen slik strøm. + + + Strømmen eksisterer sannsynligvis ikke. + + + Fjernet {0} sin stream ({1}) fra varslinger. + + + Jeg vil varsle denne kanalen når statusen endres. + + + Soloppgang + + + Solnedgang + + + Temperatur + + + Tittel: + + + + + + Oversettelse: + + + Typer + + + Kunne ikke finne definisjonen for dette ordet. + + + + + + Seerne + + + + + + Kunne ikke finne det ordet på den angitte Wikia. + + + Vennligst skriv inn et mål-wikia, etterfulgt av søket. + + + Side ikke funnet. + + + Vindfart + + + De {0} mest forbydde 'champions' + + + + + + Ble med + + + + /s and total need to be localized to fit the context - +`1.` + + + Aktivitet side #{0} + + + {0} brukere totalt. + + + Forfatter + + + + + + Liste over funksjoner i {0}calc kommandoer + + + {0} av denne kanalen er {1} + + + Kanal emne + + + Kommandoer kjørt + + + {0} {1} er lik {2} {3} + + + Enheter som kan brukes av omformeren + + + Kan ikke konvertere {0} til {1}: enheter ikke funnet + + + Kan ikke konvertere {0} til {1}: typer enheter er ikke lik + + + laget på + + + Ble med i kanalen for snakk på tvers av servere + + + Forlatt kanalen for snakk på tvers av servere + + + Dette er din CSC token + + + Spesiallagde emojier + + + Feil + + + Egenskaper + + + ID + + + Indeks utenfor rekkevidde. + + + Her er en liste over brukere i disse rollene: + + + Du har ikke lov til å bruke denne kommandoen på roller med mange brukere i dem for å hindre misbruk. + + + Ugyldig {0} verdi. + Invalid months value/ Invalid hours value + + + Ble med Discord + + + Ble med serveren + + + ID: {0} +Medlemmer: {1} +Eier ID: {2} + + + Ingen servere funnet på denne siden. + + + Liste over repeater + + + Medlemmer + + + Minne + + + Meldinger + + + + + + Navn + + + Kallenavn + + + Det er ingen som spiller det spillet. + + + Det er ingen aktive repeatere. + + + Det er ingen roller på denne siden. + + + Det er ingen shards på denne siden. + + + Ingen emne er satt. + + + Eier + + + Eier Identiteter + + + Tilstedeværelse + + + {0} Servere +{1} Tekst kanaler +{2} Talekanaler + + + Slettet alle sitater med {0} nøkkelord. + + + Side {0} av sitater + + + Det er ingen sitater på denne siden. + + + Ingen sitater funnet som du kan fjerne. + + + Sitat lagt til + + + Slettet et tilfeldig sitat. + + + Region + + + Registrert på + + + Jeg vil minne på {0} til {1} i {2} `({3:. D.M.ÅÅÅÅ} ved {4:TT:mm})` + + + Ikke et gyldig format. Sjekk kommandolisten. + + + + + + Repeterer {0} {1} hver dag(er), {2} time(r) og {3} minutt(er). + + + + + + + + + #{0} stoppet. + + + + + + Resultat + + + Roller + + + Side #{0} av alle roller på denne serveren: + + + Side #{0} av roller for {1} + + + Ingen farger er i riktig format. Bruk `#00ff00` for eksempel. + + + Startet rotering av {0} rolle farge. + + + Stoppet rotering av farger for {0} rolle + + + {0} av denne serveren er {1} + + + Server info + + + + + + + + + + + + **Navn:** {0} **Link:** {1} + + + Ingen spesielle emojier funnet. + + + Spiller {0} sanger, {1} kø. + + + Tekst kanaler + + + Her er linken til rommet ditt: + + + Oppetid + + + {0} til brukeren {1} er {2} + Id of the user kwoth#1234 is 123123123123 + + + Brukere + + + Tale kanaler + + + Du har allerede sluttet deg til dette løpet! + + + \ No newline at end of file diff --git a/src/NadekoBot/Resources/ResponseStrings.pl-PL.resx b/src/NadekoBot/Resources/ResponseStrings.pl-PL.resx new file mode 100644 index 00000000..665f605b --- /dev/null +++ b/src/NadekoBot/Resources/ResponseStrings.pl-PL.resx @@ -0,0 +1,2209 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Ta baza została już zdobyta lub zniszczona. + + + Ta baza została już zniszczona. + + + Ta baza nie jest zdobyta. + + + **ZNISZCZONO** bazę #{1} w wojnie przeciwko {1} + + + {0} **POZBYŁ SIĘ** bazy #{1} w wojnie przeciwko {2} + + + {0} zdobył bazę #{1} w wojnie przeciwko {2} + + + @{0} Już zdobyłeś bazę #{1}. Nie możesz zdobyć nowej. + + + Wypowiedzenie wojny od @{0} przeciwko {1} wygasło. + Fuzzy + + + Wróg + + + Informacje o wojnie przeciwko {0} + + + Nieprawidłowy numer bazy. + + + Nieprawidłowy rozmiar wojny. + Fuzzy + + + Lista aktualnych wojen + Fuzzy + + + niezdobyta + + + Nie uczestniczysz w tej wojnie. + + + @{0} nie uczestniczysz w tej wojnie albo ta baza została już zniszczona. + + + Brak aktywnych wojen. + Fuzzy + + + Rozmiar + + + Wojna przeciwko {0} już się zaczęła. + + + Wojna przeciwko {0} stworzona. + + + Wojna przeciwko {0} zakończyła się. + + + Ta wojna nie istnieje. + + + Wojna przeciwko {o} zaczęła się! + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Brak rezultatów. + + + {0} już zemdlał. + + + {0} ma już pełne HP. + + + Twoim typem jest już {0} + + + użyto {0}{1} na {2}{3} zadając {4} obrażeń. + Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage. + + + Nie możesz znowu zaatakować bez odwetu! + + + Nie możesz zaatakować sam siebie. + + + {0} zemdlał! + + + wyleczono {0} używając {1} + + + {0} zostało {1} HP. + + + Nie możesz użyć {0}. Napisz `{1}ml` by zobaczyć listę wszystkich ruchów które możesz użyć. + + + Lista ruchów dla typu {0} + + + To nie jest efektywne. + + + Nie masz wystarczająco {0} + + + Ożywiono {0}, używając {1} + + + Ożywiłeś siebie, używając {0} + + + Twój typ został zmieniony z {0} na {1} + + + To trochę efektywne. + + + To bardzo efektywne! + + + Użyłeś za dużo ruchów, więc nie możesz się ruszyć! + + + Typem {0} jest {1} + + + Nie znaleziono użytkownika. + + + Zemdlałeś, więc nie jesteś w stanie się ruszyć! + + + **Automatyczne przydzielanie ról** dla nowych użytkowników jest teraz **wyłączone**. + + + **Automatycznie przydzielanie ról** dla nowych użytkowników jest teraz **włączone*. + + + Załączniki + + + Awatar został zmieniony + + + Zostałeś zbanowany z serwera {0}. +Powód: {1} + + + zbanowany + PLURAL + + + Użytkownik zabanowany + + + Nazwa bota została zmieniona na: {0} + + + Status bota został zmieniony na: {0} + + + Automatyczne usuwanie wiadomości pożegnalnych zostało wyłączone. + + + Wiadomości pożegnalne będą usuwane po {0} sekundach. + + + Obecna wiadomość pożegnalna: {0} + + + Włącz wiadomości pożegnalne, pisząc {0} + + + Nowa wiadomość pożegnalna ustawiona. + + + Powiadomienia pożegnalne wyłączone. + + + Powiadomienia pożegnalne są włączone na tym kanale. + + + Nazwa kanału została zmieniona. + + + Stara nazwa + + + Temat kanału zmieniony + + + Wyczyszczono. + + + Zawartość + + + Stworzono rolę {0} + + + Kanał tekstowy {0} został stworzony. + + + Kanał głosowy {0} został stworzony. + + + Wyciszono pomyślnie. + + + Usunięto serwer {0} + + + Zatrzymano automatyczne usuwanie potwierdzeń o udanych użyciach komend. + + + Rozpoczęto usuwanie potwierdzeń o udanych użyciach komend. + + + Kanał tekstowy {0} został usunięty. + + + Kanał głosowy {0} został usunięty. + + + Prywatna wiadomość od + + + Z powodzeniem dodano nowego darczyńcę. Łączna darowizna przekazana przez tego użytkownika wynosi: {0} 👑 + + + Dziękuję ludziom wypisanym na dole za pomoc w realizacji tego projektu! + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Aktualna wiadomość powitalna: {0} + + + + + + + + + + + + + + + Nie możesz użyć tej komendy na użytkowniku z rolą wyższą lub równą twojej. + + + Obrazki załadowane po {0} sekundach. + + + + + + + + + {0} dołączył do {1} + + + Zostałeś wyrzucony z serwera {0}. +Powód: {1} + + + Użytkownik wyrzucony + Fuzzy + + + Lista języków +{0} + Fuzzy + + + + + + + + + + + + + + + Język serwera został zmieniony na {0} - {1} + + + {0} opuścił {1} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Wiadomość została wysłana. + + + {0} przeniesiono z {1} do {2} + + + + + + + + + Wyciszony + PLURAL (users have been muted) + + + Wyciszony + singular "User muted." + + + + + + + + + Potrzebuję uprawnień **administratora* żeby to zrobić. + + + Nowa wiadomość + Fuzzy + + + Nowy pseudonim + Fuzzy + + + Nowy temat + Fuzzy + + + Pseudonim zmieniony + Fuzzy + + + Serwer nie został znaleziony. + + + + + + Stara wiadomość + Fuzzy + + + Stary pseudonim + Fuzzy + + + Stary temat + Fuzzy + + + Wystąpił błąd. Najwyraźniej nie mam wystarczających uprawnień. + + + Uprawnienia tego serwera zostały zresetowane. + + + + + + + + + + + + + + + + + + + + + + + + Czas musi być pomiędzy {0} a {1} sekundą. + + + Z powodzeniem usunięto wszystkie role użytkownika {0} + + + Nie udało się usunąć ról. Nie mam wystarczających uprawnień. + + + Kolor roli {0} został zmieniony. + + + Ta rola nie istnieje. + + + + + + + + + + + + Wystąpił błąd przy usunięciu roli. Masz niewystarczające uprawnienia. + + + Nazwa roli została zmieniona. + + + Nie udało się zmienić nazwy roli. Nie mam wystarczających uprawnień. + + + Nie możesz edytować ról wyższych od twojej. + + + + + + Rola {0} została dodana do listy. + + + + + + + + + + + + + + + + + + + + + + + + Masz już rolę {0}. + + + + + + + + + Istnieje {0} ról, które możesz sam sobie nadać. + + + Tej roli nie możesz nadać sobie sam. + + + Nie posiadasz roli {0} + + + + + + Nie jestem w stanie nadać ci tej roli. `Nie mogę nadawać ról wyższych niż moja.` + + + Rola {0} została usunięta z listy ról, które użytkownik może sobie nadać sam. + + + + + + Masz teraz rolę {0}. + + + Z powodzeniem nadano rolę {0} użytkownikowi {1} + + + Nadanie roli nie powiodło się. Nie mam wystarczających uprawnień. + + + Nowy awatar został ustawiony! + + + Nowa nazwa kanału została ustawiona! + + + + + + + + + + + + + + + + + + + + + Użytkownik nie może wysłać więcej niż {1} wiadomości na {1} sekund. + + + + + + + + + + PLURAL + + + {0} będzie ignorował ten kanał. + + + {0} nie będzie więcej ignorował tego kanału. + + + + + + + + + + + + + + + + singular + + + Nazwa użytkownika + + + Nazwa użytkownika została zmieniona + Fuzzy + + + Użytkownicy + + + Użytkownik zbanowany + Fuzzy + + + + + + + + + + + + + + + + + + + + + + + + {0} jest teraz {1} + + + + + + {0} dołączył do kanału {1}. + + + {0} opuścił kanał {1}. + + + {0} przeniesiony z kanału {1} na {2} + + + + + + + + + Kanał głosowy został stworzony + Fuzzy + + + Kanał głosowy został usunięty + Fuzzy + + + + + + + + + + + + + + + + + + + + + + + + Użytkownik {0} z kanału głosowego + + + Zostałeś tymczasowo zablokowany na serwerze {0} +Powód: {1} + + + Użytkownik został odbanowany + Fuzzy + + + + + + + + + + + + Użytkownik tymczasowo zablokowany + Fuzzy + + + nagrodził {0} {1} + + + Powodzenia następnym razem! ^_^ + + + Gratulacje! Wygrałeś {0} za wyrzucenie ponad {1} + + + Talia została przetasowana. + + + + User flipped tails. + + + Zgadłeś! Wygrałeś {0} + + + + + + Dodaj reakcję {0} do tej wiadomości, aby dostać {1} + + + To wydarzenie jest aktywne {0} godziny. + + + Wydarzenie reagowania kwiatkami rozpoczęło się! + + + dał (0} dla {1} + X has gifted 15 flowers to Y + + + {0} ma {1} + X has Y flowers + + + Orzeł + Fuzzy + + + Ranking + + + + + + Nie możesz założyć się o więcej niż {0} + + + Nie możesz założyć się o mniej niż {0} + + + Nie masz wystarczająco {0} + + + W talii nie ma więcej kart. + + + + + + Wyrzucono {0} + + + Zakład + + + ŁAAAAAAAAAAAAŁ!!! Gratulacje!!! x{0} + + + + + + + + + + + + + + + Użytkownicy muszą wpisać tajny kod aby dostać {0}. +Trwa {0} sekund. Nie nikomu. Ciiii. + + + + + + + + + Reszka + Fuzzy + + + z powodzeniem wziął {0} od {1} + + + nie był w stanie wziąć {0} od {1}, ponieważ użytkownik nie ma tylu {2}! + + + + + + Tylko właściciel bota + + + + + + Możesz wspierać ten projekt na patreonie: <{0}> albo poprzez paypala: <{1}> + + + + + + + + + + + + Nie mogę znaleźć komendy. Proszę sprawdź czy komenda istnieje, zanim jej użyjesz. + + + Opis + + + Możesz wspierać projekt NadekoBot na +Patreonie <{0}> albo +Paypalu <{1}> +Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomości. + +**Dziękujemy** ♥️ + + + **Lista komend**:<{0}> +**Poradniki hostowania i dokumenty znajdziesz tutaj**:<{1}> + Fuzzy + + + Lista komend + Fuzzy + + + Lista modułów + + + + + + Ten moduł nie istnieje. + + + + + + + + + Użycie + + + Autohentai uaktywnione. Obrazki z jednym z tagów: {1} będą zamieszczane co {0} sekund. + + + Tag + + + Wyścig zwierzaków + Fuzzy + + + Nie udało się zacząć wyścigu, ponieważ nie wzięła w nim udziału wystarczająca ilość osób. + + + Wszystkie miejsca są zajęte! Wyścig zacznie się natychmiastowo. + + + {0} dołączył jako {1} + + + {0} dołączył jako {1} i założył się o {2}! + + + Wpisz {0}jr aby wciąć udział w wyścigu. + + + Zacznie się za 20 sekund albo gdy wszystkie miejsca będą zajęte. + + + Zaczyna z {0} uczestnikami. + + + {0} jako {1} wygrał wyścig! + + + {0} jako {1} wygrał wyścig i {2}! + + + + + + + Someone rolled 35 + + + Wyrzucone kostki: {0} + Dice Rolled: 5 + + + Nie można zacząć wyścigu. Prawdopodobnie inny wyścig jest już aktywny. + + + Żaden wyścig nie jest aktywny na tym serwerze. + + + Drugi numer musi być większy od pierwszego. + + + Zmiany serca + Fuzzy + + + + + + Rozwody + + + Lubi + + + Cena + + + Nie zdobyłeś jeszcze żadnej waifu. + + + Ranking + + + + + + + Make sure to get the formatting right, and leave the thinking emoji + + + + + + + + + chce być zdobyta przez {0}. Aww <3 + + + zdobył waifu {0} za {1}! + + + Rozwiodłeś się z waifu, która cię lubi. Ty bezduszny potworze! +{0} odtrzymał {1} jako rekompensatę. + + + + + + + + + Żadna waifu nie jest taka tania. Musisz zapłacić co najmniej {0} aby zdobyć waifu, nawet jeśli nie jest tyle warta. + + + Musisz zapłacić {0} albo więcej aby zdobyć tą waifu. + + + Ta waifu nie jest twoja. + + + Nie możesz zdobyć siebie. + + + Rozwiodłeś się ostatnio. Musisz poczekać {0} ny i {1} minuty aby rozwieść się ponownie. + + + Nikt + + + Rozwiodłeś się z waifu, która cię nie lubi. W zamian dostałeś {0}. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Zwycięzcą jest {0} z {1} punktami. + + + + + + Pytanie + + + + + + + + + + + + Wyścig zwierzaków właśnie się odbywa. + + + Łącznie: {0} Średnia: {1} + + + Kategoria + + + Wyłączono cleverbota na tym serwerze. + + + Włączono cleverbota na tym serwerze. + + + + + + + + + + plural + + + + + + Nie udało się załadować pytania. + + + Gra rozpoczęta. + + + Gra w wisielca rozpoczęta + + + Gra w wisielca już trwa na tym kanale. + + + Rozpoczynanie gry w wisielca nie powiodło się. + + + + + + Ranking + + + Nie masz wystarczająco {0} + + + Brak rezultatów + + + podniósł {0} + Kwoth picked 5* + + + {0} zasadził {1] + Kwoth planted 5* + + + + + + + + + {0} zgadł! Odpowiedź to: {1} + + + + + + {0} posiada {1} punktów + + + + + + Koniec czasu! Prawidłowa odpowiedź to {0} + + + {0} zgadł i wygrał grę! Odpowiedź to: {1} + + + Nie możesz grać przeciwko sobie. + + + + + + Remis! + + + + + + {0} wygrał! + + + + + + Brak ruchów! + + + Koniec czasu! + + + Kolej {0} + + + {0} kontra {1} + + + + + + Automatyczne odtwarzanie wyłączone. + + + Automatyczne odtwarzanie włączone. + + + Domyślna głośność ustawiona na {0}% + + + + + + + + + Zakończono odtwarzanie piosenki + + + + + + + + + + + + ID + + + + + + Maksymalny czas grania ustawiony na: bez limitu. + + + Maksymalny czas grania ustawiony na: {0} sekund. + + + Maksymalna długość kolejki ustawiona na: bez limitu. + + + Maksymalna długość kolejki ustawiona na {5} utworów. + + + + + + Imię + + + Teraz gra + + + + + + Brak wyników + + + + + + + + + + + + + + + + + + Playlista usunięta. + + + Nie możesz usunąć tej playlisty. Albo nie istnieje albo nie jesteś jej autorem. + + + Playlista z takim ID nie istnieje. + + + + + + Playlista zapisana + + + + + + Kolejka + + + Zakolejkowany utwór + + + Kolejka wyczyszczona. + + + + + + Usunięto utwór + context: "removed song #5" + + + + + + Powtarzenie playlisty + + + Powtarzanie utworu + + + Powtarzanie aktualnego utworu zatrzymane. + + + + + + Powtarzanie playlisty wyłączone. + + + Powtarzanie playlisty włączone. + + + + + + Przewinięto do `{0}:{1}` + + + Utwory pomieszane + + + Utwór przeniesiony + + + + + + + + + + + + Głośność musi być pomiędzy 0 a 100. + + + Głośność ustawiona na {0}% + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Komenda {0} ma teraz {1}-sekundowy cooldown. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + komenda + Gen (of command) + + + moduł + Gen. (of module) + + + + + + + + + + + + + + + + + + + + + + + + + Short of seconds. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Zdolności + + + + + + Zaczęto automatyczne tłumaczenie wiadomości na tym kanale. Wiadomości użytkowników będą automatycznie usuwane. + + + + + + + + + Zaczęto automatyczne tłumaczenie wiadomości na tym kanale. + + + Zakończono automatyczne tłumaczenie wiadomości na tym kanale. + + + + + + Nieznaleziono tej karty. + + + fakt + + + Rozdziały + + + + + + + + + + + + + + + + + + Zakończony + + + + + + + + + Data + + + + + + + + + Odcinki + + + Wystąpił błąd. + + + Przykład + + + Wyszukiwanie tego animu nie powiodło się. + + + Wyszukiwanie mango nie powiodło się. + + + Gatunki + + + + + + Wysokość/szerokość + + + + + + Wilgotność + + + + + + Wyszukiwanie tego filmu nie powiodło się. + + + + + + Żarty nie zostały załadowane. + + + + + + Poziom + + + + Don't translate {0}place + + + + + + Magiczne przedmioty nie zostały załadowane. + + + MAL użytkownika {0} + + + + + + + + + + + + Brak rezultatów. + + + + + + + + + + + + + + + + + + + + + + + + Platforma + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Skracanie tego url'u nie powiodło się + + + Skróć url + + + Coś poszło nie tak. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Wschód słońca + + + Zachód słońca + + + Temperatura + + + + + + 3 ulubione anime: + + + Tłumaczenie: + + + + + + + + + Url + + + + + + + + + + + + + + + Strona nie została znaleziona. + + + Szybkość wiatru + + + + + + + + + Dołączył + + + + /s and total need to be localized to fit the context - +`1.` + + + + + + + + + + + + ID bota + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Błąd + + + + + + ID + + + + + + + + + + + + + Invalid months value/ Invalid hours value + + + Dołączył do Discorda + + + Dołączył do serwera + + + + + + Nie znaleziono serwerów na tej stronie. + + + + + + Członkowie + + + Pamięć + + + Wiadomości + + + + + + Imię + + + Pseudonim + + + Nikt nie gra w tą grę. + + + + + + + + + + + + + + + Właściciel + + + ID właściciela + + + + + + {0} serwerów +{1} kanałów głosowych +{2} kanałów tekstowych + + + + + + + + + + + + + + + + + + + + + Region + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Wynik + + + Role + + + + + + + + + Kolory zostały podane w niepoprawnej formie. Użyj np. `#00ff00` + + + Zaczęto zmienianie kolorów dla roli {0} + + + Zakończono zmienianie kolorów dla roli {0} + + + + + + Informacje o serwerze + + + + + + + + + + + + + + + Nie znaleziono żadnych specjalnych emotikon + + + + + + Kanały głosowe + + + + + + + + + + Id of the user kwoth#1234 is 123123123123 + + + Użytkownicy + + + Kanały głosowe + + + Już dołączyłeś do tego wyścigu! + + + \ No newline at end of file diff --git a/src/NadekoBot/Resources/ResponseStrings.sv-SE.resx b/src/NadekoBot/Resources/ResponseStrings.sv-SE.resx new file mode 100644 index 00000000..a1b017d1 --- /dev/null +++ b/src/NadekoBot/Resources/ResponseStrings.sv-SE.resx @@ -0,0 +1,2275 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Denna bas är redan tagen eller förstörd. + + + Denna bas är redan förstörd. + + + Denna bas är inte tagen. + + + **FÖRSTÖRD** bas #{0} i krig mot {1} + + + {0} har **TAGIT BORT SITT ANSPRÅK PÅ** bas #{1} i krig mot {2} + + + {0} har gjort anspråk på en bas #{1} i ett krig mot {2} + + + @{0} Du har redan gjort anspråk på bas #{1}. Du kan inte göra ett anspråk på en ny bas. + + + Anspråk från @{0} för ett krig mot {1} har gått ut. + Fuzzy + + + Fiende + + + Information om krig mot {0} + + + Ogiltigt basnummer. + + + Ogiltig krigsstorlek. + Fuzzy + + + Lista Över Aktiva Krig + Fuzzy + + + Inte gjort anspråk på + + + Du är inte med i det kriget. + + + @{0} Du är antingen inte med i det kriget eller så är basen redan förstörd. + + + Inga aktiva krig. + Fuzzy + + + Storlek + + + Krig mot {0} har redan börjat. + + + Krig mot {0} skapat. + + + Krig mot {0} har tagit slut. + + + Det kriget existerar inte. + + + Krig mot {0} har börjat! + + + Alla anpassade emojis uppgifter borttagna. + + + Anpassad emoji har blivit raderad. + + + + Otillräckliga behörigheter. Kräver Bot ägande för globala anpassade reaktioner, och administratör för server anpassade reaktioner. + + + Lista av alla egengjorda reaktioner + + + Egengjorda Reaktioner + + + Nya egengjorda Reaktioner + + + Inga egnagjorde reaktioner hittades. + Fuzzy + + + Ingen egengjord reaktion funnen med det id. + + + svar + + + Egengjord reaktion statistiker. + + + Statistiker rensade för {0} egengjorda reaktioner. + + + Inga statistik för den triggern funnen, inget återgärd gjord. + + + Trigger. + + + Automatisk hentai stoppad. + + + Inga resultat hittades. + + + +{0} har redan svimmat + + + {0} har redan full hälsa + + + din typ är redan {0} + + + har använt {0}{1} på {2}{3} för {4} skada. + Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage. + + + Du kan inte attackera igen utan motståndarens drag! + + + du kan inte attackera dig själv + + + +{0} har svimmat! + + + helade {0} med en {1} + + + + {0} har {1} hälsa kvar + + + Du kan inte använda {0}. Skriv `{1}ml` för att se en lista av attacker du kan använda. + + + Attacker för {0} typer + + + Detta var inte så effektivt. + + + Du har inte nog {0} + + + återupplivade {0} med en {1} + + + Du återupplivade dig själv med en {0} + + + Din typ har blivit ändrad till {0} för en {1} + + + Det är någorlunda effektivt. + + + Det är super effektivt! + + + Du använde för många attacker på raken, så du kan inte attackera! + + + Typ av {0} är {1} + + + Användaren hittades inte. + + + Du svimmade, så du kan inte attackera! + + + **Auto tilldela roll** på användare som ansluter sig är nu **inaktiverad**. + + + **Auto tildela roll** på användare som ansluter sig är nu **aktiverad**. + + + Tillbehör + + + Avatar byttes + + + Du har blivit bannad från {0} server. anledning: {1} + + + bannad + PLURAL + + + Användare bannad + + + Bot namn byttes till {0} + + + Bot status byttes till {0} + + + Automastisk radering av avskeds meddelanden har blivit avaktiverat. + + + Avskeds meddelanden kommer bli raderade efter {0} sekunder. + + + Nuvarande avskeds meddelande: {0} + + + Aktivera avskeds meddelanden genom att skriva {0} + + + Nytt avskeds meddelande satt. + + + Avskeds meddelande inaktiverat. + + + Avskeds meddelanden aktiverad på denna kanal. + + + Kanal namn har byts. + + + Gammalt Namn + + + Kanal ämne har byts. + + + Städats upp. + + + Innehåll + + + Lyckats skapa roll {0} + + + Text kanal {0} skapad. + + + Röst kanal {0} skapad. + + + Dövning lyckats. + + + Raderad server {0} + + + Stoppad automatisk borttagning av lyckade kommando åkallanden. + + + Raderar nu lyckade kommando åkallanden. + + + Text kanal {0} raderad. + + + Röst kanal {0} raderad. + + + Meddelande från + + + Lyckats lägga till en ny donator. Totalt donerat från denna användare: {0} 👑 + + + Tack alla personer listade som har hjälpt oss skapa detta projekt! + + + Jag kommer skicka vidare meddelanden till alla ägare. + + + Jag kommer bara skicka vidare meddelanden till den första ägaren. + + + Jag kommer skicka vidare meddelanden från och med nu. + + + Jag kommer sluta skicka vidare meddelande från och med nu. + + + Automatisk radering av hälsnings meddelanden har blivit avaktiverat. + + + hälsnings meddelanden kommer bli raderade efter {0} sekunder + + + Nuvarande direkt meddelande hälsning: {0} + + + Aktivera hälsnings direkt meddelande genom att skriva {0} + + + Ny direkt meddenlande vid hälsning har gjorts. + + + Direkt meddelande för hälsning har avaktiverats. + + + Direkt meddelande för hälsning har aktiverats. + + + Nuvarande hälsning: {0} + + + Aktivera hälsning genom att skriva {0} + + + Ny hälsning skapad. + + + Hälsningar har blivit avaktiverade. + + + Hälsningar har blivit aktiverade på denna kanal. + + + Du kan inte använda detta kommando på användare med högre eller likastående rank till din egna enligt rankerna. + + + Bilder laddade efter {0} sekunder! + + + Ogiltig inmatnings format. + + + Ogiltiga parametrar. + + + {0} har gått med {1} + + + Du har blivit kickad från {0} server. +Anledning: {1} + + + Användare sparkad + Fuzzy + + + Lista av språk +{0} + Fuzzy + + + Din servers lokal är nu {0} -{ 1} + + + Bottens standard lokal är nu {0} - {1} + + + Bottens språk är nu gjord till {0} - {1} + + + Misslyckades att ställa lokal. Se över kommandots hjälp. + + + Denna servers språk är nu gjord till {0} - {1} + + + {0} har lämnat {1} + + + Lämnat server {0} + + + Loggar {0} händelser i denna kanal. + + + Loggar alla händelser i denna kanal. + + + Loggning avaktiverad. + + + Loggade event du kan prenumerera till: + + + Loggning kommer ignorera {0} + + + Loggning kommer inte ignorera {0} + + + Stoppade loggning {0} händelser. + + + {0} har åkallat ett omnämnande på följande roller + + + Meddelande från {0} `[Bot Ägare]`: + + + Meddelande skickat. + + + {0} flyttad från {1] till {2} + + + Meddelande Raderat i #{0} + Fuzzy + + + Meddelande Uppdaterat i #{0} + Fuzzy + + + Mutade + PLURAL (users have been muted) + + + Mutad + singular "User muted." + + + Jag har sannolikt inte de flesta tillstånd för detta. + + + Ny mute roll gjord. + + + Jag behöver **Administration** tillåtelse för att göra det där. + + + Nytt Meddelande + Fuzzy + + + Nytt Smeknamn + Fuzzy + + + Nytt Ämne + Fuzzy + + + Smeknamn Ändrat + Fuzzy + + + Kan inte hitta den servern + + + Ingen shard med den ID funnen + + + Gammalt Meddelande + Fuzzy + + + Gammalt Smeknamn + Fuzzy + + + Gammalt Ämne + Fuzzy + + + Fel. Troligtvis så har jag inte tillräcklig behörighet. + + + Tillstånd för denna server har blivit återställt. + + + Aktiva Skydd + Fuzzy + + + {0} har blivit **avaktiverat** på denna server. + + + {0} Aktiverad + + + Fel. Jag behöver tillstånd att hantera roller. + + + + + Inga skydd är aktiverade. + Fuzzy + + + Användar + + + Om {0} eller mer användare går med inom {1} sekunder, kommer jag {2} dom. + + + Tiden måste vara inom {0} och {1} sekunder. + + + Lyckats ta bort alla roller från användare {0} + + + Misslyckades att ta bort roller. Jag har inte nog med behörighet. + + + Färger av {0} roll har blivit ändrad. + + + Den rollen existerar inte. + + + Dom angivna parametrarna är ogiltiga. + + + Ett fel uppstod på grund av ogiltig färg eller otillräckliga behörigheter. + + + Lyckats ta bort roll {0} från användare {1} + + + Misslyckades att ta bort roll. Jag har inte tillräckligt med behörighet. + + + Roll omdöpt. + + + Det gick inte att byta namn på roll. Jag har inte tillräckligt behörighet. + + + Du kan inte redigera roller högre än din högsta roll. + + + Tog bort spelande meddelande: {0} + + + Roll {0} har blivit tillagd till listan. + + + {0} inte funnen. Städar upp. + + + Roll {0} finns redan i listan. + + + Tillagd. + + + Rotering av spelar status avaktiverad. + + + Rotering av spelar status aktiverad. + + + Här är en lista av roterande statusar: +{0} + + + Inga roterande spel statusar aktiverade. + + + Du har redan {0} roll. + + + Du har redan {0} exklusiv egentilldelad roll + + + Egentilldelade roller är nu exklusiva! + + + Det finns {0} egentilldelade roller + + + Den rollen är inte möjlig att egentilldela. + + + Du har inte {0} roll. + + + Egentilldelade roller är nu inte exklusiva! + + + Jag är oförmögen att lägga den rollen för dig. 'Jag kan inte lägga till roller till ägare eller andra roller högre än min roll i roll hierarkin.` + + + + + {0} har tagits bort från listan av egentilldelade roller. + + + Du har inte längre {0} roll. + + + Du har nu {0} roll. + + + Lyckats lägga till roll {0} till användare {1} + + + Misslyckades att lägga till roll. Jag har inte nog behörighet. + + + Ny avatar satt! + + + Nytt kanal namn satt. + + + Nytt spel satt! + + + Nytt stream satt! + + + Nytt kanal ämne satt! + + + Shard {0} har återansluts. + + + Shard {0} håller på att återansluta. + + + Stänger ner. + + + Användare kan inte skicka mer än {0} meddelanden varje {1} sekunder. + + + Långsamt läge avaktiverat. + + + Långsamt läge initierad + + + mjukt-bannad (kickad) + PLURAL + + + {0} kommer ignorera denna kanal. + + + {0} kommer inte längre att ignorera denna kanal. + + + Om en användare skriver {0} samma meddelanden på en gång so kommer jag {1} dom. +__IgnoreradeKannaler_: {2} + + + Text kanal skapad + Fuzzy + + + Text kanal förstörd␣ + Fuzzy + + + Borttagning av dövning lyckats. + + + Omutad + singular + + + Användarnamn + + + Användarnamn ändrats + Fuzzy + + + Användare + + + Användare Bannad + Fuzzy + + + {0} har blivit **mutad** från att chatta. + + + {0} har blivit **omutad** från att chatta. + + + Användare har gått med. + Fuzzy + + + Användare har lämnat. + Fuzzy + + + {0} har blivit **mutad** från text och röst kanal. + + + Användarens roll har blivit tillagd. + Fuzzy + + + Användarens roll har blivit borttagen. + Fuzzy + + + {0} är nu {1} + + + {0} har nu blivit **omutad** från text och röst kanal. + + + {0} har gått med {1} röst kanal. + + + {0} har lämnat {1} röst kanal. + + + {0} flyttade från {1} till {2} röst kanal. + + + {0} har blivit **röst mutad**. + + + {0} har blivit **röst omutad**- + + + Röst Kanal Skapad + Fuzzy + + + Röst Kanal Förstörd + Fuzzy + + + Avaktiverat röst + text funktion. + + + Aktiverat röst + text funktion. + + + Jag har inte **hantera roller** och / eller **hantera kanaler** tillstånd, så jag kan inte köra `röst + text` på {0} server. + + + Du aktiverar / inaktiverar funktionen och **Jag har inte administratörsbehörighet**. Detta kan orsaka vissa problem, och du kommer själv att behöva städa upp textkanaler efteråt. + + + Jag behöver minst **hantera roller** och **hantera kanaler** behörighet att aktivera den här funktionen. (Föredrar Administration tillåtelse) + + + Användare {0} från text chat + + + Användare {0} från text och röst chat. + + + Användare {0} från röst kanal + + + Du har blivit mjuk-bannad från {0} server. +Anledning: {1} + + + Användare inte längre bannad. + Fuzzy + + + Migration gjort! + + + Fel vid migrering, kontrollera botens konsol för mer information. + + + Närvaro Uppdateringar. + Fuzzy + + + Användare mjuk-bannad. + Fuzzy + + + har tilldelat {0} till {1} + + + Bättre lycka nästa gång ^_^ + + + Grattis! Du vann {0} för att ha rullat över {1} + + + Kortlek omblandat. + + + Vänt {0}. + User flipped tails. + + + Du gissade rätt! Du vann {0} + + + Ogiltigt nummer anged. Du kan vända 1 till {0} mynt. + + + Lägg till {0} reaktion till detta meddelande för att få {1}␣ + + + Denna händelse är aktiv upptill {0} timmar. + + + Blomm reaktions händelse igång! + + + har begåvat {0} till {1} + X has gifted 15 flowers to Y + + + {0} har {1} + X has Y flowers + + + Krona + Fuzzy + + + Topplista + + + Tilldelat {0} till {1} ​​användare från {2} roll. + + + Du kan inte satsa mer än {0} + + + Du kan inte satsa mindre än {0} + + + Du har inte nog med {0} + + + Inga fler kort i kortleken. + + + Lotto användare + Fuzzy + + + Du rullade {0} + + + Satsa + + + WOAAHHHHHH!!! Grattis!!! x{0} + + + En enda {0}, x {1} + + + Wow! Tur! Tre av en sort! x {0} + + + Bra jobbat! Två {0} - insats x {1} + + + Vann + + + Användare måste ange en hemlig kod för att få {0}. +Varar {1} sekunder. Berätta inte för någon. Shhh. + + + Hemlig spel händelse har tagit slut. {0} användare fick belöningen. + + + Hemlig spel status händelse har börjat + + + Klave + Fuzzy + + + Lyckats ta {0} från {1} + + + Lyckades inte ta {0} från {1} för att användaren inte har så mycket {2}! + + + Tillback till ToC + + + Bara Bot ägare + Fuzzy + + + Kräver {0} kanal tillstånd. + + + Du kan stödja projektet på patreon: <{0}> eööer paypal: <{1}> + + + Kommando och alias + Fuzzy + + + Kommando lista regenereras. + + + Skriv `{0}h CommandName` för att se hjälp för det specifika kommandot. t.ex. `{0}h >8ball` + + + Jag kan inte hitta det kommandot. Var snäll och verifiera om det kommandot existerar innan du provar igen. + + + Beskrivning + + + Du kan stödja NadekoBot projektet på +Patreon <{0}> eller +Paypal <{1}> +Glömm inte att lämna ditt discord namn eller id i meddelandet. + +**Tack så mycket** ♥️ + + + **Lista av kommandon**. <{0}> +**Värd guider och dokument kan bli hittade här*': <{1}> + Fuzzy + + + Kommandolista + Fuzzy + + + Modullista + Fuzzy + + + Skriv `{0}cmds ModuleName` för att få en lista av kommandon i den modulen. t.ex. `{0}cmds games` + + + Modulen existerar inte. + + + Kräver {0} server tillåtelse. + + + Innehållsförteckning + Fuzzy + + + Användning + + + Auto hentai startad. Svarar varje {0}s med en av följande taggar: +{1} + + + Tagg + + + Djur Lopp + Fuzzy + + + Det gick inte att starta eftersom det inte fanns tillräckligt många deltagare. + + + Loppet är full! Startar omedelbart. + + + {0} gick med som en {1} + + + {0} gick med som en {1} och satsa {2}! + + + Skriv {0}jr för att ansluta dig till loppet. + + + Börjar från inom 20 sekunder eller när rummet är fullt. + + + Startar från och med {0} deltagare. + + + {0} som {1} Vann loppet! + + + {0} som {1} Vann loppet och {2}! + + + Ogiltigt nummer specificerat. Du kan rulla {0}-{1} tärningar på en gång. + + + rullade {0} + Someone rolled 35 + + + Tärningar rullade: {0} + Dice Rolled: 5 + + + Misslyckades att starta loppet. Ett annat lopp är förmodligen igång. + + + Inget lopp finns på denna server + + + Andra numret måste vara större än den första. + + + Ändring av hjärta + Fuzzy + + + Anspråk av + Fuzzy + + + Skilsmässor + + + Gillar + + + Pris + + + Inga waifus har blivit tagna hittls. + + + Top Waifus + + + din affinitet är redan inställd på den waifun eller så försöker du att ta bort din affinitet utan att ha en. + + + ändrat sin affinitet från {0} till {1}. + +* Detta är moraliskt tveksamt. * 🤔 + Make sure to get the formatting right, and leave the thinking emoji + + + Du måste vänta {0} timmar och {1} minuter för att byta affinitet igen. + + + Din affinitet återställs. Du har inte en person som du gillar längre. + + + vill vara {0}s waifu. Aww <3 + + + har tagit {0} som deras waifu för {1}! + + + Du har skilt dig från en waifu som gillar dig. Ditt hjärtlösa monster. +{0} har fått {1} som kompensation. + + + du kan inte ställa affinitet till dig själv, din egoist. + + + 🎉 Deras kärlek är uppfyllt! 🎉 +{0} s nya värdet är {1}! + + + Ingen waifu är så billig. Du måste betala minst {0} för att få en waifu, även om deras riktiga värde är lägre. + + + Du måste betala {0} eller mer för att ta den waifun! + + + Denna waifun är inte din. + + + Du kan inte göra anspråk på sig själv. + + + Du blev frånskild nyligen. Du måste vänta {0} timmar och {1} minuter att skilja sig igen. + + + Ingen + + + Du har frånskild en waifu som inte gillar dig. Du har fått {0} tillbaka. + + + 8boll + + + Acrophobia + + + Spelet slutade utan några synpunkter. + + + Inga röster. Spelet slutade med ingen vinnare. + + + Acronym var {0}. + + + Acrophobia spel är redan igång i denna kanal. + + + Spelet började. Skapa en mening med följande akronym: {0}. + + + Du har {0} sekunder för att göra en inlaga. + + + {0} lämnat sitt straff. ({1} totalt) + + + Rösta genom att skriva ett number av det du inlämnar + + + {0} lägger sin röst! + + + Vinnaren är {0} med {1} poäng. + + + {0} är vinnaren för att vara den enda användaren som gjorde ett förslag! + + + Fråga + + + Det är lika! Båda valde {0} + + + {0} vann! {1} slår {2} + + + Förslag Stängda + Fuzzy + + + Djur lopp körs redan. + + + Totalt: {0} Genomsnitt: {1} + + + Kategori + + + Avaktiverade cleverbot på denna server. + + + Aktiverat cleverbot på denna server. + + + Valuta skapande har inaktiverats på denna kanal. + + + Valuta skapande har aktiverats på denna kanal. + + + {0} slumpmässig {1} dök up! Plocka upp genom att skriva `{2} pick` + plural + + + En slumpmässig {0} dök upp! Plocka upp genom att skriva `{1} pick` + + + Misslyckades ladda en fråga. + + + Spel börjat + Fuzzy + + + Hänga gubbe har börjat + + + Hänga gubbe spelas redan i denna kanal. + + + Startar hänga gubbe errored. + + + Lista över "{0} hängagubbe" term typer: + + + Ledartavla + + + Du har inte nog med {0} + + + Inga resultat + + + plockade {0} + Kwoth picked 5* + + + {0} planterade {1} + Kwoth planted 5* + + + Trivia spel pågår redan i denna server. + + + Trivia spel + + + {0} gissade rätt! Svaret var: {1} + + + Inget trivia spel pågår just nu. + + + {0} har {1} poäng + + + Stoppar efter denna fråga. + + + Tiden är slut! Det korrekta svaret var {0} + + + {0} gissade rätt och VANN spelet! Svaret var: {1} + + + Du kan inte spela mot dig själv. + + + Tre I Rad spelet pågår redan i denna kanal. + + + Oavgjort! + + + har skapat ett spel av Tre I Rad. + + + {0} har Vunnit! + Fuzzy + + + Matchade Tre + Fuzzy + + + Inga drag kvar! + + + Tiden är Slut! + Fuzzy + + + {0}s drag + + + {0} mot {1} + + + Försöker köa {0} låtar... + + + Auto spelning avaktiverad. + + + Auto spelning aktiverad. + + + Standard volym satt till {0}% + + + Katalog kö komplett. + + + rent spel + + + Sång Avslutad + Fuzzy + + + Rent spel avaktiverat + + + Rent spel aktiverat + + + Från position + + + Id + + + Ogiltig inmatning. + + + Max speltid har ingen gräns nu. + + + Max speltid satt till {0} sekund(er). + + + Max musik köns storleken inställd på obegränsad. + + + Max musik köns storleken inställd på {0} spår. + + + Du måste vara i röst kanalen på den här servern. + + + Namn + + + Nu Spelas + Fuzzy + + + Ingen aktiv musikspelare. + + + Inga sök resultat. + + + Musikuppspelning pausas. + + + Spelar Kö - Sida {0}/{1} + Fuzzy + + + Spelar låt + Fuzzy + + + `#{0}` - **{1}** by *{2}* ({3} låtar) + + + Sida {0} av Sparade Spellistor + Fuzzy + + + Spelllista borttagen. + + + Kunde ej ta bort den låtlistan. Antingen finns den ej eller så är det inte du som skapat den. + + + Spellista med det ID existerar inte. + + + Spellista komplett. + + + Spellista Sparad + Fuzzy + + + {0}s gräns + + + Kö + + + Köad sång + Fuzzy + + + Musik kön rensad. + + + Kön är full på {0}/{0}. + + + Tog bort låt + context: "removed song #5" + + + Repeterar Nuvarande Låt + Fuzzy + + + Repeterar Spellistan + Fuzzy + + + Repeterar Låt + Fuzzy + + + Nuvarande låt repetering stoppad. + + + Musikuppspelning återupptas. + + + Upprepning av spellista inaktiverad. + + + Upprepning av spellista aktiverad. + + + Jag kommer nu att utgångs spela, färdig pausad och borttagna låtar i denna kanal. + + + Skippat till `{0}:{1}` + + + Sånger blandade. + Fuzzy + + + Sång flyttad + Fuzzy + + + {0}h {1}m {2}s + + + Till position + + + obegränsad + + + Volym måste vara mellan 0 och 100 + + + Volym satt till {0}% + + + Avaktiverat användning av alla MODULER på kanalen {0}. + + + Aktiverat användning av alla MODULER på kanalen {0}. + + + Tillåtet + + + Avaktiverat användning av alla MODULER för roll {0}. + + + Aktiverat användning av alla MODULER för roll {0}. + + + Avaktiverat användning av alla MODULER på denna server. + + + Aktiverat användning av alla MODULER på denna server. + + + Avaktiverat användning av alla MODULER för användare {0}. + + + Aktiverat användning av alla MODULER för användare {0}. + + + Svartlistat {0} med ID {1} + + + Kommando {0} har nu {1}s väntetid. + + + Kommando {0} har nu ingen väntetid och alla existerande väntetider har blivit rensade. + + + Inga kommando väntetider satta. + + + Kommando kostar + + + Avaktiverade användning av {0} {1} på kanal {2}. + + + Aktiverade användning av {0} {1} på kanal {2}. + + + Nekad + + + La till ordet {0} till listan över filtrerade ord. + + + Lista av filtrerade ord + + + Tog bort ord {0} från listan av filtrerade ord. + + + Ogiltig andra parameter.(Måste vara ett nummer mellan {0} och {1}) + + + Inbjuds filtrering avaktiverad på denna kanal. + + + Inbjuds filtrering aktiverad på denna kanal. + + + Inbjuds filtrering avaktiverad på denna server. + + + Inbjuds filtrering aktiverad på denna server. + + + Flyttade behörighet {0} från #{1} till #{2} + + + Kan inte kitta behörighet på index #{0} + + + Inga kostnader satta. + + + kommando + Gen (of command) + + + modul + Gen. (of module) + + + Behörighets sida {0} + + + Nuvarade behörighets roll är {0} + + + Användare behöver nu {0} rollen för att kunna ändra behörigheter. + + + Inga behörigheter funna i den indexen. + + + Tog bort behörighet #{0} - {1} + + + Avaktiverat användning av {0} {1} för {2} rollen. + + + Aktiverat användning av {0} {1} för {2} rollen. + + + sek. + Short of seconds. + + + Avaktiverat användning av {0} {1} på denna server. + + + Aktiverat användning av {0} {1} på denna server. + + + Togbort {0} från svartlistan med ID {1} + + + oredigerbar + + + Avaktiverat användning av {0} {1} för {2} användare. + + + Aktiverat användning av {0} {1} för {2} användare. + + + Jag kommer inte länga visa behörighets varningar. + + + Jag kommer nu visa behörighets varningar. + + + Ord filtrering avaktiverat i denna kanal. + + + Ord filtrering aktiverat i denna kanal. + + + Ord filtrering avaktiverat på denna server. + + + Ord filtrering aktiverat på denna server. + + + Förmågor + + + Ingen favoritanime än + + + Började automatisk översättning av meddelanden på denna kanal. Användarmeddelanden kommer att automatiskt tas bort. + + + ditt automatiska översätta-språk har tagits bort. + + + ditt automatiska översätta-språk har blivit satt till {0}>{1} + + + Började automatisk översättning av meddelanden på denna kanal. + + + Stoppat automatisk översättning av meddelanden på denna kanal. + + + Dålig inmatnings format, eller så gick något fel. + + + Kunde ej hitta det kortet. + + + fakta + + + Kapitel + + + Serie # + + + Kompetitiva Förluster + Fuzzy + + + Kompetitiva Spelade + Enbart kompetitiva eller kompetitiva matcher? :thinking: +Fuzzy + + + Kompetitiv Rank + Fuzzy + + + Kompetitiva Vinster + + + Avslutade + + + Kondition + + + Kostnad + + + Datum + + + Definera: + + + Övergivna + Fuzzy + + + Avsnitt + + + Ett fel inträffade. + + + Exempel + + + Kunde ej hitta den animun. + + + Kunde ej hitta den mangon. + Fuzzy + + + Genres + + + Misslyckades att hitta en definition för den taggen. + + + Längd/Vikt + + + {0}m/{1}kg + + + Fuktighet + + + Bild Sökning För: + Fuzzy + + + Kunde ej hitta den filmen. + + + Ogiltig källa eller mål språk. + + + Skämt ej laddade. + + + Lat/Long + + + Nivå + + + Lista av {0} plats taggar + Don't translate {0}place + + + Plats + + + Magiska föremål inte laddade. + + + {0}:s MAL profil + Fuzzy + + + Bot ägare specificerade inte MashapeApiKey. Du kan inte använda den här funktionen. + + + Min/Max + + + Inga kanaler hittades. + + + Inga resultat hittades. + + + Placerad i kö + + + Original url + + + En osu! API nyckel krävs. + + + Misslyckades att hämta osu! signatur. + + + Hittade över {0} bilder. Visar slumpmässig {0}. + + + Användare inte funnen! Snälla kolla Regionen och BattleTag innan du försöker igen. + + + Planerar att kolla + + + Plattform + + + Ingen förmåga hittad. + + + Ingen pokemon funnen. + + + Profil link: + + + Kvalitet: + + + Snabb speltid + + + Snabba vinster + Fuzzy + + + Betyg + + + Poäng: + + + Leta efter: + Fuzzy + + + Misslyckades att förkorta den url. + + + Kort utl + + + Något gick fel. + + + Var snäll och specificera sök parametrar. + + + Status + + + Butik url + + + Streamer {0} är offline. + + + Streamer {0} är online med {1} tittare. + + + Du följer {0} streams på denna server. + + + Du följer inga streams på denna server. + + + Finns ingen sådan stream. + + + Stream existerar förmodligen inte. + + + Tog bort {0}'s stream från notifikationer. + + + Jag kommer notifikera denna kanal när status ändras. + + + Soluppgång + + + Solnedgång + + + Temperatur + + + Titel: + + + Top 3 favorit anime: + + + Översättning: + + + Typer + + + Misslyckades att hitta definitionen för den termen. + + + Url + + + Tittare + + + Tittar + + + Misslyckades att hitta term på den specificerade wikia. + + + Snälla skriv en wikia, följd av sökfråga. + + + Sidan kunde ej hittas. + + + vindhastighet + + + De {0} mest bannade mästare + + + Misslyckades att yodifiera din mening. + + + Gick med + + + `{0}.` {1} [{2:F2}/s] - {3} total + /s and total need to be localized to fit the context - +`1.` + + + Aktivitets sida #{0} + + + {0} användare totalt. + + + Författare + + + Bot ID + + + Lista av funktioner i {0}calc kommando + + + Kanalens {0} är {1} + + + Kanal ämne + + + Kommandon Körda + Fuzzy + + + {0} {1} är samma som {2} {3} + + + Enheter som kan användas av konverteraren + + + Kan inte konvertera {0} till {1}: enheter inte funna. + + + Kan inte konvertera {0} till {1}: typer av enheter är inte lika värda. + + + Skapad vid + + + Gå med kanal för att prata över servrar. + + + Lämnade kanal för att prata över servrar. + + + Detta är din CSC token + + + Egengjorda emojis + + + Fel + + + Funktioner + + + ID + + + Index utom räckhåll + + + Här är en lista av användare i dom rollerna: + + + Du är inte tillåten att använda detta kommando på roller med många användare i dem för att förhindra missbruk. + + + Ogiltigt {0} värde. + Invalid months value/ Invalid hours value + + + Gick med Discord + + + Gick med Server + Fuzzy + + + ID: {0} +Medlemmar: {1} +ÄgarID: {2} + Fuzzy + + + Inga servrar funna på den sidan. + + + List över repeterare + + + Medlemmar + + + Minne + + + Meddelanden + + + Meddelande repeterare + + + Namn + + + Smeknamn + + + Ingen spelar det spelet. + + + Inga aktiva repeterare. + + + Inga roller på denna sida. + + + Inga shards på denna sida. + + + Inget ämne satt + + + Ägare + + + Ägar IDs + + + Närvaro + + + {0} Servrar +{1} Textkanaler +{2} Röstkanaler + + + Tog bort alla citat med nyckelordet {0}. + + + Sida {0} av citat + + + Inga citat på denna sida. + + + Inga citat hittades som du kan ta bort. + + + Citat tillagt + + + Tog bort ett slumpvalt citat. + + + Region + + + Registrerad på + + + Jag kommer påminna {0} att {1} om {2} `({3:d.M.yyyy.} klockan {4:HH:mm})` + + + Inte en giltig tids format. Kolla kommandolistan. + + + Ny påminnelse mall satt. + + + Repeterar {0} varje {1} dag(ar), {2} timme(ar) and {3} minut(er). + + + Lista av repeterare + + + Ingen repeterare körs på denna server. + + + #{0} slutade. + + + Inga repeterande medelanden funna på denna server. + + + Resultat + + + Roller + + + Sida #{0} av roller på denna server: + + + Sida #{0} av roller för {1} + + + Inga färger använder rätt format. Använd `#00ff00` som exempel. + + + Började rotera {0} rollens färger. + + + Slutade rotera färger för {0} rollen + + + Denna servers {0} är {1} + + + Server Information + Fuzzy + + + Shard + + + Shard status + + + Shard **#{0}** är i {1} status med {2} servers + + + **Namn:** {0} **Länk:** {1} + + + Inga special emojis funna. + + + Spelar {0} låtar, {1} köad. + + + Textkanaler + Fuzzy + + + Här är länken till ditt rum: + + + Upptid + + + {0} av användare {1} är {2} + Id of the user kwoth#1234 is 123123123123 + + + Användare + + + Röstkanaler + Fuzzy + + + Du har redan gått med detta lopp! + + + \ No newline at end of file diff --git a/src/NadekoBot/Resources/ResponseStrings.tr-TR.resx b/src/NadekoBot/Resources/ResponseStrings.tr-TR.resx new file mode 100644 index 00000000..9a4ed57f --- /dev/null +++ b/src/NadekoBot/Resources/ResponseStrings.tr-TR.resx @@ -0,0 +1,2179 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + Düşman + + + + + + Hatalı köy numarası. + + + Savaş büyüklüğü geçerli değil. + + + Aktif olan savaşlar + + + Hak idda edilmedi. + Fuzzy + + + Bu savaşa katılmadınız. + + + @{0} Bu savaşa katılmadınız veya köyünüz yok edildi. + + + Aktif olan savaş yok. + + + Büyüklük + + + {0} İle olan savaş başladı. + + + {0} İle Savaş çıkardın. + + + {0} İle Olan savaş sona erdi. + + + Böyle bir savaş bulunamadı. + + + {0} İle olan savaş başladı. + + + Tüm özel reaksiyonlar temizlendi. + Fuzzy + + + Özel reaksiyonlar silindi. + Fuzzy + + + Yetersiz yetki.Global özel reaksiyonlar için bot sahibi yetkisi gerkirken, server tabanlı özel reaksiyonlar için Administrator yetkisi gerekir. + + + Tüm özel reaksiyonların listesi + + + Özel reaksiyonlar + + + Yeni özel reaksiyon + + + Böyle bir özel reaksiyon bulunamadı. + + + Bu id'ye sahip bir özel reaksiyon bulunamadı. + + + Cevap. + + + Özel reaksiyon istatistikleri + + + {0} özel reaksiyonun istatistikleri temizlendi. + + + + + + Tetiklendi. + Fuzzy + + + Autohentai durduruldu. + + + + + + + + + + + + + + + + Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Kullanıcı girişinde otomatik rol tanımlaması devre dışı. + + + Kullanıcı girişinde otomatik rol tanımlaması devrede. + + + Eklentiler + + + Profil fotoğrafı değiştirildi. + + + {0} sunucusundan uzaklaştırıldınız. +Sebep: {1} + + + uzaklaştırıldı + PLURAL + + + Kullanıcı Uzaklaştırıldı + + + Bot ismi {0} ile değiştirildi. + + + Bot durum mesajı {0} ile değiştirildi. + + + Çıkış mesajlarının otomatik silinmesi devre dışı bırakıldı. + + + Çıkış mesajları {0} saniye sonra silinecektir. + + + Şu anki çıkış mesajı: {0} + + + {0} yazarak çıkış mesajlarını etkinleştirin. + + + Yeni çıkış mesajı tanımlandı. + + + Çıkış duyuruları devre dışı. + + + Çıkış duyuruları bu kanalda devreye sokuldu. + + + Kanal İsmi Değişti + + + Eski İsim + + + Kanal Konusu Değişti + + + Temizlendi. + + + İçerik + + + {0} rolü başarıyla yaratıldı. + + + {0} yazı kanalı yaratıldı. + + + {0} ses kanalı yaratıldı. + + + Sağırlaştırma başarılı. + + + {0} sunucusu silindi. + + + Başarılı komut bildirimlerinin otomatik silinmesi durduruldu. + + + Artık başarılı komut bildirimleri siliniyor. + + + {0} yazı kanalı silindi. + + + {0} ses kanalı silindi. + + + Bu kullanıcıdan özel mesaj geldi: + + + Başarıyla yeni bağışçı eklendi. Bu kullanıcının bağışladığı toplam miktar: {0} 👑 + + + Aşağıda ismi bulunan kişilerin bu projeyi gerçekleşmesini sağladıkları için teşekkürler. + + + Özel mesajları bütün sahiplere ileteceğim. + + + Özel mesajları sadece ilk sahibe ileteceğim. + + + Özel mesajları iletmeye başlayacağım. + + + Özel mesajları iletmeyi bırakacağım. + + + Karşılama mesajlarının otomatik silinmesi devre dışı bırakıldı. + + + Karşılama mesajları {0} saniye sonra silinecektir. + + + Şu anki özelden karşılama mesajı: {0} + + + {0} yazarak özelden karşılama mesajlarını aktif edebilirsiniz. + + + Yeni özelden karşılama mesajı tanımlandı. + + + Özel mesajdan karşılama duyuruları devre dışı. + + + Özel mesajdan karşılama duyuruları devrede. + + + Şu anki karşılama mesajı: {0} + + + {0} yazarak karşılama mesajlarını aktif et. + + + Yeni karşılama mesajı tanımlandı. + + + Karşılama duyuruları devre dışı. + + + Karşılama duyuruları bu kanalda aktif edildi. + + + Bu komutu senin dengin veya üstlerin üstünde kullanamazsın. + + + Resimler {0} saniye sonra yüklendi. + + + Geçersiz giriş biçimi. + + + Geçersiz parametreler. + + + {0} {1}'e katıldı. + + + {0} sunucusundan atıldınız. +Sebep: {1} + + + Kullanıcı Atıldı + Fuzzy + + + Dil Listesi +{0} + Fuzzy + + + Sunucunuzun dili değiştirildi: {0} - {1} + + + Bot varsayılan dili değiştirildi: {0} - {1} + + + Bot dili değiştirildi: {0} - {1} + + + Yerel ayarlar değiştirilemedi. Komutun kılavuzuna bakın. + + + Sunucunun dili değiştirildi: {0} - {1} + + + {0} {1}'den ayrıldı. + + + Sunucudan çıkıldı: {0} + + + Bu kanaldaki {0} olayları kayıt ediliyor. + + + Bu kanaldaki bütün olaylar kayıt ediliyor. + + + Kayıtlar devre dışı. + + + Abone olabileceğiniz olaylar: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLURAL (users have been muted) + + + + singular "User muted." + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLURAL + + + + + + + + + + + + + + + + + + + + + + singular + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + User flipped tails. + + + + + + + + + + + + + + + + + + + X has gifted 15 flowers to Y + + + + X has Y flowers + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Someone rolled 35 + + + + Dice Rolled: 5 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Make sure to get the formatting right, and leave the thinking emoji + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + plural + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Kwoth picked 5* + + + + Kwoth planted 5* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + context: "removed song #5" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Gen (of command) + + + + Gen. (of module) + + + + + + + + + + + + + + + + + + + + + + + + + Short of seconds. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Don't translate {0}place + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /s and total need to be localized to fit the context - +`1.` + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Invalid months value/ Invalid hours value + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Id of the user kwoth#1234 is 123123123123 + + + + + + + + + + + + \ No newline at end of file diff --git a/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx b/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx new file mode 100644 index 00000000..3ab3c220 --- /dev/null +++ b/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx @@ -0,0 +1,2298 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 該基地已被佔領或摧毀。 + + + 該基地已摧毀。 + + + 該基地尚未佔領 + + + 在與 {1} 對戰時 **摧毀** 了基地 #{0} + + + {0} 在與 {2} 對戰時 **解放** 基地 #{1} + + + {0} 在與 {2} 對戰時 **佔領** 基地 #{1} + + + @{0} 您已佔領基地 #{1}。您不能再佔領一個新的。 + + + 在 @{0} 與 {1} 對戰後佔領的基地已失效。 + Fuzzy + + + 敵人 + + + 與 {0} 對戰的信息 + + + 無效的基地編號。 + + + 無效的戰爭大小。 + Fuzzy + + + 目前正在進行的戰爭 + Fuzzy + + + 未佔領 + + + 您並未参與此戰爭。 + + + @{0} 您並未参與此戰爭或此基地已被毁壞。 + + + 目前尚無戰爭進行中。 + Fuzzy + + + 大小 + + + 與 {0} 的戰爭已經開始了。 + + + 與 {0} 的戰爭已創建。 + + + 與 {0} 的戰爭已結束。 + + + 此戰爭不存在。 + + + 與 {0} 的戰爭已開始! + + + 所有自訂回應統計已刪除。 + To simplified chinese crew: You guys forgot about the "stats" + + + 自訂回應已刪除 + + + 權限不足。伺服器自訂回應需要管理員權限，而只有Bot擁有者才能設定全域自訂回應。 + + + 列出所有自訂回應 + + + 自訂回應 + + + 新自訂回應 + + + 沒有找到自訂回應 。 + Fuzzy + + + 找不到輸入的自訂回應編號。 + + + 回應 + + + 自訂回應統計 + + + 清除了 {0} 自訂回應的統計。 + + + 尚未觸發此回應，故無結果。 + + + 觸發 + + + Autohentai指令效果停止。 + Keep in mind Autohentai is the actual command name, avoid translating it. + + + 沒有结果。 + + + {0} 已昏厥。 + + + {0} HP已满。 + + + 您的屬性已是 {0} + + + 對 {2}{3} 使出 {0}{1} 而造成 {4} 點傷害。 + Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage. + + + 對方反擊前無法對他再次攻擊! + + + 您不能攻擊自己。 + + + {0} 已昏厥！ + + + 用了一個 {1} 醫好 {0} + + + {0} 還剩餘 {1} 生命值。 + + + 您不能使用 {0} 。請輸入 `{1}ml` 來查閱您能用的招式。 + + + {0} 屬性的招式列表 + + + 攻擊不太有效。 + + + 你並沒有足够的 {0} + + + 使用了一個 {1} 復活 {0} + + + 您使用了一個 {0} 復活了自己 + + + 您的屬性已從 {0} 變更成 {1} + + + 攻擊有點效果。 + + + 攻擊非常有效! + + + 您已連續使用太多招式，所以您無法行動！ + + + {0} 的屬性是 {1} + + + 該用戶不存在。 + + + 您已昏厥所以不能移動！ + + + **自動指派身分組**給新加入的成員**已停用**。 + + + **自動指派身分組**給新加入的成員**已啟用**。 + + + 附件 + + + 頭像更換成功。 + + + 你已被 {0} 伺服器封鎖。 +原因：{1} + + + 用戶已封鎖 + PLURAL + + + 用戶已封鎖 + + + Bot 暱稱已改為 {0} + + + Bot 狀態已改為 {0} + + + 自動刪除告別訊息功能已停用。 + + + 告別訊息將於 {0} 秒後刪除。 + + + 目前的告別訊息: {0} + + + 輸入 {0} 來啟用告別訊息 + + + 新的告別訊息已設定。 + + + 告別訊息已停用。 + + + 在這個頻道啟用告別訊息。 + + + 頻道名稱已更改 + + + 舊名 + + + 頻道主題已更改 + + + 清理完畢。 + + + 内容 + + + 成功創建身分組 {0} + + + 成功創建文字頻道 {0} + + + 成功創建語音頻道 {0} + + + 成功禁音 + + + 已刪除伺服器 {0} + + + 自動刪除已處理指令已停用 + + + 自動刪除已處理指令已啟用 + + + 成功刪除文字頻道 {0} + + + 成功刪除語音頻道 {0} + + + 私人訊息來自 + + + 成功新增了新的捐贈者。此用戶總共捐贈了：{0} + + + 感謝下列的人使這個項目繼續運作! + + + 我會將私人訊息轉發給所有擁有者。 + + + 我會將私人訊息轉發給第一個擁有者。 + + + 我將開始轉發私人訊息。 + + + 我將停止轉發私人訊息。 + + + 自動刪除歡迎訊息已停用。 + + + 歡迎訊息將於 {0} 秒後刪除。 + + + 目前的歡迎私訊：{0} + + + 輸入 {0} 來啟用歡迎私訊 + + + 新的歡迎私訊已設定。 + + + DM歡迎公告關閉。 + + + 私訊歡迎公告已啟用。 + + + 当前欢迎消息是：{0} + + + 输入{0}来启用欢迎消息 + + + 新欢迎消息设定成功。 + + + 欢迎公告关闭。 + + + 欢迎公告在此频道开启。 + + + 您不能对身份层次结构中身份高于或等于您的身份的用户使用此命令。 + + + {0} 秒後載入圖片！ + + + 格式輸入無效。 + + + 參數無效。 + + + {0} 已加入 {1} + + + 你已被從 {0} 伺服器踢出。 +原因：{1} + + + 用戶已被踢出 + Fuzzy + + + 語言列表 +{0} + Fuzzy + + + 您的服务器的语言设置现在为{0} - {1} + + + 机器人的默认语言环境现在是{0} - {1} + + + 机器人的语言设置为{0} - {1} + + + 设置语言设置失败。 重新访问此命令帮助。 + + + 此服务器的语言设置为{0} - {1} + + + {0}已离开{1} + + + 离开服务器{0} + + + 在此频道中记录{0}事件。 + + + 记录频道中所有事件 + + + 记录功能取消 + + + 您可以设定的记录项目： + + + 记录会忽略{0} + + + 记录不会忽略{0} + + + 已停止记录{0}事件。 + + + {0}已经提到了以下身份 + + + 来自{0}`[机器人主人]’的消息： + + + 消息已发. + + + {0}被移动由{1}到{2} + + + 在＃{0}中删除讯息 + Fuzzy + + + 讯息在＃{0}中被更新 + Fuzzy + + + 已静音 + PLURAL (users have been muted) + + + 已静音 + singular "User muted." + + + 权限不够执行此命令 + + + 新的静音角色设定成功。 + + + 我需要**管理**权限才能做那个。 + + + 新消息 + Fuzzy + + + 新昵称 + Fuzzy + + + 新主题 + Fuzzy + + + 昵称成功更换 + Fuzzy + + + 找不到该服务器 + + + 找不到具有该ID的分片。 + + + 旧信息 + Fuzzy + + + 旧昵称 + Fuzzy + + + 旧题目 + Fuzzy + + + 失败。很可能我没有足够的权限。 + + + 重置此服务器的权限。 + + + 主动保护 + Fuzzy + + + {0}已在此服务器禁用。 + + + {0}已启用。 + + + 失败。 我需要 ManageRoles 权限 + + + 未启用保护项目。 + Fuzzy + + + 用户阈值必须介于{0}和{1}之间。 + + + 如果{0}或更多用户在{1}秒内加入，我将{2}他们。 + + + 时间必须在{0}和{1}秒之间。 + + + 已成功从用户{0}中移除所有身份 + + + 无法移除身份。 我没有足够的权限。 + + + {0}身份的颜色已更改。 + + + 那个身份不存在。 + + + 指定的参数错误。 + + + 由于颜色无效或权限不足而发生错误。 + + + 已成功从用户{1}中删除身份{0} + + + 无法移除身份。 我没有足够的权限。 + + + 身份名已改 + + + 身份重命名失败。我的权限不足。 + + + 您不能编辑比你 + + + 已移除游玩消息：{0} + + + 身份{0}已添加到列表中。 + + + {0}未找到。已清理。 + + + 身份{0}已在列表中。 + + + 添加成功. + + + 旋转游玩状态关闭。 + + + 旋转游玩状态开启。 + + + 以下是旋转状态列表： +{0} + + + 未设置旋转游戏状态。 + + + 您已经拥有{0}身份。 + + + 您已拥有{0}独占的自行分配。 + + + 自行分配身份现在是独家！ + + + 有{0}个可自行分配身份 + + + 这个身份是不可自行分配的。 + + + 您没有{0}身份。 + + + 自我分配的身份现在不是独家的！ + + + 我无法向您添加该身份。 ‘我不能向身份层次结构中我身份以外的所有者或其他身份添加身份。’ + + + {0}已从可自我分配身份列表中删除。 + + + 您不再拥有{0}身份。 + + + 您现在拥有{0}身份。 + + + 已成功将身份{0}添加到用户{1} + + + 无法添加身份。 我没有足够的权限。 + + + 新头像集！ + + + 新频道名称设定。 + + + 新游戏设定！ + + + 新直播设定！ + + + 新频道主题集。 + + + 分段{0}已重新连接。 + + + 分段{0}重新连接中。 + + + 关闭中 + + + 用户不能在{1}秒内发送超过{0}条消息。 + + + 慢速模式关闭。 + + + 慢速模式启动 + + + 软禁（踢出） + PLURAL + + + {0}将忽略此通道。 + + + 0}将不再忽略此通道。 + + + 如果用户发布{0}个相同的消息，我会{1}他们。 +     __IgnoredChannels__：{2} + + + 新文字频道成立 + Fuzzy + + + 文字频道已删除 + Fuzzy + + + Undeafen成功。 + + + 已取消静音 + singular + + + 用户名 + + + 用户名已更改 + Fuzzy + + + 用户 + + + 用户被禁止 + Fuzzy + + + {0}已从聊天内被静音**。 + + + {0}已从聊天内**取消静音**。 + + + 用户已加入 + Fuzzy + + + 用户离开了 + Fuzzy + + + {0} 已被文字与语音静音了 + + + 用户身份添加成功 + Fuzzy + + + 用户身份移除了 + Fuzzy + + + {0} 改成了 {1} + + + {0}已从文字和语音频道中取消静音**。 + + + {0}已加入{1}语音通道。 + + + {0}已离开{1}语音通道。 + + + {0}已从{1}移至{2}语音通道。 + + + {0}已被**静音**。 + + + {0}已被**取消静音**。 + + + 语音频道已创建 + Fuzzy + + + 语音通道已被毁 + Fuzzy + + + 已停用语音+文字功能。 + + + 启用语音+文字功能。 + + + 我没有**管理身份**和/或**管理频道**权限，所以我不能在{0}服务器上运行`语音+文字`。 + + + 您正在启用/禁用此功能，并且**我没有ADMINISTRATOR权限**。 这可能会导致一些问题，您必须自己清理文本频道。 + + + 我需要至少**管理身份**和**管理频道**权限，以启用此功能。 （优先管理权限） + + + 用户{0}来自文字频道 + + + 用户{0}来自文字和语音频道 + + + 用户{0}来自语音频道 + + + 您已从{0}服务器软禁止。 +原因：{1} + + + 用户已取消禁止 + Fuzzy + + + 迁移完成！ + + + 在迁移时出错，请检查机器人的控制台以获取更多信息。 + + + 在线状态更新 + Fuzzy + + + 用户被软禁用 + Fuzzy + + + 已将{0}奖励给{1} + + + 下一次好运^ _ ^ + + + 恭喜！ 您赢得{0}因为您滚{1}或以上 + + + 卡牌改组。 + + + 抛了{0}。 + User flipped tails. + + + 你猜到了！ 您赢得了{0} + + + 指定的数字无效。 你可以抛1到{0}钱币。 + + + 将{0}反应添加到此消息以获取{1} + + + 此活动在{0}小时内有效。 + + + 花反应活动开始了！ + + + 给了{1}{0} + X has gifted 15 flowers to Y + + + {0}拥有{1} + X has Y flowers + + + 头 + Fuzzy + + + 排行榜 + + + 从{2}身份授予{0}至{1}名用户。 + + + 您赌注不能超过{0} + + + 您赌注不能低于{0} + + + 您没有足够的{0} + + + 卡牌组中没有更多的牌。 + + + 抽奖用户 + Fuzzy + + + 您抛了{0}。 + + + 赌注 + + + 哇啊啊啊啊啊啊！ 恭喜！ x {0} + + + 单个{0}，x {1} + + + 哇！好运！ 三个相同！ x {0} + + + 做得好！ 两个{0} - 投注x {1} + + + 胜利 + + + 用户必须键入密码才能获取{0}。 +持续{1}秒。 嘘~别跟任何人说。 + + + SneakyGame事件结束。 {0}个用户收到了奖励。 + + + SneakyGameStatus事件已启动 + + + 尾 + Fuzzy + + + 已成功从{1}取得{0} + + + 无法从{1}取得{0}，因为用户没有那么多{2}！ + + + 返回ToC + + + 仅限Bot Owner + Fuzzy + + + 需要{0}频道权限。 + + + 您可以在patreon上支持项目：<{0}>或paypal：<{1}> + + + 命令和别名 + Fuzzy + + + 命令列表已重新生成。 + Fuzzy + + + 输入`{0} h CommandName`可查看该指定命令的帮助。 例如 `{0} h> 8ball` + + + 我找不到该命令。 请再次尝试之前验证该命令是否存在。 + + + 描述 + + + 您可以在： +Patreon <{0}>或 +Paypal <{1}> +上支持NadekoBot +不要忘记在邮件中留下您的不和名字或ID。 + +**谢谢**♥️ + + + **命令列表**：<{0}> +**主机指南和文档可以在这里找到**：<{1}> + Fuzzy + + + 命令列表 + Fuzzy + + + 组件列表 + Fuzzy + + + 输入“{0} cmds ModuleName”以获取该组件中的命令列表。 例如`{0} cmds games` + + + 该组件不存在。 + + + 需要{0}服务器权限。 + + + 目录 + Fuzzy + + + 用法 + + + 自动hentai启动。 使用以下标记之一重新排列每个{0}： +{1} + + + 标签 + + + 动物竞赛 + Fuzzy + + + 启动失败，因为没有足够的参与者。 + + + 竞赛已满！ 立即开始。 + + + {0}加入为{1} + + + {0}加入为{1}，赌注{2}！ + + + 输入{0} jr 以加入竞赛。 + + + 在20内秒或当房间满后开始。 + + + {0}个参与者开始。 + + + {0}为{1}赢得竞赛！ + + + 0}为{1}赢得竞赛，和赢得{2}！ + + + 指定的数字无效。 您可以一次滚动{0} - {1}骰子。 + + + 掷了{0} + Someone rolled 35 + + + 掷骰子：{0} + Dice Rolled: 5 + + + 竞赛启动失败。 另一个比赛可能正在运行。 + + + 此服务器上不存在竞赛 + + + 第二个数字必须大于第一个数字。 + + + 爱被改变 + Fuzzy + + + 声称 + Fuzzy + + + 离婚 + + + 喜欢 + + + 价钱 + + + 没有waifus被要求。 + + + 最佳Waifus + + + 您的兴趣已设置为该waifu，或者您尝试在没有兴趣的情况下删除您的兴趣。 + + + 将把兴趣从{0}更改为{1}。 + +*这在道德上是有问题的*🤔 + Make sure to get the formatting right, and leave the thinking emoji + + + 您必须等待{0}小时和{1}分钟才能再次更改您的兴趣。 + + + 您的兴趣已重置。 你不再有你喜欢的人。 + + + 想成为{0}的waifu。哇非常可爱<3 + + + 声明{0}为他的waifu，花了{1}！ + + + 你已经离婚了一个喜欢你的waifu。 你无情的怪物。 +{0}收到了{1}作为补偿。 + + + 你不能设置兴趣自己，你好自卑。 + + + 🎉他的爱实现！ 🎉 +{0}的新值为{1}！ + + + 没有waifu那么便宜。 您必须至少支付{0}才能获得waifu，即使他们的实际价值较低。 + + + 您必须支付{0}或更多才能认领那个waifu！ + + + 那waifu不是你的。 + + + 你不能认领自己。 + + + 你最近离婚了。 您必须等待{0}小时和{1}分钟再次离婚。 + + + 没人 + + + 你离婚了一个不喜欢你的waifu。 您收到了{0}。 + + + 8ball + + + 恐惧症游戏 + + + 游戏结束，没人提交。 + + + 没人投票。 游戏结束，没有赢家。 + + + 首字母缩写是{0}。 + + + 恐惧症游戏已经在这个频道中运行。 + + + 游戏开始。 创建具有以下首字母缩写的句子：{0}。 + + + 您有{0}秒的时间提交。 + + + {0}提交了他的判决。 （总{1}个） + + + 通过输入提交数字投票 + + + {0}投了票！ + + + 获胜者{0}获得{1}分。 + + + {0}赢了因为是唯一的提交用户！ + + + 题 + + + 平局！ 两个都挑了{0} + + + {0}赢了！ {1} 打赢了 {2} + + + 提交关闭 + Fuzzy + + + 动物竞赛已经运行。 + + + 总计：{0} 平均：{1} + + + 类别 + + + 在此服务器上禁用cleverbot。 + + + 在此服务器上启用cleverbot。 + + + 在此频道上停用的货币生成功能。 + + + 在此频道上启用的货币生成功能。 + + + {0} 个 {1}出现了！ 通过输入`{2} pick'来拾取 + plural + + + 一个{0}出现了！ 通过输入`{1} pick`来拾取 + + + 加载问题失败。 + + + 游戏开始 + Fuzzy + + + Hangman游戏开始了 + + + Hangman游戏已在此频道上打开。 + + + 启动hangman错误。 + + + “{0} hangman”字词类型列表： + + + 排行榜 + + + 您没有足够的{0} + + + 没有结果 + + + 采了{0} + Kwoth picked 5* + + + {0}种了{1} + Kwoth planted 5* + + + 琐事游戏已经在这个服务器上运行。 + + + 琐事游戏 + + + {0}猜对了！ 答案是：{1} + + + 此服务器上没有运行琐事游戏。 + + + {0}有{1}分 + + + 这个问题后停止。 + + + 时间到！ 正确的答案是{0} + + + {0}猜到了，赢得了游戏！ 答案是：{1} + + + 你不能对自己玩。 + + + TicTacToe游戏已在此频道中运行。 + + + 平局！ + + + 开始了一局TicTacToe游戏。 + + + {0}赢了！ + Fuzzy + + + 相配了三个 + Fuzzy + + + 没有地方动了！ + + + 时间已过！ + Fuzzy + + + 轮到{0}了 + + + {0}对{1} + + + 正在排{0}首歌... + + + 已停用自动播放。 + + + 已启用自动播放。 + + + 默认音量设置为{0}％ + + + 目录队列完成。 + + + 公平播放 + + + 完成歌曲 + Fuzzy + + + 停用公平播放。 + + + 启用公平播放。 + + + 从位置 + + + ID + + + 输入错误。 + + + 最大播放时间没有限制移除。 + + + 最大播放时间设置为{0}秒。 + + + 最大音乐队列大小设置为无限。 + + + 最大音乐队列大小设置为{0}首。 + + + 您需要在此服务器上加入语音频道。 + + + 名 + + + 现在播放 + Fuzzy + + + 没有活动音乐播放器。 + + + + 没有搜索结果。 + + + 音乐播放暂停。 + + + 播放器队列 - {0} / {1}页 + Fuzzy + + + 正在播放 + Fuzzy + + + `＃{0}` - ** {1} ** by * {2} *（{3}首歌） + + + 有保存{0}页的播放列表 + Fuzzy + + + 播放列表已删除。 + + + 无法删除该播放列表。 它不存在，或者你不是它的作者。 + + + 具有该ID的播放列表不存在。 + + + 播放列表队列完成。 + + + 播放列表已保存 + Fuzzy + + + {0}秒限制 + + + 队列 + + + 歌加入队列 + Fuzzy + + + 音乐队列已清除。 + + + 队列已满{0} / {0}。 + + + 歌被移除 + context: "removed song #5" + + + 重复播放当前歌曲 + Fuzzy + + + 重复播放列表 + Fuzzy + + + 重复曲目 + Fuzzy + + + 当前曲目停止重复。 + + + 音乐播放已恢复。 + + + 禁用重复播放列表 + + + 重复播放列表已启用。 + + + 我现在将在此频道里输出播放，完成，暂停和删除歌曲。 + + + 跳到‘{0}：{1}’ + + + 歌播放列表曲被随机。 + Fuzzy + + + 歌曲被移动 + Fuzzy + + + {0}小时 {1}分钟 {2}秒 + + + 到位置 + + + 无限 + + + 音量必须介于0和100之间 + + + 音量设置为{0}％ + + + 在{0}频道上禁止所有组件的使用。 + Fuzzy + + + 在{0}频道上允许启用所有组件。 + Fuzzy + + + 允许 + + + {0}身份的所有组件被禁止使用。 + Fuzzy + + + {0}身份的所有组件被允许使用。 + Fuzzy + + + 在此服务器上禁止所有组件的使用。 + + + 在此服务器上允许所有组件的使用。 + + + {0}用户的所有模块被禁止使用。 + Fuzzy + + + {0}用户的所有模块被允许使用。 + Fuzzy + + + ID为{1}被加入黑名单{0} + + + 命令{0}冷却时间现有{1}秒。 + + + 命令{0}没有冷却时间了，现有所有的冷却时间已被清除。 + Fuzzy + + + 没有设置命令冷却时间。 + + + 命令成本 + Fuzzy + + + {2}频道上已停用{0} {1}。 + Fuzzy + + + 已在{2}频道上启用{0} {1}的使用。 + Fuzzy + + + 被拒绝 + + + 以巴{0}添加到已过滤字词列表中。 + + + 被过滤的词列表 + Fuzzy + + + 已从过滤字词列表中删除{0}。 + + + 第二个参数无效（必须是{0}和{1}之间的数字） + + + 在此频道上停用邀请过滤功能。 + + + 在此频道上启用邀请过滤。 + + + 在此服务器上停用邀请过滤功能。 + + + 在此服务器上启用邀请过滤功能。 + + + 已将权限{0}从＃{1}移至＃{2} + + + 在索引＃{0}找不到权限 + + + 未设置费用。 + + + 命令 + Gen (of command) + + + 组件 + Gen. (of module) + + + 权限页面第{0}页 + + + 当前权限身份为{0}。 + + + 用户现在需要{0}身份才能编辑权限。 + + + 在该索引中找不到权限。 + + + 已删除权限＃{0} - {1} + + + 禁止{2}身份使用{0} {1}。 + + + 允许{2}身份使用{0} {1}。 + + + 秒 + Short of seconds. + + + 此服务器上的{0} {1}已被禁止使用。 + + + 此服务器上的{0} {1}已被允许使用。 + + + ID为{1}的{0}从黑名单上移除 + + + 不可编辑 + + + {2}用户的{0} {1}已被禁止使用。 + + + {2}用户的{0} {1}已允许使用。 + + + 我将不再显示权限警告。 + + + 我现在将显示权限警告。 + + + 此频道上的字过滤已停用。 + + + 此频道上的字过滤已启用。 + + + 此服务器上的字过滤已停用。 + + + 此服务器上的字过滤已启用。 + + + 能力 + + + 没有最喜爱的动漫 + + + 开始自动翻译此频道上的消息。 用户消息将被自动删除。 + + + 您的自动翻译语言已删除。 + + + 您的自动翻译语言已设置为{0}> {1} + + + 开始自动翻译此频道上的消息。 + + + 停止自动翻译此频道上的消息。 + + + 错误格式或出现错误。 + + + 找不到该卡。 + + + 实 + + + 章 + + + 漫画＃ + + + 竞争模式失败次数 + Fuzzy + + + 竞争模式玩次数 + Fuzzy + + + 竞争模式排名 + Fuzzy + + + 竞争模式胜利次数 + + + 完成 + + + 条件 + + + 花费 + + + 日期 + + + 定义： + + + 放掉 + + + 剧集 + + + 发生了错误。 + + + 例子 + + + 找不到那个动画。 + + + 找不到漫画。 + + + 类型 + + + 未能找到该标记的定义。 + + + 身高/体重 + + + {0} m / {1} kg + + + 湿度 + + + 图片搜索： + Fuzzy + + + 找不到该电影。 + + + 来源或目标语言错误。 + + + 笑话没加载。 + + + 纬度/经度 + + + 等级 + + + {0}地方标记列表 + Don't translate {0}place + + + 地点 + + + 未加载魔术项目。 + + + {0}的MAL个人资料 + + + 机器人的业主没有指定MashapeApiKey。 您不能使用此功能。 + + + 最小/最大 + + + 找不到频道。 + + + 没找到结果。 + + + 等候接听 + Fuzzy + + + 原始网址 + Fuzzy + + + 需要osu！API密钥。 + + + 无法检索osu！ 线索。 + + + 找到{0}张图片。 显示随机{0}。 + + + 找不到用户！ 请再次前检查区域和BattleTag。 + + + 计划看 + + + 平台 + + + 找不到能力。 + + + 找不到宠物小精灵。 + + + 个人资料链接： + Fuzzy + + + 质量： + + + 快速游戏时间 + Fuzzy + + + 快赢 + Fuzzy + + + 评分 + + + 得分： + + + 搜索： + Fuzzy + + + 无法缩短该链接。 + + + 短链接 + Fuzzy + + + 出了些问题。 + + + 请指定搜索参数。 + + + 状态 + + + 储存链接 + Fuzzy + + + 直播台{0}已离线。 + + + 直播台{0}在线有{1}个观众。 + + + 您在此服务器上关注{0}个直播台 + + + 您未在此服务器上关注任何直播台。 + + + 没有这个直播台。 + + + 直播台可能不存在。 + + + 已从（{1}）的通知中移除{0}的直播台 + + + 状态更改时，我会通知此频道。 + + + 日出 + + + 日落 + + + 温度 + + + 标题： + + + 3个最喜欢的动画： + + + 翻译： + + + 类型 + + + 未能找到该字词的定义。 + + + 链接 + + + 观众 + + + 观看 + + + 无法在指定的维基上找到该字词。 + + + 请输入目标维基，然后搜索查询。 + + + 找不到网页。 + + + 风速 + Fuzzy + + + {0}个被禁止最多的英雄 + + + 无法yodify您的句子。 + + + 加入 + + + `{0} .` {1} [{2：F2} / s] - {3}总计 + /s and total need to be localized to fit the context - +`1.` + + + 活动页面＃{0} + Fuzzy + + + {0}个用户。 + + + 作者 + + + 机器ID + + + {0} calc命令功能列表 + + + 此频道的{0}是{1} + + + 频道主题 + Fuzzy + + + 执行命令 + Fuzzy + + + {0} {1}等于{2} {3} + + + 转换器可以使用的单位 + + + 无法将{0}转换为{1}：找不到单位 + + + 无法将{0}转换为{1}：单位类型不相等 + + + 创建于 + Fuzzy + + + 加入跨服务器频道。 + + + 离开跨服务器频道。 + + + 这是您的CSC令牌 + + + 自定义Emojis + Fuzzy + + + 错误 + + + 特征 + + + + ID + + + 索引超出范围。 + + + 以下是这个身份的用户列表： + + + 您不能对其中有用户很多的身份使用此命令来防止滥用。 + Fuzzy + + + 值{0}错误。 + Invalid months value/ Invalid hours value + + + 加入Discord + + + 加入服务器 + Fuzzy + + + ID：{0} +会员数：{1} +业主ID：{2} + Fuzzy + + + 在该网页上找不到服务器。 + + + 重复列表 + Fuzzy + + + 会员 + + + 存储 + + + 讯息 + + + 消息重复功能 + Fuzzy + + + 名字 + + + 昵称 + + + 没有人在玩那个游戏 + + + 没有活动重复功能。 + + + 此页面上没有身份。 + + + 此页面上没有分片。 + + + 没有主题设置。 + + + 业主 + + + 业主IDs + + + 状态 + + + {0}个服务器 +{1}个文字频道 +{2}个语音频道 + + + 删除所有引号使用{0}关键字。 + + + {0}页引号 + + + 此页面上没有引用。 + + + 没有您可以删除的引用。 + + + 引用被添加 + + + 删除了随机引用。 + + + 区域 + + + 注册日 + Fuzzy + + + 我将在{2}`（{3：d.M.yyyy。}的{4：HH：mm}）提醒{0}关于{1} + + + 无效时间格式。 检查命令列表。 + + + 新的提醒模板被设定。 + + + 会每{1}天{2}小时{3}分钟重复{0}。 + + + 重复列表 + Fuzzy + + + 此服务器上没有运行重复消息。 + + + ＃{0}已停止。 + + + 此服务器上没有找到被重复的消息。 + + + 结果 + + + 身份 + + + 此服务器上所有身份第{0}页： + + + {1}身份的第{0}页 + + + 颜色的格式不正确。 例如，使用‘＃00ff00’。 + + + 开始轮流{0}身份的颜色。 + + + 停止{0}身份颜色轮流 + + + 此服务器的{0}是{1} + + + 伺服器資訊 + Fuzzy + + + 分片 + + + 分片统计 + Fuzzy + + + 分片**＃{0} **处于{1}状态与{2}台服务器 + + + **名称：** {0} **链接：** {1} + + + 找不到特殊的表情符號。 + + + 正在播放 {0} 首歌，{1} 首等待播放。 + + + 文字頻道 + Fuzzy + + + 这是你的房间链接： + + + 運行時間 + + + 此用户 {1} 的{0} 是 {2} + Id of the user kwoth#1234 is 123123123123 + + + 用戶 + + + 語音頻道 + Fuzzy + + + + + + \ No newline at end of file From b0352c20be1a90ec8ba7c92d257e9cd168f1299a Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sun, 5 Mar 2017 23:05:38 +0100 Subject: [PATCH 183/496] Updated supported languages list --- .../Administration/Commands/LocalizationCommands.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs index 8166a633..d7dd424e 100644 --- a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs +++ b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs @@ -18,15 +18,19 @@ namespace NadekoBot.Modules.Administration { private ImmutableDictionary supportedLocales { get; } = new Dictionary() { + //{"zh-TW", "Chinese (Traditional), China" }, + {"zh-CN", "Chinese (Simplified), China"}, + //{"nl-NL", "Dutch, Netherlands"}, {"en-US", "English, United States"}, {"fr-FR", "French, France"}, - {"ru-RU", "Russian, Russia"}, {"de-DE", "German, Germany"}, - //{"nl-NL", "Dutch, Netherlands"}, //{"ja-JP", "Japanese, Japan"}, + {"nb-NO", "Norwegian (bokmål), Norway"}, + //{"pl-PL", "Polish, Poland" } {"pt-BR", "Portuguese, Brazil"}, - {"zh-CN", "Chinese (Simplified), China"} + {"ru-RU", "Russian, Russia"}, //{"sr-Cyrl-RS", "Serbian, Serbia - Cyrillic"} + {"sv-SE", "Swedish, Sweden"}, }.ToImmutableDictionary(); [NadekoCommand, Usage, Description, Aliases] From 504da01917cf4879f2811e201ce2cdbca5e56cd4 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sun, 5 Mar 2017 23:34:01 +0100 Subject: [PATCH 184/496] People without manage messages can no longer user reminds on channels --- src/NadekoBot/Modules/Utility/Commands/Remind.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/NadekoBot/Modules/Utility/Commands/Remind.cs b/src/NadekoBot/Modules/Utility/Commands/Remind.cs index 572a7afc..45406de9 100644 --- a/src/NadekoBot/Modules/Utility/Commands/Remind.cs +++ b/src/NadekoBot/Modules/Utility/Commands/Remind.cs @@ -114,6 +114,7 @@ namespace NadekoBot.Modules.Utility [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] + [RequireUserPermission(GuildPermission.ManageMessages)] [Priority(0)] public async Task Remind(IMessageChannel ch, string timeStr, [Remainder] string message) { From f1157f424b0cde47501d5afd6c99f83a5de2c6eb Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 6 Mar 2017 04:20:06 +0100 Subject: [PATCH 185/496] inrole now shows the number of users in a given role --- src/NadekoBot/Modules/Utility/Utility.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Modules/Utility/Utility.cs b/src/NadekoBot/Modules/Utility/Utility.cs index 0452dab6..38951dd5 100644 --- a/src/NadekoBot/Modules/Utility/Utility.cs +++ b/src/NadekoBot/Modules/Utility/Utility.cs @@ -225,8 +225,9 @@ namespace NadekoBot.Modules.Utility var usrs = (await Context.Guild.GetUsersAsync()).ToArray(); foreach (var role in roles.Where(r => r.Id != Context.Guild.Id)) { - send += $"```css\n[{role.Name}]\n"; - send += string.Join(", ", usrs.Where(u => u.RoleIds.Contains(role.Id)).Select(u => u.ToString())); + var roleUsers = usrs.Where(u => u.RoleIds.Contains(role.Id)).Select(u => u.ToString()).ToArray(); + send += $"```css\n[{role.Name}] ({roleUsers.Length})\n"; + send += string.Join(", ", roleUsers); send += "\n```"; } var usr = (IGuildUser)Context.User; From c1c8c1c85662a16c4991c2a41cda3603c56facce Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 6 Mar 2017 16:51:02 +0100 Subject: [PATCH 186/496] fixed default language? --- .../Resources/ResponseStrings.en-US.resx | 2221 +++++++++++++++++ 1 file changed, 2221 insertions(+) create mode 100644 src/NadekoBot/Resources/ResponseStrings.en-US.resx diff --git a/src/NadekoBot/Resources/ResponseStrings.en-US.resx b/src/NadekoBot/Resources/ResponseStrings.en-US.resx new file mode 100644 index 00000000..8f964f3a --- /dev/null +++ b/src/NadekoBot/Resources/ResponseStrings.en-US.resx @@ -0,0 +1,2221 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + That base is already claimed or destroyed. + + + That base is already destroyed. + + + That base is not claimed. + + + **DESTROYED** base #{0} in a war against {1} + + + {0} has **UNCLAIMED** base #{1} in a war against {2} + + + {0} claimed a base #{1} in a war against {2} + + + @{0} You already claimed base #{1}. You can't claim a new one. + + + Claim from @{0} in a war against {1} has expired. + + + Enemy + + + Info about war against {0} + + + Invalid base number. + + + Not a valid war size. + + + List of active wars + + + not claimed + + + You are not participating in that war. + + + @{0} You are either not participating in that war, or that base is already destroyed. + + + No active war. + + + Size + + + War against {0} has already started. + + + War against {0} created. + + + War against {0} ended. + + + That war does not exist. + + + War against {0} started! + + + All custom reaction stats cleared. + + + Custom Reaction deleted + + + Insufficient permissions. Requires Bot ownership for global custom reactions, and Administrator for server custom reactions. + + + List of all custom reactions + + + Custom Reactions + + + New Custom Reaction + + + No custom reaction found. + + + No custom reaction found with that id. + + + Response + + + Custom Reaction Stats + + + Stats cleared for {0} custom reaction. + + + No stats for that trigger found, no action taken. + + + Trigger + + + Autohentai stopped. + + + No results found. + + + {0} has already fainted. + + + {0} already has full HP. + + + Your type is already {0} + + + used {0}{1} on {2}{3} for {4} damage. + Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage. + + + You can't attack again without retaliation! + + + You can't attack yourself. + + + {0} has fainted! + + + healed {0} with one {1} + + + {0} has {1} HP remaining. + + + You can't use {0}. Type `{1}ml` to see a list of moves you can use. + + + Movelist for {0} type + + + It's not effective. + + + You don't have enough {0} + + + revived {0} with one {1} + + + You revived yourself with one {0} + + + Your type has been changed to {0} for a {1} + + + It's somewhat effective. + + + It's super effective! + + + You used too many moves in a row, so you can't move! + + + Type of {0} is {1} + + + User not found. + + + You fainted, so you are not able to move! + + + **Auto assign role** on user join is now **disabled**. + + + **Auto assign role** on user join is now **enabled**. + + + Attachments + + + Avatar Changed + + + You have been banned from {0} server. +Reason: {1} + + + banned + PLURAL + + + User Banned + + + Bot name changed to {0} + + + Bot status changed to {0} + + + Automatic deletion of bye messages has been disabled. + + + Bye messages will be deleted after {0} seconds. + + + Current bye message: {0} + + + Enable bye messages by typing {0} + + + New bye message set. + + + Bye announcements disabled. + + + Bye announcements enabled on this channel. + + + Channel Name Changed + + + Old Name + + + Channel Topic Changed + + + Cleaned up. + + + Content + + + Sucessfully created role {0} + + + Text channel {0} created. + + + Voice channel {0} created. + + + Deafen successful. + + + Deleted server {0} + + + Stopped automatic deletion of successful command invokations. + + + Now automatically deleting sucessful command invokations. + + + Text channel {0} deleted. + + + Voice channel {0} deleted. + + + DM from + + + Sucessfully added a new donator.Total donated amount from this user: {0} 👑 + + + Thanks to the people listed below for making this project happen! + + + I will forward DMs to all owners. + + + I will forward DMs only to the first owner. + + + I will forward DMs from now on. + + + I will stop forwarding DMs from now on. + + + Automatic deletion of greet messages has been disabled. + + + Greet messages will be deleted after {0} seconds. + + + Current DM greet message: {0} + + + Enable DM greet messages by typing {0} + + + New DM greet message set. + + + DM greet announcements disabled. + + + DM greet announcements enabled. + + + Current greet message: {0} + + + Enable greet messages by typing {0} + + + New greet message set. + + + Greet announcements disabled. + + + Greet announcements enabled on this channel. + + + You can't use this command on users with a role higher or equal to yours in the role hierarchy. + + + Images loaded after {0} seconds! + + + Invalid input format. + + + Invalid parameters. + + + {0} has joined {1} + + + You have been kicked from {0} server. +Reason: {1} + + + User kicked + + + List of languages + + + Your server's locale is now {0} - {1} + + + Bot's default locale is now {0} - {1} + + + Bot's language is set to {0} - {1} + + + Failed setting locale. Revisit this command's help. + + + This server's language is set to {0} - {1} + + + {0} has left {1} + + + Left server {0} + + + Logging {0} event in this channel. + + + Logging all events in this channel. + + + Logging disabled. + + + Log events you can subscribe to: + + + Logging will ignore {0} + + + Logging will not ignore {0} + + + Stopped logging {0} event. + + + {0} has invoked a mention on the following roles + + + Message from {0} `[Bot Owner]`: + + + Message sent. + + + {0} moved from {1} to {2} + + + Message deleted in #{0} + + + Message updated in #{0} + + + Muted + PLURAL (users have been muted) + + + Muted + singular "User muted." + + + I don't have the permission necessary for that most likely. + + + New mute role set. + + + I need **Administration** permission to do that. + + + New message + + + New nickname + + + New topic + + + Nickname changed + + + Can't find that server + + + No shard with that ID found. + + + Old message + + + Old nickname + + + Old topic + + + Error. Most likely I don't have sufficient permissions. + + + Permissions for this server are reset. + + + Active protections + + + {0} has been **disabled** on this server. + + + {0} Enabled + + + Error. I need ManageRoles permission + + + No protection enabled. + + + User threshold must be between {0} and {1}. + + + If {0} or more users join within {1} seconds, I will {2} them. + + + Time must be between {0} and {1} seconds. + + + Successfully removed all roles from user {0} + + + Failed to remove roles. I have insufficient permissions. + + + Color of {0} role has been changed. + + + That role does not exist. + + + The parameters specified are invalid. + + + Error occured due to invalid color or insufficient permissions. + + + Successfully removed role {0} from user {1} + + + Failed to remove role. I have insufficient permissions. + + + Role renamed. + + + Failed to rename role. I have insufficient permissions. + + + You can't edit roles higher than your highest role. + + + Removed the playing message: {0} + + + Role {0} as been added to the list. + + + {0} not found.Cleaned up. + + + Role {0} is already in the list. + + + Added. + + + Rotating playing status disabled. + + + Rotating playing status enabled. + + + Here is a list of rotating statuses: +{0} + + + No rotating playing statuses set. + + + You already have {0} role. + + + You already have {0} exclusive self-assigned role. + + + Self assigned roles are now exclusive! + + + There are {0} self assignable roles + + + That role is not self-assignable. + + + You don't have {0} role. + + + Self assigned roles are now not exclusive! + + + I am unable to add that role to you. `I can't add roles to owners or other roles higher than my role in the role hierarchy.` + + + {0} has been removed from the list of self-assignable roles. + + + You no longer have {0} role. + + + You now have {0} role. + + + Sucessfully added role {0} to user {1} + + + Failed to add role. I have insufficient permissions. + + + New avatar set! + + + New channel name set. + + + New game set! + + + New stream set! + + + New channel topic set. + + + Shard {0} reconnected. + + + Shard {0} reconnecting. + + + Shutting down + + + Users can't send more than {0} messages every {1} seconds. + + + Slow mode disabled. + + + Slow mode initiated + + + soft-banned (kicked) + PLURAL + + + {0} will ignore this channel. + + + {0} will no longer ignore this channel. + + + If a user posts {0} same messages in a row, I will {1} them. + __IgnoredChannels__: {2} + + + Text channel created. + + + Text channel destroyed. + + + Undeafen successful. + + + Unmuted + singular + + + Username + + + Username changed + + + Users + + + User banned + + + {0} has been **muted** from chatting. + + + {0} has been **unmuted** from chatting. + + + User joined + + + User left + + + {0} has been **muted** from text and voice chat. + + + User's role added + + + User's role removed + + + {0} is now {1} + + + {0} has been **unmuted** from text and voice chat. + + + {0} has joined {1} voice channel. + + + {0} has left {1} voice channel. + + + {0} moved from {1} to {2} voice channel. + + + {0} has been **voice muted**. + + + {0} has been **voice unmuted**. + + + Voice channel created + + + Voice channel destroyed + + + Disabled voice + text feature. + + + Enabled voice + text feature. + + + I don't have **manage roles** and/or **manage channels** permission, so I cannot run `voice+text` on {0} server. + + + You are enabling/disabling this feature and **I do not have ADMINISTRATOR permissions**. This may cause some issues, and you will have to clean up text channels yourself afterwards. + + + I require atleast **manage roles** and **manage channels** permissions to enable this feature. (preffered Administration permission) + + + User {0} from text chat + + + User {0} from text and voice chat + + + User {0} from voice chat + + + You have been soft-banned from {0} server. +Reason: {1} + + + User unbanned + + + Migration done! + + + Error while migrating, check bot's console for more information. + + + Presence updates + + + User soft-banned + + + has awarded {0} to {1} + + + Better luck next time ^_^ + + + Congratulations! You won {0} for rolling above {1} + + + Deck reshuffled. + + + flipped {0}. + User flipped tails. + + + You guessed it! You won {0} + + + Invalid number specified. You can flip 1 to {0} coins. + + + Add {0} reaction to this message to get {1} + + + This event is active for up to {0} hours. + + + Flower reaction event started! + + + has gifted {0} to {1} + X has gifted 15 flowers to Y + + + {0} has {1} + X has Y flowers + + + Head + + + Leaderboard + + + Awarded {0} to {1} users from {2} role. + + + You can't bet more than {0} + + + You can't bet less than {0} + + + You don't have enough {0} + + + No more cards in the deck. + + + Raffled user + + + You rolled {0}. + + + Bet + + + WOAAHHHHHH!!! Congratulations!!! x{0} + + + A single {0}, x{1} + + + Wow! Lucky! Three of a kind! x{0} + + + Good job! Two {0} - bet x{1} + + + Won + + + Users must type a secret code to get {0}. +Lasts {1} seconds. Don't tell anyone. Shhh. + + + SneakyGame event ended. {0} users received the reward. + + + SneakyGameStatus event started + + + Tail + + + successfully took {0} from {1} + + + was unable to take {0} from{1} because the user doesn't have that much {2}! + + + Back to ToC + + + Bot owner only + + + Requires {0} channel permission. + + + You can support the project on patreon: <{0}> or paypal: <{1}> + + + Commands and aliases + + + Commandlist regenerated. + + + Type `{0}h CommandName` to see the help for that specified command. e.g. `{0}h >8ball` + + + I can't find that command. Please verify that the command exists before trying again. + + + Description + + + You can support the NadekoBot project on +Patreon <{0}> or +Paypal <{1}> +Don't forget to leave your discord name or id in the message. + +**Thank you** ♥️ + + + **List of commands**: <{0}> +**Hosting guides and docs can be found here**: <{1}> + + + List of commands + + + List of modules + + + Type `{0}cmds ModuleName` to get a list of commands in that module. eg `{0}cmds games` + + + That module does not exist. + + + Requires {0} server permission. + + + Table of contents + + + Usage + + + Autohentai started. Reposting every {0}s with one of the following tags: +{1} + + + Tag + + + Animal race + + + Failed to start since there was not enough participants. + + + Race is full! Starting immediately. + + + {0} joined as a {1} + + + {0} joined as a {1} and bet {2}! + + + Type {0}jr to join the race. + + + Starting in 20 seconds or when the room is full. + + + Starting with {0} participants. + + + {0} as {1} Won the race! + + + {0} as {1} Won the race and {2}! + + + Invalid number specified. You can roll {0}-{1} dice at once. + + + rolled {0} + Someone rolled 35 + + + Dice rolled: {0} + Dice Rolled: 5 + + + Failed starting the race. Another race is probably running. + + + No race exists on this server + + + Second number must be larger than the first one. + + + Changes of heart + + + Claimed by + + + Divorces + + + Likes + + + Nobody + + + Price + + + No waifus have been claimed yet. + + + Top Waifus + + + your affinity is already set to that waifu or you're trying to remove your affinity while not having one. + + + changed their affinity from {0} to {1}. + +*This is morally questionable.*🤔 + Make sure to get the formatting right, and leave the thinking emoji + + + You must wait {0} hours and {1} minutes in order to change your affinity again. + + + Your affinity is reset. You no longer have a person you like. + + + wants to be {0}'s waifu. Aww <3 + + + claimed {0} as their waifu for {1}! + + + You have divorced a waifu who likes you. You heartless monster. +{0} received {1} as a compensation. + + + You have divorced a waifu who doesn't like you. You received {0} back. + + + you can't set affinity to yourself, you egomaniac. + + + 🎉 Their love is fulfilled! 🎉 +{0}'s new value is {1}! + + + No waifu is that cheap. You must pay at least {0} to get a waifu, even if their actual value is lower. + + + You must pay {0} or more to claim that waifu! + + + That waifu is not yours. + + + You can't claim yourself. + + + You divorced recently. You must wait {0} hours and {1} minutes to divorce again. + + + 8ball + + + Acrophobia + + + Game ended with no submissions. + + + No votes cast. Game ended with no winner. + + + Acronym was {0}. + + + Acrophobia game is already running in this channel. + + + Game started. Create a sentence with the following acronym: {0}. + + + You have {0} seconds to make a submission. + + + {0} submitted their sentence. ({1} total) + + + Vote by typing a number of the submission + + + {0} cast their vote! + + + Winner is {0} with {1} points. + + + {0} is the winner for being the only user who made a submission! + + + Question + + + It's a draw! Both picked {0} + + + {0} won! {1} beats {2} + + + Submissions closed + + + Animal Race is already running. + + + You've already joined this race! + + + Total: {0} Average: {1} + + + Category + + + Disabled cleverbot on this server. + + + Enabled cleverbot on this server. + + + Currency generation has been disabled on this channel. + + + Currency generation has been enabled on this channel. + + + {0} random {1} appeared! Pick them up by typing `{2}pick` + plural + + + A random {0} appeared! Pick it up by typing `{1}pick` + + + Failed loading a question. + + + Game started + + + Hangman game started + + + Hangman game already running on this channel. + + + Starting hangman errored. + + + List of "{0}hangman" term types: + + + Leaderboard + + + You don't have enough {0} + + + No results + + + picked {0} + Kwoth picked 5* + + + {0} planted {1} + Kwoth planted 5* + + + Trivia game is already running on this server. + + + Trivia Game + + + {0} guessed it! The answer was: {1} + + + No trivia is running on this server. + + + {0} has {1} points + + + Stopping after this question. + + + Time's up! The correct answer was {0} + + + {0} guessed it and WON the game! The answer was: {1} + + + You can't play against yourself. + + + TicTacToe Game is already running in this channel. + + + A draw! + + + has created a game of TicTacToe. + + + {0} has won! + + + Matched three + + + No moves left! + + + Time expired! + + + {0}'s move + + + {0} vs {1} + + + Attempting to queue {0} songs... + + + Autoplay disabled. + + + Autoplay enabled. + + + Default volume set to {0}% + + + Directory queue complete. + + + fairplay + + + Finished song + + + Fair play disabled. + + + Fair play enabled. + + + From position + + + Id + + + Invalid input. + + + Max playtime has no limit now. + + + Max playtime set to {0} second(s). + + + Max music queue size set to unlimited. + + + Max music queue size set to {0} track(s). + + + You need to be in the voice channel on this server. + + + Name + + + Now playing + + + No active music player. + + + No search results. + + + Music playback paused. + + + Player queue - Page {0}/{1} + + + Playing song + + + `#{0}` - **{1}** by *{2}* ({3} songs) + + + Page {0} of saved playlists + + + Playlist deleted. + + + Failed to delete that playlist. It either doesn't exist, or you are not its author. + + + Playlist with that ID doesn't exist. + + + Playlist queue complete. + + + Playlist saved + + + {0}s limit + + + Queue + + + Queued song + + + Music queue cleared. + + + Queue is full at {0}/{0}. + + + Removed song + context: "removed song #5" + + + Repeating current song + + + Repeating playlist + + + Repeating track + + + Current track repeat stopped. + + + Music playback resumed. + + + Repeat playlist disabled. + + + Repeat playlist enabled. + + + I will now output playing, finished, paused and removed songs in this channel. + + + Skipped to `{0}:{1}` + + + Songs shuffled + + + Song moved + + + {0}h {1}m {2}s + + + To position + + + unlimited + + + Volume must be between 0 and 100 + + + Volume set to {0}% + + + Disabled usage of ALL MODULES on channel {0}. + + + Enabled usage of ALL MODULES on channel {0}. + + + Allowed + + + Disabled usage of ALL MODULES for role {0}. + + + Enabled usage of ALL MODULES for role {0}. + + + Disabled usage of ALL MODULES on this server. + + + Enabled usage of ALL MODULES on this server. + + + Disabled usage of ALL MODULES for user {0}. + + + Enabled usage of ALL MODULES for user {0}. + + + Blacklisted {0} with ID {1} + + + Command {0} now has a {1}s cooldown. + + + Command {0} has no cooldown now and all existing cooldowns have been cleared. + + + No command cooldowns set. + + + Command costs + + + Disabled usage of {0} {1} on channel {2}. + + + Enabled usage of {0} {1} on channel {2}. + + + Denied + + + Added word {0} to the list of filtered words. + + + List of filtered words + + + Removed word {0} from the list of filtered words. + + + Invalid second parameter.(Must be a number between {0} and {1}) + + + Invite filtering disabled on this channel. + + + Invite filtering enabled on this channel. + + + Invite filtering disabled on this server. + + + Invite filtering enabled on this server. + + + Moved permission {0} from #{1} to #{2} + + + Can't find permission at index #{0} + + + No costs set. + + + command + Gen. (of command) + + + module + Gen. (of module) + + + Permissions page {0} + + + Current permissions role is {0}. + + + Users now require {0} role in order to edit permissions. + + + No permission found on that index. + + + removed permission #{0} - {1} + + + Disabled usage of {0} {1} for {2} role. + + + Enabled usage of {0} {1} for {2} role. + + + sec. + Short of seconds. + + + Disabled usage of {0} {1} on this server. + + + Enabled usage of {0} {1} on this server. + + + Unblacklisted {0} with ID {1} + + + uneditable + + + Disabled usage of {0} {1} for {2} user. + + + Enabled usage of {0} {1} for {2} user. + + + I will no longer show permission warnings. + + + I will now show permission warnings. + + + Word filtering disabled on this channel. + + + Word filtering enabled on this channel. + + + Word filtering disabled on this server. + + + Word filtering enabled on this server. + + + Abilities + + + No favorite anime yet + + + Started automatic translation of messages on this channel. User messages will be auto-deleted. + + + your auto-translate language has been removed. + + + Your auto-translate language has been set to {0}>{1} + + + Started automatic translation of messages on this channel. + + + Stopped automatic translation of messages on this channel. + + + Bad input format, or something went wrong. + + + Couldn't find that card. + + + fact + + + Chapters + + + Comic # + + + Competitive losses + + + Competitive played + + + Competitive rank + + + Competitive Wins + + + Completed + + + Condition + + + Cost + + + Date + + + Define: + + + Dropped + + + Episodes + + + Error occured. + + + Example + + + Failed finding that animu. + + + Failed finding that mango. + + + Genres + + + Failed finding a definition for that tag. + + + Height/Weight + + + {0}m/{1}kg + + + Humidity + + + Image search for: + + + Failed to find that movie. + + + Invalid source or target language. + + + Jokes not loaded. + + + Lat/Long + + + Level + + + List of {0}place tags + Don't translate {0}place + + + Location + + + Magic Items not loaded. + + + {0}'s MAL profile + + + Bot owner didn't specify MashapeApiKey. You can't use this functionality. + + + Min/Max + + + No channel found. + + + No results found. + + + On-hold + + + Original url + + + An osu! API key is required. + + + Failed retrieving osu! signature. + + + Found over {0} images. Showing random {0}. + + + User not found! Please check the Region and BattleTag before trying again. + + + Plan to watch + + + Platform + + + No ability found. + + + No pokemon found. + + + Profile link: + + + Quality: + + + Quick playtime + + + Quick wins + + + Rating + + + Score: + + + Search for: + + + Failed to shorten that url. + + + Short url + + + Something went wrong. + + + Please specify search parameters. + + + Status + + + Store url + + + Streamer {0} is offline. + + + Streamer {0} is online with {1} viewers. + + + You are following {0} streams on this server. + + + You are not following any streams on this server. + + + No such stream. + + + Stream probably doesn't exist. + + + Removed {0}'s stream ({1}) from notifications. + + + I will notify this channel when status changes. + + + Sunrise + + + Sunset + + + Temperature + + + Title: + + + Top 3 favorite anime: + + + Translation: + + + Types + + + Failed finding definition for that term. + + + Url + + + Viewers + + + Watching + + + Failed finding that term on the specified wikia. + + + Please enter a target wikia, followed by search query. + + + Page not found. + + + Wind speed + + + The {0} most banned champions + + + Failed to yodify your sentence. + + + Joined + + + `{0}.` {1} [{2:F2}/s] - {3} total + /s and total need to be localized to fit the context - +`1.` + + + Activity page #{0} + + + {0} users total. + + + Author + + + Bot ID + + + List of functions in {0}calc command + + + {0} of this channel is {1} + + + Channel topic + + + Commands ran + + + {0} {1} is equal to {2} {3} + + + Units which can be used by the converter + + + Cannot convert {0} to {1}: units not found + + + Cannot convert {0} to {1}: types of unit are not equal + + + Created at + + + Joined cross server channel. + + + Left cross server channel. + + + This is your CSC token + + + Custom emojis + + + Error + + + Features + + + ID + + + Index out of range. + + + Here is a list of users in those roles: + + + You are not allowed to use this command on roles with a lot of users in them to prevent abuse. + + + Invalid {0} value. + Invalid months value/ Invalid hours value + + + Joined Discord + + + Joined server + + + ID: {0} +Members: {1} +Owner ID: {2} + + + No servers found on that page. + + + List of repeater + + + Members + + + Memory + + + Messages + + + Message repeater + + + Name + + + Nickname + + + Nobody is playing that game. + + + No active repeaters. + + + No roles on this page. + + + No shards on this page. + + + No topic set. + + + Owner + + + Owner IDs + + + Presence + + + {0} Servers +{1} Text Channels +{2} Voice Channels + + + Deleted all quotes with {0} keyword. + + + Page {0} of quotes + + + No quotes on this page. + + + No quotes found which you can remove. + + + Quote Added + + + Deleted a random quote. + + + Region + + + Registered on + + + I will remind {0} to {1} in {2} `({3:d.M.yyyy.} at {4:HH:mm})` + + + Not a valid time format. Check the commandlist. + + + New remind template set. + + + Repeating {0} every {1} day(s), {2} hour(s) and {3} minute(s). + + + List of repeaters + + + No repeaters running on this server. + + + #{0} stopped. + + + No repeating messages found on this server. + + + Result + + + Roles + + + Page #{0} of all roles on this server: + + + Page #{0} of roles for {1} + + + No colors are in the correct format. Use `#00ff00` for example. + + + Started rotating {0} role's color. + + + Stopped rotating colors for the {0} role + + + {0} of this server is {1} + + + Server info + + + Shard + + + Shard stats + + + Shard **#{0}** is in {1} state with {2} servers + + + **Name:** {0} **Link:** {1} + + + No special emojis found. + + + Playing {0} songs, {1} queued. + + + Text channels + + + Here is your room link: + + + Uptime + + + {0} of the user {1} is {2} + Id of the user kwoth#1234 is 123123123123 + + + Users + + + Voice channels + + + Current poll results + + + No votes cast. + + + Poll is already running on this server. + + + 📃 {0} has created a poll which requires your attention: + + + `{0}.` {1} with {2} votes. + + + {0} voted. + Kwoth voted. + + + Private Message me with the corresponding number of the answer. + + + Send a Message here with the corresponding number of the answer. + + + Thank you for voting, {0} + + + {0} total votes cast. + + \ No newline at end of file From 8be5bff792d0e8adc4976a777190480bdc82ecb0 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 6 Mar 2017 17:07:12 +0100 Subject: [PATCH 187/496] Update ResponseStrings.zh-CN.resx (POEditor.com) --- .../Resources/ResponseStrings.zh-CN.resx | 180 +++++++++++++++--- 1 file changed, 157 insertions(+), 23 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.zh-CN.resx b/src/NadekoBot/Resources/ResponseStrings.zh-CN.resx index 3d0396c5..804e7006 100644 --- a/src/NadekoBot/Resources/ResponseStrings.zh-CN.resx +++ b/src/NadekoBot/Resources/ResponseStrings.zh-CN.resx @@ -141,6 +141,7 @@ @{0} 在与 {1} 对战后认领的基地已过期。 + Fuzzy 敌人 @@ -153,9 +154,11 @@ 此战争大小无效 + Fuzzy 现进行的战争列表 + Fuzzy 未被认领 @@ -168,6 +171,7 @@ 现无战争进行。 + Fuzzy 大小 @@ -188,7 +192,7 @@ 与{0}的对战已开始！ - 所有定制反应清除。 + 所有定制反应数据清除。 定制反应删除 @@ -207,6 +211,7 @@ 没有找到定制反应。 + Fuzzy 于此用户标识相联系的定制反应并未找到。 @@ -227,7 +232,7 @@ 触发器 - 自动变态模式停止。 + autohentai停止。 没有结果。 @@ -316,7 +321,7 @@ 原因： {1} - 你被禁止了 + 已被禁止了 PLURAL @@ -329,7 +334,7 @@ 机器人状态换成{0} - 自动告别消息关闭。 + 自动删除告别消息关闭。 告别消息将在{0}秒钟内删除。 @@ -395,7 +400,7 @@ 私人信息来自 - 成功添加新的捐赠者. 此用户总共捐赠了: {0} + 成功添加新的捐赠者. 此用户总共捐赠了: {0} 👑 感谢下面列出的人们使这个项目发生！ @@ -469,10 +474,12 @@ 用户已被踢出 + Fuzzy 语言列表 {0} + Fuzzy 您的服务器的语言设置现在为{0} - {1} @@ -530,9 +537,11 @@ 在＃{0}中删除讯息 + Fuzzy 讯息在＃{0}中被更新 + Fuzzy 已静音 @@ -553,15 +562,19 @@ 新消息 + Fuzzy 新昵称 + Fuzzy 新主题 + Fuzzy 昵称成功更换 + Fuzzy 找不到该服务器 @@ -571,12 +584,15 @@ 旧信息 + Fuzzy 旧昵称 + Fuzzy 旧题目 + Fuzzy 失败。很可能我没有足够的权限。 @@ -586,6 +602,7 @@ 主动保护 + Fuzzy {0}已在此服务器禁用。 @@ -598,6 +615,7 @@ 未启用保护项目。 + Fuzzy 用户阈值必须介于{0}和{1}之间。 @@ -757,9 +775,11 @@ 新文字频道成立 + Fuzzy 文字频道已删除 + Fuzzy Undeafen成功。 @@ -773,12 +793,14 @@ 用户名已更改 + Fuzzy 用户 用户被禁止 + Fuzzy {0}已从聊天内被静音**。 @@ -788,18 +810,22 @@ 用户已加入 + Fuzzy 用户离开了 + Fuzzy {0} 已被文字与语音静音了 用户身份添加成功 + Fuzzy 用户身份移除了 + Fuzzy {0} 改成了 {1} @@ -824,9 +850,11 @@ 语音频道已创建 + Fuzzy 语音通道已被毁 + Fuzzy 已停用语音+文字功能。 @@ -858,6 +886,7 @@ 用户已取消禁止 + Fuzzy 迁移完成！ @@ -867,9 +896,11 @@ 在线状态更新 + Fuzzy 用户被软禁用 + Fuzzy 已将{0}奖励给{1} @@ -912,6 +943,7 @@ 头 + Fuzzy 排行榜 @@ -933,6 +965,7 @@ 抽奖用户 + Fuzzy 您抛了{0}。 @@ -967,6 +1000,7 @@ 尾 + Fuzzy 已成功从{1}取得{0} @@ -979,6 +1013,7 @@ 仅限Bot Owner + Fuzzy 需要{0}频道权限。 @@ -988,9 +1023,11 @@ 命令和别名 + Fuzzy 命令列表已重新生成。 + Fuzzy 输入`{0} h CommandName`可查看该指定命令的帮助。 例如 `{0} h> 8ball` @@ -1013,12 +1050,15 @@ Paypal <{1}> **命令列表**：<{0}> **主机指南和文档可以在这里找到**：<{1}> + Fuzzy 命令列表 + Fuzzy 组件列表 + Fuzzy 输入“{0} cmds ModuleName”以获取该组件中的命令列表。 例如`{0} cmds games` @@ -1031,6 +1071,7 @@ Paypal <{1}> 目录 + Fuzzy 用法 @@ -1044,6 +1085,7 @@ Paypal <{1}> 动物竞赛 + Fuzzy 启动失败，因为没有足够的参与者。 @@ -1094,9 +1136,11 @@ Paypal <{1}> 爱被改变 + Fuzzy 声称 + Fuzzy 离婚 @@ -1216,6 +1260,7 @@ Paypal <{1}> 提交关闭 + Fuzzy 动物竞赛已经运行。 @@ -1250,6 +1295,7 @@ Paypal <{1}> 游戏开始 + Fuzzy Hangman游戏开始了 @@ -1318,15 +1364,18 @@ Paypal <{1}> {0}赢了！ + Fuzzy 相配了三个 + Fuzzy 没有地方动了！ 时间已过！ + Fuzzy 轮到{0}了 @@ -1354,6 +1403,7 @@ Paypal <{1}> 完成歌曲 + Fuzzy 停用公平播放。 @@ -1390,6 +1440,7 @@ Paypal <{1}> 现在播放 + Fuzzy 没有活动音乐播放器。 @@ -1403,15 +1454,18 @@ Paypal <{1}> 播放器队列 - {0} / {1}页 + Fuzzy 正在播放 + Fuzzy `＃{0}` - ** {1} ** by * {2} *（{3}首歌） 有保存{0}页的播放列表 + Fuzzy 播放列表已删除。 @@ -1427,6 +1481,7 @@ Paypal <{1}> 播放列表已保存 + Fuzzy {0}秒限制 @@ -1436,6 +1491,7 @@ Paypal <{1}> 歌加入队列 + Fuzzy 音乐队列已清除。 @@ -1449,12 +1505,15 @@ Paypal <{1}> 重复播放当前歌曲 + Fuzzy 重复播放列表 + Fuzzy 重复曲目 + Fuzzy 当前曲目停止重复。 @@ -1476,9 +1535,11 @@ Paypal <{1}> 歌播放列表曲被随机。 + Fuzzy 歌曲被移动 + Fuzzy {0}小时 {1}分钟 {2}秒 @@ -1497,18 +1558,22 @@ Paypal <{1}> 在{0}频道上禁止所有组件的使用。 + Fuzzy 在{0}频道上允许启用所有组件。 + Fuzzy 允许 {0}身份的所有组件被禁止使用。 + Fuzzy {0}身份的所有组件被允许使用。 + Fuzzy 在此服务器上禁止所有组件的使用。 @@ -1518,9 +1583,11 @@ Paypal <{1}> {0}用户的所有模块被禁止使用。 + Fuzzy {0}用户的所有模块被允许使用。 + Fuzzy ID为{1}被加入黑名单{0} @@ -1530,18 +1597,22 @@ Paypal <{1}> 命令{0}没有冷却时间了，现有所有的冷却时间已被清除。 + Fuzzy 没有设置命令冷却时间。 命令成本 + Fuzzy {2}频道上已停用{0} {1}。 + Fuzzy 已在{2}频道上启用{0} {1}的使用。 + Fuzzy 被拒绝 @@ -1551,6 +1622,7 @@ Paypal <{1}> 被过滤的词列表 + Fuzzy 已从过滤字词列表中删除{0}。 @@ -1686,12 +1758,15 @@ Paypal <{1}> 竞争模式失败次数 + Fuzzy 竞争模式玩次数 + Fuzzy 竞争模式排名 + Fuzzy 竞争模式胜利次数 @@ -1746,6 +1821,7 @@ Paypal <{1}> 图片搜索： + Fuzzy 找不到该电影。 @@ -1789,9 +1865,11 @@ Paypal <{1}> 等候接听 + Fuzzy 原始网址 + Fuzzy 需要osu！API密钥。 @@ -1819,15 +1897,18 @@ Paypal <{1}> 个人资料链接： + Fuzzy 质量： 快速游戏时间 + Fuzzy 快赢 + Fuzzy 评分 @@ -1837,12 +1918,14 @@ Paypal <{1}> 搜索： + Fuzzy 无法缩短该链接。 短链接 + Fuzzy 出了些问题。 @@ -1855,6 +1938,7 @@ Paypal <{1}> 储存链接 + Fuzzy 直播台{0}已离线。 @@ -1920,13 +2004,14 @@ Paypal <{1}> 请输入目标维基，然后搜索查询。 - 找不到网页。 + 找不到该页面。 风速 + Fuzzy - {0}个被禁止最多的英雄 + {0}个被封号最多的英雄 无法yodify您的句子。 @@ -1935,12 +2020,13 @@ Paypal <{1}> 加入 - `{0} .` {1} [{2：F2} / s] - {3}总计 + `{0}.` {1} [{2:F2}/秒] - {3} 总计 /s and total need to be localized to fit the context - `1.` 活动页面＃{0} + Fuzzy {0}个用户。 @@ -1952,16 +2038,18 @@ Paypal <{1}> 机器ID - {0} calc命令功能列表 + {0} 计算器命令列表 此频道的{0}是{1} 频道主题 + Fuzzy - 执行命令 + 执行的命令 + Fuzzy {0} {1}等于{2} {3} @@ -1973,10 +2061,11 @@ Paypal <{1}> 无法将{0}转换为{1}：找不到单位 - 无法将{0}转换为{1}：单位类型不相等 + 无法将{0}转换为{1}：单位类型不属于一类 创建于 + Fuzzy 加入跨服务器频道。 @@ -1989,13 +2078,13 @@ Paypal <{1}> 自定义Emojis + Fuzzy 错误 - 特征 - + 功能 ID @@ -2007,10 +2096,11 @@ Paypal <{1}> 以下是这个身份的用户列表： - 您不能对其中有用户很多的身份使用此命令来防止滥用。 + 为防止滥用，您不能对有过多用户的身份使用此命令。 + Fuzzy - 值{0}错误。 + {0}值错误。 Invalid months value/ Invalid hours value @@ -2018,17 +2108,20 @@ Paypal <{1}> 加入服务器 + Fuzzy ID：{0} 会员数：{1} 业主ID：{2} + Fuzzy 在该网页上找不到服务器。 重复列表 + Fuzzy 会员 @@ -2041,6 +2134,7 @@ Paypal <{1}> 消息重复功能 + Fuzzy 名字 @@ -2052,7 +2146,7 @@ Paypal <{1}> 没有人在玩那个游戏 - 没有活动重复功能。 + 没有正在重复的消息。 此页面上没有身份。 @@ -2078,10 +2172,10 @@ Paypal <{1}> {2}个语音频道 - 删除所有引号使用{0}关键字。 + 已删除所有使用{0}关键字的引用。 - {0}页引号 + 引用的第{0}页 此页面上没有引用。 @@ -2093,13 +2187,14 @@ Paypal <{1}> 引用被添加 - 删除了随机引用。 + 随机删除了一个引用。 区域 注册日 + Fuzzy 我将在{2}`（{3：d.M.yyyy。}的{4：HH：mm}）提醒{0}关于{1} @@ -2114,7 +2209,8 @@ Paypal <{1}> 会每{1}天{2}小时{3}分钟重复{0}。 - 重复列表 + 重复消息列表 + Fuzzy 此服务器上没有运行重复消息。 @@ -2138,7 +2234,7 @@ Paypal <{1}> {1}身份的第{0}页 - 颜色的格式不正确。 例如，使用‘＃00ff00’。 + 颜色的格式不正确。 例如，使用 “#00ff00”。 开始轮流{0}身份的颜色。 @@ -2151,15 +2247,17 @@ Paypal <{1}> 服务器信息 + Fuzzy 分片 分片统计 + Fuzzy - 分片**＃{0} **处于{1}状态与{2}台服务器 + 分片**＃{0} **与{2}台服务器处于{1}状态 **名称：** {0} **链接：** {1} @@ -2172,6 +2270,7 @@ Paypal <{1}> 文字频道 + Fuzzy 这是你的房间链接： @@ -2180,7 +2279,7 @@ Paypal <{1}> 正常运行时间 - 此用户 {1} 的{0} 是 {2} + 用户 {1} 的{0} 是 {2} Id of the user kwoth#1234 is 123123123123 @@ -2188,6 +2287,41 @@ Paypal <{1}> 语音频道 + Fuzzy + + + 你已经参加这场比赛！ + + + 当前投票结果 + + + 没有票投。 + + + 此服务器上已运行投票。 + + + 📃{0}创建一个需要您注意的投票： + + + '{0}'。{1} 有 {2}票。 + + + {0}投了票。 + Kwoth voted. + + + 私人消息我相应答案的数字。 + + + 在这里发送消息相应答案的数字。 + + + 谢谢投票，{0} + + + {0}投票总数。 \ No newline at end of file From fe2c7171578ccd23ffbb242a361578930647b64a Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 6 Mar 2017 17:07:16 +0100 Subject: [PATCH 188/496] Update ResponseStrings.zh-TW.resx (POEditor.com) --- .../Resources/ResponseStrings.zh-TW.resx | 574 +++++++++--------- 1 file changed, 300 insertions(+), 274 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx b/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx index 3ab3c220..7b58202d 100644 --- a/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx +++ b/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx @@ -1,121 +1,121 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 該基地已被佔領或摧毀。 @@ -344,22 +344,22 @@ 目前的告別訊息: {0} - 輸入 {0} 來啟用告別訊息 + 輸入 {0} 來啟用告別通知 新的告別訊息已設定。 - 告別訊息已停用。 + 告別通知已停用。 - 在這個頻道啟用告別訊息。 + 在這個頻道啟用告別通知。 頻道名稱已更改 - 舊名 + 舊頻道名稱 頻道主題已更改 @@ -434,43 +434,43 @@ 新的歡迎私訊已設定。 - DM歡迎公告關閉。 + 私訊歡迎公告已停用。 私訊歡迎公告已啟用。 - 当前欢迎消息是：{0} + 目前的歡迎訊息: {0} - 输入{0}来启用欢迎消息 + 輸入 {0} 來啟用歡迎訊息 - 新欢迎消息设定成功。 + 新的歡迎訊息已設定。 - 欢迎公告关闭。 + 歡迎通知已關閉。 - 欢迎公告在此频道开启。 + 在這個頻道啟用歡迎通知。 - 您不能对身份层次结构中身份高于或等于您的身份的用户使用此命令。 + 您不能對身分組與您一樣或更高的人使用此指令。 - {0} 秒後載入圖片！ + 圖片共花了 {0} 秒載入! - 格式輸入無效。 + 無效的輸入格式。 - 參數無效。 + 無效的參數。 {0} 已加入 {1} - 你已被從 {0} 伺服器踢出。 + 你已被 {0} 伺服器踢出。 原因：{1} @@ -478,71 +478,69 @@ Fuzzy - 語言列表 + 可用的語言清單 {0} Fuzzy - 您的服务器的语言设置现在为{0} - {1} + 您的伺服器語言現在為 {0} - {1} - 机器人的默认语言环境现在是{0} - {1} + Bot的預設語言為 {0} - {1} - 机器人的语言设置为{0} - {1} + Bot的語言已被設定為 {0} - {1} - 设置语言设置失败。 重新访问此命令帮助。 + 語言設定失敗，請重新檢閱本指令說明。 - 此服务器的语言设置为{0} - {1} + 本伺服器的語言現在為 {0} - {1} - {0}已离开{1} + {0} 已離開 {1} - 离开服务器{0} + 已離開伺服器 {0} - 在此频道中记录{0}事件。 + 在此頻道中紀錄 {0} 事件。 - 记录频道中所有事件 + 在此頻道中記錄所有事件。 - 记录功能取消 + 紀錄功能已停用。 - 您可以设定的记录项目： + 您可以記錄的事件: - 记录会忽略{0} + 紀錄將會忽略 {0} - 记录不会忽略{0} + 紀錄將不會忽略 {0} - 已停止记录{0}事件。 + 已停止紀錄 {0} 事件。 - {0}已经提到了以下身份 + {0} 提到了下列身分組 - 来自{0}`[机器人主人]’的消息： + 来自 {0} '[Bot所有者]’ 的消息： - 消息已发. + 訊息已傳送。 - {0}被移动由{1}到{2} + {0} 已從 {1} 移動至 {2} - 在＃{0}中删除讯息 - Fuzzy + #{0} 中删除了讯息 - 讯息在＃{0}中被更新 - Fuzzy + #{0} 中更新了訊息 已静音 @@ -553,321 +551,317 @@ singular "User muted." - 权限不够执行此命令 + 我並沒有足夠的權限來執行此指令。 - 新的静音角色设定成功。 + 新的禁言身分已設定。 - 我需要**管理**权限才能做那个。 + 我需要此伺服器的**管理**權限才能執行此指令。 - 新消息 + 新訊息 Fuzzy - 新昵称 + 新暱稱 Fuzzy - 新主题 + 新主題 Fuzzy - 昵称成功更换 + 暱稱已變更 Fuzzy - 找不到该服务器 + 找不到那個伺服器 - 找不到具有该ID的分片。 + 找不到有著那個ID的Shard。 - 旧信息 + 舊訊息 Fuzzy - 旧昵称 + 舊暱稱 Fuzzy - 旧题目 + 舊主題 Fuzzy - 失败。很可能我没有足够的权限。 + 錯誤: 很可能我並沒有足夠的權限。 - 重置此服务器的权限。 + 此伺服器的權限已重設。 - 主动保护 - Fuzzy + 生效中的保護機制 - {0}已在此服务器禁用。 + {0} 已在此伺服器 **停用**。 - {0}已启用。 + {0} 已啟用。 - 失败。 我需要 ManageRoles 权限 + 錯誤。我需要此伺服器的 管理身分組 權限 - 未启用保护项目。 + 沒有生效中的保護機制 Fuzzy - 用户阈值必须介于{0}和{1}之间。 + 用戶緩衝數應介於 {0} 和 {1} 之間。 - 如果{0}或更多用户在{1}秒内加入，我将{2}他们。 + 如果 {1} 秒內進入了 {0} 或更多位使用者，我則會將他們 {2} 。 - 时间必须在{0}和{1}秒之间。 + 時間必須在於 {0} 和 {1} 秒之間。 - 已成功从用户{0}中移除所有身份 + 已成功移除了使用者 {0} 上所有的身分組。 - 无法移除身份。 我没有足够的权限。 + 無法移除身分組。我的權限不夠。 - {0}身份的颜色已更改。 + {0} 身份組的顏色已變更。 - 那个身份不存在。 + 那個身分組並不存在。 - 指定的参数错误。 + 指定的參數錯誤。 - 由于颜色无效或权限不足而发生错误。 + 無效的色碼或是權限不足引起錯誤。 - 已成功从用户{1}中删除身份{0} + 成功的移除 {1} 的 {0} 身分組。 - 无法移除身份。 我没有足够的权限。 + 無法移除身分組。我沒有足夠的權限。 - 身份名已改 + 身分組名已改。 - 身份重命名失败。我的权限不足。 + 身分組名變更失敗。我沒有足夠的權限。 - 您不能编辑比你 + 您不能编辑比你最高身分組還高的身分組。 - 已移除游玩消息：{0} + 已移除遊玩訊息: {0} - 身份{0}已添加到列表中。 + 身分組 {0} 已新增至清單。 - {0}未找到。已清理。 + {0} 未找到。已清理。 - 身份{0}已在列表中。 + 身分組 {0} 已在清單中。 - 添加成功. + 新增成功。 - 旋转游玩状态关闭。 + 輪播遊玩狀態已停用。 - 旋转游玩状态开启。 + 輪播遊玩狀態已啟用。 - 以下是旋转状态列表： + 輪播遊玩狀態清單： {0} - 未设置旋转游戏状态。 + 尚未設定輪播遊玩狀態。 - 您已经拥有{0}身份。 + 您已經是 {0} 身分組了。 - 您已拥有{0}独占的自行分配。 + 您已經是 {0} 身分組的成員，您一次只能加入一個自入身分群組。 - 自行分配身份现在是独家！ + 自入身分群組現在為擇一模式。 - 有{0}个可自行分配身份 + 有 {0} 個可以自入的身分群組 - 这个身份是不可自行分配的。 + 此身分組並不能自行加入。 - 您没有{0}身份。 + 您並不是 {0} 身份組的成員。 - 自我分配的身份现在不是独家的！ + 自入身分群組不再為擇一模式! - 我无法向您添加该身份。 ‘我不能向身份层次结构中我身份以外的所有者或其他身份添加身份。’ + 我無法新增身分組比我還高的身分組給您。 - {0}已从可自我分配身份列表中删除。 + {0} 已從自入身分組清單中移除。 - 您不再拥有{0}身份。 + 您不再是 {0} 身分組的成員了。 - 您现在拥有{0}身份。 + 您現在是 {0} 身份組的成員了。 - 已成功将身份{0}添加到用户{1} + 成功將 {0} 身分組指派給 {1} - 无法添加身份。 我没有足够的权限。 + 無法指派身分組。我沒有足夠的權限。 - 新头像集！ + 新的大頭貼已設定! - 新频道名称设定。 + 新的頻道名稱已設定。 - 新游戏设定！ + 新的遊戲名稱已設定! - 新直播设定！ + 新的實況已設定! - 新频道主题集。 + 新的頻道主題已設定! - 分段{0}已重新连接。 + Shard {0} 已重新連線。 - 分段{0}重新连接中。 + Shard {0} 重新連線中。 - 关闭中 + 關閉中 - 用户不能在{1}秒内发送超过{0}条消息。 + 使用者無法在 {1} 秒發送超過 {0} 條訊息。 - 慢速模式关闭。 + 慢速模式已停用。 - 慢速模式启动 + 慢速模式已啟用 - 软禁（踢出） + 軟禁 (踢出) PLURAL - {0}将忽略此通道。 + {0} 將會忽略此頻道。 - 0}将不再忽略此通道。 + {0} 將會注意此頻道。 - 如果用户发布{0}个相同的消息，我会{1}他们。 -     __IgnoredChannels__：{2} + 如果使用者連續貼出 {0} 個相同的訊息，我將會把他們 {1}。 +     __忽略的頻道__: {2} - 新文字频道成立 + 文字頻道已建立 Fuzzy - 文字频道已删除 + 文字頻道已刪除 Fuzzy - Undeafen成功。 + 成功解除靜音。 - 已取消静音 + 解除靜音 singular - 用户名 + 使用者名稱 - 用户名已更改 + 使用者名稱已更改 Fuzzy - 用户 + 使用者 - 用户被禁止 + 使用者已封鎖 Fuzzy - {0}已从聊天内被静音**。 + {0} 已**被禁**__文字聊天__。 - {0}已从聊天内**取消静音**。 + {0} 已**允許**__文字聊天__。 - 用户已加入 + 使用者已加入 Fuzzy - 用户离开了 + 使用者已離開 Fuzzy - {0} 已被文字与语音静音了 + {0} 已**被禁**__文字和語音聊天__。 - 用户身份添加成功 - Fuzzy + 使用者身分組已新增 - 用户身份移除了 + 已移除用戶的身分組 Fuzzy {0} 改成了 {1} - {0}已从文字和语音频道中取消静音**。 + {0} 已從文字頻道和語音頻道被**取消禁音**。 - {0}已加入{1}语音通道。 + {0} 已加入 {1} 語音頻道。 - {0}已离开{1}语音通道。 + {0} 已離開 {1} 語音頻道。 - {0}已从{1}移至{2}语音通道。 + {0} 已從 {1} 移至 {2} 語音頻道。 - {0}已被**静音**。 + {0} 已被**静音**。 - {0}已被**取消静音**。 + {0} 已被**取消静音**。 - 语音频道已创建 - Fuzzy + 已建立語音頻道 - 语音通道已被毁 - Fuzzy + 已刪除語音頻道 - 已停用语音+文字功能。 + 已停用語音+文字功能。 - 启用语音+文字功能。 + 已啟用語音+文字功能。 - 我没有**管理身份**和/或**管理频道**权限，所以我不能在{0}服务器上运行`语音+文字`。 + 我沒有**管理身分組**和/或**管理頻道**權限，所以我無法在 {0} 伺服器上運行`語音+文字`。 - 您正在启用/禁用此功能，并且**我没有ADMINISTRATOR权限**。 这可能会导致一些问题，您必须自己清理文本频道。 + 您正在啟用/停用此功能，而且**我没有管理員權限**。這可能會造成一些問題，您必須自己清理文字頻道。 我需要至少**管理身份**和**管理频道**权限，以启用此功能。 （优先管理权限） @@ -904,10 +898,10 @@ Fuzzy - 已将{0}奖励给{1} + 已給予 {0} 給 {1} - 下一次好运^ _ ^ + 祝你下一次好運 ^_^ 恭喜！ 您赢得{0}因为您滚{1}或以上 @@ -916,35 +910,34 @@ 卡牌改组。 - 抛了{0}。 + 拋出了 {0}。 User flipped tails. - 你猜到了！ 您赢得了{0} + 你猜對了！你赢得了 {0} - 指定的数字无效。 你可以抛1到{0}钱币。 + 指定的數字無效。你可以丟 1 至 {0} 個硬幣。 将{0}反应添加到此消息以获取{1} - 此活动在{0}小时内有效。 + 此活動只在 {0} 小時內有效。 花反应活动开始了！ - 给了{1}{0} + 送了 {1} 給 {0} X has gifted 15 flowers to Y - {0}拥有{1} + {0} 擁有 {1} X has Y flowers - 头 - Fuzzy + 頭 排行榜 @@ -953,13 +946,13 @@ 从{2}身份授予{0}至{1}名用户。 - 您赌注不能超过{0} + 你的賭注不能大於 {0} - 您赌注不能低于{0} + 你的賭注不能少於 {0} - 您没有足够的{0} + 你沒有足夠的 {0} 卡牌组中没有更多的牌。 @@ -972,10 +965,10 @@ 您抛了{0}。 - 赌注 + 賭注 - 哇啊啊啊啊啊啊！ 恭喜！ x {0} + 哇啊啊啊啊啊啊！恭喜！x{0} 单个{0}，x {1} @@ -987,7 +980,7 @@ 做得好！ 两个{0} - 投注x {1} - 胜利 + 獲勝 用户必须键入密码才能获取{0}。 @@ -2292,7 +2285,40 @@ Paypal <{1}> Fuzzy - + 你已經加入這場比賽了！ + + + 目前投票結果 + + + 沒有投票。 + + + 投票已在這個伺服器進行。 + + + 📃 {0} 已建立一個投票 which requires your attention: + Fuzzy + + + `{0}.` {1} 有 {2} 票。 + Fuzzy + + + {0} 已投票。 + Kwoth voted. + + + 私訊我相對數字的答案。 + + + 發送相對數字的答案在這裡。 + + + 感謝你的投票, {0} + + + 共收到 {0}票。 \ No newline at end of file From ac752cffea67ef77e382ee0951c26dc9eedb024a Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 6 Mar 2017 17:07:21 +0100 Subject: [PATCH 189/496] Update ResponseStrings.fr-fr.resx (POEditor.com) --- .../Resources/ResponseStrings.fr-fr.resx | 139 +++++++++++++++++- 1 file changed, 137 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx b/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx index b0bcd0c5..bed50a57 100644 --- a/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx +++ b/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx @@ -140,6 +140,7 @@ La demande de la part de @{0} pour une guerre contre {1} a expiré. + Fuzzy Ennemi @@ -152,9 +153,11 @@ La taille de la guerre n'est pas valide. + Fuzzy Liste des guerres en cours + Fuzzy non réclamé @@ -167,6 +170,7 @@ Aucune guerre en cours. + Fuzzy Taille @@ -206,6 +210,7 @@ Aucune réaction personnalisée trouvée. + Fuzzy Aucune réaction personnalisée ne correspond à cet ID. @@ -468,10 +473,12 @@ Raison : {1} Utilisateur expulsé + Fuzzy Listes des langues {0} + Fuzzy La langue du serveur est désormais {0} - {1} @@ -530,9 +537,11 @@ Raison : {1} Message supprimé dans #{0} + Fuzzy Mise à jour du message dans #{0} + Fuzzy Tous les utilisateurs sont maintenant muets. @@ -553,15 +562,19 @@ Raison : {1} Nouveau message + Fuzzy Nouveau pseudonyme + Fuzzy Nouveau sujet + Fuzzy Pseudonyme changé + Fuzzy Impossible de trouver ce serveur @@ -572,12 +585,15 @@ Raison : {1} Ancien message + Fuzzy Ancien pseudonyme + Fuzzy Ancien sujet + Fuzzy Erreur. Je ne dois sûrement pas posséder les permissions suffisantes. @@ -587,6 +603,7 @@ Raison : {1} Protections actives + Fuzzy {0} a été **désactivé** sur ce serveur. @@ -599,6 +616,7 @@ Raison : {1} Aucune protection activée. + Fuzzy Le seuil d'utilisateurs doit être entre {0} et {1}. @@ -762,9 +780,11 @@ Raison : {1} Salon textuel crée. + Fuzzy Salon textuel supprimé. + Fuzzy Son activé avec succès. @@ -778,12 +798,14 @@ Raison : {1} Nom d'utilisateur modifié. + Fuzzy Utilisateurs Utilisateur banni + Fuzzy {0} est maintenant **muet** sur le chat. @@ -793,18 +815,22 @@ Raison : {1} L'utilisateur a rejoint + Fuzzy L'utilisateur a quitté + Fuzzy {0} est maintenant **muet** à la fois sur les salons textuels et vocaux. Rôle ajouté à l'utilisateur + Fuzzy Rôle retiré de l'utilisateur + Fuzzy {0} est maintenant {1} @@ -829,9 +855,11 @@ Raison : {1} Salon vocal crée. + Fuzzy Salon vocal supprimé. + Fuzzy Fonctionnalités vocales et textuelles désactivées. @@ -863,6 +891,7 @@ Raison: {1} Utilisateur débanni + Fuzzy Migration effectuée! @@ -872,9 +901,11 @@ Raison: {1} Présences mises à jour. + Fuzzy Utilisateur expulsé. + Fuzzy a récompensé {0} à {1} @@ -918,6 +949,7 @@ Raison: {1} Face + Fuzzy Classement @@ -939,6 +971,7 @@ Raison: {1} Utilisateur tiré au sort + Fuzzy Vous avez roulé un {0}. @@ -972,6 +1005,7 @@ Raison: {1} Pile + Fuzzy Vous avez pris {0} de {1} avec succès @@ -984,6 +1018,7 @@ Raison: {1} Propriétaire du Bot seulement + Fuzzy Nécessite {0} permissions du salon. @@ -993,9 +1028,11 @@ Raison: {1} Commandes et alias + Fuzzy Liste des commandes rafraîchie. + Fuzzy Écrivez `{0}h NomDeLaCommande` pour voir l'aide spécifique à cette commande. Ex: `{0}h >8ball` @@ -1017,12 +1054,15 @@ N'oubliez pas de mettre votre nom discord ou ID dans le message. **Liste des Commandes**: <{0}> **La liste des guides et tous les documents peuvent être trouvés ici**: <{1}> + Fuzzy Liste des commandes + Fuzzy Liste des modules + Fuzzy Entrez `{0}cmds NomDuModule` pour avoir la liste des commandes de ce module. ex `{0}cmds games` @@ -1035,6 +1075,7 @@ N'oubliez pas de mettre votre nom discord ou ID dans le message. Table des matières + Fuzzy Usage @@ -1048,6 +1089,7 @@ N'oubliez pas de mettre votre nom discord ou ID dans le message. Course d'animaux + Fuzzy Pas assez de participants pour commencer. @@ -1098,9 +1140,11 @@ N'oubliez pas de mettre votre nom discord ou ID dans le message. Changements de Coeur + Fuzzy Revendiquée par + Fuzzy Divorces @@ -1219,6 +1263,7 @@ La nouvelle valeur de {0} est {1} ! Inscriptions terminées. + Fuzzy Une course d'animaux est déjà en cours. @@ -1254,6 +1299,7 @@ La nouvelle valeur de {0} est {1} ! La jeu a commencé. + Fuzzy Partie de pendu commencée. @@ -1322,15 +1368,18 @@ La nouvelle valeur de {0} est {1} ! {0} a gagné ! + Fuzzy Trois alignés. + Fuzzy Aucun mouvement restant ! Le temps a expiré ! + Fuzzy Tour de {0}. @@ -1358,6 +1407,7 @@ La nouvelle valeur de {0} est {1} ! Lecture terminée + Fuzzy Système de tour de rôle désactivé. @@ -1394,6 +1444,7 @@ La nouvelle valeur de {0} est {1} ! Vous écoutez + Fuzzy Aucun lecteur de musique actif. @@ -1406,15 +1457,18 @@ La nouvelle valeur de {0} est {1} ! File d'attente - Page {0}/{1} + Fuzzy Lecture en cours + Fuzzy `#{0}` - **{1}** par *{2}* ({3} pistes) Page {0} des listes de lecture sauvegardées + Fuzzy Liste de lecture supprimée. @@ -1430,6 +1484,7 @@ La nouvelle valeur de {0} est {1} ! Liste de lecture sauvegardée + Fuzzy Limite à {0}s @@ -1439,6 +1494,7 @@ La nouvelle valeur de {0} est {1} ! Piste ajoutée à la file d'attente + Fuzzy File d'attente effacée. @@ -1452,12 +1508,15 @@ La nouvelle valeur de {0} est {1} ! Répétition de la piste en cours de lecture + Fuzzy Liste de lecture en boucle + Fuzzy Piste en boucle + Fuzzy La piste ne sera lue qu'une fois. @@ -1479,9 +1538,11 @@ La nouvelle valeur de {0} est {1} ! Lecture aléatoire activée. + Fuzzy Piste déplacée + Fuzzy {0}h {1}m {2}s @@ -1500,18 +1561,22 @@ La nouvelle valeur de {0} est {1} ! Désactivation de l'usage de TOUS LES MODULES pour le salon {0}. + Fuzzy Activation de l'usage de TOUS LES MODULES pour le salon {0}. + Fuzzy Permis Désactivation de l'usage de TOUS LES MODULES pour le rôle {0}. + Fuzzy Activation de l'usage de TOUS LES MODULES pour le rôle {0}. + Fuzzy Désactivation de l'usage de TOUS LES MODULES sur ce serveur. @@ -1521,9 +1586,11 @@ La nouvelle valeur de {0} est {1} ! Désactivation de l'usage de TOUS LES MODULES pour l'utilisateur {0}. + Fuzzy Activation de l'usage de TOUS LES MODULES pour l'utilisateur {0}. + Fuzzy {0} sur liste noire avec l'ID {1} @@ -1534,18 +1601,22 @@ La nouvelle valeur de {0} est {1} ! La commande {0} n'a pas de temps de recharge et tous les temps de recharge ont été réinitialisés. + Fuzzy Aucune commande n'a de temps de recharge. Coût de la commande : + Fuzzy Usage de {0} {1} désactivé sur le salon {2}. + Fuzzy Usage de {0} {1} activé sur le salon {2}. + Fuzzy Refusé @@ -1555,6 +1626,7 @@ La nouvelle valeur de {0} est {1} ! Liste Des Mots Filtrés + Fuzzy Suppression du mot {0} de la liste des mots filtrés. @@ -1690,12 +1762,15 @@ La nouvelle valeur de {0} est {1} ! Parties compétitives perdues + Fuzzy Parties compétitives jouées + Fuzzy Rang en compétitif + Fuzzy Parties compétitives gagnées @@ -1751,6 +1826,7 @@ La nouvelle valeur de {0} est {1} ! Recherche d'images pour: + Fuzzy Impossible de trouver ce film. @@ -1794,9 +1870,11 @@ La nouvelle valeur de {0} est {1} ! En attente + Fuzzy Url originale + Fuzzy Une clé d'API osu! est nécessaire. @@ -1825,15 +1903,18 @@ La nouvelle valeur de {0} est {1} ! Lien du profil : + Fuzzy Qualité Durée en Jeux Rapides + Fuzzy Victoires Rapides + Fuzzy Évaluation @@ -1843,13 +1924,15 @@ La nouvelle valeur de {0} est {1} ! Chercher pour: - recherche plutôt non ? + recherche plutôt non ? +Fuzzy Impossible de réduire cette Url. Url réduite + Fuzzy Une erreur s'est produite. @@ -1862,6 +1945,7 @@ La nouvelle valeur de {0} est {1} ! Url stockée + Fuzzy Le streamer {0} est hors ligne. @@ -1931,6 +2015,7 @@ La nouvelle valeur de {0} est {1} ! Vitesse du vent + Fuzzy Les {0} champions les plus bannis @@ -1948,6 +2033,7 @@ La nouvelle valeur de {0} est {1} ! Page d'activité #{0} + Fuzzy {0} utilisateurs en total. @@ -1966,9 +2052,11 @@ La nouvelle valeur de {0} est {1} ! Sujet du salon + Fuzzy Commandes exécutées + Fuzzy {0} {1} est équivalent à {2} {3} @@ -1984,6 +2072,7 @@ La nouvelle valeur de {0} est {1} ! Créé le + Fuzzy Salon inter-serveur rejoint. @@ -1996,6 +2085,7 @@ La nouvelle valeur de {0} est {1} ! Emojis personnalisées + Fuzzy Erreur @@ -2014,6 +2104,7 @@ La nouvelle valeur de {0} est {1} ! Vous ne pouvez pas utiliser cette commande sur un rôle incluant beaucoup d'utilisateurs afin d'éviter les abus. + Fuzzy Valeur {0} invalide. @@ -2024,17 +2115,20 @@ La nouvelle valeur de {0} est {1} ! Serveur rejoint + Fuzzy ID: {0} Membres: {1} OwnerID: {2} + Fuzzy Aucun serveur trouvée sur cette page. Liste des messages répétés + Fuzzy Membres @@ -2047,6 +2141,7 @@ OwnerID: {2} Répéteur de messages + Fuzzy Nom @@ -2107,6 +2202,7 @@ OwnerID: {2} Inscrit sur + Fuzzy Je vais vous rappeler {0} pour {1} dans {2} `({3:d.M.yyyy} à {4:HH:mm})` @@ -2122,6 +2218,7 @@ OwnerID: {2} Liste des répétitions + Fuzzy Aucune répétition active sur ce serveur. @@ -2158,6 +2255,7 @@ OwnerID: {2} Info du serveur + Fuzzy Shard @@ -2165,7 +2263,8 @@ OwnerID: {2} Statistique des shards - Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. + Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. +Fuzzy Le shard **#{0}** est en état {1} avec {2} serveurs. @@ -2182,6 +2281,7 @@ OwnerID: {2} Salons textuels + Fuzzy Voici le lien pour votre salon: @@ -2198,6 +2298,41 @@ OwnerID: {2} Salons vocaux + Fuzzy + + + Vous avez déjà rejoint cette course! + + + Résultats du sondage actuel + + + Aucun vote enregistré. + + + Un sondage est déjà en cours sur ce serveur. + + + 📃 {0} a créé un sondage qui requiert votre attention: + + + `{0}.` {1} avec {2} votes. + + + {0} a voté. + Kwoth voted. + + + Envoyez moi un message privé avec le numéro correspondant à la réponse. + + + Envoyez un Message ici avec le numéro correspondant à la réponse. + + + Merci d'avoir voté, {0} + + + {0} votes enregistrés au total. \ No newline at end of file From 7ca64392a0f35f78b990eae8f33f4d4e4205f32a Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 6 Mar 2017 17:07:24 +0100 Subject: [PATCH 190/496] Update ResponseStrings.de-DE.resx (POEditor.com) --- .../Resources/ResponseStrings.de-DE.resx | 141 +++++++++++++++++- 1 file changed, 139 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.de-DE.resx b/src/NadekoBot/Resources/ResponseStrings.de-DE.resx index 318404de..879094e3 100644 --- a/src/NadekoBot/Resources/ResponseStrings.de-DE.resx +++ b/src/NadekoBot/Resources/ResponseStrings.de-DE.resx @@ -140,6 +140,7 @@ Beanspruchung von @{0} für den Krieg gegen {1} ist abgelaufen. + Fuzzy Gegner @@ -152,9 +153,11 @@ Keine gültige Kriegsgröße. + Fuzzy Liste der aktiven Kriege + Fuzzy nicht beansprucht @@ -167,6 +170,7 @@ Keine aktiven Kriege. + Fuzzy Größe @@ -206,6 +210,7 @@ Keine benutzerdefinierten Reaktionen gefunden. + Fuzzy Keine benutzerdefinierte Reaktion mit dieser ID gefunden. @@ -468,10 +473,12 @@ Grund: {1} Benutzer wurde gekickt + Fuzzy Liste der Sprachen {0} + Fuzzy Die Sprachumgebung des Servers ist jetzt {1} - {1} @@ -530,9 +537,11 @@ Grund: {1} Nachricht in #{0} gelöscht + Fuzzy Nachricht in #{0} aktualisiert + Fuzzy wurden Stumm geschalten @@ -553,15 +562,19 @@ Grund: {1} Neue Nachricht + Fuzzy Neuer Nickname + Fuzzy Neues Thema + Fuzzy Nickname wurde geändert + Fuzzy Konnte den Server nicht finden @@ -571,12 +584,15 @@ Grund: {1} Alte Nachricht + Fuzzy Alter Nickname + Fuzzy Altes Thema + Fuzzy Fehler. Ich habe wahrscheinlich nicht ausreichend Rechte. @@ -586,6 +602,7 @@ Grund: {1} Aktive Schutzmechanismen + Fuzzy {0} wurde auf diesem Server **deaktiviert**. @@ -598,6 +615,7 @@ Grund: {1} Keine Schutzmechanismen aktiviert. + Fuzzy Benutzerschwelle muss zwischen {0} und {1} sein. @@ -757,9 +775,11 @@ __ignoredChannels__: {2} Textkanal erstellt + Fuzzy Textkanal zerstört + Fuzzy Taubschaltung aufgehoben. @@ -773,12 +793,14 @@ __ignoredChannels__: {2} Benutzername geändert + Fuzzy Benutzer Benutzer gebannt + Fuzzy {0} wurde **stummgeschaltet** im Chat. @@ -788,18 +810,22 @@ __ignoredChannels__: {2} Benutzer ist beigetreten + Fuzzy Benutzer ist gegangen + Fuzzy {0} wurde **stummgeschaltet** im Text- und Sprachchat. Benutzerrolle hinzugefügt + Fuzzy Benutzerrolle entfernt + Fuzzy {0} ist nun {1} @@ -824,10 +850,12 @@ __ignoredChannels__: {2} Sprachkanal erstellt - Should say "Voice Channel Created" + Should say "Voice Channel Created" +Fuzzy Sprachkanal zerstört + Fuzzy Text- und Sprachfunktion deaktiviert. @@ -859,6 +887,7 @@ Grund: {1} Benutzer entbannt + Fuzzy Migration fertig! @@ -868,9 +897,11 @@ Grund: {1} Anwesenheits Änderungen + Fuzzy Nutzer wurde gekickt + Fuzzy gab {0} an {1} @@ -913,6 +944,7 @@ Grund: {1} Kopf + Fuzzy Bestenliste @@ -934,6 +966,7 @@ Grund: {1} Ausgewählter Benutzer + Fuzzy Sie haben eine {0} gewürfelt. @@ -967,6 +1000,7 @@ Grund: {1} Zahl + Fuzzy hat erfolgreich {0} von {1} genommen @@ -979,6 +1013,7 @@ Grund: {1} Nur Bot-Besitzer + Fuzzy Benötigt Kanalrecht {0}. @@ -988,9 +1023,11 @@ Grund: {1} Befehle und Alias + Fuzzy Befehlsliste neu generiert. + Fuzzy Gebe `{0}h NameDesBefehls` ein, um die Hilfestellung für diesen Befehl zu sehen. Z.B. `{0}h >8ball` @@ -1012,12 +1049,15 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu **Liste der Befehle**: <{0}> **Hosting Anleitungen und Dokumentationen können hier gefunden werden**: <{1}> + Fuzzy Lister der Befehle + Fuzzy Liste der Module + Fuzzy Schreibe `{0}cmds ModuleName` um eine Liste aller Befehle dieses Moduls zu erhalten. z.B. `{0}cmds games` @@ -1030,6 +1070,7 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Inhaltsverzeichnis + Fuzzy Verwendung @@ -1042,6 +1083,7 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Tierrennen + Fuzzy Das Rennen konnte nicht gestartet werden, da es nicht genügend Teilnehmer gibt. @@ -1092,9 +1134,11 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Sinneswandel + Fuzzy Beansprucht von + Fuzzy Scheidungen @@ -1213,6 +1257,7 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Einsendungen geschlossen + Fuzzy Tierrennen läuft bereits. @@ -1247,6 +1292,7 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Spiel gestartet + Fuzzy Hangman-Spiel gestartet @@ -1315,15 +1361,18 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu {0} hat gewonnen! + Fuzzy Drei in einer Reihe + Fuzzy Keine Züge übrig Zeit abgelaufen + Fuzzy {0}'s Zug @@ -1351,6 +1400,7 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Lied beendet + Fuzzy Fairer Modus deaktiviert. @@ -1387,6 +1437,7 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Aktuelles Lied: + Fuzzy Kein aktiver Musikspieler. @@ -1399,15 +1450,18 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Musik-Warteschlange - Seite {0}/{1} + Fuzzy Spiele Lied + Fuzzy `#{0}` - **{1}** by *{2}* ({3} Lieder) Seite {0} der gespeicherten Playlists + Fuzzy Playlist gelöscht. @@ -1423,6 +1477,7 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Playlist gespeichert + Fuzzy {0}'s Limit @@ -1432,6 +1487,7 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Eingereihtes Lied + Fuzzy Musik-Warteschlange geleert. @@ -1445,12 +1501,15 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Aktuelles Lied wird wiederholt + Fuzzy Playlist wird wiederholt + Fuzzy Lied wird wiederholt + Fuzzy Aktuelles Lied wird nicht mehr wiederholt. @@ -1472,9 +1531,11 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Lieder gemischt. + Fuzzy Lied bewegt + Fuzzy {0}h {1}m {2}s @@ -1493,18 +1554,22 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Benutzung ALLER MODULE für Kanal {0} verboten. + Fuzzy Benutzung ALLER MODULE für Kanal {0} erlaubt. + Fuzzy Erlaubt Benutzung ALLER MODULE für die Rolle {0} verboten. + Fuzzy Benutzung ALLER MODULE für die Rolle {0} erlaubt. + Fuzzy Benutzung ALLER MODULE für diesen Server verboten. @@ -1514,9 +1579,11 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Benutzung ALLER MODULE für den Benutzer {0} verboten. + Fuzzy Benutzung ALLER MODULE für den Benutzer {0} erlaubt. + Fuzzy {0} mit ID {1} wurde zur Sperrliste hinzugefügt @@ -1526,18 +1593,22 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Befehl {0} hat keine Abklingzeit mehr und alle laufenden Abklingzeiten wurden entfernt. + Fuzzy Keine Befehls Abklingzeiten gesetzt. Preis für Befehle + Fuzzy Benutzung von {0} {1} wurde für Kanal {2} verboten. + Fuzzy Benutzung von {0} {1} wurde für Kanal {2} erlaubt. + Fuzzy Verweigert @@ -1547,6 +1618,7 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Liste der gefilterten Wörter + Fuzzy Wort {0} von der Liste der gefilterten Wörter entfernt. @@ -1683,12 +1755,15 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Verlorene Competitives + Fuzzy Gespielte Competitives + Fuzzy Competitive Rang + Fuzzy Gewonnene Competitives @@ -1743,6 +1818,7 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Bildersuche für: + Fuzzy Konnte diesen Film nicht finden. @@ -1786,9 +1862,11 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Pausierte + Fuzzy Ursprüngliche Url + Fuzzy Ein osu! API-Schlüssel wird benötigt. @@ -1816,15 +1894,18 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Profil Link: + Fuzzy Qualität Quick Spielzeit + Fuzzy Gewonnene Quicks + Fuzzy Bewertung @@ -1834,12 +1915,14 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Suche nach: + Fuzzy Url konnte nicht gekürzt werden Kurze Url + Fuzzy Etwas lief schief. @@ -1852,6 +1935,7 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Geschäfts Url + Fuzzy Streamer {0} ist jetzt offline. @@ -1921,6 +2005,7 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Wind Geschwindigkeit + Fuzzy Die {0} meist gebannten Champions @@ -1938,6 +2023,7 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Aktivitäten Liste #{0} + Fuzzy {0} totale Benutzer. @@ -1956,12 +2042,14 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Thema des Kanals + Fuzzy Befehle ausgeführt Commands ran 9 -^used like that in .stats +^used like that in .stats +Fuzzy {0} {1} ist gleich zu {2} {3} @@ -1977,6 +2065,7 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Erstellt am + Fuzzy Betritt Multi-Server-Kanal. @@ -1989,6 +2078,7 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Benutzerdefinierte Emojis + Fuzzy Fehler @@ -2007,6 +2097,7 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Sie haben keine Berechtigung diesen Befehl auf Rollen mit vielen Nutzern zu benutzen um Missbrauch zu verhindern. + Fuzzy Ungültiger {0} Wert. @@ -2017,17 +2108,20 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Server beigetreten + Fuzzy ID: {0} Mitglieder: {1} ID des Besitzers: {2} + Fuzzy Keine Server auf dieser Seite gefunden. Liste der Wiederholer + Fuzzy Mitglieder @@ -2040,6 +2134,7 @@ ID des Besitzers: {2} Nachrichten Wiederholer + Fuzzy Name @@ -2099,6 +2194,7 @@ ID des Besitzers: {2} Registriert an + Fuzzy Ich werde {0} erinnern {1} in {2} `({3:d.M.yyyy.} um {4:HH:mm})` zu tun. @@ -2114,6 +2210,7 @@ ID des Besitzers: {2} Liste der Wiederholungen + Fuzzy Auf diesem Server laufen keine Wiederholer. @@ -2150,12 +2247,14 @@ ID des Besitzers: {2} Server Info + Fuzzy Shard Shard Statistiken + Fuzzy Shard **#{0}** ist im {1} status mit {2} Servern @@ -2171,6 +2270,7 @@ ID des Besitzers: {2} Text Kanäle + Fuzzy Hier ist Ihr Raum link @@ -2187,6 +2287,43 @@ ID des Besitzers: {2} Sprach Kanäle + Fuzzy + + + Sie sind diesem Rennen schon beigetreten! + + + Aktuelle Umfragewerte + + + Keine Abstimmungen eingereicht. + + + Eine Umfrage läuft bereits auf diesem Server. + + + 📃 {0} hat eine Umfrage erstellt die Ihre Aufmerksamkeit benötigt: + + + `{0}.` {1} mit {2} Abstimmungen. + + + {0} stimmte ab. + Kwoth voted. + + + Senden Sie mir eine Private Nachrciht mit der entsprechenden Nummer der Antwort. + Fuzzy + + + Senden Sie hier eine Nachricht mit der entsprechenden Nummer der Antwort. + + + Danke für das Abstimmen. {0} + + + {0} totale Abstimmungen eingereicht. + Fuzzy \ No newline at end of file From 4fc75f99b4c4508630ae61c4b72e67f7006bb205 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 6 Mar 2017 17:07:26 +0100 Subject: [PATCH 191/496] Update ResponseStrings.ja-JP.resx (POEditor.com) --- .../Resources/ResponseStrings.ja-JP.resx | 491 ++++++++++++------ 1 file changed, 318 insertions(+), 173 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.ja-JP.resx b/src/NadekoBot/Resources/ResponseStrings.ja-JP.resx index 1261856c..fdfc3df1 100644 --- a/src/NadekoBot/Resources/ResponseStrings.ja-JP.resx +++ b/src/NadekoBot/Resources/ResponseStrings.ja-JP.resx @@ -118,35 +118,37 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - その基盤はすでに主張されている。または破壊されました。 - + そのベースはもう要求・破壊されました。 - ベースが破壊されました - + そのベースはもう破壊されました。 - その基地は主張されていない。 - + そのベースは要求されていません。 - {1}との戦いで基地#{0}を**破壊**しました + {1}との対戦でベース#{0}を**破壊**しました。 - + {0}は{2}との戦いで、未請求の塩基番号{1}を持っています + + Fuzzy - + {0}は{2}との戦いで塩基番号{1}を主張しました + - + @ {0}あなたはすでに基本番号{1}を主張しています。あなたは新しいものを請求することはできません。 + - + {1}との戦争で@ {0}からの申し立てが終了しました。 + + The English wording is wrong. - 敵 - + 敵 {0} との戦争に関する情報 @@ -182,8 +184,7 @@ サイズ - 戦争の戦い{0}は既に始まった。 - + {0}に対する大戦が既に始まった。 戦争{0}が作成されました。 @@ -210,7 +211,8 @@ - + 権限が不十分です。グローバルカスタム反応のために必要なボットの所有権、サーバーカスタム反応の管理者。 + すべてのカスタム反応をリストします。 @@ -227,6 +229,7 @@ カスタム反応が見つかりませんでした。 + Fuzzy その識別情報でカスタム反応が見つかりませんでした。 @@ -240,102 +243,132 @@ - + {0}カスタム反応の統計がクリアされました。 + - + そのトリガーの統計は見つかりませんでした。 + 引き金 - + NSFWが停止しました + 結果が見つかりません - + {0}は既に気絶しています。 + - + {0}健康は既に最大です + - + あなたはすでに{0}です + - - Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage. + {4}ダメージのために{2} {3}に{0} {1}を使用しました。 + + Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage. +Fuzzy - + あなたは報復せずに再び攻撃することはできません！ + - + あなた自身を攻撃することはできません。 + - + {0}が気絶しました！ + - + 1つの{1}で{0}を回復しました + - + {0}は{1} HPが残っています。 + - + {0}を使用することはできません。 `{1} ml`と入力すると、使用できる移動のリストが表示されます。 + - + {0}タイプの攻撃リスト + - + それは効果的ではありません。 + - + あなたに十分な{0}がありません。 + - + 1つの{1}で復活{0} + - + 1つの{0}のために癒された + - + あなたのタイプは{1}のために{0}に変更されました + - + それはやや有効です。 + - + それは超効果的です！ + - + あなたは連続してあまりにも多くの動きを使用したので、移動することはできません！ + - + タイプ{0}は{1}です。 + - + ユーザーが見つかりません。 + - + あなたが気絶したので、動かすことはできません。 + - + **ユーザー割り当ての**役割を自動割り当て**が無効**になりました。 + - + **ユーザー割り当ての**役割を自動割り当て**が現在有効になっています**。 + 接続 - + 画像が変更されました。 + - + あなたは{0}サーバーから追放されました。 +理由：{1} 亡命 @@ -343,306 +376,377 @@ ユーザーはＢＡＮＮＥＤ + Fuzzy - + ボット名が{0}に変更されました + - + ボットのステータスが{0}に変更されました + - + byeメッセージの自動削除が無効になっています。 + - + Byeメッセージは{0}秒後に削除されます。 + - + 現在の離脱メッセージ：{0} + - + {0}と入力して休暇メッセージを有効にする + - + 新しい出発メッセージセット。 + - + 出発アナウンスが無効になりました。 + - + このチャンネルで有効になっている出発発言。 + - + チャンネル名が変更されました。 + 古称 - + チャネルトピックが変更されました + - + クリーンアップ + コンテント - + 正常に作成されたロール - + 正常に作成されたロール - + 音声チャネル{0}が作成されました。 - + 聴覚障害者は成功です。 - + 削除されたサーバー{0} + - + 成功したコマンド呼び出しの自動削除を停止しました。 + + Invocations* not invokations - + これで正常に実行されたコマンド呼び出しが自動的に削除されます。 + - + テキストチャネル{0}が削除されました。 + - + 音声チャネル{0}が削除されました。 + タイレクトメッセージガ - + 新しい寄付者を追加しました。このユーザーから寄付された金額：{0} + - + このプロジェクトを実現するために、下記の人々に感謝します！ + - + 私はDMをすべての所有者に転送します。 - + 私は最初の所有者にDMを転送します。 - + 私は今からDMを転送します。 + - + 私は今からDMを転送するのをやめます。 + - + 挨拶メッセージの自動削除が無効になっています。 + - + {0}秒後にメッセージが削除されます。 + - + 現在のDM挨拶メッセージ：{0} + - + {0}を入力してDM greetメッセージを有効にする + - + 新しいDMはメッセージセットを迎える。 + - + DMのお知らせを無効にする - + DMのお知らせを有効にしました。 - + 現在の挨拶メッセージ：{0} + - + {0}と入力してgreetメッセージを有効にする + - + 新しい挨拶メッセージセット。 - + お知らせを無効にしました。 - + このチャンネルでアナウンスを有効にします。 - + このコマンドは、役割階層内の役割以上のユーザーに対しては使用できません。 - + {0}秒後に画像が読み込まれました！ - + 入力フォーマットが無効です。 - + パラメータが無効です。 - + {0}は{1}に参加しました - + あなたは{0}サーバーから蹴られました。 +理由：{1} - + ユーザーが蹴った + Fuzzy - + 言語一覧 +{0} + Fuzzy - + サーバーのロケールが{0} - {1}になりました + - + Botのデフォルトのロケールは{0} - {1}になりました + - + Botの言語は{0} - {1}に設定されています + - + ロケールの設定に失敗しました。このコマンドのヘルプに戻ってください。 - + このサーバーの言語は{0}〜{1}に設定されています + - + {0}さんが{1}を去りました - + {0}サーバーを去った - + このチャネルに{0}イベントを記録します。 - + このチャンネルのすべてのイベントを記録します。 - + ロギングが無効です - + 購読可能なイベントを記録する： - + ロギングは{0}を無視します {0} - + ロギングは{0}を無視しません {0} - + ログに記録された{0}イベントが停止しました。 + - + {0}は次の役割についての言及を呼び出しました + - + {0} `[Bot Owner]`からのメッセージ： + - + メッセージが送信されました。 + - + {0}は{1}から{2}に移動しました + - + ＃{0}でメッセージが削除されました + - + ＃{0}で更新されたメッセージ + Fuzzy ミュート中 - PLURAL (users have been muted) -Fuzzy + PLURAL (users have been muted) - ミュート中 + ミュート + singular "User muted." - + 私はそれに必要な許可を持っていません。 + - + 新しいミュートロールセット。 + - + 管理の権利が必要となります。 - + 新しいメッセージ + Is this： make a new message or、 there is a new message? +Fuzzy - + 新しいニックネーム + Fuzzy - + 新しいトピック + Fuzzy - + ニックネームが変更されました + Fuzzy - + そのサーバーを見つけることができません + - + そのIDのシャードは見つかりませんでした。 + - + 古いメッセージ + Fuzzy - + 古いニックネーム + Fuzzy - + 古いトピック + Fuzzy - + エラー。ほとんどの場合、十分な権限がありません。 + - + このサーバーのアクセス許可はリセットされます。 + - + アクティブな保護 + - + このサーバーで{0}は**無効**になっています。 + - + {0}を有効にしました + - + 保護は有効になっていません。 + - + ユーザーのしきい値は{0}から{1}の間でなければなりません。 + - + {0}以上のユーザーが{1}秒以内に参加する場合は、{2}それらを行います。 + - + 時刻は{0}〜{1}秒の間でなければなりません。 + - + ユーザー{0}からすべてのロールを削除しました + - + ロールを削除できませんでした。私には十分な権限がありません。 + - + {0}ロールの色が変更されました。 + - + その役割は存在しません。 + - + 指定されたパラメータは無効です。 + @@ -699,10 +803,10 @@ Fuzzy - + 自分に割り当てられるロールが{0}個あります。 - + そのロールは自分に割り当てられません。 @@ -726,7 +830,7 @@ Fuzzy - + ロールの追加に失敗しました。アクセス権が足りません。 @@ -810,19 +914,19 @@ Fuzzy - + 利用者が去った - + 利用者にロールを追加した - + 利用者のロールを削除した - + {0}さんは今{1}になった @@ -1359,7 +1463,8 @@ Fuzzy - + 曲が終わった + Fuzzy @@ -1392,16 +1497,17 @@ Fuzzy - + 曲名 - + プレイ中 + Fuzzy - + 検索結果なし @@ -1437,10 +1543,11 @@ Fuzzy - + 次に聞く曲一覧 + Does this mean "the song was added to the queue" ? @@ -1614,7 +1721,7 @@ Fuzzy - + 秒 Short of seconds. @@ -1627,7 +1734,7 @@ Fuzzy - + 編集不可能 @@ -1784,7 +1891,7 @@ Fuzzy - + 最低／最高 @@ -1796,7 +1903,8 @@ Fuzzy - + 元のURL + Fuzzy @@ -1823,7 +1931,8 @@ Fuzzy - + プロファイルへのリンク + Fuzzy @@ -1838,10 +1947,11 @@ Fuzzy - + スコア: - + 検索: + Fuzzy @@ -2030,22 +2140,23 @@ Fuzzy - + 中継器一覧 + Fuzzy - + メンバー - + メッセージ - + 名前 @@ -2066,10 +2177,10 @@ Fuzzy - + オーナー - + オーナーのID @@ -2096,7 +2207,7 @@ Fuzzy - + 地域 @@ -2126,13 +2237,13 @@ Fuzzy - + 結果 - + 役割 - + このサーバーにある役割一覧のページ{0} @@ -2180,14 +2291,48 @@ Fuzzy - + {1}の{0}は{2} Id of the user kwoth#1234 is 123123123123 - + 利用者 + + + + + + + + + + + + + + + + + + + + + Kwoth voted. + + + + + + + + + + + + + \ No newline at end of file From 2dff5d9883ecabddd8841c0979e01ddadbbc7d01 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 6 Mar 2017 17:07:29 +0100 Subject: [PATCH 192/496] Update ResponseStrings.nb-NO.resx (POEditor.com) --- .../Resources/ResponseStrings.nb-NO.resx | 445 ++++++++++-------- 1 file changed, 238 insertions(+), 207 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.nb-NO.resx b/src/NadekoBot/Resources/ResponseStrings.nb-NO.resx index 1bdd9412..104eb49a 100644 --- a/src/NadekoBot/Resources/ResponseStrings.nb-NO.resx +++ b/src/NadekoBot/Resources/ResponseStrings.nb-NO.resx @@ -1,121 +1,121 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Den basen har allerede blitt tatt over eller ødelagt. @@ -130,7 +130,7 @@ **ØDELAGT** base #{0} i en krig mot {1} - + {0} har **hevdet** bare #{1} i en krig mot {2} {0} har hevdet en base #{1} i en krig mot {2} @@ -200,7 +200,7 @@ Utilstrekkelig tilgang. Krever Bot-eierskap for globale tilpassede reaksjoner, og Administrator for server reaksjoner. - Liste av alel tilpassede reaksjoner. + Liste av alle tilpassede reaksjoner. Tilpassede reaksjoner. @@ -1053,7 +1053,7 @@ Ikke glem å skrive Discord navnet eller ID i meldingen. Fuzzy - + Skriv '{0}cmds ModulNavn' for og få en liste av kommandoer i den modulen. f.eks '{0}cmds spill' Den modulen finnes ikke. @@ -1374,35 +1374,35 @@ Ikke glem å skrive Discord navnet eller ID i meldingen. {0} mot {1} - + Forsøker å sette i kø {0} sanger... Automatisk avspilling deaktivert - Automatisk spilling aktivert. + Automatisk avspilling aktivert. - Standard volume satt til {0}% + Standard volum satt til {0}% - + Mappelisting ferdig. - + fairplay Sang ferdig Fuzzy - + Rettferdig avspilling deaktivert - + Rettferdig avspilling aktivert - Fra possisjon + Fra posisjon Id @@ -1417,10 +1417,10 @@ Ikke glem å skrive Discord navnet eller ID i meldingen. Max spilletid satt til {0} sekund(er). - Max musikkkø størrelse satt til uendelig. + Max musikk-kø størrelse satt til uendelig. - Max musikkkø størrelse satt til {0} sang(er). + Max musikk-kø størrelse satt til {0} sang(er). Du må være i en talekanal på denne serveren. @@ -1450,7 +1450,7 @@ Ikke glem å skrive Discord navnet eller ID i meldingen. Fuzzy - #{0}` - **{1}** av *{2}* ({3} sanger) + #{0}` - **{1}** av *{2}* ({3} sanger) Side {0} av lagrede spillelister @@ -1460,7 +1460,7 @@ Ikke glem å skrive Discord navnet eller ID i meldingen. Spilleliste slettet. - Klarte ikke og slette spillelisten. Enten eksisterer den ikke, eller så var det ikke du som lagde den. + Klarte ikke å slette spillelisten. Enten eksisterer den ikke, eller så var det ikke du som lagde den. Spilleliste med den IDen eksisterer ikke. @@ -1473,7 +1473,7 @@ Ikke glem å skrive Discord navnet eller ID i meldingen. Fuzzy - {0}er grense + {0}s grense Kø @@ -1493,28 +1493,28 @@ Ikke glem å skrive Discord navnet eller ID i meldingen. context: "removed song #5" - + Repeterer nåværende sang - + Repeterer spilleliste - + Repeterer spor - + Repetisjon av nåværende sang stoppet - Musikk-avspilling startet + Musikk-avspilling gjenopptatt. - + Repetisjon av spilleliste stoppet. - + Repetisjon av spilleliste startet. - + Meldinger om sanger som spilles av, er ferdige, pauset og fjernet vil bli vist i denne kanalen. Skippet til '{0}:{1}' @@ -1542,21 +1542,21 @@ Ikke glem å skrive Discord navnet eller ID i meldingen. Volum satt til {0}% - Deaktivert bruk av ALLE MODULER på {0} kanalen. + Deaktivert bruk av ALLE MODULER i kanalen {0}. Fuzzy - Aktivert bruk av ALLE MODULER på {0} kanalen. + Aktivert bruk av ALLE MODULER i kanalen {0}. Fuzzy Tillatt - Deaktivert bruk av ALLE MODULER for {0} rolle. + Deaktivert bruk av ALLE MODULER for {0} rollen. - Aktivert bruk av ALLE MODULER for {0} rolle. + Aktivert bruk av ALLE MODULER for {0} rollen. Deaktivert bruk av ALLE MODULER på denne serveren. @@ -1565,19 +1565,19 @@ Ikke glem å skrive Discord navnet eller ID i meldingen. Aktivert bruk av ALLE MODULER på denne serveren. - Deaktivert bruk av ALLE MODULER for {0} bruker. + Deaktivert bruk av ALLE MODULER for bruker {0}. - Aktivert bruk av ALLE MODULER for {0} bruker. + Aktivert bruk av ALLE MODULER for bruker {0}. Svartelistet {0} med ID {1} - Kommando {0} har nå en {1}'s ventetid. + Kommando {0} har nå en {1}s ventetid. - Kommando {0} har ingen ventetid nå og alle eksisterende ventetider har blitt fjernet. + Kommando {0} har ingen ventetid og alle eksisterende ventetider har blitt fjernet. Ingen kommando-ventetid satt. @@ -1592,7 +1592,7 @@ Ikke glem å skrive Discord navnet eller ID i meldingen. Aktivert bruk av {0} {1} i kanal {2}. - Benektet + Nektet La til ordet {0} til listen av filtrerte ord. @@ -1622,7 +1622,7 @@ Ikke glem å skrive Discord navnet eller ID i meldingen. Flyttet tillatelse {0} fra #{1} til #{2} - Finner ikke tillatelse til index #{0} + Finner ikke tillatelse ved index #{0} Ingen kostnader satt. @@ -1636,13 +1636,13 @@ Ikke glem å skrive Discord navnet eller ID i meldingen. Gen. (of module) - Rettigheter side {0} + Tillatelser side {0} - Nåværende rettighets-rolle er {0}. + Nåværende tillatelses-rolle er {0}. - Brukere må nå ha {0} rollen for og endre rettigheter. + Brukere må nå ha {0} rollen for å endre tillatelser. Ingen tillatelse funnet på denne indeksen. @@ -1657,7 +1657,7 @@ Ikke glem å skrive Discord navnet eller ID i meldingen. Aktivert bruk av {0} {1} for {2} rollen. - + sek. Short of seconds. @@ -1667,7 +1667,7 @@ Ikke glem å skrive Discord navnet eller ID i meldingen. Aktivert bruk av {0} {1} på denne serveren. - + Fjernet {0} med ID {1} fra svartelisten uredigerbar @@ -1679,10 +1679,10 @@ Ikke glem å skrive Discord navnet eller ID i meldingen. Aktivert bruk av {0} {1} for {2} bruker. - Jeg vil ikke lenger vise tillatelse advarsler. + Jeg vil ikke lenger vise tillatelses-advarsler. - Jeg vil nå vise rettighets-advarsler. + Jeg vil nå vise tillatelses-advarsler. Ord filtrering er deaktivert i denne kanalen. @@ -1700,16 +1700,16 @@ Ikke glem å skrive Discord navnet eller ID i meldingen. Ferdigheter - + Ingen favoritt anime Startet automatisk oversettelse av meldinger i denne kanalen. Bruker-meldinger vil bli slettet automatisk. - + Ditt automatisk oversatte språk er fjernet - + Ditt automatisk oversatte språk er satt til {0}>{1} Startet automatisk oversettelse av meldinger i denne kanalen. @@ -1742,7 +1742,7 @@ Ikke glem å skrive Discord navnet eller ID i meldingen. Konkurrerende rangering - + Konkurerende vinn Fullført @@ -1772,16 +1772,16 @@ Ikke glem å skrive Discord navnet eller ID i meldingen. Eksempel - + Kunne ikke finne anime. - + Kunne ikke finne manga - Sjangere + Sjangre - + Fant ingen definisjon for det ordet Høyde/vekt @@ -1802,32 +1802,32 @@ Ikke glem å skrive Discord navnet eller ID i meldingen. Ugyldig kilde- eller målspråk. - Vitser ikke lastet. + Kunne ikke laste vitser. - + Bred./Lengd. Nivå - + Liste over {0}place stikkord Don't translate {0}place Plassering - + Magiske ting ble ikke lastet - + {0} sin MAL profil - Bot eieren ikke spesifisere MashapeApiKey. Du kan ikke bruke denne funksjonaliteten. + Bot eieren har ikke spesifiser MashapeApiKey. Du kan ikke bruke denne funksjonen. - Min/Max + Min/Max Ingen kanal funnet. @@ -1854,7 +1854,7 @@ Ikke glem å skrive Discord navnet eller ID i meldingen. Bruker ikke funnet! Vennligst sjekk regionen og BattleTag før du prøver igjen. - Planlegg å se + Planlegger å se Plattform @@ -1881,7 +1881,7 @@ Ikke glem å skrive Discord navnet eller ID i meldingen. Vurdering - + Resultat: Søk etter: @@ -1923,7 +1923,7 @@ Ikke glem å skrive Discord navnet eller ID i meldingen. Strømmen eksisterer sannsynligvis ikke. - Fjernet {0} sin stream ({1}) fra varslinger. + Fjernet {0} sin strøm ({1}) fra varslinger. Jeg vil varsle denne kanalen når statusen endres. @@ -1941,7 +1941,7 @@ Ikke glem å skrive Discord navnet eller ID i meldingen. Tittel: - + Topp 3 favoritt animer: Oversettelse: @@ -1953,13 +1953,13 @@ Ikke glem å skrive Discord navnet eller ID i meldingen. Kunne ikke finne definisjonen for dette ordet. - + URL - Seerne + Seere - + Ser på Kunne ikke finne det ordet på den angitte Wikia. @@ -1977,13 +1977,13 @@ Ikke glem å skrive Discord navnet eller ID i meldingen. De {0} mest forbydde 'champions' - + Kunne ikke 'yodify' setningen din Ble med - + `{0}.` {1} [{2:F2}/s] - {3} totalt /s and total need to be localized to fit the context - `1.` @@ -1997,13 +1997,13 @@ Ikke glem å skrive Discord navnet eller ID i meldingen. Forfatter - + BOT ID - Liste over funksjoner i {0}calc kommandoer + Liste over funksjoner i {0}calc kommandoen - {0} av denne kanalen er {1} + denne kanalens {0} er {1} Kanal emne @@ -2024,13 +2024,13 @@ Ikke glem å skrive Discord navnet eller ID i meldingen. Kan ikke konvertere {0} til {1}: typer enheter er ikke lik - laget på + Laget på Ble med i kanalen for snakk på tvers av servere - Forlatt kanalen for snakk på tvers av servere + Forlot kanalen for snakk på tvers av servere Dette er din CSC token @@ -2075,7 +2075,7 @@ Eier ID: {2} Ingen servere funnet på denne siden. - Liste over repeater + Liste over gjentagende meldinger Medlemmer @@ -2087,7 +2087,7 @@ Eier ID: {2} Meldinger - + Meldingsgjentager Navn @@ -2099,7 +2099,7 @@ Eier ID: {2} Det er ingen som spiller det spillet. - Det er ingen aktive repeatere. + Det er ingen aktive gjentagere. Det er ingen roller på denne siden. @@ -2114,7 +2114,7 @@ Eier ID: {2} Eier - Eier Identiteter + Eier IDer Tilstedeværelse @@ -2125,10 +2125,10 @@ Eier ID: {2} {2} Talekanaler - Slettet alle sitater med {0} nøkkelord. + Slettet alle sitater med nøkkelordet `{0}`. - Side {0} av sitater + Side {0} med sitater Det er ingen sitater på denne siden. @@ -2146,31 +2146,31 @@ Eier ID: {2} Region - Registrert på + Registrert den - Jeg vil minne på {0} til {1} i {2} `({3:. D.M.ÅÅÅÅ} ved {4:TT:mm})` + Jeg vil minne på {0} til {1} i {2} `({3:. d.M.yyyy} ved {4:HH:mm})` Ikke et gyldig format. Sjekk kommandolisten. - + Ny påminnelses-mal satt - Repeterer {0} {1} hver dag(er), {2} time(r) og {3} minutt(er). + Gjentar {0} hver {1} dag(er), {2} time(r) og {3} minutt(er). - + Liste over gjentagere - + Ingen gjentagere kjører på denne serveren #{0} stoppet. - + Ingen gjentagende meldinger funnet på denne serveren. Resultat @@ -2185,13 +2185,13 @@ Eier ID: {2} Side #{0} av roller for {1} - Ingen farger er i riktig format. Bruk `#00ff00` for eksempel. + Ingen farger er i riktig format. Bruk for eksempel `#00ff00`. - Startet rotering av {0} rolle farge. + Startet rotering av {0} rollens farge. - Stoppet rotering av farger for {0} rolle + Stoppet rotering av farger for {0} rollen {0} av denne serveren er {1} @@ -2200,13 +2200,13 @@ Eier ID: {2} Server info - + Shard - + Shard status - + Shard **#{0}** sin status: {1} med {2} servere **Navn:** {0} **Link:** {1} @@ -2215,7 +2215,7 @@ Eier ID: {2} Ingen spesielle emojier funnet. - Spiller {0} sanger, {1} kø. + Spiller {0} sanger, {1} i kø. Tekst kanaler @@ -2239,5 +2239,36 @@ Eier ID: {2} Du har allerede sluttet deg til dette løpet! + + Foreløpige stemmeresultater + + + Ingen stemmer samlet + + + Det kjøres allerede en avstemming på serveren. + + + 📃 {0} har startet en avstemming som krever din oppmerksomhet: + + + `{0}.` {1} med {2} stemmer. + + + {0} stemte. + Kwoth voted. + + + Send meg en privat melding med korresponderende antall svar. + + + Send en melding her med tilsvarende nummer til ditt svar. + + + Takk for at du stemte, {0} + + + {0} totalt stemmer avgitt. + \ No newline at end of file From 1fbd537c17f4ce60520ff1a7acf50248f7f94f02 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 6 Mar 2017 17:07:32 +0100 Subject: [PATCH 193/496] Update ResponseStrings.pl-PL.resx (POEditor.com) --- .../Resources/ResponseStrings.pl-PL.resx | 424 ++++++++++-------- 1 file changed, 228 insertions(+), 196 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.pl-PL.resx b/src/NadekoBot/Resources/ResponseStrings.pl-PL.resx index 665f605b..eb8b202b 100644 --- a/src/NadekoBot/Resources/ResponseStrings.pl-PL.resx +++ b/src/NadekoBot/Resources/ResponseStrings.pl-PL.resx @@ -1,121 +1,121 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Ta baza została już zdobyta lub zniszczona. @@ -194,28 +194,28 @@ - + Własne reakcje zostały usunięte - + Lista własnych reakcji - + Własne reakcje - + Nowe własne reakcje - + Własne reakcje nie zostały znalezione. - + Własne reakcje z tym ID nie zostały znalezione. - + Odpowiedź @@ -230,7 +230,7 @@ - + Zatrzymano autohentai. Brak rezultatów. @@ -404,31 +404,31 @@ Powód: {1} Dziękuję ludziom wypisanym na dole za pomoc w realizacji tego projektu! - + Wyślę prywatne wiadomości do wszystkich właścicieli. - + Wyślę prywatną wiadomość tylko do pierwszego właściciela. - + Od teraz będę wysyłać prywatne wiadomości. - + Od teraz nie będę wysyłać prywatnych wiadomości. - + Wiadomości powitalne będą usuwane po {0} sekundach. - + Aktualna prywatna wiadomość powitalna: {0} - + Aby włączyć prywatną wiadomość powitalną, wpisz {0} - + Nowa prywatna wiadomość powitalna została ustawiona. @@ -440,16 +440,16 @@ Powód: {1} Aktualna wiadomość powitalna: {0} - + Włącz wiadomości powitalne wpisując {0} - + Nowa wiadomość powitalna ustawiona. - + Ogłoszenie powitalne wyłączone. - + Ogłoszenie powitalne włączone na tym kanale. Nie możesz użyć tej komendy na użytkowniku z rolą wyższą lub równą twojej. @@ -498,7 +498,7 @@ Powód: {1} {0} opuścił {1} - + Opuścił serwer {0} @@ -525,7 +525,7 @@ Powód: {1} - + Wiadomość od {0} `[Właściciel bota]`: Wiadomość została wysłana. @@ -534,10 +534,10 @@ Powód: {1} {0} przeniesiono z {1} do {2} - + Wiadomość usunięta w #{0} - + Wiadomość zaktualizowana w #{0} Wyciszony @@ -548,7 +548,7 @@ Powód: {1} singular "User muted." - + Nie mam wystarczających uprawnień aby to zrobić. @@ -576,7 +576,7 @@ Powód: {1} Serwer nie został znaleziony. - + Żaden shard z tym ID nie został znaleziony. Stara wiadomość @@ -600,13 +600,13 @@ Powód: {1} - + {0} został **wyłączony** na tym serwerze. - + {0} włączone - + Wystąpił błąd. Potrzebuję uprawnień zarządzania rolami @@ -615,7 +615,7 @@ Powód: {1} - + Jeśli {0} lub więcej użytkowników dołączy w ciągu {1} sekund, {2} ich. Czas musi być pomiędzy {0} a {1} sekundą. @@ -633,13 +633,13 @@ Powód: {1} Ta rola nie istnieje. - + Wyszczególnione parametry są błędne - + Wystąpił błąd w związku z błędnym kolorem albo niewystarczającymi uprawnieniami. - + Z powodzeniem usunięto rolę {0} użytkownikowi {1} Wystąpił błąd przy usunięciu roli. Masz niewystarczające uprawnienia. @@ -663,10 +663,10 @@ Powód: {1} - + Rola {0} jest już na liście. - + Dodano. @@ -687,7 +687,7 @@ Powód: {1} - + Role, które można nadawać sobie samemu, są teraz ekskluzywne. Istnieje {0} ról, które możesz sam sobie nadać. @@ -699,7 +699,7 @@ Powód: {1} Nie posiadasz roli {0} - + Role, które można nadawać sobie samemu, nie są już ekskluzywne. Nie jestem w stanie nadać ci tej roli. `Nie mogę nadawać ról wyższych niż moja.` @@ -708,7 +708,7 @@ Powód: {1} Rola {0} została usunięta z listy ról, które użytkownik może sobie nadać sam. - + Nie masz więcej roli {0} Masz teraz rolę {0}. @@ -726,34 +726,34 @@ Powód: {1} Nowa nazwa kanału została ustawiona! - + Nowa gra ustawiona! - + Nowy stream ustawiony! - + Nowy temat kanału ustawiony. - + Shard {0} połączony ponownie. - + Shard {0} łączy się ponownie. - + Wyłączanie. Użytkownik nie może wysłać więcej niż {1} wiadomości na {1} sekund. - + Slow mode wyłączony. - + Slow mode włączony - + lekko zbanowany (wyrzucony) PLURAL @@ -763,19 +763,20 @@ Powód: {1} {0} nie będzie więcej ignorował tego kanału. - + Jeśli użytkownik napisze {0} takich samych wiadomości pod rząd, {0} go. + __IgnorowaneKanały__: {2} - + Kanał tekstowy został stworzony. - + Kanał tekstowy został usunięty. - + Odciszony singular @@ -793,31 +794,31 @@ Powód: {1} Fuzzy - + {0} został **wyciszony** z chatowania. - + {0} został **odciszony** z chatowania. - + Użytkownik dołączył - + Użytkownik wyszedł - + {0} został **wyciszony** z chatu głosowego i pisanego. - + Rola użytkownika dodana - + Rola użytkownika usunięta {0} jest teraz {1} - + {0} został **odciszony** z chatu głosowego i pisanego. {0} dołączył do kanału {1}. @@ -829,10 +830,10 @@ Powód: {1} {0} przeniesiony z kanału {1} na {2} - + {0} został **wyciszony z chatu głosowego**. - + {0} został **odciszony z chatu głosowego**. Kanał głosowy został stworzony @@ -843,28 +844,28 @@ Powód: {1} Fuzzy - + Wyłączono funkcję głos + tekst. - + Włączono funkcję głos + tekst. - + Nie mam uprawnień: **zarządzanie rolami** i **zarządzanie kanałami**, więc nie mogę uruchomić funkcji `głos+tekst` na serwerze {0}. - + Włączasz/Wyłączasz tą funkcję i **Nie mam uprawnień ADMINISTRATORA**. Może to spowodować problemy i będziesz musiał czyścić kanały tekstowe sam. - + Użytkownik {0} z tekstowego czatu - + Użytkownik {0} z tekstowego i głosowego czatu - Użytkownik {0} z kanału głosowego + Użytkownik {0} z czatu głosowego Zostałeś tymczasowo zablokowany na serwerze {0} @@ -934,7 +935,7 @@ Powód: {1} Ranking - + Nagrodził {0} dla {1} użytkowników z roli {2} Nie możesz założyć się o więcej niż {0} @@ -1229,7 +1230,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + {0} wygrał! {1} pokonuje {2} @@ -1352,7 +1353,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś {0} kontra {1} - + Próba dołączenia {0} piosenek do kolejki... Automatyczne odtwarzanie wyłączone. @@ -1367,16 +1368,16 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + fairplay Zakończono odtwarzanie piosenki - + Fair play wyłączony. - + Fair play włączony. @@ -1464,7 +1465,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś context: "removed song #5" - + Powtarzanie aktualnego utworu Powtarzenie playlisty @@ -1497,7 +1498,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Utwór przeniesiony - + {0}g {1}m {2}s @@ -1625,7 +1626,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + sek. Short of seconds. @@ -1755,7 +1756,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Wysokość/szerokość - + {0}m/{1}kg Wilgotność @@ -1798,7 +1799,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + Nie znaleziono kanału. Brak rezultatów. @@ -2205,5 +2206,36 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Już dołączyłeś do tego wyścigu! + + + + + + + + + + + + + + + + + + Kwoth voted. + + + + + + + + + + + + + \ No newline at end of file From 5c8c2a0db9797036c70530ef009f41731d4b831a Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 6 Mar 2017 17:07:35 +0100 Subject: [PATCH 194/496] Update ResponseStrings.pt-BR.resx (POEditor.com) --- .../Resources/ResponseStrings.pt-BR.resx | 135 ++++++++++++++++++ 1 file changed, 135 insertions(+) diff --git a/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx b/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx index bac83942..5502e166 100644 --- a/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx +++ b/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx @@ -140,6 +140,7 @@ O pedido de guerra de @{0} contra {1} expirou. + Fuzzy Inimigo @@ -153,9 +154,11 @@ Não é um tamanho de guerra válido. + Fuzzy Lista de guerras ativas + Fuzzy não reivindicado @@ -168,6 +171,7 @@ Nenhuma guerra ativa. + Fuzzy Tamanho @@ -207,6 +211,7 @@ Nenhuma reação personalizada encontrada. + Fuzzy Nenhuma reação personalizada encontrada com este id. @@ -469,10 +474,12 @@ Razão: {1} Usuário Kickado + Fuzzy Lista de Linguagens {0} + Fuzzy A região do seu servidor agora é {0} - {1} @@ -530,9 +537,11 @@ Razão: {1} Mensagem deletada em #{0} + Fuzzy Mensagem atualizada em #{0} + Fuzzy Mutados @@ -553,15 +562,19 @@ Razão: {1} Nova mensagem + Fuzzy Novo Apelido + Fuzzy Novo Tópico + Fuzzy Apelido Alterado + Fuzzy Não posso encontrar esse servidor @@ -571,12 +584,15 @@ Razão: {1} Mensagem Antiga + Fuzzy Apelido Antigo + Fuzzy Tópico Antigo + Fuzzy Erro. Não tenho permissões suficientes. @@ -586,6 +602,7 @@ Razão: {1} Proteções ativadas + Fuzzy {0} foi **desativado** neste servidor. @@ -598,6 +615,7 @@ Razão: {1} Nenhuma proteção ativa. + Fuzzy O limite de usuários deve ser entre {0} e {1}. @@ -758,9 +776,11 @@ __Canais Ignorados__: {2} Canal de Texto Criado + Fuzzy Canal de Texto Destruído + Fuzzy Desensurdecido com sucesso. @@ -774,12 +794,14 @@ __Canais Ignorados__: {2} Nome de usuário alterado + Fuzzy Usuários Usuário Banido + Fuzzy {0} foi **mutado** @@ -789,18 +811,22 @@ __Canais Ignorados__: {2} Usuário juntou-se + Fuzzy Usuário saiu + Fuzzy {0} foi **mutado** nos chats de voz e texto. Cargo do usuário adicionado + Fuzzy Cargo do usuário removido + Fuzzy {0} agora está {1} @@ -825,9 +851,11 @@ __Canais Ignorados__: {2} Canal de voz criado + Fuzzy Canal de voz destruído + Fuzzy Atributo voz + texto desabilitado. @@ -859,6 +887,7 @@ Motivo: {1} Usuário desbanido + Fuzzy Migração concluída! @@ -868,9 +897,11 @@ Motivo: {1} Atualizações de Presença + Fuzzy Usuário Banido Temporariamente + Fuzzy concedeu {0} para {1} @@ -913,6 +944,7 @@ Motivo: {1} Cara + Fuzzy Placar de Líderes @@ -934,6 +966,7 @@ Motivo: {1} Usuário sorteado + Fuzzy Você rolou {0}. @@ -968,6 +1001,7 @@ Dura {1} segundos. Não diga a ninguém. Shhh. Coroa + Fuzzy Tomou {0} de {1} com sucesso @@ -980,6 +1014,7 @@ Dura {1} segundos. Não diga a ninguém. Shhh. Proprietário do bot apenas. + Fuzzy Requer a permissão {0} do canal. @@ -989,9 +1024,11 @@ Dura {1} segundos. Não diga a ninguém. Shhh. Comandos e abreviações + Fuzzy Lista de Comandos Regenerada. + Fuzzy Digite `{0}h NomeDoComando` para ver a ajuda para o comando especificado. Ex: `{0}h >8ball` @@ -1012,12 +1049,15 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. **Lista de Comandos**. <{0}> **Guias de hosteamento e documentos podem ser encontrados aqui**. <{1}> + Fuzzy Lista de Comandos + Fuzzy Lista de Módulos + Fuzzy Digite `{0}cmds NomeDoMódulo` para receber uma lista de comandos deste módulo. Ex: `{0}cmds games` @@ -1030,6 +1070,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Tabela de Conteúdo + Fuzzy Modo de uso @@ -1043,6 +1084,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Corrida de Animais + Fuzzy Falha ao iniciar, não houve participantes suficientes. @@ -1093,9 +1135,11 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. Mudanças no Coração + Fuzzy Reivindicado por + Fuzzy Divórcios @@ -1215,6 +1259,7 @@ O novo valor de {0} é {1}! Submissões Encerradas + Fuzzy A Corrida de Animais já está em andamento @@ -1249,6 +1294,7 @@ O novo valor de {0} é {1}! Jogo Iniciado + Fuzzy Jogo da Forca iniciado @@ -1317,15 +1363,18 @@ O novo valor de {0} é {1}! {0} venceu! + Fuzzy Combinou três + Fuzzy Nenhum movimento restante! Tempo Esgotado! + Fuzzy É a vez de {0} @@ -1353,6 +1402,7 @@ O novo valor de {0} é {1}! Música concluída. + Fuzzy Fair play desativado. @@ -1389,6 +1439,7 @@ O novo valor de {0} é {1}! Tocando agora + Fuzzy Nenhum player de música ativo. @@ -1401,15 +1452,18 @@ O novo valor de {0} é {1}! Fila de Músicas - Página {0}/{1} + Fuzzy Tocando Musica + Fuzzy `#{0}` - **{1}** by *{2}* ({3} músicas) Página {0} de Playlists Salvas + Fuzzy Playlist deletada. @@ -1425,6 +1479,7 @@ O novo valor de {0} é {1}! Playlist Salva + Fuzzy Limite de {0}s @@ -1434,6 +1489,7 @@ O novo valor de {0} é {1}! Músicas em fila + Fuzzy Fila de músicas limpa. @@ -1447,12 +1503,15 @@ O novo valor de {0} é {1}! Repetindo a Música Atual + Fuzzy Repetindo Playlist + Fuzzy Repetindo Faixa + Fuzzy A repetição da faixa atual parou. @@ -1474,9 +1533,11 @@ O novo valor de {0} é {1}! Músicas embaralhadas. + Fuzzy Música movida + Fuzzy {0}h {1}m {2}s @@ -1495,18 +1556,22 @@ O novo valor de {0} é {1}! O uso de TODOS OS MÓDULOS foi desabilitado no canal {0}. + Fuzzy O uso de TODOS OS MÓDULOS foi habilitado no canal {0}. + Fuzzy Permitido O uso de TODOS OS MÓDULOS foi desabilitado para o cargo {0}. + Fuzzy O uso de TODOS OS MÓDULOS foi habilitado para o cargo {0}. + Fuzzy O uso de TODOS OS MÓDULOS foi desabilitado neste servidor. @@ -1516,9 +1581,11 @@ O novo valor de {0} é {1}! O uso de TODOS OS MÓDULOS foi desabilitado para o usuário {0}. + Fuzzy O uso de TODOS OS MÓDULOS foi habilitado para o usuário {0}. + Fuzzy {0} entrou na Lista Negra com o ID {1} @@ -1528,18 +1595,22 @@ O novo valor de {0} é {1}! O comando {0} não possui nenhum cooldown agora e todos os cooldowns existentes foram limpos. + Fuzzy Nenhum cooldown de comando definido. Custos de Comando + Fuzzy Desabilitado o uso de {0} {1} no canal {2}. + Fuzzy Habilitado o uso de {0} {1} no canal {2}. + Fuzzy Negado @@ -1549,6 +1620,7 @@ O novo valor de {0} é {1}! Lista de Palavras Filtradas + Fuzzy A palavra {0} foi removida da lista de palavras filtradas. @@ -1685,12 +1757,15 @@ O novo valor de {0} é {1}! Derrotas Competitivas + Fuzzy Partidas Competitivas jogadas + Fuzzy Rank Competitivo + Fuzzy Vitórias Competitivas @@ -1745,6 +1820,7 @@ O novo valor de {0} é {1}! Busca de Imagens para: + Fuzzy Falha ao encontrar este filme. @@ -1788,9 +1864,11 @@ O novo valor de {0} é {1}! Em espera + Fuzzy Url Original + Fuzzy Requer uma API key de osu! @@ -1818,15 +1896,18 @@ O novo valor de {0} é {1}! Link do Perfil: + Fuzzy Qualidade: Tempo em Partida Rápida + Fuzzy Vitórias em Partida Rápida + Fuzzy Avaliação @@ -1836,12 +1917,14 @@ O novo valor de {0} é {1}! Busca Por: + Fuzzy Falha ao encurtar esse url. Url Curta + Fuzzy Alguma coisa deu errado. @@ -1854,6 +1937,7 @@ O novo valor de {0} é {1}! Url da Loja + Fuzzy Streamer {0} está offline. @@ -1923,6 +2007,7 @@ O novo valor de {0} é {1}! Velocidade do Vento + Fuzzy Os {0} campeões mais banidos @@ -1940,6 +2025,7 @@ O novo valor de {0} é {1}! Página de Atividade #{0} + Fuzzy {0} usuários no total. @@ -1958,9 +2044,11 @@ O novo valor de {0} é {1}! Tópico do Canal + Fuzzy Comandos Utilizados + Fuzzy {0} {1} é igual a {2} {3} @@ -1976,6 +2064,7 @@ O novo valor de {0} é {1}! Criado em + Fuzzy Juntou-se ao canal de servidor cruzado. @@ -1988,6 +2077,7 @@ O novo valor de {0} é {1}! Emojis Personalizados + Fuzzy Erro @@ -2006,6 +2096,7 @@ O novo valor de {0} é {1}! você não tem permissão de usar esse comando em cargos com muitos usuários para prevenir abuso. + Fuzzy Valor {0} inválido. @@ -2016,17 +2107,20 @@ O novo valor de {0} é {1}! Juntou-se ao Servidor + Fuzzy ID: {0} Membros: {1} OwnerID: {2} + Fuzzy Nenhum servidor encontrado nessa página. Lista de Repetidores + Fuzzy Membros @@ -2039,6 +2133,7 @@ OwnerID: {2} Repetidor de Mensagem + Fuzzy Nome @@ -2098,6 +2193,7 @@ OwnerID: {2} Registrado em + Fuzzy Eu lembrarei {0} de {1} em {2} `({3:d.M.yyyy.} at {4:HH:mm})` @@ -2113,6 +2209,7 @@ OwnerID: {2} Lista de Repetidores + Fuzzy Nenhum repetidor neste servidor. @@ -2149,12 +2246,14 @@ OwnerID: {2} Informações do Servidor + Fuzzy Shard Status do Shard + Fuzzy Shard **#{0}** está no estado {1} com {2} servidores @@ -2170,6 +2269,7 @@ OwnerID: {2} Canais de Texto + Fuzzy Aqui está o link da sala: @@ -2186,6 +2286,41 @@ OwnerID: {2} Canais de Voz + Fuzzy + + + Você já entrou nesta corrida! + + + Resultado atual da votação + + + Nenhum voto proferido. + + + Uma votação já está ocorrendo neste servidor. + + + 📃 {0} criou uma votação que requer sua atenção: + + + `{0}.` {1} com {2} votos. + + + {0} votou. + Kwoth voted. + + + Mande uma Mensagem Direta para mim com o número que corresponde à resposta. + + + Mande uma Mensagem aqui com o número que corresponde à resposta. + + + Obrigado por votar, {0} + + + Total de {0} votos proferidos. \ No newline at end of file From 6217491a57aa734275545add84978c384257143f Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 6 Mar 2017 17:07:37 +0100 Subject: [PATCH 195/496] Update ResponseStrings.ru-RU.resx (POEditor.com) --- .../Resources/ResponseStrings.ru-RU.resx | 136 +++++++++++++++++- 1 file changed, 135 insertions(+), 1 deletion(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx b/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx index 12a8b4d2..20b53a3d 100644 --- a/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx +++ b/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx @@ -140,6 +140,7 @@ Время действия запроса от @{0} на войну против {1} истёкло. + Fuzzy Враг @@ -152,9 +153,11 @@ Неправильный размер войны. + Fuzzy Список активных войн + Fuzzy не захвачена @@ -167,6 +170,7 @@ Нет активных войн. + Fuzzy Размер @@ -206,6 +210,7 @@ Не найдено настраиваемых реакций. + Fuzzy Не найдено настраиваемых реакций с таким номером. @@ -467,10 +472,12 @@ Пользователь выгнан + Fuzzy Список языков {0} + Fuzzy Язык вашего сервера теперь {0} - {1} @@ -528,9 +535,11 @@ Сообщение удалено в #{0} + Fuzzy Сообщение изменено в #{0} + Fuzzy Заглушены @@ -551,15 +560,19 @@ Новое сообщение + Fuzzy Новое имя + Fuzzy Новый заголовок + Fuzzy Имя изменено + Fuzzy Сервер не найден @@ -569,12 +582,15 @@ Старое сообщение + Fuzzy Старое имя + Fuzzy Старый заголовок + Fuzzy Ошибка. Скорее всего мне не хватает прав. @@ -584,6 +600,7 @@ Активные защиты от рейдов + Fuzzy {0} был **отключён** на этом сервере. @@ -596,6 +613,7 @@ Нет защит от рейдов + Fuzzy Порог пользователей должен лежать между {0} и {1}. @@ -754,9 +772,11 @@ Создан текстовый канал + Fuzzy Уничтожен текстовый канал. + Fuzzy Отключено заглушение. @@ -771,12 +791,14 @@ Fuzzy Имя изменено + Fuzzy Пользователи Пользователь заблокирован + Fuzzy {0} получил **запрет** на разговор в текстовых каналах. @@ -786,18 +808,22 @@ Fuzzy Пользователь присоединился + Fuzzy Пользователь вышел + Fuzzy {0} получил **запрет** на разговор в текстовых и голосовых каналах Добавлена роль пользователя + Fuzzy Удалена роль пользователя + Fuzzy {0} теперь {1} @@ -822,9 +848,11 @@ Fuzzy Голосовой канал создан + Fuzzy Голосовой канал удалён + Fuzzy Отключены голосовые + текстовые функции. @@ -855,6 +883,7 @@ Fuzzy Пользователь разбанен. + Fuzzy Перемещение закончено! @@ -864,9 +893,11 @@ Fuzzy История присутвия пользователей + Fuzzy Пользователя выгнали + Fuzzy наградил {0} пользователю {1} @@ -909,6 +940,7 @@ Fuzzy Орёл + Fuzzy Таблица рекордов @@ -930,6 +962,7 @@ Fuzzy Победитель лотереи + Fuzzy Вам выпало {0}. @@ -963,6 +996,7 @@ Fuzzy Решка + Fuzzy успешно забрал {0} у {1} @@ -975,6 +1009,7 @@ Fuzzy Только для владельца бота + Fuzzy Требуется разрешение канала {0}. @@ -984,9 +1019,11 @@ Fuzzy Команды и альтернативные имена команд + Fuzzy Список команд создан. + Fuzzy Напишите '{0}h ИмяКоманды', чтобы получить справку для этой команды. Например, '{0}h >8ball' @@ -1008,12 +1045,15 @@ Paypal <{1}> **Список команд**: <{0}> **Руководства по установке и документы можно найти здесь**: <{1}> + Fuzzy Список команд + Fuzzy Список модулей + Fuzzy Напишите '{0}cmds ИмяМодуля', чтобы получить список команд в этом модуле. Например, '{0}cmds games' @@ -1026,6 +1066,7 @@ Paypal <{1}> Оглавление + Fuzzy Использование @@ -1039,6 +1080,7 @@ Paypal <{1}> Гонка зверей + Fuzzy Не удалось начать гонку, так как не хватает участников. @@ -1089,6 +1131,7 @@ Paypal <{1}> Смены чувств + Fuzzy Является мужем @@ -1211,6 +1254,7 @@ Paypal <{1}> Приём ответов закончен. + Fuzzy Гонка зверей уже идёт. @@ -1245,6 +1289,7 @@ Paypal <{1}> Игра началась + Fuzzy Игра в Виселицу началась @@ -1313,15 +1358,18 @@ Paypal <{1}> {0} выиграл! + Fuzzy Выстроил 3 в ряд + Fuzzy Ходов не осталось! Время вышло! + Fuzzy Ход {0} @@ -1349,6 +1397,7 @@ Paypal <{1}> Песня завершилась. + Fuzzy Отключено справедливое воспроизведение. @@ -1387,6 +1436,7 @@ Paypal <{1}> Сейчас играет + Fuzzy Нет активного музыкального проигрывателя. @@ -1399,15 +1449,18 @@ Paypal <{1}> Очередь воспроизведения - Страница {0}/{1} + Fuzzy Проигрывается песня + Fuzzy '#{0}' - **{1}** *{2}* ({3} песен) Страница {0} сохранённых плейлистов. + Fuzzy Плейлист удалён. @@ -1423,6 +1476,7 @@ Paypal <{1}> Плейлист сохранён. + Fuzzy Ограничение {0}c @@ -1432,6 +1486,7 @@ Paypal <{1}> Песня добавлена в очередь воспроизведения. + Fuzzy Очередь воспроизведения музыки очищена. @@ -1445,12 +1500,15 @@ Paypal <{1}> Повторяется текущая песня. + Fuzzy Повторяется плейлист. + Fuzzy Повторяется песня. + Fuzzy Повтор текущей песни приостановлен. @@ -1472,9 +1530,11 @@ Paypal <{1}> Песни перемешаны. + Fuzzy Песня перемещена. + Fuzzy {0}ч {1}м {2}с @@ -1493,18 +1553,22 @@ Paypal <{1}> Отключено использование ВСЕХ МОДУЛЕЙ в канале {0}. + Fuzzy Включено использование ВСЕХ МОДУЛЕЙ в канале {0}. + Fuzzy Разрешено Отключено использование ВСЕХ МОДУЛЕЙ для роли {0}. + Fuzzy Включено использование ВСЕХ МОДУЛЕЙ для роли {0}. + Fuzzy Отключено использование ВСЕХ МОДУЛЕЙ на этом сервере. @@ -1514,9 +1578,11 @@ Paypal <{1}> Отключено использование ВСЕХ МОДУЛЕЙ для пользователя {0}. + Fuzzy Включено использование ВСЕХ МОДУЛЕЙ для пользователя {0}. + Fuzzy Добавлено {0} в чёрный список c ID {1} @@ -1526,18 +1592,22 @@ Paypal <{1}> У команды {0} больше нет времени перезарядки и все существующие времена перезадки были сброшены. + Fuzzy У команды не установлено время перезарядки. Стоимость команды + Fuzzy Отключено использование {0} {1} в канале {2} + Fuzzy Включено использование {0} {1} в канале {2} + Fuzzy Отказано @@ -1547,6 +1617,7 @@ Paypal <{1}> Список фильтруемых слов + Fuzzy Слово {0} убрано из списка фильтруемых слов. @@ -1682,12 +1753,15 @@ Paypal <{1}> Поражения в соревновательном режиме + Fuzzy Матчи в соревновательном режиме + Fuzzy Соревновательный ранг + Fuzzy Победы в соревновательном режиме @@ -1742,6 +1816,7 @@ Paypal <{1}> Поиск изображений: + Fuzzy Не удалос найти этот фильм. @@ -1785,9 +1860,11 @@ Paypal <{1}> Ожидание + Fuzzy Оригинальный URL + Fuzzy Требуется ключ osu! API. @@ -1815,16 +1892,19 @@ Paypal <{1}> Ссылка на профиль: + Fuzzy Качество: Время игры в Быстрой Игре - Is this supposed to be Overwatch Quick Play stats? + Is this supposed to be Overwatch Quick Play stats? +Fuzzy Побед в Быстрой Игре + Fuzzy Рейтинг: @@ -1834,12 +1914,14 @@ Paypal <{1}> Искать: + Fuzzy Не удалось укоротить эту ссылку. Короткая ссылка + Fuzzy Что-то пошло не так. @@ -1852,6 +1934,7 @@ Paypal <{1}> Url Магазина + Fuzzy Стример {0} в оффлане. @@ -1921,6 +2004,7 @@ Paypal <{1}> Скорость ветра. + Fuzzy {0} наиболее часто забаненных чемпионов. @@ -1938,6 +2022,7 @@ Paypal <{1}> Страница списка активности #{0} + Fuzzy Всего {0} пользователей. @@ -1956,9 +2041,11 @@ Paypal <{1}> Тема канала + Fuzzy Команд запущено + Fuzzy {0} {1} равно {2} {3} @@ -1974,6 +2061,7 @@ Paypal <{1}> Создано + Fuzzy Присоедился к межсерверному каналу. @@ -1986,6 +2074,7 @@ Paypal <{1}> Серверные emoji + Fuzzy Ошибка @@ -2004,6 +2093,7 @@ Paypal <{1}> Вам запрещено использовать эту комманду в отношении ролей с большим числом пользователей для предотвращения + Fuzzy Неправильное значение {0}. @@ -2014,17 +2104,20 @@ Paypal <{1}> Присоединился к серверу + Fuzzy Имя: {0} Участники: {1} IDВладельца: {2} + Fuzzy На этой странице не найдено серверов. Список повторяемых сообщений + Fuzzy Участники @@ -2037,6 +2130,7 @@ IDВладельца: {2} Повторяемое сообщения + Fuzzy Имя @@ -2096,6 +2190,7 @@ IDВладельца: {2} Зарегистрирован + Fuzzy Я напомню, чтобы {0} сделал {2} '{3:d.M.yyyy.} в {4:HH:mm}' @@ -2111,6 +2206,7 @@ IDВладельца: {2} Список повторяемых сообщений + Fuzzy На этом сервере нет повторяемых сообщений. @@ -2147,12 +2243,14 @@ IDВладельца: {2} Информация о сервере + Fuzzy Shard Статискика Shard-а + Fuzzy Shard **#{0}** находится в состоянии {1} с {2} серверами. @@ -2168,6 +2266,7 @@ IDВладельца: {2} Текстовые каналы + Fuzzy Ссылка на Вашу комнату: @@ -2184,6 +2283,41 @@ IDВладельца: {2} Голосовые каналы + Fuzzy + + + + + + + + + + + + + + + + + + + + + + Kwoth voted. + + + + + + + + + + + + \ No newline at end of file From 763ae7598c1bc2fce4f71df301d0c70f5f1f6a80 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 6 Mar 2017 17:07:40 +0100 Subject: [PATCH 196/496] Update ResponseStrings.sr-cyrl-rs.resx (POEditor.com) --- .../Resources/ResponseStrings.sr-cyrl-rs.resx | 210 +++++++++++++----- 1 file changed, 150 insertions(+), 60 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx b/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx index ea90f4b6..5e1f33f3 100644 --- a/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx +++ b/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx @@ -140,6 +140,7 @@ Захтев од @{0} за рат против {1} је истекао. + Fuzzy Противник @@ -152,9 +153,11 @@ Величина рата није валидна. + Fuzzy Листа Ратова У Току + Fuzzy нема захтева @@ -167,6 +170,7 @@ Нема ратова у току. + Fuzzy Величина @@ -206,6 +210,7 @@ Реакција по избору није нађена. + Fuzzy Није нађена реакција са тим идентификатором. @@ -468,10 +473,12 @@ Reason: {1} User Kicked + Fuzzy List Of Languages {0} + Fuzzy Your server's locale is now {0} - {1} @@ -531,9 +538,11 @@ Reason: {1} Message Deleted in #{0} + Fuzzy Message Updated in #{0} + Fuzzy Muted @@ -554,15 +563,19 @@ Reason: {1} New Message + Fuzzy New Nickname + Fuzzy New Topic + Fuzzy Nickname Changed + Fuzzy Can't find that server @@ -572,12 +585,15 @@ Reason: {1} Old Message + Fuzzy Old Nickname + Fuzzy Old Topic + Fuzzy Error. Most likely I don't have sufficient permissions. @@ -587,6 +603,7 @@ Reason: {1} Active Protections + Fuzzy {0} has been **disabled** on this server. @@ -599,6 +616,7 @@ Reason: {1} No protections enabled. + Fuzzy User threshold must be between {0} and {1}. @@ -758,9 +776,11 @@ Reason: {1} Text Channel Destroyed + Fuzzy Text Channel Destroyed + Fuzzy Undeafen successful. @@ -774,12 +794,14 @@ Reason: {1} Username Changed + Fuzzy Users User Banned + Fuzzy {0} has been **muted** from chatting. @@ -789,18 +811,22 @@ Reason: {1} User Joined + Fuzzy User Left + Fuzzy {0} has been **muted** from text and voice chat. User's Role Added + Fuzzy User's Role Removed + Fuzzy {0} is now {1} @@ -825,9 +851,11 @@ Reason: {1} Voice Channel Destroyed + Fuzzy Voice Channel Destroyed + Fuzzy Disabled voice + text feature. @@ -859,6 +887,7 @@ Reason: {1} User Unbanned + Fuzzy Migration done! @@ -868,9 +897,11 @@ Reason: {1} Presence Updates + Fuzzy User Soft-Banned + Fuzzy has awarded {0} to {1} @@ -913,6 +944,7 @@ Reason: {1} Heads + Fuzzy Leaderboard @@ -934,6 +966,7 @@ Reason: {1} Raffled User + Fuzzy You rolled {0}. @@ -968,6 +1001,7 @@ Lasts {1} seconds. Don't tell anyone. Shhh. Tails + Fuzzy successfully took {0} from {1} @@ -980,6 +1014,7 @@ Lasts {1} seconds. Don't tell anyone. Shhh. Само Власник Бота + Fuzzy Захтева {0} дозволу на каналу. @@ -989,9 +1024,11 @@ Lasts {1} seconds. Don't tell anyone. Shhh. Команде и псеудоними + Fuzzy Листа команди је обновљена. + Fuzzy Укуцај `{0}h ИмеКоманде` да видиш помоћ за ту команду. нпр. `{0}h >8ball` @@ -1013,12 +1050,15 @@ Lasts {1} seconds. Don't tell anyone. Shhh. **List of Commands**: <{0}> **Hosting Guides and docs can be found here**: <{1}> + Fuzzy Листа Команди + Fuzzy Листа Модула + Fuzzy Укуцај `{0}cmds ИмеМодула` да видиш листу свих команди у том модулу. нпр `{0}cmds games` @@ -1031,6 +1071,7 @@ Lasts {1} seconds. Don't tell anyone. Shhh. Садржај + Fuzzy Упутство @@ -1044,6 +1085,7 @@ Lasts {1} seconds. Don't tell anyone. Shhh. Трка Животиња + Fuzzy Започињање трке није успело јер нема довољно учесника. @@ -1095,9 +1137,11 @@ Lasts {1} seconds. Don't tell anyone. Shhh. Промена Осећања + Fuzzy Присвојена од стране + Fuzzy Развода @@ -1149,37 +1193,37 @@ Lasts {1} seconds. Don't tell anyone. Shhh. - + Та waifu није твоја. - + Не можеш присвојити себе. - + Нико - + 8кугла - + Акрофобија - + Игра је се завршила без уноса. - + Нема гласова. Игра је се завршила без победника. - + Игра акрофобије већ постоји у овом каналу. @@ -1191,7 +1235,7 @@ Lasts {1} seconds. Don't tell anyone. Shhh. - + Гласај тако што укуцаш број уноса. @@ -1203,7 +1247,7 @@ Lasts {1} seconds. Don't tell anyone. Shhh. - + Питање @@ -1212,28 +1256,28 @@ Lasts {1} seconds. Don't tell anyone. Shhh. - + Уноси затворени - + Трка животиња већ постоји. - + Категорија - + Клевербот је угашен на овом серверу. - + Клевербот је упаљен на овом серверу. - + Генерација валуте је угашена на овом каналу. - + Генерација валуте је упаљена на овом каналу. @@ -1243,19 +1287,19 @@ Lasts {1} seconds. Don't tell anyone. Shhh. - + Није успело учитавање питања. - + Игра је почела - + Игра вешалица је почела - + Игра вешалица већ постоји на овом каналу. - + Игра вешалица није успешно почела. @@ -1268,7 +1312,7 @@ Lasts {1} seconds. Don't tell anyone. Shhh. Немаш довољно {0} - + Нема резултата. @@ -1279,22 +1323,22 @@ Lasts {1} seconds. Don't tell anyone. Shhh. Kwoth planted 5* - + Игра тривије већ постоји на овом серверу. - + Игра тривије - + Нема тривије у току на овом серверу. - + Игра се зауставља после овог питања. @@ -1303,28 +1347,28 @@ Lasts {1} seconds. Don't tell anyone. Shhh. - + Не можеш играти против себе. - + Игра икс-окс већ постоји на овом каналу. - + Нерешено! - + је направио игру икс-окса. - + Три спојене - + Нема више потеза! - + Време је истекло! @@ -1336,73 +1380,73 @@ Lasts {1} seconds. Don't tell anyone. Shhh. - + Аутопуштање је угашено. - + Аутопуштање је упаљено. - + Директоријум успешно стављен у плејлисту. - + ферплеј - + Песма је завршена - + Ферплеј је угашен. - + Ферплеј је упаљен. - + Са позиције - + ИД - + Нисправан унос. - + Максимални плејтајм више нема лимит. - + Максимална величина реда је неограничена. - + Требаш бити у говорном каналу на овом серверу. - + Име - + Сада се пушта - + Нема активног музичког плејера. - + Нема резултата претраге. - + Музика је паузирана. - + Пушта се песма @@ -1411,28 +1455,28 @@ Lasts {1} seconds. Don't tell anyone. Shhh. - + Плејлиста обрисана. - + Није успело брисање те плејлисте. Или не постоји, или ниси ти ниси њен аутор. - + Плејлиста са тим ИДем не постоји. - + Успешно учитавање плејлисте. - + Плејлиста је сачувана. - + Ред - + Песма је учитана @@ -1986,6 +2030,7 @@ Lasts {1} seconds. Don't tell anyone. Shhh. Емотикони по Мери + Fuzzy Грешка @@ -2004,6 +2049,7 @@ Lasts {1} seconds. Don't tell anyone. Shhh. није ти дозвољено да користиш ову команду на ролама са пуно корисника да би се спречила злоупотреба. + Fuzzy Нетачна вредност {0}. @@ -2014,17 +2060,20 @@ Lasts {1} seconds. Don't tell anyone. Shhh. Ушао на сервер + Fuzzy ИД: {0} Чланова; {1} Ид Власника; {2} + Fuzzy Нема сервера на овој страници. Листа Понављача + Fuzzy Чланова @@ -2037,6 +2086,7 @@ Lasts {1} seconds. Don't tell anyone. Shhh. Понављач Порука + Fuzzy Име @@ -2096,6 +2146,7 @@ Lasts {1} seconds. Don't tell anyone. Shhh. Регистрован + Fuzzy @@ -2111,6 +2162,7 @@ Lasts {1} seconds. Don't tell anyone. Shhh. Листа понављача + Fuzzy Нема понављача на овом серверу. @@ -2147,12 +2199,14 @@ Lasts {1} seconds. Don't tell anyone. Shhh. Инфо Сервера + Fuzzy Шард Статови Шардова + Fuzzy @@ -2168,6 +2222,7 @@ Lasts {1} seconds. Don't tell anyone. Shhh. Текст Канали + Fuzzy Ево га твој линк ка соби: @@ -2184,6 +2239,41 @@ Lasts {1} seconds. Don't tell anyone. Shhh. Говорни канал + Fuzzy + + + + + + + + + + + + + + + + + + + + + + Kwoth voted. + + + + + + + + + + + + \ No newline at end of file From b210ea680a41d909d06f2df641606a17bf770347 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 6 Mar 2017 17:07:43 +0100 Subject: [PATCH 197/496] Update ResponseStrings.sv-SE.resx (POEditor.com) --- .../Resources/ResponseStrings.sv-SE.resx | 272 ++++++++++-------- 1 file changed, 152 insertions(+), 120 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.sv-SE.resx b/src/NadekoBot/Resources/ResponseStrings.sv-SE.resx index a1b017d1..305c8788 100644 --- a/src/NadekoBot/Resources/ResponseStrings.sv-SE.resx +++ b/src/NadekoBot/Resources/ResponseStrings.sv-SE.resx @@ -1,121 +1,121 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Denna bas är redan tagen eller förstörd. @@ -780,11 +780,11 @@ Anledning: {1} __IgnoreradeKannaler_: {2} - Text kanal skapad + Text kanal skapad. Fuzzy - Text kanal förstörd␣ + Text kanal förstörd. Fuzzy @@ -1815,7 +1815,7 @@ Fuzzy Fuktighet - Bild Sökning För: + Bild sökning för: Fuzzy @@ -2271,5 +2271,37 @@ Medlemmar: {1} Du har redan gått med detta lopp! + + Nuvarande röstningsresultat + + + Inga röster gjorda. + + + Rösten är redan igång på denna server. + + + 📃 {0} har skapat en röst som kräver din uppmärksamhet: + + + `{0}.` {1} med {2} röster. + + + {0} röstade. + Kwoth voted. + + + Privat Meddela mig det nummer som stämmer överens med svaret. + Fuzzy + + + Skicka ett Meddelande här med det nummer som stämmer överens med svaret. + + + Tack för att du röstade, {0} + + + {0} antal röster gjorda. + \ No newline at end of file From 11f51249525b2a4afd97a8f5993ffabe64e0d1ed Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 6 Mar 2017 17:07:46 +0100 Subject: [PATCH 198/496] Update ResponseStrings.tr-TR.resx (POEditor.com) --- .../Resources/ResponseStrings.tr-TR.resx | 525 ++++++++++-------- 1 file changed, 279 insertions(+), 246 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.tr-TR.resx b/src/NadekoBot/Resources/ResponseStrings.tr-TR.resx index 9a4ed57f..8ebe09d9 100644 --- a/src/NadekoBot/Resources/ResponseStrings.tr-TR.resx +++ b/src/NadekoBot/Resources/ResponseStrings.tr-TR.resx @@ -1,130 +1,130 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + Bu köy daha önceden alınmış veya yok edilmiş. - + Bu köy önceden yok edilmiş. - + Bu köy alınmamış. @@ -157,7 +157,7 @@ Aktif olan savaşlar - Hak idda edilmedi. + Alınmamış Fuzzy @@ -233,74 +233,75 @@ Autohentai durduruldu. - + Sonuç bulunamadı. - + {0} zaten bayılmış. - + {0} zaten canı dolu. - + Senin türn zaten {0} Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage. - + İntikam almadan bir daha saldıramassın. - + Kendine saldıramassın. - + {0} bayıldı. - + {0} iyileştirdi kullanarak {1} + Fuzzy - + {0} canı {1} kaldı. - + {0} tipi için hareklerin listesi - + Efektif değil. - + Sende yeteri kadar {0} yok - + Kendini yeniden canlardırdın bir tane {0} kullanarak. - + Senin tipin {0}'dan {1}'e değiştirildi. - + BU oldukça efektif! - + Bu süper efektif! - + Arka arkaya çok fazla harekt kullandın, artık haraket edemiyorsun! - + Kullanıcı bulunamadı. - + Bayıldın,yani hareket edemiyiceksin. Kullanıcı girişinde otomatik rol tanımlaması devre dışı. @@ -525,69 +526,69 @@ Sebep: {1} - + Bot sahibine mesaj {0} `[Bot Owner]`: - + Mesaj yollandı. - + {0} {1}'den {2}'ye taşındı. - + Mesajlar silinicek {0} içinde - + Susturuldunuz PLURAL (users have been muted) - + Susturuldun singular "User muted." - + Yeni swssiz rolu atandı. - + Yeni mesaj - + Yeni nick - + Yeni konu - + Nick değiştirildi - + Server bulunamadı - + Eski mesaj - + Eski nick - + Eski konu - + Hata.Yüksek ihtimalle yeterki kadar yetki'ye sahip değilim. - + Bu server için yetkiler sıfırlandı. @@ -599,7 +600,7 @@ Sebep: {1} - + Hata. Rolleri değiştirme iznine sahip değilim @@ -614,37 +615,37 @@ Sebep: {1} - + {0} yetkileri başarı ile alındı - + Yetkileri almada hata . Yüksek ihtimalle yeteri kadar yetkim yok. - + {0}ın rolünün renki değiştirildi - + Bu röl bulunmamakta. - + Bu parametreler hatalı. - + {1} kullanıcısının sahip olduğu {0} rolü başarı ile alındı - + Yetkiyi almada hata . Yüksek ihtimalle yeteri kadar yetkim yok. - + Rol yeniden adlandırıldı. - + Rol yeniden adladırılmasında hata. Yüksek ihtimalle yeteri kadar yetkim yok. - + Kendi rolunüzden daha yüksek rolleri değiştiremezsiniz. @@ -659,7 +660,7 @@ Sebep: {1} - + Eklendi. @@ -719,7 +720,7 @@ Sebep: {1} - + Yeni oyun başladı! @@ -734,19 +735,19 @@ Sebep: {1} - + Kapatılıyor - + Yavaş modu deaktive edildi - + Yavaş modu aktive edildi - + Kicklendiniz PLURAL @@ -759,50 +760,50 @@ Sebep: {1} - + Mesaj kanalı oluşturuldu. - + Mesaj kanalı kapatıldı. - + Susturulmanız kaldırıldı singular - + Kullanıcı adı - + Kullanıcı adı değiştirildi - + Kullanıcılar - + Kullanıcı uzaklaştırıldı. - + {0} bundan sonra mesajlaşmak için susturuldu. - + {0} bundan sonra mesajlaşmak için susturulması kaldırıldı. - + Kullanıcı katıldı - + Kullanıcı ayrıldı - + Kullanıcı rolü eklendi - + Kullanıcı rölü kaldırıldı @@ -826,10 +827,10 @@ Sebep: {1} - + Ses kanalı kuruldu - + Ses kanalı kapatıldı @@ -877,20 +878,20 @@ Sebep: {1} - + Birdaki sefere daha iyi bir şansın olur umarım ^_^ - + Deste karıldı User flipped tails. - + Tebrikler bildin! {0} kazandın @@ -902,7 +903,7 @@ Sebep: {1} - + Çiçek reaksiyonu etkinliği başladı! @@ -913,25 +914,25 @@ Sebep: {1} X has Y flowers - + Tura - + Liderlik Listesi - + {0}'dan fazla bahis yapamazssın - + {0}'dan az bahis yapamassın - + {0} yeteri kadar yok - + Destede kart kalmadı @@ -940,10 +941,10 @@ Sebep: {1} - + Bahis - + WOAAHHHHHH!!!Tebrikler!!! x{0} @@ -955,7 +956,7 @@ Sebep: {1} - + Kazandın @@ -967,7 +968,7 @@ Sebep: {1} - + Yazı @@ -979,7 +980,7 @@ Sebep: {1} - + Bot sahibine özel @@ -1000,7 +1001,7 @@ Sebep: {1} - + Açıklama @@ -1009,16 +1010,16 @@ Sebep: {1} - + Komutların listesi - + Modüllerin listesi - + Böyle bir modül bulunamadı @@ -1027,7 +1028,7 @@ Sebep: {1} - + Kullanım @@ -1036,51 +1037,51 @@ Sebep: {1} - + Hayvan yarışı - + Yarış dolu ! Hemen Başlıyor. - + {0} {1} olarak katıldı - + yarışa katılmak için {0}jr yazın. - + Yarışın başlaması için 20 saniye beklenmeli veya odanın dolması gerekmektedir. - + {0} katılımcı ile başlıyor - + {1} olan {0} yarışı kazandı! - + {1} olan {0} yarışı kazandı ve şu kadarlık bahisi topladı {2}! - + atıldı {0} Someone rolled 35 - + Zar atıldı: {0} Dice Rolled: 5 - + Yarış başlayamadı. Büyük ihtimalle bir başka yariş aktif. - + BU serverda bir yariş bulunmuyor. @@ -1089,22 +1090,23 @@ Sebep: {1} - + tarafından alındı. - + Ayrılıklar + is that plural? - + Sevdikleri - + Ücreti - + En yüksek Waifular @@ -1141,22 +1143,22 @@ Sebep: {1} - + BU waifu senin değil. - + Kendini alamazsın. - + Hiç kimse - + Seni sevemeyen bir waifundan ayrıldın.{0} kadarını geri aldın. - + 8NumaralıTop @@ -1222,7 +1224,7 @@ Sebep: {1} - + Bu kanalda birim üretimi kapatıldı. @@ -1262,11 +1264,11 @@ Sebep: {1} - + {0} aldı Kwoth picked 5* - + {0} ekti {1} aldı Kwoth planted 5* @@ -1423,7 +1425,7 @@ Sebep: {1} - + Şarkı sırasına eklendi. @@ -1432,7 +1434,7 @@ Sebep: {1} - + Şarkı kaldırıldı context: "removed song #5" @@ -1511,7 +1513,7 @@ Sebep: {1} - + {0} adlı ve {1} idli kullanıcı karalisteye alındı. @@ -1538,7 +1540,7 @@ Sebep: {1} - + Filtrelenmiş sözler listesi @@ -1568,11 +1570,11 @@ Sebep: {1} - + komut Gen (of command) - + modül Gen. (of module) @@ -1597,7 +1599,7 @@ Sebep: {1} - + sn Short of seconds. @@ -1700,7 +1702,7 @@ Sebep: {1} - + Ara verildi @@ -1794,7 +1796,7 @@ Sebep: {1} - + İzlemeyi düşünülen @@ -1824,7 +1826,7 @@ Sebep: {1} - + Şunu ara: @@ -1949,7 +1951,7 @@ Sebep: {1} - + Komutlar yürütüyor @@ -1991,7 +1993,7 @@ Sebep: {1} - + Bu roldeki kullanıcıların listesi: @@ -2175,5 +2177,36 @@ Sebep: {1} + + + + + + + + + + + + + + + + + {0} oyladı. + Kwoth voted. + + + + + + + + + + + + + \ No newline at end of file From 6437fb6f90701eb6b5d579f45b2c57b311feba1e Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 6 Mar 2017 18:43:03 +0100 Subject: [PATCH 199/496] Fixed .remind me --- .../Modules/Utility/Commands/Remind.cs | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/src/NadekoBot/Modules/Utility/Commands/Remind.cs b/src/NadekoBot/Modules/Utility/Commands/Remind.cs index 45406de9..092d1470 100644 --- a/src/NadekoBot/Modules/Utility/Commands/Remind.cs +++ b/src/NadekoBot/Modules/Utility/Commands/Remind.cs @@ -64,7 +64,10 @@ namespace NadekoBot.Modules.Utility IMessageChannel ch; if (r.IsPrivate) { - ch = await NadekoBot.Client.GetDMChannelAsync(r.ChannelId).ConfigureAwait(false); + var user = NadekoBot.Client.GetGuild(r.ServerId).GetUser(r.ChannelId); + if(user == null) + return; + ch = await user.CreateDMChannelAsync().ConfigureAwait(false); } else { @@ -100,23 +103,16 @@ namespace NadekoBot.Modules.Utility [Priority(1)] public async Task Remind(MeOrHere meorhere, string timeStr, [Remainder] string message) { - IMessageChannel target; - if (meorhere == MeOrHere.Me) - { - target = await ((IGuildUser)Context.User).CreateDMChannelAsync().ConfigureAwait(false); - } - else - { - target = Context.Channel; - } - await Remind(target, timeStr, message).ConfigureAwait(false); + ulong target; + target = meorhere == MeOrHere.Me ? Context.User.Id : Context.Channel.Id; + await Remind(target, meorhere == MeOrHere.Me, timeStr, message).ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] [RequireUserPermission(GuildPermission.ManageMessages)] [Priority(0)] - public async Task Remind(IMessageChannel ch, string timeStr, [Remainder] string message) + public async Task Remind(ulong targetId, bool isPrivate, string timeStr, [Remainder] string message) { var channel = (ITextChannel)Context.Channel; @@ -164,8 +160,8 @@ namespace NadekoBot.Modules.Utility var rem = new Reminder { - ChannelId = ch.Id, - IsPrivate = ch is IDMChannel, + ChannelId = targetId, + IsPrivate = isPrivate, When = time, Message = message, UserId = Context.User.Id, @@ -182,7 +178,7 @@ namespace NadekoBot.Modules.Utility { await channel.SendConfirmAsync( "⏰ " + GetText("remind", - Format.Bold(ch is ITextChannel ? ((ITextChannel) ch).Name : Context.User.Username), + Format.Bold(!isPrivate ? $"<#{targetId}>" : Context.User.Username), Format.Bold(message.SanitizeMentions()), Format.Bold(output), time, time)).ConfigureAwait(false); From 74ac9858dcd0643641482a791c06038f5c5b1f53 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 6 Mar 2017 19:19:23 +0100 Subject: [PATCH 200/496] .inrole nerfed, takes only one role, prettier --- src/NadekoBot/Modules/Utility/Utility.cs | 33 ++++--------------- .../Resources/CommandStrings.Designer.cs | 4 +-- src/NadekoBot/Resources/CommandStrings.resx | 4 +-- .../Resources/ResponseStrings.Designer.cs | 2 +- src/NadekoBot/Resources/ResponseStrings.resx | 2 +- 5 files changed, 13 insertions(+), 32 deletions(-) diff --git a/src/NadekoBot/Modules/Utility/Utility.cs b/src/NadekoBot/Modules/Utility/Utility.cs index 38951dd5..fefa35bd 100644 --- a/src/NadekoBot/Modules/Utility/Utility.cs +++ b/src/NadekoBot/Modules/Utility/Utility.cs @@ -217,34 +217,15 @@ namespace NadekoBot.Modules.Utility [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] - public async Task InRole(params IRole[] roles) + public async Task InRole([Remainder] IRole role) { - if (roles.Length == 0) - return; - var send = "ℹ️ " + Format.Bold(GetText("inrole_list")); + var usrs = (await Context.Guild.GetUsersAsync()).ToArray(); - foreach (var role in roles.Where(r => r.Id != Context.Guild.Id)) - { - var roleUsers = usrs.Where(u => u.RoleIds.Contains(role.Id)).Select(u => u.ToString()).ToArray(); - send += $"```css\n[{role.Name}] ({roleUsers.Length})\n"; - send += string.Join(", ", roleUsers); - send += "\n```"; - } - var usr = (IGuildUser)Context.User; - while (send.Length > 2000) - { - if (!usr.GetPermissions((ITextChannel)Context.Channel).ManageMessages) - { - await ReplyErrorLocalized("inrole_not_allowed").ConfigureAwait(false); - return; - } - var curstr = send.Substring(0, 2000); - await Context.Channel.SendConfirmAsync(curstr.Substring(0, - curstr.LastIndexOf(", ", StringComparison.Ordinal) + 1)).ConfigureAwait(false); - send = curstr.Substring(curstr.LastIndexOf(", ", StringComparison.Ordinal) + 1) + - send.Substring(2000); - } - await Context.Channel.SendConfirmAsync(send).ConfigureAwait(false); + var roleUsers = usrs.Where(u => u.RoleIds.Contains(role.Id)).Select(u => u.ToString()).ToArray(); + var embed = new EmbedBuilder().WithOkColor() + .WithTitle("ℹ️ " + Format.Bold(GetText("inrole_list")) + $" - {roleUsers.Length}") + .WithDescription(string.Join(", ", roleUsers)); + await Context.Channel.EmbedAsync(embed).ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] diff --git a/src/NadekoBot/Resources/CommandStrings.Designer.cs b/src/NadekoBot/Resources/CommandStrings.Designer.cs index 41965836..3b42debd 100644 --- a/src/NadekoBot/Resources/CommandStrings.Designer.cs +++ b/src/NadekoBot/Resources/CommandStrings.Designer.cs @@ -3552,7 +3552,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Lists every person from the provided role or roles, separated with space, on this server. You can use role IDs, role names (in quotes if it has multiple words), or role mention If the list is too long for 1 message, you must have Manage Messages permission.. + /// Looks up a localized string similar to Lists every person from the specified role on this server. You can use role ID, role name.. /// public static string inrole_desc { get { @@ -3561,7 +3561,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to `{0}inrole Role` or `{0}inrole Role1 "Role 2" @role3`. + /// Looks up a localized string similar to `{0}inrole Some Role`. /// public static string inrole_usage { get { diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx index 3379b98b..528700c3 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -841,10 +841,10 @@ inrole - Lists every person from the provided role or roles, separated with space, on this server. You can use role IDs, role names (in quotes if it has multiple words), or role mention If the list is too long for 1 message, you must have Manage Messages permission. + Lists every person from the specified role on this server. You can use role ID, role name. - `{0}inrole Role` or `{0}inrole Role1 "Role 2" @role3` + `{0}inrole Some Role` checkmyperms diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index 7e2b3173..44f51416 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -5702,7 +5702,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Here is a list of users in those roles:. + /// Looks up a localized string similar to List of users in {0} role. /// public static string utility_inrole_list { get { diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index 8f964f3a..a74c16db 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -2002,7 +2002,7 @@ Don't forget to leave your discord name or id in the message. Index out of range. - Here is a list of users in those roles: + List of users in {0} role You are not allowed to use this command on roles with a lot of users in them to prevent abuse. From 05d6152936bc7c1b9bc4178beb4027cb6b5e0375 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 6 Mar 2017 20:13:06 +0100 Subject: [PATCH 201/496] Cleverbot is beyond stupid, but works. Not using cleverbot, but program-o.com --- .../Games/Commands/CleverBotCommands.cs | 50 ++++++++++++++++--- src/NadekoBot/Services/Impl/StatsService.cs | 2 +- src/NadekoBot/_Extensions/Extensions.cs | 6 +++ 3 files changed, 50 insertions(+), 8 deletions(-) diff --git a/src/NadekoBot/Modules/Games/Commands/CleverBotCommands.cs b/src/NadekoBot/Modules/Games/Commands/CleverBotCommands.cs index fa04a2c6..3d7fb832 100644 --- a/src/NadekoBot/Modules/Games/Commands/CleverBotCommands.cs +++ b/src/NadekoBot/Modules/Games/Commands/CleverBotCommands.cs @@ -5,12 +5,15 @@ using NadekoBot.Attributes; using NadekoBot.Extensions; using NadekoBot.Services; using NLog; -using Services.CleverBotApi; +//using Services.CleverBotApi; using System; using System.Collections.Concurrent; using System.Diagnostics; using System.Linq; +using System.Net.Http; using System.Threading.Tasks; +using Newtonsoft.Json; +using Services.CleverBotApi; namespace NadekoBot.Modules.Games { @@ -27,13 +30,11 @@ namespace NadekoBot.Modules.Games { _log = LogManager.GetCurrentClassLogger(); var sw = Stopwatch.StartNew(); - - var bot = ChatterBotFactory.Create(ChatterBotType.CLEVERBOT); CleverbotGuilds = new ConcurrentDictionary>( NadekoBot.AllGuildConfigs .Where(gc => gc.CleverbotEnabled) - .ToDictionary(gc => gc.GuildId, gc => new Lazy(() => bot.CreateSession(), true))); + .ToDictionary(gc => gc.GuildId, gc => new Lazy(() => new ChatterBotSession(gc.GuildId), true))); sw.Stop(); _log.Debug($"Loaded in {sw.Elapsed.TotalSeconds:F2}s"); @@ -100,9 +101,7 @@ namespace NadekoBot.Modules.Games return; } - var cleverbot = ChatterBotFactory.Create(ChatterBotType.CLEVERBOT); - - CleverbotGuilds.TryAdd(channel.Guild.Id, new Lazy(() => cleverbot.CreateSession(), true)); + CleverbotGuilds.TryAdd(channel.Guild.Id, new Lazy(() => new ChatterBotSession(Context.Guild.Id), true)); using (var uow = DbHandler.UnitOfWork()) { @@ -113,5 +112,42 @@ namespace NadekoBot.Modules.Games await ReplyConfirmLocalized("cleverbot_enabled").ConfigureAwait(false); } } + + public class ChatterBotSession + { + private static NadekoRandom rng { get; } = new NadekoRandom(); + public string ChatterbotId { get; } + public string ChannelId { get; } + private int _botId = 15; + + public ChatterBotSession(ulong channelId) + { + ChannelId = channelId.ToString().ToBase64(); + ChatterbotId = rng.Next(0, 1000000).ToString().ToBase64(); + } + + private string apiEndpoint => "http://api.program-o.com/v2/chatbot/" + + $"?bot_id={_botId}&" + + "say={0}&" + + $"convo_id=nadekobot_{ChatterbotId}_{ChannelId}&" + + "format=json"; + + public async Task Think(string message) + { + using (var http = new HttpClient()) + { + var res = await http.GetStringAsync(string.Format(apiEndpoint, message)).ConfigureAwait(false); + var cbr = JsonConvert.DeserializeObject(res); + //Console.WriteLine(cbr.Convo_id); + return cbr.BotSay.Replace("
", "\n"); + } + } + } + + public class ChatterBotResponse + { + public string Convo_id { get; set; } + public string BotSay { get; set; } + } } } \ No newline at end of file diff --git a/src/NadekoBot/Services/Impl/StatsService.cs b/src/NadekoBot/Services/Impl/StatsService.cs index 0390cbda..946bf11f 100644 --- a/src/NadekoBot/Services/Impl/StatsService.cs +++ b/src/NadekoBot/Services/Impl/StatsService.cs @@ -16,7 +16,7 @@ namespace NadekoBot.Services.Impl private readonly DiscordShardedClient _client; private readonly DateTime _started; - public const string BotVersion = "1.2"; + public const string BotVersion = "1.21"; public string Author => "Kwoth#2560"; public string Library => "Discord.Net"; diff --git a/src/NadekoBot/_Extensions/Extensions.cs b/src/NadekoBot/_Extensions/Extensions.cs index f95e6fbb..429e9c80 100644 --- a/src/NadekoBot/_Extensions/Extensions.cs +++ b/src/NadekoBot/_Extensions/Extensions.cs @@ -21,6 +21,12 @@ namespace NadekoBot.Extensions private const string arrow_left = "⬅"; private const string arrow_right = "➡"; + public static string ToBase64(this string plainText) + { + var plainTextBytes = System.Text.Encoding.UTF8.GetBytes(plainText); + return Convert.ToBase64String(plainTextBytes); + } + public static Stream ToStream(this IEnumerable bytes, bool canWrite = false) { var ms = new MemoryStream(bytes as byte[] ?? bytes.ToArray(), canWrite); From cf44ff9b7923509cfeb4731ef7e66136ffeba32a Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 6 Mar 2017 20:17:43 +0100 Subject: [PATCH 202/496] woops, forgot to put botid back --- src/NadekoBot/Modules/Games/Commands/CleverBotCommands.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Games/Commands/CleverBotCommands.cs b/src/NadekoBot/Modules/Games/Commands/CleverBotCommands.cs index 3d7fb832..0e85e4b0 100644 --- a/src/NadekoBot/Modules/Games/Commands/CleverBotCommands.cs +++ b/src/NadekoBot/Modules/Games/Commands/CleverBotCommands.cs @@ -118,7 +118,7 @@ namespace NadekoBot.Modules.Games private static NadekoRandom rng { get; } = new NadekoRandom(); public string ChatterbotId { get; } public string ChannelId { get; } - private int _botId = 15; + private int _botId = 6; public ChatterBotSession(ulong channelId) { From 1d8387b8d971faa82a05cd60208604d5ccb5b827 Mon Sep 17 00:00:00 2001 From: samvaio Date: Wed, 8 Mar 2017 01:41:57 +0530 Subject: [PATCH 203/496] .NET Core 1.1.0 SDK Preview 2.1 build 3177 --- docs/guides/Windows Guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/guides/Windows Guide.md b/docs/guides/Windows Guide.md index 0d569909..c0e62c76 100644 --- a/docs/guides/Windows Guide.md +++ b/docs/guides/Windows Guide.md @@ -120,7 +120,7 @@ In order to have a functioning music module, you need to install ffmpeg and setu -[.NET Core SDK]: https://www.microsoft.com/net/core#windowscmd +[.NET Core SDK]: https://github.com/dotnet/core/blob/master/release-notes/download-archives/1.1-preview2.1-download.md [Git]: https://git-scm.com/download/win [7zip]: http://www.7-zip.org/download.html [DiscordApp]: https://discordapp.com/developers/applications/me From 4c1d405d51b11edf82833807bd20ed1654246bf7 Mon Sep 17 00:00:00 2001 From: samvaio Date: Wed, 8 Mar 2017 02:19:18 +0530 Subject: [PATCH 204/496] linux and macos update links changed to .NET Core 1.1.0 SDK Preview 2.1 build 3177 --- docs/guides/Linux Guide.md | 48 +++++++++++++++++++++++++++++++------- docs/guides/OSX Guide.md | 3 ++- 2 files changed, 42 insertions(+), 9 deletions(-) diff --git a/docs/guides/Linux Guide.md b/docs/guides/Linux Guide.md index 1997407b..4e168cf4 100644 --- a/docs/guides/Linux Guide.md +++ b/docs/guides/Linux Guide.md @@ -198,17 +198,49 @@ CentOS: ![img2](https://cdn.discordapp.com/attachments/251504306010849280/251504746987388938/dotnet.gif) Go to [this link](https://www.microsoft.com/net/core#ubuntu) (for Ubuntu) or to [this link](https://www.microsoft.com/net/core#linuxcentos) (for CentOS) provided by microsoft for instructions on how to get the most up to date version of the dotnet core sdk! -Make sure that you're on the correct page for your distribution of linux as the guides are different for the various distributions +Make sure that you're on the correct page for your distribution of linux as the guides are different for the various distributions. +Install the **currently supported version** `1.0.0-preview2-1-003177`. +You can find it [here](https://github.com/dotnet/core/blob/master/release-notes/download-archives/1.1-preview2.1-download.md) if you prefer manual installing `dpkg` files. -We'll go over the steps here for Ubuntu 16.04 anyway (these will **only** work on Ubuntu 16.04), accurate as of 3/2/2017 +We'll go over the steps here for few linux distributions, accurate as of March 08, 2017: +**NOTE:** .NET CORE SDK only supports 64-bit Linux Operating Systems (Raspberry Pis are not supported because of this) +**Ubuntu x64 17.04 & 16.10** +```sh +sudo sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/ yakkety main" > /etc/apt/sources.list.d/dotnetdev.list' +sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 417A0893 +sudo apt-get update && sudo apt-get install dotnet-dev-1.0.0-preview2.1-003177 -y ``` + +**Ubuntu x64 16.04** +```sh sudo sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/ xenial main" > /etc/apt/sources.list.d/dotnetdev.list' sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 417A0893 sudo apt-get update && sudo apt-get install dotnet-dev-1.0.0-preview2.1-003177 -y ``` -**NOTE:** .NET CORE SDK only supports 64-bit Linux Operating Systems (Raspberry Pis are not supported because of this) +**Ubuntu x64 14.04** +```sh +sudo sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/ trusty main" > /etc/apt/sources.list.d/dotnetdev.list' +sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 417A0893 +sudo apt-get update && sudo apt-get install dotnet-dev-1.0.0-preview2.1-003177 -y +``` + +**Debian 8 x64** +```sh +sudo apt-get install curl libunwind8 gettext -y +curl -sSL -o dotnet.tar.gz https://go.microsoft.com/fwlink/?LinkID=835021 +sudo mkdir -p /opt/dotnet && sudo tar zxf dotnet.tar.gz -C /opt/dotnet +sudo ln -s /opt/dotnet/dotnet /usr/local/bin +``` + +**CentOS 7 x64** +```sh +sudo yum install libunwind libicu -y +curl -sSL -o dotnet.tar.gz https://go.microsoft.com/fwlink/?LinkID=835019 +sudo mkdir -p /opt/dotnet && sudo tar zxf dotnet.tar.gz -C /opt/dotnet +sudo ln -s /opt/dotnet/dotnet /usr/local/bin +``` #####Installing Opus Voice Codec and libsodium @@ -232,14 +264,14 @@ Ubuntu: Centos: -``` +```sh yum -y install http://li.nux.ro/download/nux/dextop/el7/x86_64/nux-dextop-release-0-5.el7.nux.noarch.rpm epel-release yum -y install ffmpeg ``` **NOTE:** If you are running **UBUNTU 14.04**, you must run these first: -``` +```sh sudo add-apt-repository ppa:mc3man/trusty-media sudo apt-get update sudo apt-get dist-upgrade @@ -250,7 +282,7 @@ sudo apt-get dist-upgrade **NOTE:** If you are running **Debian 8 Jessie**, please, follow these steps: -``` +```sh sudo apt-get update echo "deb http://ftp.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/debian-backports.list sudo apt-get update && sudo apt-get install ffmpeg -y @@ -330,14 +362,14 @@ If the [Nadeko installer](http://nadekobot.readthedocs.io/en/latest/guides/Linux **OR** -``` +```sh cd ~ && git clone -b dev --recursive --depth 1 https://github.com/Kwoth/NadekoBot.git cd ~/NadekoBot/discord.net/src/Discord.Net && dotnet restore && cd ../Discord.Net.Commands && dotnet restore && cd ../../../src/NadekoBot/ && dotnet restore && dotnet build --configuration Release ``` If you are getting error using the above steps try: -``` +```sh cd ~/NadekoBot/discord.net && dotnet restore -s https://dotnet.myget.org/F/dotnet-core/api/v3/index.json && dotnet restore cd ~/NadekoBot/src/NadekoBot/ && dotnet restore && dotnet build --configuration Release ``` diff --git a/docs/guides/OSX Guide.md b/docs/guides/OSX Guide.md index 7475a911..366a5319 100644 --- a/docs/guides/OSX Guide.md +++ b/docs/guides/OSX Guide.md @@ -30,7 +30,7 @@ brew install tmux - `ln -s /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/` - `ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/` -- Download the [.NET Core SDK](https://www.microsoft.com/net/core#macos), found [here.](https://go.microsoft.com/fwlink/?LinkID=835011) +- Download the [.NET Core SDK][.NET Core SDK] - Open the `.pkg` file you downloaded and install it. - `ln -s /usr/local/share/dotnet/dotnet /usr/local/bin` @@ -166,6 +166,7 @@ If you used Screen press CTRL+A+D (this will detach the nadeko screen) - `dotnet build --configuration Release` [Homebrew]: http://brew.sh/ +[.NET Core SDK]: https://github.com/dotnet/core/blob/master/release-notes/download-archives/1.1-preview2.1-download.md [DiscordApp]: https://discordapp.com/developers/applications/me [Atom]: https://atom.io/ [Invite Guide]: http://discord.kongslien.net/guide.html From 96bf2a5233bf9769baf58c5b9ad37dece2580e27 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 8 Mar 2017 02:17:30 +0100 Subject: [PATCH 205/496] Update ResponseStrings.zh-CN.resx (POEditor.com) From 221ca3f4de316849c2af4ecd4ac6ee52baa280e6 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 8 Mar 2017 02:17:33 +0100 Subject: [PATCH 206/496] Update ResponseStrings.zh-TW.resx (POEditor.com) --- .../Resources/ResponseStrings.zh-TW.resx | 622 +++++++++++++----- 1 file changed, 468 insertions(+), 154 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx b/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx index 7b58202d..cb7f3b62 100644 --- a/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx +++ b/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx @@ -140,7 +140,6 @@ 在 @{0} 與 {1} 對戰後佔領的基地已失效。 - Fuzzy 敵人 @@ -153,11 +152,9 @@ 無效的戰爭大小。 - Fuzzy 目前正在進行的戰爭 - Fuzzy 未佔領 @@ -170,7 +167,6 @@ 目前尚無戰爭進行中。 - Fuzzy 大小 @@ -211,7 +207,6 @@ 沒有找到自訂回應 。 - Fuzzy 找不到輸入的自訂回應編號。 @@ -300,7 +295,7 @@ {0} 的屬性是 {1} - 該用戶不存在。 + 該成員不存在。 您已昏厥所以不能移動！ @@ -326,7 +321,7 @@ PLURAL - 用戶已封鎖 + 成員已封鎖 Bot 暱稱已改為 {0} @@ -401,7 +396,7 @@ 私人訊息來自 - 成功新增了新的捐贈者。此用戶總共捐贈了：{0} + 成功新增了新的捐贈者。此成員總共捐贈了：{0} 感謝下列的人使這個項目繼續運作! @@ -455,7 +450,7 @@ 在這個頻道啟用歡迎通知。 - 您不能對身分組與您一樣或更高的人使用此指令。 + 您不能對身分組與您一樣或更高的成員使用此指令。 圖片共花了 {0} 秒載入! @@ -474,7 +469,7 @@ 原因：{1} - 用戶已被踢出 + 成員已被踢出 Fuzzy @@ -616,16 +611,16 @@ Fuzzy - 用戶緩衝數應介於 {0} 和 {1} 之間。 + 成員緩衝數應介於 {0} 和 {1} 之間。 - 如果 {1} 秒內進入了 {0} 或更多位使用者，我則會將他們 {2} 。 + 如果 {1} 秒內進入了 {0} 或更多位成員，我則會將他們 {2} 。 時間必須在於 {0} 和 {1} 秒之間。 - 已成功移除了使用者 {0} 上所有的身分組。 + 成功的移除了 {0} 所有的身分組。 無法移除身分組。我的權限不夠。 @@ -643,7 +638,7 @@ 無效的色碼或是權限不足引起錯誤。 - 成功的移除 {1} 的 {0} 身分組。 + 成功的移除了 {1} 的 {0} 身分組。 無法移除身分組。我沒有足夠的權限。 @@ -744,293 +739,352 @@ Shard {0} 重新連線中。 + Fuzzy 關閉中 + Fuzzy - 使用者無法在 {1} 秒發送超過 {0} 條訊息。 + 成員無法在 {1} 秒發送超過 {0} 條訊息。 + Fuzzy 慢速模式已停用。 + Fuzzy 慢速模式已啟用 + Fuzzy 軟禁 (踢出) - PLURAL + PLURAL +Fuzzy {0} 將會忽略此頻道。 + Fuzzy {0} 將會注意此頻道。 + Fuzzy - 如果使用者連續貼出 {0} 個相同的訊息，我將會把他們 {1}。 + 如果成員連續貼出 {0} 個相同的訊息，我將會把他們 {1}。      __忽略的頻道__: {2} + Fuzzy 文字頻道已建立 - Fuzzy 文字頻道已刪除 - Fuzzy 成功解除靜音。 + Fuzzy 解除靜音 - singular + singular +Fuzzy - 使用者名稱 + 成員名稱 + Fuzzy - 使用者名稱已更改 - Fuzzy + 成員名稱已更改 - 使用者 - - - 使用者已封鎖 + 成員 Fuzzy + + 成員已封鎖 + - {0} 已**被禁**__文字聊天__。 + 已**禁止** {0} 的__文字聊天__。 + Fuzzy - {0} 已**允許**__文字聊天__。 + 已**開啟** {0} 的__文字聊天__。 + Fuzzy 使用者已加入 - Fuzzy 使用者已離開 - Fuzzy - {0} 已**被禁**__文字和語音聊天__。 + 已**禁止** {0} 的__文字和語音聊天__。 + Fuzzy 使用者身分組已新增 + Fuzzy 已移除用戶的身分組 - Fuzzy {0} 改成了 {1} + Fuzzy - {0} 已從文字頻道和語音頻道被**取消禁音**。 + 已**開放** {0} 的__文字和語音聊天__。 + Fuzzy {0} 已加入 {1} 語音頻道。 + Fuzzy {0} 已離開 {1} 語音頻道。 + Fuzzy {0} 已從 {1} 移至 {2} 語音頻道。 + Fuzzy - {0} 已被**静音**。 + 已**禁止** {0} 的__語音聊天__。 + Fuzzy - {0} 已被**取消静音**。 + 已**開放** {0} 的__語音聊天__。 + Fuzzy 已建立語音頻道 + Fuzzy 已刪除語音頻道 + Fuzzy 已停用語音+文字功能。 + Fuzzy 已啟用語音+文字功能。 + Fuzzy - 我沒有**管理身分組**和/或**管理頻道**權限，所以我無法在 {0} 伺服器上運行`語音+文字`。 + 我沒有**管理身分組**和/或**管理頻道**權限，所以我無法在 {0} 伺服器上執行`語音+文字`功能。 + Fuzzy - 您正在啟用/停用此功能，而且**我没有管理員權限**。這可能會造成一些問題，您必須自己清理文字頻道。 + 您正在啟用/停用此功能，但我**__没有__管理員權限**。這可能會造成一些問題，而事後您必須自行處理這些文字頻道。 + Fuzzy - 我需要至少**管理身份**和**管理频道**权限，以启用此功能。 （优先管理权限） + 我至少需要**管理身份組**和**管理頻道**權限才能使用此功能。(建議給我管理員權限) + Fuzzy - 用户{0}来自文字频道 + 使用者被 {0} 文字聊天 + Fuzzy - 用户{0}来自文字和语音频道 + 使用者被 {0} 文字及語音聊天 + Fuzzy - 用户{0}来自语音频道 + 使用者被 {0} 語音聊天 + Fuzzy - 您已从{0}服务器软禁止。 -原因：{1} + 您已被伺服器 {0} 軟禁。 +理由: {1} + Fuzzy - 用户已取消禁止 - Fuzzy + 使用者已解禁 迁移完成！ + Fuzzy 在迁移时出错，请检查机器人的控制台以获取更多信息。 + Fuzzy 在线状态更新 - Fuzzy 用户被软禁用 - Fuzzy 已給予 {0} 給 {1} + Fuzzy 祝你下一次好運 ^_^ + Fuzzy 恭喜！ 您赢得{0}因为您滚{1}或以上 + Fuzzy 卡牌改组。 + Fuzzy 拋出了 {0}。 - User flipped tails. + User flipped tails. +Fuzzy 你猜對了！你赢得了 {0} + Fuzzy 指定的數字無效。你可以丟 1 至 {0} 個硬幣。 + Fuzzy 将{0}反应添加到此消息以获取{1} + Fuzzy 此活動只在 {0} 小時內有效。 + Fuzzy 花反应活动开始了！ + Fuzzy 送了 {1} 給 {0} - X has gifted 15 flowers to Y + X has gifted 15 flowers to Y +Fuzzy {0} 擁有 {1} - X has Y flowers + X has Y flowers +Fuzzy 頭 + Fuzzy 排行榜 + Fuzzy 从{2}身份授予{0}至{1}名用户。 + Fuzzy 你的賭注不能大於 {0} + Fuzzy 你的賭注不能少於 {0} + Fuzzy 你沒有足夠的 {0} + Fuzzy 卡牌组中没有更多的牌。 + Fuzzy - 抽奖用户 - Fuzzy + 得獎用戶 您抛了{0}。 + Fuzzy 賭注 + Fuzzy 哇啊啊啊啊啊啊！恭喜！x{0} + Fuzzy 单个{0}，x {1} + Fuzzy 哇！好运！ 三个相同！ x {0} + Fuzzy 做得好！ 两个{0} - 投注x {1} + Fuzzy 獲勝 + Fuzzy 用户必须键入密码才能获取{0}。 持续{1}秒。 嘘~别跟任何人说。 + Fuzzy SneakyGame事件结束。 {0}个用户收到了奖励。 + Fuzzy SneakyGameStatus事件已启动 + Fuzzy 尾 - Fuzzy 已成功从{1}取得{0} + Fuzzy 无法从{1}取得{0}，因为用户没有那么多{2}！ + Fuzzy 返回ToC + Fuzzy - 仅限Bot Owner + 只限 BOT 擁有者 Fuzzy - 需要{0}频道权限。 + 需要 {0} 頻道權限。 + Fuzzy - 您可以在patreon上支持项目：<{0}>或paypal：<{1}> + 您可以在 patreon 上：<{0}> 或 paypal：<{1}> 支持這個項目 命令和别名 - Fuzzy 命令列表已重新生成。 - Fuzzy 输入`{0} h CommandName`可查看该指定命令的帮助。 例如 `{0} h> 8ball` + Fuzzy 我找不到该命令。 请再次尝试之前验证该命令是否存在。 + Fuzzy 描述 + Fuzzy 您可以在： @@ -1040,1285 +1094,1545 @@ Paypal <{1}> 不要忘记在邮件中留下您的不和名字或ID。 **谢谢**♥️ + Fuzzy **命令列表**：<{0}> **主机指南和文档可以在这里找到**：<{1}> - Fuzzy - 命令列表 - Fuzzy + 指令列表 组件列表 - Fuzzy 输入“{0} cmds ModuleName”以获取该组件中的命令列表。 例如`{0} cmds games` + Fuzzy 该组件不存在。 + Fuzzy 需要{0}服务器权限。 + Fuzzy 目录 - Fuzzy - 用法 + 使用方式 + Fuzzy - 自动hentai启动。 使用以下标记之一重新排列每个{0}： + Autohentai 啟動。每 {0} 秒發送一張含有以下標籤的圖片： {1} - 标签 - - - 动物竞赛 + 標籤 Fuzzy + + 動物競速比賽 + - 启动失败，因为没有足够的参与者。 + 參賽者不足，無法啟動比賽。 + Fuzzy - 竞赛已满！ 立即开始。 + 參賽者已滿！將立即開始比賽。 + Fuzzy - {0}加入为{1} + {0} 扮演為 {1} - {0}加入为{1}，赌注{2}！ + {0} 扮演為 {1} 並下注了 {2}！ - 输入{0} jr 以加入竞赛。 + 輸入 {0}jr 來加入比賽。 + Fuzzy - 在20内秒或当房间满后开始。 + 比賽將開始於20秒內或房間人數滿後。 + Fuzzy - {0}个参与者开始。 + 比賽開始，共有 {0} 個參賽者。 {0}为{1}赢得竞赛！ + Fuzzy 0}为{1}赢得竞赛，和赢得{2}！ + Fuzzy 指定的数字无效。 您可以一次滚动{0} - {1}骰子。 + Fuzzy 掷了{0} - Someone rolled 35 + Someone rolled 35 +Fuzzy 掷骰子：{0} - Dice Rolled: 5 + Dice Rolled: 5 +Fuzzy 竞赛启动失败。 另一个比赛可能正在运行。 + Fuzzy 此服务器上不存在竞赛 + Fuzzy 第二个数字必须大于第一个数字。 + Fuzzy 爱被改变 - Fuzzy 声称 - Fuzzy 离婚 + Fuzzy 喜欢 + Fuzzy - 价钱 + 價格 + Fuzzy 没有waifus被要求。 + Fuzzy 最佳Waifus + Fuzzy 您的兴趣已设置为该waifu，或者您尝试在没有兴趣的情况下删除您的兴趣。 + Fuzzy 将把兴趣从{0}更改为{1}。 *这在道德上是有问题的*🤔 - Make sure to get the formatting right, and leave the thinking emoji + Make sure to get the formatting right, and leave the thinking emoji +Fuzzy 您必须等待{0}小时和{1}分钟才能再次更改您的兴趣。 + Fuzzy 您的兴趣已重置。 你不再有你喜欢的人。 + Fuzzy 想成为{0}的waifu。哇非常可爱<3 + Fuzzy 声明{0}为他的waifu，花了{1}！ + Fuzzy 你已经离婚了一个喜欢你的waifu。 你无情的怪物。 {0}收到了{1}作为补偿。 + Fuzzy 你不能设置兴趣自己，你好自卑。 + Fuzzy 🎉他的爱实现！ 🎉 {0}的新值为{1}！ + Fuzzy 没有waifu那么便宜。 您必须至少支付{0}才能获得waifu，即使他们的实际价值较低。 + Fuzzy 您必须支付{0}或更多才能认领那个waifu！ + Fuzzy 那waifu不是你的。 + Fuzzy 你不能认领自己。 + Fuzzy 你最近离婚了。 您必须等待{0}小时和{1}分钟再次离婚。 + Fuzzy 没人 + Fuzzy 你离婚了一个不喜欢你的waifu。 您收到了{0}。 + Fuzzy 8ball + Fuzzy 恐惧症游戏 + Fuzzy 游戏结束，没人提交。 + Fuzzy 没人投票。 游戏结束，没有赢家。 + Fuzzy 首字母缩写是{0}。 + Fuzzy 恐惧症游戏已经在这个频道中运行。 + Fuzzy 游戏开始。 创建具有以下首字母缩写的句子：{0}。 + Fuzzy 您有{0}秒的时间提交。 + Fuzzy {0}提交了他的判决。 （总{1}个） + Fuzzy 通过输入提交数字投票 + Fuzzy {0}投了票！ + Fuzzy 获胜者{0}获得{1}分。 + Fuzzy {0}赢了因为是唯一的提交用户！ + Fuzzy 题 + Fuzzy 平局！ 两个都挑了{0} + Fuzzy {0}赢了！ {1} 打赢了 {2} + Fuzzy 提交关闭 - Fuzzy 动物竞赛已经运行。 + Fuzzy 总计：{0} 平均：{1} + Fuzzy 类别 + Fuzzy 在此服务器上禁用cleverbot。 + Fuzzy 在此服务器上启用cleverbot。 + Fuzzy 在此频道上停用的货币生成功能。 + Fuzzy 在此频道上启用的货币生成功能。 + Fuzzy {0} 个 {1}出现了！ 通过输入`{2} pick'来拾取 - plural + plural +Fuzzy 一个{0}出现了！ 通过输入`{1} pick`来拾取 + Fuzzy 加载问题失败。 + Fuzzy 游戏开始 - Fuzzy Hangman游戏开始了 + Fuzzy Hangman游戏已在此频道上打开。 + Fuzzy 启动hangman错误。 + Fuzzy “{0} hangman”字词类型列表： + Fuzzy 排行榜 + Fuzzy 您没有足够的{0} + Fuzzy 没有结果 + Fuzzy 采了{0} - Kwoth picked 5* + Kwoth picked 5* +Fuzzy {0}种了{1} - Kwoth planted 5* + Kwoth planted 5* +Fuzzy 琐事游戏已经在这个服务器上运行。 + Fuzzy 琐事游戏 + Fuzzy {0}猜对了！ 答案是：{1} + Fuzzy 此服务器上没有运行琐事游戏。 + Fuzzy {0}有{1}分 + Fuzzy 这个问题后停止。 + Fuzzy 时间到！ 正确的答案是{0} + Fuzzy {0}猜到了，赢得了游戏！ 答案是：{1} + Fuzzy 你不能对自己玩。 + Fuzzy TicTacToe游戏已在此频道中运行。 + Fuzzy 平局！ + Fuzzy 开始了一局TicTacToe游戏。 + Fuzzy {0}赢了！ - Fuzzy 相配了三个 - Fuzzy 没有地方动了！ + Fuzzy 时间已过！ - Fuzzy 轮到{0}了 + Fuzzy {0}对{1} + Fuzzy 正在排{0}首歌... + Fuzzy 已停用自动播放。 + Fuzzy 已启用自动播放。 + Fuzzy 默认音量设置为{0}％ + Fuzzy 目录队列完成。 + Fuzzy 公平播放 + Fuzzy 完成歌曲 - Fuzzy 停用公平播放。 + Fuzzy 启用公平播放。 + Fuzzy 从位置 + Fuzzy ID + Fuzzy 输入错误。 + Fuzzy 最大播放时间没有限制移除。 + Fuzzy 最大播放时间设置为{0}秒。 + Fuzzy 最大音乐队列大小设置为无限。 + Fuzzy 最大音乐队列大小设置为{0}首。 + Fuzzy 您需要在此服务器上加入语音频道。 + Fuzzy 名 + Fuzzy 现在播放 - Fuzzy 没有活动音乐播放器。 + Fuzzy 没有搜索结果。 + Fuzzy 音乐播放暂停。 + Fuzzy 播放器队列 - {0} / {1}页 - Fuzzy 正在播放 - Fuzzy `＃{0}` - ** {1} ** by * {2} *（{3}首歌） + Fuzzy 有保存{0}页的播放列表 - Fuzzy 播放列表已删除。 + Fuzzy 无法删除该播放列表。 它不存在，或者你不是它的作者。 + Fuzzy 具有该ID的播放列表不存在。 + Fuzzy 播放列表队列完成。 + Fuzzy 播放列表已保存 - Fuzzy {0}秒限制 + Fuzzy 队列 + Fuzzy 歌加入队列 - Fuzzy 音乐队列已清除。 + Fuzzy 队列已满{0} / {0}。 + Fuzzy 歌被移除 - context: "removed song #5" + context: "removed song #5" +Fuzzy 重复播放当前歌曲 - Fuzzy 重复播放列表 - Fuzzy 重复曲目 - Fuzzy 当前曲目停止重复。 + Fuzzy 音乐播放已恢复。 + Fuzzy 禁用重复播放列表 + Fuzzy 重复播放列表已启用。 + Fuzzy 我现在将在此频道里输出播放，完成，暂停和删除歌曲。 + Fuzzy 跳到‘{0}：{1}’ + Fuzzy 歌播放列表曲被随机。 - Fuzzy 歌曲被移动 - Fuzzy {0}小时 {1}分钟 {2}秒 + Fuzzy 到位置 + Fuzzy 无限 + Fuzzy 音量必须介于0和100之间 + Fuzzy 音量设置为{0}％ + Fuzzy 在{0}频道上禁止所有组件的使用。 - Fuzzy 在{0}频道上允许启用所有组件。 - Fuzzy 允许 + Fuzzy {0}身份的所有组件被禁止使用。 - Fuzzy {0}身份的所有组件被允许使用。 - Fuzzy 在此服务器上禁止所有组件的使用。 + Fuzzy 在此服务器上允许所有组件的使用。 + Fuzzy {0}用户的所有模块被禁止使用。 - Fuzzy {0}用户的所有模块被允许使用。 - Fuzzy ID为{1}被加入黑名单{0} + Fuzzy 命令{0}冷却时间现有{1}秒。 + Fuzzy 命令{0}没有冷却时间了，现有所有的冷却时间已被清除。 - Fuzzy 没有设置命令冷却时间。 + Fuzzy 命令成本 - Fuzzy {2}频道上已停用{0} {1}。 - Fuzzy 已在{2}频道上启用{0} {1}的使用。 - Fuzzy 被拒绝 + Fuzzy 以巴{0}添加到已过滤字词列表中。 + Fuzzy 被过滤的词列表 - Fuzzy 已从过滤字词列表中删除{0}。 + Fuzzy 第二个参数无效（必须是{0}和{1}之间的数字） + Fuzzy 在此频道上停用邀请过滤功能。 + Fuzzy 在此频道上启用邀请过滤。 + Fuzzy 在此服务器上停用邀请过滤功能。 + Fuzzy 在此服务器上启用邀请过滤功能。 + Fuzzy 已将权限{0}从＃{1}移至＃{2} + Fuzzy 在索引＃{0}找不到权限 + Fuzzy 未设置费用。 + Fuzzy 命令 - Gen (of command) + Gen (of command) +Fuzzy 组件 - Gen. (of module) + Gen. (of module) +Fuzzy 权限页面第{0}页 + Fuzzy 当前权限身份为{0}。 + Fuzzy 用户现在需要{0}身份才能编辑权限。 + Fuzzy 在该索引中找不到权限。 + Fuzzy 已删除权限＃{0} - {1} + Fuzzy 禁止{2}身份使用{0} {1}。 + Fuzzy 允许{2}身份使用{0} {1}。 + Fuzzy 秒 - Short of seconds. + Short of seconds. +Fuzzy 此服务器上的{0} {1}已被禁止使用。 + Fuzzy 此服务器上的{0} {1}已被允许使用。 + Fuzzy ID为{1}的{0}从黑名单上移除 + Fuzzy 不可编辑 + Fuzzy {2}用户的{0} {1}已被禁止使用。 + Fuzzy {2}用户的{0} {1}已允许使用。 + Fuzzy 我将不再显示权限警告。 + Fuzzy 我现在将显示权限警告。 + Fuzzy 此频道上的字过滤已停用。 + Fuzzy 此频道上的字过滤已启用。 + Fuzzy 此服务器上的字过滤已停用。 + Fuzzy 此服务器上的字过滤已启用。 + Fuzzy 能力 + Fuzzy 没有最喜爱的动漫 + Fuzzy 开始自动翻译此频道上的消息。 用户消息将被自动删除。 + Fuzzy 您的自动翻译语言已删除。 + Fuzzy 您的自动翻译语言已设置为{0}> {1} + Fuzzy 开始自动翻译此频道上的消息。 + Fuzzy 停止自动翻译此频道上的消息。 + Fuzzy 错误格式或出现错误。 + Fuzzy 找不到该卡。 + Fuzzy 实 + Fuzzy 章 + Fuzzy 漫画＃ + Fuzzy 竞争模式失败次数 - Fuzzy 竞争模式玩次数 - Fuzzy 竞争模式排名 - Fuzzy 竞争模式胜利次数 + Fuzzy 完成 + Fuzzy 条件 + Fuzzy 花费 + Fuzzy 日期 + Fuzzy 定义： + Fuzzy 放掉 + Fuzzy 剧集 + Fuzzy 发生了错误。 + Fuzzy 例子 + Fuzzy 找不到那个动画。 + Fuzzy 找不到漫画。 + Fuzzy 类型 + Fuzzy 未能找到该标记的定义。 + Fuzzy 身高/体重 + Fuzzy {0} m / {1} kg + Fuzzy 湿度 + Fuzzy 图片搜索： - Fuzzy 找不到该电影。 + Fuzzy 来源或目标语言错误。 + Fuzzy 笑话没加载。 + Fuzzy 纬度/经度 + Fuzzy 等级 + Fuzzy {0}地方标记列表 - Don't translate {0}place + Don't translate {0}place +Fuzzy 地点 + Fuzzy 未加载魔术项目。 + Fuzzy {0}的MAL个人资料 + Fuzzy 机器人的业主没有指定MashapeApiKey。 您不能使用此功能。 + Fuzzy 最小/最大 + Fuzzy 找不到频道。 + Fuzzy 没找到结果。 + Fuzzy 等候接听 - Fuzzy 原始网址 - Fuzzy 需要osu！API密钥。 + Fuzzy 无法检索osu！ 线索。 + Fuzzy 找到{0}张图片。 显示随机{0}。 + Fuzzy 找不到用户！ 请再次前检查区域和BattleTag。 + Fuzzy 计划看 + Fuzzy 平台 + Fuzzy 找不到能力。 + Fuzzy 找不到宠物小精灵。 + Fuzzy 个人资料链接： - Fuzzy 质量： + Fuzzy 快速游戏时间 - Fuzzy 快赢 - Fuzzy 评分 + Fuzzy 得分： + Fuzzy 搜索： - Fuzzy 无法缩短该链接。 + Fuzzy 短链接 - Fuzzy 出了些问题。 + Fuzzy 请指定搜索参数。 + Fuzzy 状态 + Fuzzy 储存链接 - Fuzzy 直播台{0}已离线。 + Fuzzy 直播台{0}在线有{1}个观众。 + Fuzzy 您在此服务器上关注{0}个直播台 + Fuzzy 您未在此服务器上关注任何直播台。 + Fuzzy 没有这个直播台。 + Fuzzy 直播台可能不存在。 + Fuzzy 已从（{1}）的通知中移除{0}的直播台 + Fuzzy 状态更改时，我会通知此频道。 + Fuzzy 日出 + Fuzzy 日落 + Fuzzy 温度 + Fuzzy 标题： + Fuzzy 3个最喜欢的动画： + Fuzzy 翻译： + Fuzzy 类型 + Fuzzy 未能找到该字词的定义。 + Fuzzy 链接 + Fuzzy 观众 + Fuzzy 观看 + Fuzzy 无法在指定的维基上找到该字词。 + Fuzzy 请输入目标维基，然后搜索查询。 + Fuzzy 找不到网页。 + Fuzzy 风速 - Fuzzy {0}个被禁止最多的英雄 + Fuzzy 无法yodify您的句子。 + Fuzzy 加入 + Fuzzy `{0} .` {1} [{2：F2} / s] - {3}总计 /s and total need to be localized to fit the context - -`1.` +`1.` +Fuzzy 活动页面＃{0} - Fuzzy {0}个用户。 + Fuzzy 作者 + Fuzzy 机器ID + Fuzzy {0} calc命令功能列表 + Fuzzy 此频道的{0}是{1} + Fuzzy 频道主题 - Fuzzy 执行命令 - Fuzzy {0} {1}等于{2} {3} + Fuzzy 转换器可以使用的单位 + Fuzzy 无法将{0}转换为{1}：找不到单位 + Fuzzy 无法将{0}转换为{1}：单位类型不相等 + Fuzzy 创建于 - Fuzzy 加入跨服务器频道。 + Fuzzy 离开跨服务器频道。 + Fuzzy 这是您的CSC令牌 + Fuzzy 自定义Emojis - Fuzzy 错误 + Fuzzy 特征 + Fuzzy ID + Fuzzy 索引超出范围。 + Fuzzy 以下是这个身份的用户列表： + Fuzzy 您不能对其中有用户很多的身份使用此命令来防止滥用。 - Fuzzy 值{0}错误。 - Invalid months value/ Invalid hours value + Invalid months value/ Invalid hours value +Fuzzy 加入Discord + Fuzzy 加入服务器 - Fuzzy ID：{0} 会员数：{1} 业主ID：{2} - Fuzzy 在该网页上找不到服务器。 + Fuzzy 重复列表 - Fuzzy 会员 + Fuzzy 存储 + Fuzzy 讯息 + Fuzzy 消息重复功能 - Fuzzy 名字 + Fuzzy 昵称 + Fuzzy 没有人在玩那个游戏 + Fuzzy 没有活动重复功能。 + Fuzzy 此页面上没有身份。 + Fuzzy 此页面上没有分片。 + Fuzzy 没有主题设置。 + Fuzzy 业主 + Fuzzy 业主IDs + Fuzzy 状态 + Fuzzy {0}个服务器 {1}个文字频道 {2}个语音频道 + Fuzzy 删除所有引号使用{0}关键字。 + Fuzzy {0}页引号 + Fuzzy 此页面上没有引用。 + Fuzzy 没有您可以删除的引用。 + Fuzzy 引用被添加 + Fuzzy 删除了随机引用。 + Fuzzy 区域 + Fuzzy 注册日 - Fuzzy 我将在{2}`（{3：d.M.yyyy。}的{4：HH：mm}）提醒{0}关于{1} + Fuzzy 无效时间格式。 检查命令列表。 + Fuzzy 新的提醒模板被设定。 + Fuzzy 会每{1}天{2}小时{3}分钟重复{0}。 + Fuzzy 重复列表 - Fuzzy 此服务器上没有运行重复消息。 + Fuzzy ＃{0}已停止。 + Fuzzy 此服务器上没有找到被重复的消息。 + Fuzzy 结果 + Fuzzy 身份 + Fuzzy 此服务器上所有身份第{0}页： + Fuzzy {1}身份的第{0}页 + Fuzzy 颜色的格式不正确。 例如，使用‘＃00ff00’。 + Fuzzy 开始轮流{0}身份的颜色。 + Fuzzy 停止{0}身份颜色轮流 + Fuzzy 此服务器的{0}是{1} + Fuzzy 伺服器資訊 - Fuzzy 分片 + Fuzzy 分片统计 - Fuzzy 分片**＃{0} **处于{1}状态与{2}台服务器 + Fuzzy **名称：** {0} **链接：** {1} + Fuzzy 找不到特殊的表情符號。 + Fuzzy 正在播放 {0} 首歌，{1} 首等待播放。 + Fuzzy 文字頻道 - Fuzzy 这是你的房间链接： + Fuzzy 運行時間 + Fuzzy 此用户 {1} 的{0} 是 {2} - Id of the user kwoth#1234 is 123123123123 + Id of the user kwoth#1234 is 123123123123 +Fuzzy 用戶 + Fuzzy 語音頻道 - Fuzzy 你已經加入這場比賽了！ + Fuzzy 目前投票結果 + Fuzzy 沒有投票。 + Fuzzy 投票已在這個伺服器進行。 + Fuzzy 📃 {0} 已建立一個投票 which requires your attention: - Fuzzy `{0}.` {1} 有 {2} 票。 - Fuzzy {0} 已投票。 - Kwoth voted. + Kwoth voted. +Fuzzy 私訊我相對數字的答案。 + Fuzzy 發送相對數字的答案在這裡。 + Fuzzy 感謝你的投票, {0} + Fuzzy 共收到 {0}票。 + Fuzzy \ No newline at end of file From 5648394d8ddca4e6ff5febf99765e7470a6d7fe8 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 8 Mar 2017 02:17:35 +0100 Subject: [PATCH 207/496] Update ResponseStrings.nl-NL.resx (POEditor.com) --- .../Resources/ResponseStrings.nl-NL.resx | 380 +++++++++++------- 1 file changed, 227 insertions(+), 153 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.nl-NL.resx b/src/NadekoBot/Resources/ResponseStrings.nl-NL.resx index 1363046f..ef811d3e 100644 --- a/src/NadekoBot/Resources/ResponseStrings.nl-NL.resx +++ b/src/NadekoBot/Resources/ResponseStrings.nl-NL.resx @@ -140,6 +140,7 @@ De aanvraag van @{0} voor een oorlog tegen {1} is niet meer geldig. + Fuzzy Vijand @@ -152,9 +153,11 @@ Ongeldige oorlogs formaat. + Fuzzy Lijst van voorlopende oorlogen. + Fuzzy Niet veroverd. @@ -167,6 +170,7 @@ Geen voorlopende oorlogen. + Fuzzy Grootte. @@ -206,6 +210,7 @@ Geen speciale reacties gevonden. + Fuzzy Geen speciale reacties gevonden met die ID. @@ -467,10 +472,12 @@ Reden: {1} Gebruiker weggeschopt + Fuzzy Lijst van talen {0} + Fuzzy Jouw server's locale is nu {0} - {1} @@ -528,9 +535,11 @@ Reden: {1} Bericht in #{0} verwijdert + Fuzzy Bericht in #{0} bijgewerkt + Fuzzy Gebruikers zijn gedempt @@ -551,15 +560,19 @@ Reden: {1} nieuw bericht + Fuzzy nieuwe bijnaam + Fuzzy Nieuw onderwerp + Fuzzy Bijnaam veranderd + Fuzzy Kan de server niet vinden @@ -569,12 +582,15 @@ Reden: {1} Oud bericht + Fuzzy Oude bijnaam + Fuzzy Oude onderwerp + Fuzzy Fout. Hoogst waarschijnlijk heb ik geen voldoende rechten. @@ -584,6 +600,7 @@ Reden: {1} Actieve Beschermingen. + Fuzzy {0} is nu ** uitgeschakeld** op deze server. @@ -596,6 +613,7 @@ Reden: {1} Geen bescherming aangezet. + Fuzzy Gebruiker's drempel moet tussen {0} en {1} zijn. @@ -771,12 +789,14 @@ __IgnoredChannels__: {2} Gebruikersnaam veranderd + Fuzzy Gebruikers Gebruiker verbannen + Fuzzy {0} is **gedempt** van chatten. @@ -792,15 +812,18 @@ __IgnoredChannels__: {2} Gebruiker verlaten + Fuzzy {0} is **gedempt** van het tekst en stem kanaal. Rol van gebruiker toegevoegd + Fuzzy Rol van gebruiker verwijderd + Fuzzy {0} is nu {1} @@ -825,9 +848,11 @@ __IgnoredChannels__: {2} Spraakkanaal gemaakt + Fuzzy Spraakkanaal vernietigd + Fuzzy Spraak + tekst mogelijkheid uitgezet. @@ -868,9 +893,11 @@ Reden: {1} Aanwezigheid Updates + Fuzzy Gebruiker zacht-verbannen + Fuzzy heeft {0} aan {1} gegeven @@ -980,6 +1007,7 @@ Duurt {1} seconden. Vertel het aan niemand. Shhh. Alleen Voor Bot Eigenaren + Fuzzy Heeft {0} kanaal rechten nodig. @@ -989,9 +1017,11 @@ Duurt {1} seconden. Vertel het aan niemand. Shhh. Command en aliassen. + Fuzzy Commandolijst Geregenereerd. + Fuzzy Typ `{0}h CommandoNaam` om de hulp te zien voor die specifieke commando. b.v `{0}h >8bal` @@ -1013,12 +1043,15 @@ Vergeet niet je discord naam en id in het bericht te zetten. **Lijst met commando's**: <{0}> **Hosting gidsen en documenten kunnen hier gevonden worden**: <{1}> + Fuzzy Lijst Met Commando's + Fuzzy Lijst Met Modules + Fuzzy Typ `{0}cmds ModuleNaam` om een lijst van commando's te krijgen voor die module. bv `{0}cmds games` @@ -1031,6 +1064,7 @@ Vergeet niet je discord naam en id in het bericht te zetten. Inhoudsopgave + Fuzzy Gebruik @@ -1094,10 +1128,10 @@ Vergeet niet je discord naam en id in het bericht te zetten. Het tweede nummer moet groter zijn dan het eerste nummer. - Verandering Van Het Hart + Verandering van het hart - Overwonnen door + Opgeëist door Scheidingen @@ -1174,8 +1208,7 @@ Dit is moreel twijfelachtig🤔 Acrophobie - Spel geëindigd zonder submissies. - Fuzzy + Spel afgelopen zonder inzendingen. Geen stemmen ingestuurdt. Spel geëindigd zonder winnaar. @@ -1257,7 +1290,7 @@ Dit is moreel twijfelachtig🤔 Hangman - + Er is al een spel galgje aan de gang in dit kanaal. @@ -1266,36 +1299,36 @@ Dit is moreel twijfelachtig🤔 - + Scoreboard - + Je hebt niet genoeg {0} - + Geen resultaten - + {0} geplukt Kwoth picked 5* - + {0} heeft {1} geplant Kwoth planted 5* - + Trivia spel - + {0} heeft 'm geraden! Het antwoord was: {1} - + {0} heeft {1} punten @@ -1307,19 +1340,19 @@ Dit is moreel twijfelachtig🤔 - + Je kan niet tegen jezelf spelen. - + Gelijkspel! - + heeft een Boter, Kaas en eieren sessie aangemaakt. - + {0} heeft gewonnen! @@ -1328,25 +1361,25 @@ Dit is moreel twijfelachtig🤔 - + Tijd voorbij! - + {0}'s beurt - + Aan het proberen om {0} liedjes in de wachtrij te zetten... - + Autoplay uitgezet. - + Autoplay aangezet. - + Standaard volume op {0}% gezet @@ -1355,7 +1388,7 @@ Dit is moreel twijfelachtig🤔 - + Liedje afgelopen @@ -1364,43 +1397,44 @@ Dit is moreel twijfelachtig🤔 - + van positie - + ongeldige invoer. - + Maximale speeltijd heeft geen limiet meer. - + Maximale speeltijd op {0} seconden gezet. - + Maximale muziek wachtrij heeft geen limiet meer. - + Maximale muziek wachtrij is nu {0} liedjes. - + Je moet in het spraakkanaal van de server zijn. - + Naam - + Nu aan het spelen + Fuzzy - + Geen actieve muziek speler. - + Geen zoekresultaten. - + Muziek gepauzeerd. @@ -1412,10 +1446,11 @@ Dit is moreel twijfelachtig🤔 - + Pagina {0} van opgeslagen afspeellijsten + - + Afspeellijst verwijderd @@ -1427,32 +1462,32 @@ Dit is moreel twijfelachtig🤔 - + Afspeellijst opgeslagen - + {0}s limiet - + Wachtrij - + Muziek wachtrij leeggemaakt. - + Wachtrij is vol op {0}/{0}. - + Liedje verwijderd context: "removed song #5" - + Huidig liedje word herhaald - + Huidige afspeellijst word herhaald @@ -1476,25 +1511,25 @@ Dit is moreel twijfelachtig🤔 - + Liedjes geschud - + Liedje verzet - + {0}u {1}m {2}s - + Naar positie - + ongelimiteerd - + Volume moet tussen 0 en 100 zijn - + Volume op {0}% gezet @@ -1503,7 +1538,7 @@ Dit is moreel twijfelachtig🤔 - + Toegestaan @@ -1527,13 +1562,13 @@ Dit is moreel twijfelachtig🤔 - + Commando {0} heeft nu een {1}s afkoel tijd. - + Commando {0} heeft geen afkoel tijd meer, en alle bestaande afkoeltijden zijn weggehaald. - + Geen commando afkoeltijden ingesteld. @@ -1545,13 +1580,13 @@ Dit is moreel twijfelachtig🤔 - + Geweigerd - + Lijst van gefilterde worden @@ -1581,15 +1616,15 @@ Dit is moreel twijfelachtig🤔 - + Commando Gen (of command) - + Module Gen. (of module) - + Rechten pagina {0} @@ -1656,7 +1691,7 @@ Dit is moreel twijfelachtig🤔 - + Gestart met het automatisch vertalen van berichten op dit kanaal. Gebruiker berichten worden automatisch verwijderd. @@ -1665,10 +1700,10 @@ Dit is moreel twijfelachtig🤔 - + Gestart met het automatisch vertalen van berichten op dit kanaal. - + Gestopt met het automatisch vertalen van berichten op dit kanaal. @@ -1677,10 +1712,10 @@ Dit is moreel twijfelachtig🤔 - + feit - + hoofdstukken @@ -1698,64 +1733,66 @@ Dit is moreel twijfelachtig🤔 - + Voltooid - + Conditie - + Kost - + Datum - + Definiëren: - + Laten vallen - + Afleveringen - + Fout opgedaagd. - + Voorbeeld - + Mislukt in het vinden van die chinese tekenfilm + Fuzzy - + Mislukt in het vinden van die + Fuzzy - + Genres - + Lengte/Gewicht - + Vochtigheid - + Afbeelding zoekopdracht voor: - + Mislukt in het vinden van die film. - + Grapjes niet geladen. @@ -1768,13 +1805,13 @@ Dit is moreel twijfelachtig🤔 Don't translate {0}place - + Lokatie - + {0}'s MAL profiel @@ -1783,19 +1820,19 @@ Dit is moreel twijfelachtig🤔 - + Geen kanaal gevonden. - + Geen resultaten gevonden. - + Originele URL - + Een osu! API sleutel is vereist. @@ -1822,7 +1859,7 @@ Dit is moreel twijfelachtig🤔 - + Kwaliteit: @@ -1858,16 +1895,16 @@ Dit is moreel twijfelachtig🤔 - + Streamer {0} is offline. - + Streamer {0} is online met {1} kijkers. - + Je volgt {0} streams op deze server. - + Je volgt geen streams op deze server. @@ -1882,25 +1919,25 @@ Dit is moreel twijfelachtig🤔 - + Zon's opgang - + Zon's ondergang - + Temperatuur - + Titel: - + Vertaling: - + Types @@ -1909,7 +1946,7 @@ Dit is moreel twijfelachtig🤔 - + Kijkers @@ -1921,13 +1958,13 @@ Dit is moreel twijfelachtig🤔 - + Pagina niet gevonden - + Wind snelheid - + De {0} meest verbannen kampioenen. @@ -1941,16 +1978,16 @@ Dit is moreel twijfelachtig🤔 `1.` - + Activiteit pagina #{0} - + {0} gebruikers totaal. - + Auteur - + Bot ID @@ -1959,25 +1996,25 @@ Dit is moreel twijfelachtig🤔 - + Kanaal onderwerp - + Commando's uitgevoerd - + {0} {1} is gelijk aan {2} {3} - + Eenheden die gebruikt kunnen worden door de omvormer - + Kan {0} niet naar {1} omvormen: Eenheden niet gevonden - + Kan {0} niet naar {1} omvormen: Type eenheden zijn niet gelijk - + Gemaakt op @@ -1986,31 +2023,31 @@ Dit is moreel twijfelachtig🤔 - + Dit is je CSC token - + Speciale emojis - + Fout - + Kenmerken - + ID - + Index buiten bereik. - + Hier is de lijst met gebruikers in die rollen: - + Om misbruik te voorkomen ben je niet gemachtigd om dit commando te gebruiken op rollen met veel gebruikers. - + Ongeldige {0} waarde. Invalid months value/ Invalid hours value @@ -2020,67 +2057,71 @@ Dit is moreel twijfelachtig🤔 - + ID: {0} +Leden: {1} +Eigenaar ID: {2} - + Geen servers gevonden op die pagina. - + Lijst van de repeater - + Leden - + Geheugen - + Berichten - + Bericht repeater - + Naam - + Roepnaam - + Niemand speelt dat spel. - + Geen rollen op deze pagina. - + Geen shards op deze pagina. - + Geen onderwerp ingesteld. - + Eigenaar - + Eigenaar IDs - + Aanwezigheid - + {0} Servers +{1} Tekst Kanalen +{2} Spraak Kanalen - + Verwijder alle citaten met het trefwoord {0} - + Pagina {0} met citaten - + Geen citaten op deze pagina. Geen verwijderbare citaten gevonden @@ -2092,13 +2133,13 @@ Dit is moreel twijfelachtig🤔 Een willekeurig citaat verwijderd - + Regio - + Geregistreerd op - + Ik zal {0} herinneren om {1} in {2} `({3:d.M.yyyy.} op {4:HH:mm})` @@ -2107,13 +2148,13 @@ Dit is moreel twijfelachtig🤔 - + Herhalen van {0} elke {1} dagen, {2} uren en {3} minuten. - + Lijst van repeaters - + Geen repeaters actief op deze server. @@ -2137,8 +2178,7 @@ Dit is moreel twijfelachtig🤔 - Gestart met het routeren van kleuren voor de rol {0} - Fuzzy + Begonnen met het routeren van kleuren voor de rol {0} Gestopt met het routeren van kleuren voor de rol {0} @@ -2186,5 +2226,39 @@ Dit is moreel twijfelachtig🤔 Spraak Kanalen + + Je maakt al deel uit van deze race! + + + + + + + + + + + + + + + + + + {0} gestemd. + Kwoth voted. + + + + + + + + + + + + + \ No newline at end of file From 77bd6b46344a8f5a8879655271341974a734007a Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 8 Mar 2017 02:17:38 +0100 Subject: [PATCH 208/496] Update ResponseStrings.fr-fr.resx (POEditor.com) --- src/NadekoBot/Resources/ResponseStrings.fr-fr.resx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx b/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx index bed50a57..4a8a4a27 100644 --- a/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx +++ b/src/NadekoBot/Resources/ResponseStrings.fr-fr.resx @@ -1531,7 +1531,7 @@ La nouvelle valeur de {0} est {1} ! Lecture en boucle activée. - Je vais désormais afficher les pistess en cours, en pause, terminées et supprimées sur ce salon. + Je vais désormais afficher les pistes en cours, en pause, terminées et supprimées dans ce salon. Saut à `{0}:{1}` From 74b366b83409e7e60cbe352d97c40d8b9a4c567a Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 8 Mar 2017 02:17:41 +0100 Subject: [PATCH 209/496] Update ResponseStrings.de-DE.resx (POEditor.com) --- src/NadekoBot/Resources/ResponseStrings.de-DE.resx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.de-DE.resx b/src/NadekoBot/Resources/ResponseStrings.de-DE.resx index 879094e3..cd13fb9b 100644 --- a/src/NadekoBot/Resources/ResponseStrings.de-DE.resx +++ b/src/NadekoBot/Resources/ResponseStrings.de-DE.resx @@ -1052,7 +1052,7 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Fuzzy - Lister der Befehle + Liste der Befehle Fuzzy @@ -1281,11 +1281,11 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Währungsgeneration in diesem Kanal aktiviert. - {0} zufällige {1} sind erschienen! Sammle sie indem Sie `{2}pick` schreiben + {0} zufällige {1} sind erschienen! Sammlen Sie sie indem Sie `{2}pick` schreiben plural - Eine zufällige {0} ist erschienen! Sammle sie indem Sie `{1}pick` schreiben + Eine zufällige {0} ist erschienen! Sammlen Sie sie indem Sie `{1}pick` schreiben Laden einer Frage fehlgeschlagen. From 2a3653080c02ecceddcbe1bd82291a0c4b61a7f1 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 8 Mar 2017 02:17:44 +0100 Subject: [PATCH 210/496] Update ResponseStrings.ja-JP.resx (POEditor.com) --- .../Resources/ResponseStrings.ja-JP.resx | 301 ++++++++++++------ 1 file changed, 197 insertions(+), 104 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.ja-JP.resx b/src/NadekoBot/Resources/ResponseStrings.ja-JP.resx index fdfc3df1..62cacf4a 100644 --- a/src/NadekoBot/Resources/ResponseStrings.ja-JP.resx +++ b/src/NadekoBot/Resources/ResponseStrings.ja-JP.resx @@ -749,58 +749,79 @@ Fuzzy - + 無効な色または権限が不十分なためにエラーが発生しました。 + + TYPO, "Occured" should be 'Occurred' - + ユーザー{1}からロール{0}を削除しました + - + 役割を削除できませんでした。私には十分な権限がありません。 + 役割名を変更しました - + 役割の名前を変更できませんでした。私には十分な権限がありません。 + - + 最高のロールよりも上位のロールは編集できません。 + - + 再生メッセージを削除しました：{0} + - + ロール{0}がリストに追加されました。 + + TYPO. "as" should be 'has' - + {0}は見つかりませんでした。 + - + ロール{0}はすでにリストにあります。 + - + 追加されました。 + - + 回転再生状態が無効になっています。 + - + 回転再生状態が有効になっています。 + - + +回転状態の一覧は次のとおりです： +{0} + - + 回転再生状態は設定されません。 + - + あなたはすでに{0}ロールがあります。 + - + {0}はすでに自己割り当てロールを持っています。 + - + 自己割り当ての役割は今排他的です！ + 自分に割り当てられるロールが{0}個あります。 @@ -809,55 +830,72 @@ Fuzzy そのロールは自分に割り当てられません。 - + あなたは{0}ロールを持っていません。 + - + 自己割り当ての役割は現在無制限です + - + 私はあなたにその役割を追加することができません。 `私は役割階層に私の役割よりも高い所有者または他の役割に役割を追加することはできません。 + - + 自己割り当て可能なロールのリストから{0}が削除されました。 + - + あなたはもはや{0}ロールを持っていません。 + - + あなたは今{0}の役割を持っています。 + - + ユーザー{1}にロール{0}を追加しました + + Typo- "Sucessfully" should be 'Successfully' ロールの追加に失敗しました。アクセス権が足りません。 - + 新しいアバターセット！ + - + 新しいチャンネル名が設定されました。 + - + 新しいゲームセット！ + - + 新しいストリームセット！ + - + 新しいチャンネルのトピックセット。 + - + シャード{0}が再接続されました。 + - + シャード{0}再接続中です。 + - + シャットダウン + - + ユーザーは{1}秒ごとに{0}以上のメッセージを送信することはできません。 + @@ -870,19 +908,21 @@ Fuzzy PLURAL - + {0}はこのチャンネルを無視します。 - + {0}はこのチャンネルを無視しなくなりました。 - + ユーザーが同じメッセージを{0}行に投稿した場合は、{1}それらを送信します。 + - + テキストチャンネルが作成されました。 - + テキストチャネルが破棄されました。 + @@ -892,32 +932,38 @@ Fuzzy singular - + ユーザー名 + - + ユーザー名が変更されました + ユーザーズ - Fuzzy - + 追放されたユーザー + - + {0}はチャットから**ミュートされています**。 + - + {0}は、チャットから**ミュートされていません**。 + - + ユーザーが参加しました + 利用者が去った - + {0}はテキストチャットとボイスチャットから**ミュート**されています。 + 利用者にロールを追加した @@ -929,187 +975,234 @@ Fuzzy {0}さんは今{1}になった - + {0}はテキストとボイスチャットから**ミュートされていません**。 - + {0}は{1}音声チャンネルに参加しました - + {0}は音声チャネルを残しました{1} - + {0}は{1}から{2}音声チャネルに移動しました。 + - + {0}は**音声ミュートされました**。 + - + {0}は**音声ミュートされていません**。 - + 音声チャネルが作成されました + - + 音声チャネルが破壊されました + - + 音声+テキスト機能が無効になっています。 + - + 音声+テキスト機能を有効にしました。 + - + **私は役割を管理していません**そして/または**チャンネルを管理しています**許可。だから{0}サーバーで音声+テキストを実行できません。 + - + あなたはこの機能を有効/無効にしています。**私は管理者権限を持っていません**。これによりいくつかの問題が発生する可能性があります。その後、自分でテキストチャネルをクリーンアップする必要があります。 + - + この機能を有効にするには、少なくとも**役割を管理する**と**チャネルを管理する**権限が必要です。 （管理権限が必要です） + + TYPO > "atleast" isn't a word. It's 'At least' - + テキストチャットのユーザー{0} + - + テキストとボイスチャットのユーザー{0} + - + ボイスチャットからのユーザー{0} + - + あなたは{0}サーバーからソフト禁止されました。 +理由：{1} - + Since I'm using "exiled" for banned. need to rethink a new word.. so just leave this one alone + + Fuzzy - + 移行が完了しました！ + - + 移行中にエラーが発生しました。詳細については、ボットのコンソールを確認してください。 + - + 存在の更新 - + And this is where using exiled screws me over.. again lol + + Fuzzy - + {0}から{1}に授与されました + - + 次回より良い運がいいよ^ _ ^ + - + おめでとう！あなたは{1}以上で転がって{0}勝った - + デッキが再編されました。 + - + 反転した{0}。 User flipped tails. - + ご想像の通り！あなたは{0}を獲得しました + - + 無効な番号が指定されました。 1を{0}コインにすることができます。 + - + このメッセージに{0}反応を加えて{1}を得る␣ + - + このイベントは最大{0}時間有効です。 + - + 花の反応が始まった！ + - + は{0}から{1}に才能を与えました + X has gifted 15 flowers to Y - + {0}には{1}があります + X has Y flowers - + 頭 + - + リーダーボード + - + {2}から{0}人の{1}人のユーザーを獲得しました。 + - + {0}以上の賭けはできません + - + あなたは{0}未満に賭けることはできません + - + あなたに十分な{0}がありません。 + - + デッキにはもうカードがありません。 + - + 抽選でユーザーを入力しました。 + - + あなたは{0}をロールした。 + - + 賭ける - + 素晴らしい！おめでとう！ x {0} - + 単一の{0}、x {1} - + うわー！幸運な！ 3種類の！ x {0} + - + よくやった！ 2つの{0} - ベットx {1} + - + ウォン - + ユーザーは{0}を取得するために秘密のコードを入力する必要があります。 +{1}秒続く。誰にも言わないでください。 ：ウィンク： - + 卑劣なゲームイベントが終了しました。 {0}ユーザーは報酬を受け取った。 - + 卑劣なゲームステータスイベントが開始されました - + テイル - + {1}から{0}を正常に受け取りました + - + ユーザーが{2}をあまり持っていないので{1}から{0}を取ることができませんでした！ + - + ボットの所有者のみ + - + {0}チャンネル許可が必要です。 + - + コマンドとエイリアス + From a1830fbc780ca0d9dcb1c7ec921ff2d6dec85958 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 8 Mar 2017 02:17:46 +0100 Subject: [PATCH 211/496] Update ResponseStrings.pl-PL.resx (POEditor.com) --- .../Resources/ResponseStrings.pl-PL.resx | 142 +++++++++--------- 1 file changed, 72 insertions(+), 70 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.pl-PL.resx b/src/NadekoBot/Resources/ResponseStrings.pl-PL.resx index eb8b202b..381b43c2 100644 --- a/src/NadekoBot/Resources/ResponseStrings.pl-PL.resx +++ b/src/NadekoBot/Resources/ResponseStrings.pl-PL.resx @@ -856,7 +856,7 @@ Powód: {1} Włączasz/Wyłączasz tą funkcję i **Nie mam uprawnień ADMINISTRATORA**. Może to spowodować problemy i będziesz musiał czyścić kanały tekstowe sam. - + By włączyć tą funkcję, muszę posiadać uprawnienia: **zarządzanie rolami** i **zarządzanie kanałami**. (Preferowane uprawnienia administratora) Użytkownik {0} z tekstowego czatu @@ -901,7 +901,7 @@ Powód: {1} Talia została przetasowana. - + wyrzucono {0}. User flipped tails. @@ -950,7 +950,7 @@ Powód: {1} W talii nie ma więcej kart. - + Wylosowano użytkownika Wyrzucono {0} @@ -1117,7 +1117,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Fuzzy - + Zdobyta przez Rozwody @@ -1138,11 +1138,13 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + lubi teraz {0} zamiast {1}. + +*Czy to aby na pewno moralne?* Make sure to get the formatting right, and leave the thinking emoji - + Musisz poczekać {0} godzin i {1} minut aby zmienić swój obiekt westchnień. @@ -1221,19 +1223,19 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Zwycięzcą jest {0} z {1} punktami. - + Użytkownik {0} wygrywa, ponieważ jako jedyny coś zgłosił! Pytanie - + Remis! Dwie osoby wybrały {0} {0} wygrał! {1} pokonuje {2} - + Zgłoszenia zakończone Wyścig zwierzaków właśnie się odbywa. @@ -1261,7 +1263,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś plural - + {0} się pojawiły! Zdobądź je, pisząc `{1}pick` Nie udało się załadować pytania. @@ -1401,7 +1403,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Maksymalna długość kolejki ustawiona na {5} utworów. - + Musisz być na kanale głosowym na tym serwerze. Imię @@ -1422,7 +1424,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + Gra utwór @@ -1458,7 +1460,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Kolejka wyczyszczona. - + Zapełnienie kolejki: {0}/{0} Usunięto utwór @@ -1504,7 +1506,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + bez limitu Głośność musi być pomiędzy 0 a 100. @@ -1513,67 +1515,67 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Głośność ustawiona na {0}% - + Wyłączono użycie WSZYSTKICH MODÓŁÓW na kanale {0}. - + Włączono użycie WSZYSTKICH MODÓŁÓW na kanale {0}. - + Wyłączono użycie WSZYSTKICH MODÓŁÓW dla roli {0}. - + Włączono użycie WSZYSTKICH MODÓŁÓW dla roli {0}. - + Wyłączono użycie WSZYSTKICH MODÓŁÓW na tym serwerze. - + Włączono użycie WSZYSTKICH MODÓŁÓW na tym serwerze. - + Wyłączono użycie WSZYSTKICH MODÓŁÓW dla użytkownika {0}. - + Włączono użycie WSZYSTKICH MODÓŁÓW dla użytkownika {0}. - + Na czarną listę wpisano użytkownika {0} z ID {1} Komenda {0} ma teraz {1}-sekundowy cooldown. - + Komenda {0} nie ma teraz cooldown'a. Wszystkie aktywne cooldown'y zostały zresetowane. - + Żadna komenda nie ma cooldown'a. - + Komenda kosztuje - + Wyłączono użycie {0} {1} na kanale {2}. - + Włączono użycie {0} {1} na kanale {2}. - + Odmówiono - + Dodano słowo {0} do listy odfiltrowanych słów. - + Lista odfiltrowanych słów - + Usunięto słowo {0} z listy odfiltrowanych słów. - + Błędny drugi parametr. (Musi być to liczba od {0} do {1}) @@ -1588,10 +1590,10 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + Przeniesiono uprawnienia {0} z #{1} to #{2} - + Nie znaleziono uprawnień w indeksie #{0} @@ -1605,80 +1607,80 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Gen. (of module) - + Strona uprawnień {0} - + Użytkownicy wymagają roli {0}, by móc edytować uprawnienia. - + Żadne uprawnienia nie zostały znalezione w tym indeksie. - + przeniesiono uprawnienia #{0} - {1} - + Wyłączono użycie {0} {1} dla roli {2}. - + Włączono użycie {0} {1} dla roli {2}. sek. Short of seconds. - + Wyłączono użycie {0} {1} na tym serwerze. - + Włączono użycie {0} {1} na tym serwerze. - + Z czarnej listy usunięto użytkownika {0} z ID {1} - + nie do edytowania - + Wyłączono użycie {0} {1} dla użytkownika {2}. - + Włączono użycie {0} {1} dla użytkownika {2}. - + Nie będę więcej pokazywać ostrzeżeń dotyczących uprawnień. - + Będę pokazywać ostrzeżenia dotyczące uprawnień. - + Filtrowanie słów wyłączone na tym kanale. - + Filtrowanie słów włączone na tym kanale. - + Filtrowanie słów wyłączone na tym serwerze. - + Filtrowanie słów włączone na tym serwerze. Zdolności - + Brak ulubionego zwierzęcia Zaczęto automatyczne tłumaczenie wiadomości na tym kanale. Wiadomości użytkowników będą automatycznie usuwane. - + twój auto-tłumaczący język został usunięty. - + twój auto-tłumaczący język został ustawiony {0}>{1} Zaczęto automatyczne tłumaczenie wiadomości na tym kanale. @@ -1687,7 +1689,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Zakończono automatyczne tłumaczenie wiadomości na tym kanale. - + Złe dane wejściowe albo coś poszło nie tak. Nieznaleziono tej karty. @@ -1702,25 +1704,25 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + Przegrane rywalizacje - + Grane rywalizacje - + Ranking rywalizacji - + Wygrane rywalizacje Zakończony - + Warunek - + Koszt Data @@ -1750,7 +1752,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Gatunki - + Nie udało się znaleźć definicji dla tego tagu. Wysokość/szerokość @@ -1762,7 +1764,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Wilgotność - + Szukanie obrazka dla: Wyszukiwanie tego filmu nie powiodło się. @@ -1784,7 +1786,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Don't translate {0}place - + Lokalizacja Magiczne przedmioty nie zostały załadowane. @@ -1793,10 +1795,10 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś MAL użytkownika {0} - + Właściciel bota nie sprecyzował MashapeApiKey. Nie możesz użyć tej funkcji. - + Min/Max Nie znaleziono kanału. @@ -1808,7 +1810,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + Oryginalny URL @@ -1817,7 +1819,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + Znaleziono {0} obrazków. Pokazuję przypadkowe {0} From 1be2512ca19d052d20a89cf751b7e0555a5f2c22 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 8 Mar 2017 02:17:49 +0100 Subject: [PATCH 212/496] Update ResponseStrings.pt-BR.resx (POEditor.com) From d1060932b05ef8e880673f250884f68607765981 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 8 Mar 2017 02:17:51 +0100 Subject: [PATCH 213/496] Update ResponseStrings.ru-RU.resx (POEditor.com) --- .../Resources/ResponseStrings.ru-RU.resx | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx b/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx index 20b53a3d..9efa419f 100644 --- a/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx +++ b/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx @@ -2286,38 +2286,40 @@ IDВладельца: {2} Fuzzy - + Вы уже участвуете в этой гонке! - + Результаты опроса - + Не получено ни одного ответа. - + На данном сервере уже идёт опрос. - + {0} создал опрос, требующий Вашего внимания: + Fuzzy - + '{0}.' У {1} {2} голосов. + Fuzzy - + {0} проголосовал. Kwoth voted. - + Отправьте сообщение в этом текстовом канале с номером, соответствующему Вашему ответу. - + Отправьте сообщение в этом текстовом канале с номером, соответствующему Вашему ответу. - + Спасибо за Ваш ответ, {0}. - + Всего получено {0} ответов. \ No newline at end of file From cd997639493f49b7a51a5bd7bb45fb3b86a19c6e Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 8 Mar 2017 02:17:54 +0100 Subject: [PATCH 214/496] Update ResponseStrings.sr-cyrl-rs.resx (POEditor.com) --- .../Resources/ResponseStrings.sr-cyrl-rs.resx | 296 +++++++++--------- 1 file changed, 148 insertions(+), 148 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx b/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx index 5e1f33f3..69809693 100644 --- a/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx +++ b/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx @@ -1169,10 +1169,10 @@ Lasts {1} seconds. Don't tell anyone. Shhh. - + Твој афинитет је ресетован, Више немаш особу која ти се свиђа. - + хоће да буде waifu од {0} @@ -1181,16 +1181,16 @@ Lasts {1} seconds. Don't tell anyone. Shhh. - + не можеш ставити афинитет на себе, егоманијаче. - + Ни једна waifu није тако јефтина. Мораш да платиш бар {0} да би имао waifu, чак иако је њена вредност мања. - + Мораш да платиш {0} или више да би присвојио ту waifu. Та waifu није твоја. @@ -1205,7 +1205,7 @@ Lasts {1} seconds. Don't tell anyone. Shhh. Нико - + Развео си waifu којој се не свиђаш. Добио си {0} назад. 8кугла @@ -1220,16 +1220,16 @@ Lasts {1} seconds. Don't tell anyone. Shhh. Нема гласова. Игра је се завршила без победника. - + Акроним је био {0}. Игра акрофобије већ постоји у овом каналу. - + Игра је почела. Направи реченицу са овим акронимом: {0} - + Имате {0} секунди за унос. @@ -1238,22 +1238,22 @@ Lasts {1} seconds. Don't tell anyone. Shhh. Гласај тако што укуцаш број уноса. - + {0} је гласао! - + Победник је {0} са {1} поена. - + {0} је победник зато што је једини корисник са уносом. Питање - + Нерешено! Обоје сте изабрали {0} - + {0} је победио! {1} је јаче од {2} Уноси затворени @@ -1315,11 +1315,11 @@ Lasts {1} seconds. Don't tell anyone. Shhh. Нема резултата. - + је убрао {0} Kwoth picked 5* - + {0} је засадио {1} Kwoth planted 5* @@ -1329,22 +1329,22 @@ Lasts {1} seconds. Don't tell anyone. Shhh. Игра тривије - + {0} је погодио! Одговор је био: {1} Нема тривије у току на овом серверу. - + {0} има {1} поена Игра се зауставља после овог питања. - + Време је истекло! Тачан одговор је {0} - + {0} је погодио и ПОБЕДИО игру! Одговор је био: {1} Не можеш играти против себе. @@ -1359,7 +1359,7 @@ Lasts {1} seconds. Don't tell anyone. Shhh. је направио игру икс-окса. - + {0} је победио! Три спојене @@ -1371,13 +1371,13 @@ Lasts {1} seconds. Don't tell anyone. Shhh. Време је истекло! - + {0}-ов потез. - + {0} против {1} - + Покушавам да учитам {0} песама... Аутопуштање је угашено. @@ -1479,35 +1479,35 @@ Lasts {1} seconds. Don't tell anyone. Shhh. Песма је учитана - + Музички ред је очишћен. - + Песма је обрисана context: "removed song #5" - + Понављам тренутну песму - + Понављам плејлисту - + Понављам нумеру - + Понављање нумбере стопирано. - + Музика је пуштена. - + Понављање плејлисте је угашено. - + Понављање плејлисте је упаљено. @@ -1516,19 +1516,19 @@ Lasts {1} seconds. Don't tell anyone. Shhh. - + Песме су измешане - + Песме су померене - + На позицију - + неограничено @@ -1543,7 +1543,7 @@ Lasts {1} seconds. Don't tell anyone. Shhh. - + Дозвољено @@ -1573,10 +1573,10 @@ Lasts {1} seconds. Don't tell anyone. Shhh. - + Нема кулдауна за команде. - + Цене команди @@ -1585,13 +1585,13 @@ Lasts {1} seconds. Don't tell anyone. Shhh. - + Забрањено - + Листа филтрираних речи @@ -1600,16 +1600,16 @@ Lasts {1} seconds. Don't tell anyone. Shhh. - + Филтрирање позивница је угашено на овом каналу. - + Филтрирање позивница је упаљено на овом каналу. - + Филтрирање позивница је угашено на овом серверу. - + Филтрирање позивница је упаљено на овом серверу. @@ -1618,14 +1618,14 @@ Lasts {1} seconds. Don't tell anyone. Shhh. - + Нема постављених цена. - + команде Gen (of command) - + модула Gen. (of module) @@ -1650,7 +1650,7 @@ Lasts {1} seconds. Don't tell anyone. Shhh. - + сек. Short of seconds. @@ -1663,7 +1663,7 @@ Lasts {1} seconds. Don't tell anyone. Shhh. - + неизмењиво @@ -1672,58 +1672,58 @@ Lasts {1} seconds. Don't tell anyone. Shhh. - + Више нећу приказивати упозорења за дозволе. - + Од сада ћу приказивати упозорења за дозволе. - + Филтрирање речи је угашено на овом каналу. - + Филтрирање речи је упаљено на овом каналу. - + Филтрирање речи је угашено на овом серверу. - + Филтрирање речи је упаљено на овом серверу. - + Моћи - + Нема омиљених анимеа. - + твој језик ауто-превођења је обрисан. - + Започето аутоматско превођење порука на овом каналу - + Стопирано аутоматско превођење порука на овом каналу - + Није добар формат уноса, или нешто друго. - + Не могу да нађем ту карту. - + чињеница - + Поглавља - + Стрип # @@ -1735,83 +1735,83 @@ Lasts {1} seconds. Don't tell anyone. Shhh. - + Такмичних победа - + Завршено - + Услови - + Цена - + Датум - + Дефиниши: - + Испуштене - + Епизода - + Дошло је до грешке. - + Пример - + Није нађен тај аниму. - + Није нађен тај манго. - + Жанрови - + Није успешно проналажење дефиниције за тај таг. - + Висина/Ширина - + {0}м/{1}кг - + Влажност Ваздуха - + Претрага слика за: - + Филм није нађен. - + Неисправан почетни или крајњи језик. - + Вицеви нису учитани - + Лат/Лонг - + Ниво Don't translate {0}place - + Место - + Магични предмети нису учитани. @@ -1820,19 +1820,19 @@ Lasts {1} seconds. Don't tell anyone. Shhh. - + Мин/Макс - + Канал није пронађен. - + Нема резултата. - + Паузирано - + Оригинални линк @@ -1847,55 +1847,55 @@ Lasts {1} seconds. Don't tell anyone. Shhh. - + Планира да гледа - + Платформа - + Није пронађена моћ. - + Није пронађен покемон. - + Линк ка профилу: - + Квалитет: - + Време игре у квик моду - + Победа у квик моду - + Рејтинг - + Скор: - + Тражи за: - + Није успешно скраћивање тог линка. - + Кратак линк - + Дошло је до грешке. - + Унеси параметре за претрагу. - + Статус - + Линк Продавнице @@ -1907,73 +1907,73 @@ Lasts {1} seconds. Don't tell anyone. Shhh. - + Не пратиш ниједан стрим ан овом серверу. - + Нема тог стрима. - + Стрим вероватно не постоји. - + Обавестићу овај канал када се статус промени. - + Излазак сунца - + Залазак сунца - + Температура - + Наслов: - + 3 омиљене аниме: - + Превод: - + Типови - + Неуспешно проналажење дефиниције за тај термин - + Линк - + Гледаоци - + Гледа - + Није успешно проналажење термина на тој викији. - + Унеси име викије, а затим термин за претрагу. - + Страница није нађена. - + Брзина ветра - + Јодификовање реченице није успешно. - + Ушао @@ -1987,10 +1987,10 @@ Lasts {1} seconds. Don't tell anyone. Shhh. - + Аутор - + Бот ИД @@ -1999,10 +1999,10 @@ Lasts {1} seconds. Don't tell anyone. Shhh. - + Тема канала - + Извршених команди @@ -2017,7 +2017,7 @@ Lasts {1} seconds. Don't tell anyone. Shhh. - + Направљен @@ -2242,32 +2242,32 @@ Lasts {1} seconds. Don't tell anyone. Shhh. Fuzzy - + Већ си у овој трци! - + Тренутни резултати анкете - + Нема гласова. - + Анкета већ постоји на овом серверу. - + 📃 {0} је направио анкету која захтева вашу пажњу. - + {0} је гласао Kwoth voted. - + Пошаљите ми број одговора у приватној поруци. - + Пошаљите број одговора у овом каналу. From 2ef57465cfdf0ab92fd828ff606106da06bdf082 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 8 Mar 2017 02:17:57 +0100 Subject: [PATCH 215/496] Update ResponseStrings.sv-SE.resx (POEditor.com) --- .../Resources/ResponseStrings.sv-SE.resx | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.sv-SE.resx b/src/NadekoBot/Resources/ResponseStrings.sv-SE.resx index 305c8788..2eb472e8 100644 --- a/src/NadekoBot/Resources/ResponseStrings.sv-SE.resx +++ b/src/NadekoBot/Resources/ResponseStrings.sv-SE.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Denna bas är redan tagen eller förstörd. + Denna bas är redan tagen eller förstörd. Denna bas är redan förstörd. @@ -194,8 +194,7 @@ Alla anpassade emojis uppgifter borttagna. - Anpassad emoji har blivit raderad. - + Anpassad emoji har blivit raderad Otillräckliga behörigheter. Kräver Bot ägande för globala anpassade reaktioner, och administratör för server anpassade reaktioner. @@ -217,10 +216,10 @@ Ingen egengjord reaktion funnen med det id. - svar + Svar - Egengjord reaktion statistiker. + Egengjord reaktion statistiker Statistiker rensade för {0} egengjorda reaktioner. @@ -229,7 +228,7 @@ Inga statistik för den triggern funnen, inget återgärd gjord. - Trigger. + Trigger Automatisk hentai stoppad. @@ -238,11 +237,10 @@ Inga resultat hittades. - -{0} har redan svimmat + {0} har redan svimmat. - {0} har redan full hälsa + {0} har redan full hälsa. din typ är redan {0} From 6f5850830ad191876ce764102175d0ee92673054 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 8 Mar 2017 02:17:59 +0100 Subject: [PATCH 216/496] Update ResponseStrings.tr-TR.resx (POEditor.com) From a20fa2ef14b0d4693472ee6ca1b7a254a7b5fb1b Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 8 Mar 2017 02:18:02 +0100 Subject: [PATCH 217/496] Update ResponseStrings.en-US.resx (POEditor.com) --- .../Resources/ResponseStrings.en-US.resx | 371 +++++++++--------- 1 file changed, 186 insertions(+), 185 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.en-US.resx b/src/NadekoBot/Resources/ResponseStrings.en-US.resx index 8f964f3a..51f02785 100644 --- a/src/NadekoBot/Resources/ResponseStrings.en-US.resx +++ b/src/NadekoBot/Resources/ResponseStrings.en-US.resx @@ -1,121 +1,121 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 That base is already claimed or destroyed. @@ -136,7 +136,7 @@ {0} claimed a base #{1} in a war against {2} - @{0} You already claimed base #{1}. You can't claim a new one. + @{0} You already claimed base #{1}. You can't claim a new one. Claim from @{0} in a war against {1} has expired. @@ -245,10 +245,10 @@ Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage. - You can't attack again without retaliation! + You can't attack again without retaliation! - You can't attack yourself. + You can't attack yourself. {0} has fainted! @@ -260,16 +260,16 @@ {0} has {1} HP remaining. - You can't use {0}. Type `{1}ml` to see a list of moves you can use. + You can't use {0}. Type `{1}ml` to see a list of moves you can use. Movelist for {0} type - It's not effective. + It's not effective. - You don't have enough {0} + You don't have enough {0} revived {0} with one {1} @@ -281,13 +281,13 @@ Your type has been changed to {0} for a {1} - It's somewhat effective. + It's somewhat effective. - It's super effective! + It's super effective! - You used too many moves in a row, so you can't move! + You used too many moves in a row, so you can't move! Type of {0} is {1} @@ -448,7 +448,7 @@ Reason: {1} Greet announcements enabled on this channel. - You can't use this command on users with a role higher or equal to yours in the role hierarchy. + You can't use this command on users with a role higher or equal to yours in the role hierarchy. Images loaded after {0} seconds! @@ -473,19 +473,19 @@ Reason: {1} List of languages - Your server's locale is now {0} - {1} + Your server's locale is now {0} - {1} - Bot's default locale is now {0} - {1} + Bot's default locale is now {0} - {1} - Bot's language is set to {0} - {1} + Bot's language is set to {0} - {1} - Failed setting locale. Revisit this command's help. + Failed setting locale. Revisit this command's help. - This server's language is set to {0} - {1} + This server's language is set to {0} - {1} {0} has left {1} @@ -538,10 +538,10 @@ Reason: {1} Muted - singular "User muted." + singular "User muted." - I don't have the permission necessary for that most likely. + I don't have the permission necessary for that most likely. New mute role set. @@ -562,7 +562,7 @@ Reason: {1} Nickname changed - Can't find that server + Can't find that server No shard with that ID found. @@ -577,7 +577,7 @@ Reason: {1} Old topic - Error. Most likely I don't have sufficient permissions. + Error. Most likely I don't have sufficient permissions. Permissions for this server are reset. @@ -637,7 +637,7 @@ Reason: {1} Failed to rename role. I have insufficient permissions. - You can't edit roles higher than your highest role. + You can't edit roles higher than your highest role. Removed the playing message: {0} @@ -683,13 +683,13 @@ Reason: {1} That role is not self-assignable. - You don't have {0} role. + You don't have {0} role. Self assigned roles are now not exclusive! - I am unable to add that role to you. `I can't add roles to owners or other roles higher than my role in the role hierarchy.` + I am unable to add that role to you. `I can't add roles to owners or other roles higher than my role in the role hierarchy.` {0} has been removed from the list of self-assignable roles. @@ -731,7 +731,7 @@ Reason: {1} Shutting down - Users can't send more than {0} messages every {1} seconds. + Users can't send more than {0} messages every {1} seconds. Slow mode disabled. @@ -794,10 +794,10 @@ Reason: {1} {0} has been **muted** from text and voice chat. - User's role added + User's role added - User's role removed + User's role removed {0} is now {1} @@ -833,7 +833,7 @@ Reason: {1} Enabled voice + text feature. - I don't have **manage roles** and/or **manage channels** permission, so I cannot run `voice+text` on {0} server. + I don't have **manage roles** and/or **manage channels** permission, so I cannot run `voice+text` on {0} server. You are enabling/disabling this feature and **I do not have ADMINISTRATOR permissions**. This may cause some issues, and you will have to clean up text channels yourself afterwards. @@ -861,7 +861,7 @@ Reason: {1} Migration done! - Error while migrating, check bot's console for more information. + Error while migrating, check bot's console for more information. Presence updates @@ -918,13 +918,13 @@ Reason: {1} Awarded {0} to {1} users from {2} role. - You can't bet more than {0} + You can't bet more than {0} - You can't bet less than {0} + You can't bet less than {0} - You don't have enough {0} + You don't have enough {0} No more cards in the deck. @@ -955,7 +955,7 @@ Reason: {1} Users must type a secret code to get {0}. -Lasts {1} seconds. Don't tell anyone. Shhh. +Lasts {1} seconds. Don't tell anyone. Shhh. SneakyGame event ended. {0} users received the reward. @@ -970,7 +970,7 @@ Lasts {1} seconds. Don't tell anyone. Shhh. successfully took {0} from {1} - was unable to take {0} from{1} because the user doesn't have that much {2}! + was unable to take {0} from{1} because the user doesn't have that much {2}! Back to ToC @@ -994,7 +994,7 @@ Lasts {1} seconds. Don't tell anyone. Shhh. Type `{0}h CommandName` to see the help for that specified command. e.g. `{0}h >8ball` - I can't find that command. Please verify that the command exists before trying again. + I can't find that command. Please verify that the command exists before trying again. Description @@ -1003,7 +1003,7 @@ Lasts {1} seconds. Don't tell anyone. Shhh. You can support the NadekoBot project on Patreon <{0}> or Paypal <{1}> -Don't forget to leave your discord name or id in the message. +Don't forget to leave your discord name or id in the message. **Thank you** ♥️ @@ -1101,9 +1101,6 @@ Don't forget to leave your discord name or id in the message. Likes - - Nobody - Price @@ -1114,7 +1111,7 @@ Don't forget to leave your discord name or id in the message. Top Waifus - your affinity is already set to that waifu or you're trying to remove your affinity while not having one. + your affinity is already set to that waifu or you're trying to remove your affinity while not having one. changed their affinity from {0} to {1}. @@ -1129,7 +1126,7 @@ Don't forget to leave your discord name or id in the message. Your affinity is reset. You no longer have a person you like. - wants to be {0}'s waifu. Aww <3 + wants to be {0}'s waifu. Aww <3 claimed {0} as their waifu for {1}! @@ -1138,15 +1135,12 @@ Don't forget to leave your discord name or id in the message. You have divorced a waifu who likes you. You heartless monster. {0} received {1} as a compensation. - - You have divorced a waifu who doesn't like you. You received {0} back. - - you can't set affinity to yourself, you egomaniac. + you can't set affinity to yourself, you egomaniac. 🎉 Their love is fulfilled! 🎉 -{0}'s new value is {1}! +{0}'s new value is {1}! No waifu is that cheap. You must pay at least {0} to get a waifu, even if their actual value is lower. @@ -1158,11 +1152,17 @@ Don't forget to leave your discord name or id in the message. That waifu is not yours. - You can't claim yourself. + You can't claim yourself. You divorced recently. You must wait {0} hours and {1} minutes to divorce again. + + Nobody + + + You have divorced a waifu who doesn't like you. You received {0} back. + 8ball @@ -1206,7 +1206,7 @@ Don't forget to leave your discord name or id in the message. Question - It's a draw! Both picked {0} + It's a draw! Both picked {0} {0} won! {1} beats {2} @@ -1217,9 +1217,6 @@ Don't forget to leave your discord name or id in the message. Animal Race is already running. - - You've already joined this race! - Total: {0} Average: {1} @@ -1261,13 +1258,13 @@ Don't forget to leave your discord name or id in the message. Starting hangman errored. - List of "{0}hangman" term types: + List of "{0}hangman" term types: Leaderboard - You don't have enough {0} + You don't have enough {0} No results @@ -1299,13 +1296,13 @@ Don't forget to leave your discord name or id in the message. Stopping after this question. - Time's up! The correct answer was {0} + Time's up! The correct answer was {0} {0} guessed it and WON the game! The answer was: {1} - You can't play against yourself. + You can't play against yourself. TicTacToe Game is already running in this channel. @@ -1329,7 +1326,7 @@ Don't forget to leave your discord name or id in the message. Time expired! - {0}'s move + {0}'s move {0} vs {1} @@ -1416,10 +1413,10 @@ Don't forget to leave your discord name or id in the message. Playlist deleted. - Failed to delete that playlist. It either doesn't exist, or you are not its author. + Failed to delete that playlist. It either doesn't exist, or you are not its author. - Playlist with that ID doesn't exist. + Playlist with that ID doesn't exist. Playlist queue complete. @@ -1444,7 +1441,7 @@ Don't forget to leave your discord name or id in the message. Removed song - context: "removed song #5" + context: "removed song #5" Repeating current song @@ -1573,14 +1570,14 @@ Don't forget to leave your discord name or id in the message. Moved permission {0} from #{1} to #{2} - Can't find permission at index #{0} + Can't find permission at index #{0} No costs set. command - Gen. (of command) + Gen (of command) module @@ -1672,7 +1669,7 @@ Don't forget to leave your discord name or id in the message. Bad input format, or something went wrong. - Couldn't find that card. + Couldn't find that card. fact @@ -1763,7 +1760,7 @@ Don't forget to leave your discord name or id in the message. List of {0}place tags - Don't translate {0}place + Don't translate {0}place Location @@ -1772,10 +1769,10 @@ Don't forget to leave your discord name or id in the message. Magic Items not loaded. - {0}'s MAL profile + {0}'s MAL profile - Bot owner didn't specify MashapeApiKey. You can't use this functionality. + Bot owner didn't specify MashapeApiKey. You can't use this functionality. Min/Max @@ -1871,10 +1868,10 @@ Don't forget to leave your discord name or id in the message. No such stream. - Stream probably doesn't exist. + Stream probably doesn't exist. - Removed {0}'s stream ({1}) from notifications. + Removed {0}'s stream ({1}) from notifications. I will notify this channel when status changes. @@ -1936,7 +1933,7 @@ Don't forget to leave your discord name or id in the message. `{0}.` {1} [{2:F2}/s] - {3} total /s and total need to be localized to fit the context - -`1.` +`1.` Activity page #{0} @@ -2139,7 +2136,7 @@ Owner ID: {2} No colors are in the correct format. Use `#00ff00` for example. - Started rotating {0} role's color. + Started rotating {0} role's color. Stopped rotating colors for the {0} role @@ -2187,6 +2184,9 @@ Owner ID: {2} Voice channels + + You've already joined this race! + Current poll results @@ -2218,4 +2218,5 @@ Owner ID: {2} {0} total votes cast. + \ No newline at end of file From 1fe229fb7a85eac7e3742b4fddbc81c5d35f9ec5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20Do=C4=9Fan?= Date: Wed, 8 Mar 2017 04:52:26 +0200 Subject: [PATCH 218/496] Update ResponseStrings.tr-TR.resx --- .../Resources/ResponseStrings.tr-TR.resx | 4192 +++++++++-------- 1 file changed, 2097 insertions(+), 2095 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.tr-TR.resx b/src/NadekoBot/Resources/ResponseStrings.tr-TR.resx index 8ebe09d9..49168340 100644 --- a/src/NadekoBot/Resources/ResponseStrings.tr-TR.resx +++ b/src/NadekoBot/Resources/ResponseStrings.tr-TR.resx @@ -1,4 +1,4 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Cette base a déjà été revendiquée ou détruite. - - - Cette base est déjà détruite. - - - Cette base n'est pas revendiquée. - - - Base #{0} **DETRUITE** dans une guerre contre {1} - - - {0} a **ABANDONNÉ** la base #{1} dans une guerre contre {2} - - - {0} a revendiqué une base #{1} dans une guerre contre {2} - - - @{0} Vous avez déjà revendiqué la base #{1}. Vous ne pouvez pas en revendiquer une nouvelle. - - - La demande de la part de @{0} pour une guerre contre {1} a expiré. - Fuzzy - - - Ennemi - - - Informations concernant la guerre contre {0} - - - Numéro de base invalide. - - - La taille de la guerre n'est pas valide. - Fuzzy - - - Liste des guerres en cours - Fuzzy - - - non réclamé - - - Vous ne participez pas a cette guerre. - - - @{0} Vous ne participez pas à cette guerre ou la base a déjà été détruite. - - - Aucune guerre en cours. - Fuzzy - - - Taille - - - La guerre contre {0} a déjà commencé! - - - La guerre contre {0} commence! - - - La guerre contre {0} est terminée. - - - Cette guerre n'existe pas. - - - La guerre contre {0} a éclaté ! - - - Statistiques de réactions personnalisées effacées. - - - Réaction personnalisée supprimée - - - Permissions insuffisantes. Nécessite d'être le propriétaire du Bot pour avoir les réactions personnalisées globales, et Administrateur pour les réactions personnalisées du serveur. - - - Liste de toutes les réactions personnalisées - - - Réactions personnalisées - - - Nouvelle réaction personnalisée - - - Aucune réaction personnalisée trouvée. - Fuzzy - - - Aucune réaction personnalisée ne correspond à cet ID. - - - Réponse - - - Statistiques des Réactions Personnalisées - - - Statistiques effacées pour {0} réaction personnalisée. - - - Pas de statistiques pour ce déclencheur trouvées, aucune action effectuée. - - - Déclencheur - - - Autohentai arrêté. - - - Aucun résultat trouvé. - - - {0} est déjà inconscient. - - - {0} a tous ses PV. - - - Votre type est déjà {0} - - - Vous avez utilisé {0}{1} sur {2}{3} pour {4} dégâts. - Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage. - - - Vous ne pouvez pas attaquer de nouveau sans représailles ! - - - Vous ne pouvez pas vous attaquer vous-même. - - - {0} s'est évanoui! - - - Vous avez soigné {0} avec un {1} - - - {0} a {1} points de vie restants. - - - Vous ne pouvez pas utiliser {0}. Ecrivez `{1}ml` pour voir la liste des actions que vous pouvez effectuer. - - - Liste des attaques pour le type {0} - - - Ce n'est pas très efficace. - - - Vous n'avez pas assez de {0} - - - Vous avez ressuscité {0} avec un {1} - - - Vous vous êtes ressuscité avec un {0} - - - Votre type a bien été modifié de {0} à {1} - - - C'est légèrement efficace. - - - C'est très efficace ! - - - Vous avez utilisé trop de mouvements d'affilée, vous ne pouvez donc plus bouger! - - - Le type de {0} est {1} - - - Utilisateur non trouvé. - - - Vous vous êtes évanoui, vous n'êtes donc pas capable de bouger! - - - **L'affectation automatique de rôle** à l'arrivé d'un nouvel utilisateur est désormais **désactivée**. - - - **L'affectation automatique de rôle** à l'arrivé d'un nouvel utilisateur est désormais **activée**. - - - Liens - - - Avatar modifié - - - Vous avez été banni du serveur {0}. -Raison: {1} - - - bannis - PLURAL - - - Utilisateur banni - - - Le nom du Bot a changé pour {0} - - - Le statut du Bot a changé pour {0} - - - La suppression automatique des annonces de départ a été désactivée. - - - Les annonces de départ seront supprimées après {0} secondes. - - - Annonce de départ actuelle : {0} - - - Activez les annonces de départ en entrant {0} - - - Nouvelle annonce de départ définie. - - - Annonce de départ désactivée. - - - Annonce de départ activée sur ce salon. - - - Nom du salon modifié - - - Ancien nom - - - Sujet du salon modifié - - - Nettoyé. - - - Contenu - - - Rôle {0} créé avec succès - - - Salon textuel {0} créé. - - - Salon vocal {0} créé. - - - Mise en sourdine effectuée. - - - Serveur {0} supprimé - - - Suppression automatique des commandes effectuées avec succès, désactivée. - - - Suppression automatique des commandes effectuées avec succès, activée. - - - Le salon textuel {0} a été supprimé. - - - Le salon vocal {0} a été supprimé. - - - MP de - - - Nouveau donateur ajouté avec succès. Montant total des dons de cet utilisateur : {0} 👑 - - - Merci aux personnes ci-dessous pour avoir permis à ce projet d'exister! - - - Je transmettrai désormais les MPs à tous les propriétaires. - - - Je transmettrai désormais les MPs seulement au propriétaire principal. - - - Je transmettrai désormais les MPs. - - - Je ne transmettrai désormais plus les MPs. - - - La suppression automatique des messages d'accueil a été désactivé. - - - Les messages d'accueil seront supprimés après {0} secondes. - - - MP de bienvenue actuel: {0} - - - Activez les MPs de bienvenue en écrivant {0} - - - Nouveau MP de bienvenue défini. - - - MPs de bienvenue désactivés. - - - MPs de bienvenue activés. - - - Message de bienvenue actuel: {0} - - - Activez les messages de bienvenue en écrivant {0} - - - Nouveau message de bienvenue défini. - - - Messages de bienvenue désactivés. - - - Messages de bienvenue activés sur ce salon. - - - Vous ne pouvez pas utiliser cette commande sur les utilisateurs dont le rôle est supérieur ou égal au vôtre dans la hiérarchie. - - - Images chargées après {0} secondes! - - - Format d'entrée invalide. - - - Paramètres invalides. - - - {0} a rejoint {1} - - - Vous avez été expulsé du serveur {0}. -Raison : {1} - - - Utilisateur expulsé - Fuzzy - - - Listes des langues -{0} - Fuzzy - - - La langue du serveur est désormais {0} - {1} - - - La langue par défaut du bot est désormais {0} - {1} - - - La langue du bot a été changée pour {0} - {1} - - - Échec dans la tentative de changement de langue. Veuillez consulter l'aide pour cette commande. - - - La langue de ce serveur est {0} - {1} - - - {0} a quitté {1} - - - Serveur {0} quitté - - - Enregistrement de {0} événements dans ce salon. - - - Enregistrement de tous les événements dans ce salon. - - - Enregistrement désactivé. - - - Événements enregistrés que vous pouvez suivre : - - - L'enregistrement ignorera désormais {0} - - - L'enregistrement n'ignorera pas {0} - - - L’événement {0} ne sera plus enregistré. - - - {0} a émis une notification pour les rôles suivants - - - Message de {0} `[Bot Owner]` : - - - Message envoyé. - - - {0} déplacé de {1} à {2} - L'utilisateur n'a pas forcément été déplacé de son plein gré. S'est déplacé - déplacé - - - Message supprimé dans #{0} - Fuzzy - - - Mise à jour du message dans #{0} - Fuzzy - - - Tous les utilisateurs sont maintenant muets. - PLURAL (users have been muted) - - - L'utilisateur est maintenant muet. - singular "User muted." - - - Il semblerait que je n'ai pas la permission nécessaire pour effectuer cela. - - - Nouveau rôle muet créé. - - - Je nécessite la permission **Administrateur** pour effectuer cela. - - - Nouveau message - Fuzzy - - - Nouveau pseudonyme - Fuzzy - - - Nouveau sujet - Fuzzy - - - Pseudonyme changé - Fuzzy - - - Impossible de trouver ce serveur - - - Aucun Shard pour cet ID trouvée. - Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. - - - Ancien message - Fuzzy - - - Ancien pseudonyme - Fuzzy - - - Ancien sujet - Fuzzy - - - Erreur. Je ne dois sûrement pas posséder les permissions suffisantes. - - - Les permissions pour ce serveur ont été réinitialisées. - - - Protections actives - Fuzzy - - - {0} a été **désactivé** sur ce serveur. - - - {0} Activé - - - Erreur. J'ai besoin de la permission Gérer les rôles. - - - Aucune protection activée. - Fuzzy - - - Le seuil d'utilisateurs doit être entre {0} et {1}. - - - Si {0} ou plus d'utilisateurs rejoignent dans les {1} secondes suivantes, je les {2}. - - - Le temps doit être compris entre {0} et {1} secondes. - - - Vous avez retirés tous les rôles de l'utilisateur {0} avec succès - - - Impossible de retirer des rôles. Je n'ai pas les permissions suffisantes. - - - La couleur du rôle {0} a été modifiée. - - - Ce rôle n'existe pas. - - - Les paramètres spécifiés sont invalides. - - - Erreur due à un manque de permissions ou à une couleur invalide. - - - L'utilisateur {1} n'a plus le rôle {0}. - - - Impossible de supprimer ce rôle. Je ne possède pas les permissions suffisantes. - - - Rôle renommé. - - - Impossible de renommer ce rôle. Je ne possède pas les permissions suffisantes. - - - Vous ne pouvez pas modifier les rôles supérieurs au votre. - - - La répétition du message suivant a été désactivé: {0} - - - Le rôle {0} a été ajouté à la liste. - - - {0} introuvable. Nettoyé. - - - Le rôle {0} est déjà présent dans la liste. - - - Ajouté. - - - Rotation du statut de jeu désactivée. - - - Rotation du statut de jeu activée. - - - Voici une liste des rotations de statuts : -{0} - - - Aucune rotation de statuts en place. - - - Vous avez déjà le rôle {0}. - - - Vous avez déjà {0} rôles exclusifs auto-attribués. - - - Rôles auto-attribuables désormais exclusifs. - - - Il y a {0} rôles auto-attribuables. - - - Ce rôle ne peux pas vous être attribué par vous-même. - - - Vous ne possédez pas le rôle {0}. - - - Les rôles auto-attribuables ne sont désormais plus exclusifs! - Je ne pense pas que ce soit la bonne traduction.. self-assignable role serait plutôt rôle auto-attribuable - - - Je suis incapable de vous ajouter ce rôle. `Je ne peux pas ajouter de rôles aux propriétaires et aux autres rôles plus haut que le mien dans la hiérarchie.` - - - {0} a été supprimé de la liste des rôles auto-attribuables. - - - Vous n'avez plus le rôle {0}. - - - Vous avez désormais le rôle {0}. - - - L'utilisateur {1} a désormais le rôle {0}. - - - Impossible d'ajouter un rôle. Je ne possède pas les permissions suffisantes. - - - Nouvel avatar défini! - - - Nouveau nom de Salon défini avec succès. - - - Nouveau jeu défini! - Pour "set", je pense que défini irait mieux que "en service" - - - Nouveau stream défini! - - - Nouveau sujet du salon défini. - - - Shard {0} reconnecté. - Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. - - - Shard {0} en reconnection. - Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. - - - Arrêt en cours. - - - Les utilisateurs ne peuvent pas envoyer plus de {0} messages toutes les {1} secondes. - - - Mode ralenti désactivé. - - - Mode ralenti activé - - - expulsés (kick) - PLURAL - - - {0} ignorera ce Salon. - - - {0} n'ignorera plus ce Salon. - - - Si un utilisateur poste {0} le même message à la suite, je le {1}. - __SalonsIgnorés__: {2} - - - Salon textuel créé. - Fuzzy - - - Salon textuel supprimé. - Fuzzy - - - Son activé avec succès. - - - Micro activé - singular - - - Nom d'utilisateur - - - Nom d'utilisateur modifié. - Fuzzy - - - Utilisateurs - - - Utilisateur banni - Fuzzy - - - {0} est maintenant **muet** sur le chat. - - - **La parole a été rétablie** sur le chat pour {0}. - - - L'utilisateur a rejoint - Fuzzy - - - L'utilisateur a quitté - Fuzzy - - - {0} est maintenant **muet** à la fois sur les salons textuels et vocaux. - - - Rôle ajouté à l'utilisateur - Fuzzy - - - Rôle retiré de l'utilisateur - Fuzzy - - - {0} est maintenant {1} - - - {0} n'est maintenant **plus muet** des salons textuels et vocaux. - - - {0} a rejoint le salon vocal {1}. - - - {0} a quitté le salon vocal {1}. - - - {0} est allé du salon vocal {1} à {2}. - - - {0} est maintenant **muet**. - - - {0} n'est maintenant **plus muet**. - - - Salon vocal créé. - Fuzzy - - - Salon vocal supprimé. - Fuzzy - - - Fonctionnalités vocales et textuelles désactivées. - - - Fonctionnalités vocales et textuelles activées. - - - Je n'ai pas la permission **Gérer les rôles** et/ou **Gérer les salons**, je ne peux donc pas utiliser `voice+text` sur le serveur {0}. - - - Vous activez/désactivez cette fonctionnalité et **je n'ai pas la permission ADMINISTRATEUR**. Cela pourrait causer des dysfonctionnements, et vous devrez nettoyer les salons textuels vous-même après ça. - - - Je nécessite au minimum les rôles **Gérer les rôles** et **Gérer les salons** pour activer cette fonctionnalité. (Permission Administrateur de préférence) - - - Utilisateur {0} depuis un salon textuel. - - - Utilisateur {0} depuis salon textuel et vocal. - - - Utilisateur {0} depuis un salon vocal. - - - Vous avez été expulsé du serveur {0}. -Raison: {1} - - - Utilisateur débanni - Fuzzy - - - Migration effectuée! - - - Erreur lors de la migration, veuillez consulter la console pour plus d'informations. - - - Présences mises à jour. - Fuzzy - - - Utilisateur expulsé. - Fuzzy - - - a récompensé {0} à {1} - - - Plus de chance la prochaine fois ^_^ - C'est vraiment québecois ca.. On ne le dit pas comme ca ici xD - - - Félicitations! Vous avez gagné {0} pour avoir lancé au dessus de {1}. - - - Deck remélangé. - - - Lancé {0}. - User flipped tails. - - - Vous avez deviné! Vous avez gagné {0} - - - Nombre spécifié invalide. Vous pouvez lancer 1 à {0} pièces. - - - Ajoute la réaction {0} à ce message pour avoir {1} - - - Cet événement est actif pendant {0} heures. - - - L'événement "réactions fleuries" a démarré! - - - a donné {0} à {1} - X has gifted 15 flowers to Y - - - {0} a {1} - X has Y flowers - - - Face - Fuzzy - - - Classement - - - {1} utilisateurs du rôle {2} ont été récompensé de {0}. - - - Vous ne pouvez pas miser plus de {0} - - - Vous ne pouvez pas parier moins de {0} - - - Vous n'avez pas assez de {0} - - - Plus de carte dans le deck. - - - Utilisateur tiré au sort - Fuzzy - - - Vous avez roulé un {0}. - - - Mise - - - WOAAHHHHHH!!! Félicitations!!! x{0} - - - Une simple {0}, x{1} - - - Wow! Quelle chance! Trois du même genre! x{0} - - - Bon travail! Deux {0} - mise x{1} - - - Gagné - - - Les utilisateurs doivent écrire un code secret pour avoir {0}. Dure {1} secondes. Ne le dites à personne. Shhh. - "Ne le dis à personne" ou "Ne le dites à personne". Je vous laisse faire le choix - - - L’événement "jeu sournois" s'est fini. {0} utilisateurs ont reçu la récompense. - - - L'événement "jeu sournois" a démarré - - - Pile - C'est pas plutôt face ca ? -Fuzzy - - - Vous avez pris {0} de {1} avec succès - - - Impossible de prendre {0} de {1} car l'utilisateur n'a pas assez de {2}! - - - Retour à la table des matières - - - Propriétaire du Bot seulement - Fuzzy - - - Nécessite {0} permissions du salon. - - - Vous pouvez supporter ce projet sur Patreon <{0}> ou via Paypal <{1}> - - - Commandes et alias - Fuzzy - - - Liste des commandes rafraîchie. - Fuzzy - - - Écrivez `{0}h NomDeLaCommande` pour voir l'aide spécifique à cette commande. Ex: `{0}h >8ball` - - - Impossible de trouver cette commande. Veuillez vérifier qu'elle existe avant de réessayer. - - - Description - - - Vous pouvez supporter le projet NadekoBot -sur Patreon <{0}> -par Paypal <{1}> -N'oubliez pas de mettre votre nom discord ou ID dans le message. - -**Merci** ♥️ - - - **Liste des Commandes**: <{0}> -**La liste des guides et tous les documents peuvent être trouvés ici**: <{1}> - Fuzzy - - - Liste des commandes - Fuzzy - - - Liste des modules - Fuzzy - - - Entrez `{0}cmds NomDuModule` pour avoir la liste des commandes de ce module. ex `{0}cmds games` - - - Ce module n'existe pas. - - - Permission serveur {0} requise. - - - Table des matières - Fuzzy - - - Usage - - - Autohentai commencé. Publie toutes les {0}s avec l'un des tags suivants : -{1} - - - Tag - - - Course d'animaux - Fuzzy - - - Pas assez de participants pour commencer. - - - Suffisamment de participants ! La course commence. - - - {0} a rejoint sous la forme d'un {1} - - - {0} a rejoint sous la forme d'un {1} et mise sur {2} ! - - - Entrez {0}jr pour rejoindre la course. - - - Début dans 20 secondes ou quand le nombre maximum de participants est atteint. - - - Début avec {0} participants. - - - {0} sous la forme d'un {1} a gagné la course ! - - - {0} sous la forme d'un {1} a gagné la course et {2}! - - - Nombre spécifié invalide. Vous pouvez lancer de {0} à {1} dés à la fois. - - - tiré au sort {0} - Someone rolled 35 - - - Dé tiré au sort: {0} - Dice Rolled: 5 - - - Le lancement de la course a échoué. Une autre course doit probablement être en cours. - - - Aucune course n'existe sur ce serveur. - - - Le deuxième nombre doit être plus grand que le premier. - - - Changements de Coeur - Fuzzy - - - Revendiquée par - Fuzzy - - - Divorces - - - Aime - - - Prix - - - Aucune waifu n'a été revendiquée pour l'instant. - - - Top Waifus - - - votre affinité est déjà liée à cette waifu ou vous êtes en train de retirer votre affinité avec quelqu'un alors que vous n'en possédez pas. - - - Affinités changées de de {0} à {1}. - -*C'est moralement discutable.* 🤔 - Make sure to get the formatting right, and leave the thinking emoji - - - Vous devez attendre {0} heures et {1} minutes avant de pouvoir changer de nouveau votre affinité. - - - Votre affinité a été réinitialisée. Vous n'avez désormais plus la personne que vous aimez. - - - veut être la waifu de {0}. Aww <3 - - - a revendiqué {0} comme sa waifu pour {1} - - - Vous avez divorcé avec une waifu qui vous aimais. Monstre sans cœur. {0} a reçu {1} en guise de compensation. - - - vous ne pouvez pas vous lier d'affinité avec vous-même, espèce d'égocentrique. - - - 🎉Leur amour est comblé !🎉 -La nouvelle valeur de {0} est {1} ! - - - Aucune waifu n'est à ce prix. Tu dois payer au moins {0} pour avoir une waifu, même si sa vraie valeur est inférieure. - - - Tu dois payer {0} ou plus pour avoir cette waifu ! - - - Cette waifu ne t'appartient pas. - - - Tu ne peux pas t'acquérir toi-même. - - - Vous avez récemment divorcé. Vous devez attendre {0} heures et {1} minutes pour divorcer à nouveau. - - - Personne - - - Vous avez divorcé d'une waifu qui ne vous aimait pas. Vous recevez {0} en retour. - - - 8ball - - - Acrophobie - - - Le jeu a pris fin sans soumissions. - - - Personne n'a voté : la partie se termine sans vainqueur. - - - L'acronyme était {0}. - - - Une partie d'Acrophobia est déjà en cours sur ce salon. - - - La partie commence. Créez une phrase avec l'acronyme suivant : {0}. - - - Vous avez {0} secondes pour faire une soumission. - - - {0} a soumit sa phrase. ({1} au total) - - - Votez en entrant le numéro d'une soumission. - - - {0} a voté! - - - Le gagnant est {0} avec {1} points! - - - {0} est le gagnant pour être le seul utilisateur à avoir fait une soumission! - - - Question - - - Egalité ! Vous avez choisi {0}. - - - {0} a gagné ! {1} bat {2}. - - - Inscriptions terminées. - Fuzzy - - - Une course d'animaux est déjà en cours. - - - Total : {0} Moyenne : {1} - - - Catégorie - - - Cleverbot désactivé sur ce serveur. - - - Cleverbot activé sur ce serveur. - - - La génération monétaire a été désactivée sur ce salon. - Currency =/= current !!! Il s'agit de monnaie. Par example: Euro is a currency. US Dollar also is. Sur Public Nadeko, il s'agit des fleurs :) - - - La génération monétaire a été désactivée sur ce salon. - - - {0} {1} aléatoires sont apparus! - plural -Fuzzy - - - Un {0} aléatoire est apparu! - Fuzzy - - - Impossible de charger une question. - - - La jeu a commencé. - Fuzzy - - - Partie de pendu commencée. - - - Une partie de pendu est déjà en cours sur ce canal. - - - Initialisation du pendu erronée. - - - Liste des "{0}hangman" types de termes : - - - Classement - - - Vous n'avez pas assez de {0} - - - Pas de résultat - - - a cueilli {0} - Kwoth picked 5* - - - {0} a planté {1} - Kwoth planted 5* - - - Une partie de Trivia est déjà en cours sur ce serveur. - - - Partie de Trivia - - - {0} a deviné! La réponse était: {1} - - - Aucune partie de Trivia en cours sur ce serveur. - - - {0} a {1} points - - - Le jeu s'arrêtera après cette question. - - - Le temps a expiré! La réponse était {0} - - - {0} a deviné la réponse et gagne la partie! La réponse était: {1} - - - Vous ne pouvez pas jouer contre vous-même. - - - Une partie de Morpion est déjà en cours sur ce salon. - - - Égalité! - - - a créé une partie de Morpion. - - - {0} a gagné ! - Fuzzy - - - Trois alignés. - Fuzzy - - - Aucun mouvement restant ! - - - Le temps a expiré ! - Fuzzy - - - Tour de {0}. - - - {0} contre {1} - - - Tentative d'ajouter {0} pistes à la file d'attente... - - - Lecture automatique désactivée. - - - Lecture automatique activée. - - - Volume par défaut défini à {0}% - - - File d'attente complète. - - - à tour de rôle - - - Lecture terminée - Fuzzy - - - Système de tour de rôle désactivé. - - - Système de tour de rôle activé. - - - De la position - - - Id - - - Entrée invalide. - - - Le temps maximum de lecture est désormais illimité. - - - Temps maximum de lecture défini à {0} seconde(s). - - - La taille de la file d'attente est désormais illmitée. - - - La taille de la file d'attente est désormais de {0} piste(s). - - - Vous avez besoin d'être dans un salon vocal sur ce serveur. - - - Nom - - - Vous écoutez - Fuzzy - - - Aucun lecteur de musique actif. - - - Pas de résultat. - - - Lecteure mise en pause. - - - File d'attente - Page {0}/{1} - Fuzzy - - - Lecture en cours - Fuzzy - - - `#{0}` - **{1}** par *{2}* ({3} pistes) - - - Page {0} des listes de lecture sauvegardées - Fuzzy - - - Liste de lecture supprimée. - - - Impossible de supprimer cette liste de lecture. Soit elle n'existe pas, soit vous n'en êtes pas le créateur. - - - Aucune liste de lecture ne correspond a cet ID. - - - File d'attente de la liste complétée. - - - Liste de lecture sauvegardée - Fuzzy - - - Limite à {0}s - - - File d'attente - - - Piste ajoutée à la file d'attente - Fuzzy - - - File d'attente effacée. - - - File d'attente complète ({0}/{0}). - - - Piste retirée - context: "removed song #5" - - - Répétition de la piste en cours de lecture - Fuzzy - - - Liste de lecture en boucle - Fuzzy - - - Piste en boucle - Fuzzy - - - La piste ne sera lue qu'une fois. - - - Reprise de la lecture. - - - Lecture en boucle désactivée. - - - Lecture en boucle activée. - - - Je vais désormais afficher les pistes en cours, en pause, terminées et supprimées dans ce salon. - - - Saut à `{0}:{1}` - - - Lecture aléatoire activée. - Fuzzy - - - Piste déplacée - Fuzzy - - - {0}h {1}m {2}s - - - À la position - - - Illimité - - - Le volume doit être compris entre 0 et 100 - - - Volume réglé sur {0}% - - - Désactivation de TOUS LES MODULES pour le salon {0}. - Fuzzy - - - Activation de TOUS LES MODULES pour le salon {0}. - Fuzzy - - - Permis - - - Désactivation de TOUS LES MODULES pour le rôle {0}. - Fuzzy - - - Activation de TOUS LES MODULES pour le rôle {0}. - Fuzzy - - - Désactivation de TOUS LES MODULES sur ce serveur. - - - Activation de TOUS LES MODULES sur ce serveur. - - - Désactivation de TOUS LES MODULES pour l'utilisateur {0}. - Fuzzy - - - Activation de TOUS LES MODULES pour l'utilisateur {0}. - Fuzzy - - - {0} sur liste noire avec l'ID {1} - Il ne s'agit pas d'un ban mais d'une blacklist interdisant l'utilisateur d'utiliser le bot. - - - La commande {0} a désormais {1}s de temps de recharge. - - - La commande {0} n'a pas de temps de recharge et tous les temps de recharge ont été réinitialisés. - Fuzzy - - - Aucune commande n'a de temps de recharge. - - - Coût de la commande : - Fuzzy - - - Désactivation: {1} {0} sur le salon {2}. - Fuzzy - - - Activation: {1} {0} sur le salon {2}. - Fuzzy - - - Refusé - - - Ajout du mot {0} à la liste des mots filtrés. - - - Liste Des Mots Filtrés - Fuzzy - - - Suppression du mot {0} de la liste des mots filtrés. - - - Second paramètre invalide. (nécessite un nombre entre {0} et {1}) - - - Filtrage des invitations désactivé sur ce salon. - - - Filtrage des invitations activé sur ce salon. - - - Filtrage des invitations désactivé sur le serveur. - - - Filtrage des invitations activé sur le serveur. - - - Permission {0} déplacée de #{1} à #{2} - - - Impossible de trouver la permission à l'index #{0} - - - Aucun coût défini. - - - Commande - Gen (of command) - - - Module - Gen. (of module) - - - Page {0} des permissions - - - Le rôle des permissions actuelles est {0}. - - - Il faut maintenant avoir le rôle {0} pour modifier les permissions. - - - Aucune permission trouvée à cet index. - - - Supression des permissions #{0} - {1} - - - Désactivation: {1} {0} pour le rôle {2}. - - - Activation: {1} {0} pour le rôle {2}. - - - sec. - Short of seconds. - - - Désactivation: {1} {0} sur tout le serveur. - - - Activation: {1} {0} sur tout le serveur. - - - Débanni {0} avec l'ID {1} - - - Non modifiable - - - Désactivation: {1} {0} pour l'utilisateur {2}. - - - Activation: {1} {0} pour l'utilisateur {2}. - - - Je n'afficherai plus les avertissements des permissions. - - - J'afficherai désormais les avertissements des permissions. - - - Filtrage des mots désactivé sur ce salon. - - - Filtrage des mots activé sur ce salon. - - - Filtrage des mots désactivé sur le serveur. - - - Filtrage des mots activé sur le serveur. - - - Capacités - - - Pas encore d'anime préféré - - - Traduction automatique des messages activée sur ce salon. Les messages utilisateurs vont désormais être supprimés. - - - Votre langue de traduction à été supprimée. - - - Votre langue de traduction a été changée de {0} à {1} - - - Traduction automatique des messages commencée sur ce salon. - - - Traduction automatique des messages arrêtée sur ce salon. - - - Le format est invalide ou une erreur s'est produite. - - - Impossible de trouver cette carte. - - - fait - - - Chapitres - - - Bande dessinée # - - - Parties compétitives perdues - Fuzzy - - - Parties compétitives jouées - Fuzzy - - - Rang en compétitif - Fuzzy - - - Parties compétitives gagnées - - - Complétés - - - Condition - - - Coût - - - Date - - - Définis: - - - Abandonnés - droppped as in, "stopped watching" referring to shows/anime - - - Episodes - - - Une erreur s'est produite. - - - Exemple - - - Impossible de trouver cet anime. - - - Impossible de trouver ce manga. - - - Genres - - - Impossible de trouver une définition pour ce hashtag. - - - Taille/Poid - - - {0}m/{1}kg - - - Humidité - - - Recherche d'images pour: - Fuzzy - - - Impossible de trouver ce film. - - - Langue d'origine ou de destination invalide. - - - Blagues non chargées. - - - Lat/Long - - - Niveau - - - Liste de tags pour {0}place. - Don't translate {0}place - - - Emplacement - - - Les objets magiques ne sont pas chargés. - - - Profil MAL de {0} - - - Le propriétaire du Bot n'a pas spécifié de clé d'API Mashape (MashapeApiKey). Fonctionnalité non disponible - - - Min/Max - - - Aucun salon trouvé. - - - Aucun résultat trouvé. - - - En attente - Fuzzy - - - Url originale - Fuzzy - - - Une clé d'API osu! est nécessaire. - - - Impossible de récupérer la signature osu!. - - - Trouvé dans {0} images. Affichage de {0} aléatoires. - - - Utilisateur non trouvé! Veuillez vérifier la région ainsi que le BattleTag avant de réessayer. - - - Prévus de regarder - Je ne pense pas que le sens de la traduction soit le bon. - - - Plateforme - - - Attaque non trouvée. - - - Pokémon non trouvé. - - - Lien du profil : - Fuzzy - - - Qualité - - - Durée en Jeux Rapides - Fuzzy - - - Victoires Rapides - Fuzzy - - - Évaluation - - - Score: - - - Chercher pour: - recherche plutôt non ? -Fuzzy - - - Impossible de réduire cette Url. - - - Url réduite - Fuzzy - - - Une erreur s'est produite. - - - Veuillez spécifier les paramètres de recherche. - - - Statut - - - Url stockée - Fuzzy - - - Le streamer {0} est hors ligne. - - - Le streamer {0} est en ligne avec {1} viewers. - - - Vous suivez {0} streams sur ce serveur. - - - Vous ne suivez aucun stream sur ce serveur. - - - Aucun stream de ce nom. - - - Ce stream n'existe probablement pas. - - - Stream de {0} ({1}) retirée des notifications. - - - Je préviendrai ce salon lors d'un changement de statut. - - - Aube - - - Crépuscule - - - Température - - - Titre: - - - Top 3 anime favoris - - - Traduction: - - - Types - - - Impossible de trouver une définition pour ce terme. - - - Url - - - Viewers - - - En écoute - - - Impossible de trouver ce terme sur le wikia spécifié. - - - Entrez un wikia cible, suivi d'une requête de recherche. - - - Page non trouvée. - - - Vitesse du vent - Fuzzy - - - Les {0} champions les plus bannis - - - Impossible de yodifier votre phrase. - - - Rejoint - - - `{0}.` {1} [{2:F2}/s] - {3} total - /s and total need to be localized to fit the context - -`1.` - - - Page d'activité #{0} - Fuzzy - - - {0} utilisateurs en total. - - - Créateur - - - ID du Bot - - - Liste des fonctions pour la commande {0}calc - - - {0} de ce salon est {1} - - - Sujet du salon - Fuzzy - - - Commandes exécutées - Fuzzy - - - {0} {1} est équivalent à {2} {3} - - - Unités pouvant être converties : - - - Impossible de convertir {0} en {1}: unités non trouvées - - - Impossible de convertir {0} en {1} : les types des unités ne sont pas compatibles. - - - Créé le - Fuzzy - - - Salon inter-serveur rejoint. - - - Salon inter-serveur quitté. - - - Voici votre jeton CSC - - - Emojis personnalisées - Fuzzy - - - Erreur - - - Fonctionnalités - - - ID - - - Index hors limites. - - - Voici une liste des utilisateurs dans ces rôles : - Fuzzy - - - Vous ne pouvez pas utiliser cette commande sur un rôle incluant beaucoup d'utilisateurs afin d'éviter les abus. - Fuzzy - - - Valeur {0} invalide. - Invalid months value/ Invalid hours value - - - Discord rejoint - - - Serveur rejoint - Fuzzy - - - ID: {0} -Membres: {1} -OwnerID: {2} - Fuzzy - - - Aucun serveur trouvée sur cette page. - - - Liste des messages répétés - Fuzzy - - - Membres - - - Mémoire - - - Messages - - - Répéteur de messages - Fuzzy - - - Nom - - - Pseudonyme - - - Personne ne joue à ce jeu. - - - Aucune répétition active. - - - Aucun rôle sur cette page. - - - Aucun shard sur cette page. - Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. - - - Aucun sujet choisi. - - - Propriétaire - - - ID des propriétaires - - - Présence - - - {0} Serveurs -{1} Salons Textuels -{2} Salons Vocaux - - - Toutes les citations possédant le mot-clé {0} ont été supprimées. - - - Page {0} des citations - - - Aucune citation sur cette page. - - - Aucune citation que vous puissiez supprimer n'a été trouvé. - - - Citation ajoutée - - - Citation #{0} supprimée. - Fuzzy - - - Région - - - Inscrit sur - Fuzzy - - - Je vais vous rappeler {0} pour {1} dans {2} `({3:d.M.yyyy} à {4:HH:mm})` - - - Format de date non valide. Vérifiez la liste des commandes. - - - Nouveau modèle de rappel défini. - - - Répétition de {0} chaque {1} jour(s), {2} heure(s) et {3} minute(s). - - - Liste des répétitions - Fuzzy - - - Aucune répétition active sur ce serveur. - - - #{0} arrêté. - - - Pas de message répété trouvé sur ce serveur. - - - Résultat - - - Rôles - - - Page #{0} de tout les rôles sur ce serveur. - - - Page #{0} des rôles pour {1} - - - Aucune couleur n'est dans le bon format. Utilisez `#00ff00` par exemple. - - - Couleurs alternées pour le rôle {0} activées. - - - Couleurs alternées pour le rôle {0} arrêtées - - - {0} de ce serveur est {1} - - - Info du serveur - Fuzzy - - - Shard - Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. - - - Statistique des shards - Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. -Fuzzy - - - Le shard **#{0}** est en état {1} avec {2} serveurs. - Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. - - - **Nom:** {0} **Lien:** {1} - - - Pas d'emojis spéciaux trouvés. - - - Joue actuellement {0} piste(s), {1} en attente. - - - Salons textuels - Fuzzy - - - Voici le lien pour votre salon: - - - Durée de fonctionnement - - - {0} de l'utilisateur {1}: {2} - Id of the user kwoth#1234 is 123123123123 - - - Utilisateurs - - - Salons vocaux - Fuzzy - - - Vous avez déjà rejoint cette course! - - - Résultats du sondage actuel - - - Aucun vote enregistré. - - - Un sondage est déjà en cours sur ce serveur. - - - 📃 {0} a créé un sondage qui requiert votre attention: - - - `{0}.` {1} avec {2} votes. - - - {0} a voté. - Kwoth voted. - - - Envoyez moi un message privé avec le numéro correspondant à la réponse. - - - Envoyez un Message ici avec le numéro correspondant à la réponse. - - - Merci d'avoir voté, {0} - - - {0} votes enregistrés au total. - - - Attrapez-les en écrivant `{0}pick` - - - Attrapez-le en écrivant `{0}pick` - - - Aucun utilisateur trouvé. - - - page {0} - - - \ No newline at end of file From 9430222c219f6474f854106b0c2588be60c50c7b Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Sat, 11 Mar 2017 08:23:57 +0100 Subject: [PATCH 268/496] Update ResponseStrings.zh-TW.resx (POEditor.com) --- src/NadekoBot/Resources/ResponseStrings.zh-TW.resx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx b/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx index 10576b58..74edb3a9 100644 --- a/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx +++ b/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx @@ -2237,22 +2237,22 @@ Paypal <{1}> 第 {0} 頁 - + 您必須要在此伺服器上的語音頻道。 - + 沒有語音頻道身分組。 - + {0} 已被 **禁止** __文字和語音聊天__，持續 {1} 分鐘。 - + 進入 {0} 頻道的成員將會獲得 {1} 身分組。 - + 進入 {0} 頻道的成員將不再獲得身分組。 - + 語音頻道身分組 \ No newline at end of file From 4d1140bb8080541ab22e3e66a4b2841b9f80017a Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Sat, 11 Mar 2017 08:24:00 +0100 Subject: [PATCH 269/496] Update ResponseStrings.fr-FR.resx (POEditor.com) --- src/NadekoBot/Resources/ResponseStrings.fr-FR.resx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.fr-FR.resx b/src/NadekoBot/Resources/ResponseStrings.fr-FR.resx index 6786100e..c061305e 100644 --- a/src/NadekoBot/Resources/ResponseStrings.fr-FR.resx +++ b/src/NadekoBot/Resources/ResponseStrings.fr-FR.resx @@ -2353,22 +2353,22 @@ Fuzzy page {0} - + Vous devez être sur un canal vocal sur ce serveur. - + Il n'y a pas de rôle de canal vocal. - + {0} est désormais **muet** du chat textuel et vocal pour {1} minutes. - + Les utilisateurs rejoignant le canal vocal {0} obtiendrons le rôle {1}. - + Les utilisateurs rejoignant le canal vocal {0} n’obtiendrons plus de rôle. - + Rôles du canal vocal \ No newline at end of file From efb9f32389502210cb03ca6da43d237775ab5a97 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Sat, 11 Mar 2017 08:24:03 +0100 Subject: [PATCH 270/496] Update ResponseStrings.tr-TR.resx (POEditor.com) --- src/NadekoBot/Resources/ResponseStrings.tr-TR.resx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.tr-TR.resx b/src/NadekoBot/Resources/ResponseStrings.tr-TR.resx index 2b4011de..f38f1a21 100644 --- a/src/NadekoBot/Resources/ResponseStrings.tr-TR.resx +++ b/src/NadekoBot/Resources/ResponseStrings.tr-TR.resx @@ -2239,22 +2239,22 @@ Kurucu Kimliği: {2} sayfa {0} - + Bu sunucudaki bir ses kanalda olmalısınız. - + Sesli kanal rolü yok. - + {0} metin ve sesli sohbetten {1} dakika **sessiz** hale getirildi. - + {0} sesli kanalına katılan kullanıcılar {1} rolünü alacaktır. - + {0} sesli kanalına katılan kullanıcılar artık bir rol almaz. - + Sesli kanal rolleri \ No newline at end of file From 4673736b60a7a54ed5f56e3c4607d577581d111d Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 11 Mar 2017 10:22:41 +0100 Subject: [PATCH 271/496] $lb should have correct numbers now on pages > 1 --- src/NadekoBot/Modules/Gambling/Gambling.cs | 2 +- src/NadekoBot/Services/Impl/StatsService.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Modules/Gambling/Gambling.cs b/src/NadekoBot/Modules/Gambling/Gambling.cs index fa5f462e..760f8156 100644 --- a/src/NadekoBot/Modules/Gambling/Gambling.cs +++ b/src/NadekoBot/Modules/Gambling/Gambling.cs @@ -274,7 +274,7 @@ namespace NadekoBot.Modules.Gambling : usr.Username?.TrimTo(20, true); var j = i; - embed.AddField(efb => efb.WithName("#" + (j + 1) + " " + usrStr) + embed.AddField(efb => efb.WithName("#" + (9 * (page - 1) + j + 1) + " " + usrStr) .WithValue(x.Amount.ToString() + " " + NadekoBot.BotConfig.CurrencySign) .WithIsInline(true)); } diff --git a/src/NadekoBot/Services/Impl/StatsService.cs b/src/NadekoBot/Services/Impl/StatsService.cs index 11f7802c..bd8eff0b 100644 --- a/src/NadekoBot/Services/Impl/StatsService.cs +++ b/src/NadekoBot/Services/Impl/StatsService.cs @@ -16,7 +16,7 @@ namespace NadekoBot.Services.Impl private readonly DiscordShardedClient _client; private readonly DateTime _started; - public const string BotVersion = "1.22"; + public const string BotVersion = "1.23"; public string Author => "Kwoth#2560"; public string Library => "Discord.Net"; From a7f70ad4e8a5a20aa40610cf26b01e1003ccd42e Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Sat, 11 Mar 2017 10:25:55 +0100 Subject: [PATCH 272/496] Update ResponseStrings.de-DE.resx (POEditor.com) --- .../Resources/ResponseStrings.de-DE.resx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.de-DE.resx b/src/NadekoBot/Resources/ResponseStrings.de-DE.resx index 03ed4b83..34346f0c 100644 --- a/src/NadekoBot/Resources/ResponseStrings.de-DE.resx +++ b/src/NadekoBot/Resources/ResponseStrings.de-DE.resx @@ -544,11 +544,11 @@ Grund: {1} Fuzzy - wurden Stumm geschalten + wurden Stummgeschalten PLURAL (users have been muted) - wurde Stumm geschalten + wurde Stummgeschalten singular "User muted." @@ -2289,7 +2289,7 @@ ID des Besitzers: {2} Benutzer - Sprach Kanäle + Sprach-Kanäle Fuzzy @@ -2341,22 +2341,22 @@ ID des Besitzers: {2} Seite {0} - + Sie müssen in einem Sprachkanal auf diesem Server sein. - + Keine Sprachkanal Rollen gefunden. - + {0} wurde **stummgeschaltet** im Text- und Sprachchat für {1} minuten. - + Benutzer die dem Sprachkanal {0} beitreten werden der Rolle {1} zugeweist. - + Benutzer die den Sprachkanal {0} beitreten werden nicht länger einer Rolle zugeweist. - + Rollen für Sprachkanäle \ No newline at end of file From 65867992bb787a538bb8b21a1b590789457f4b9e Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Sun, 12 Mar 2017 07:37:40 +0100 Subject: [PATCH 273/496] Update ResponseStrings.ru-RU.resx (POEditor.com) --- .../Resources/ResponseStrings.ru-RU.resx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx b/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx index 9651864c..5f333da0 100644 --- a/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx +++ b/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx @@ -789,7 +789,7 @@ Пользователь вышел - {0} получил **запрет** на разговор в текстовых и голосовых каналах + {0} получил **запрет** на разговор в текстовых и голосовых каналах. Добавлена роль пользователя @@ -1114,7 +1114,7 @@ Paypal <{1}> сменил свою предрасположенность с {0} на {1}. -*Это сомнительно с точки зрения морали* :thinking: +*Это сомнительно с моральной точки зрения* :thinking: Make sure to get the formatting right, and leave the thinking emoji @@ -2232,22 +2232,22 @@ IDВладельца: {2} Страница {0} - + Вы должны быть в голосовом канале на этом сервере. - + Нет ролей для голосовых каналов. - + {0} получил **запрет** на разговор в текстовых и голосовых каналах на {1} минут. - + Пользователи, присоединяющиеся к голосовому каналу {0}, получат роль {1}. - + Пользователи, присоединяющиеся к голосовому каналу {0}, больше не будут получать роль. - + Роли голосовых каналов \ No newline at end of file From cc2d96f461966d7bcd4771f502062e5b4ffc6233 Mon Sep 17 00:00:00 2001 From: Rajath Ranganath Date: Sun, 12 Mar 2017 21:35:24 +0530 Subject: [PATCH 274/496] Fix delq usage --- src/NadekoBot/Resources/CommandStrings.resx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx index bb284bcf..638735a0 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -1159,7 +1159,7 @@ Deletes a quote with the specified ID. You have to be either server Administrator or the creator of the quote to delete it. - `{0}delq abc` + `{0}delq 123456` draw @@ -3186,4 +3186,4 @@ `{0}vcrole SomeRole` or `{0}vcrole` - \ No newline at end of file + From 3337a2675ac7ecf01c10be335eda6f2550668fb1 Mon Sep 17 00:00:00 2001 From: samvaio Date: Mon, 13 Mar 2017 09:35:32 +0530 Subject: [PATCH 275/496] branch changed to dev --- scripts/NadekoAutoRun.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/NadekoAutoRun.bat b/scripts/NadekoAutoRun.bat index c1701c7c..69060962 100644 --- a/scripts/NadekoAutoRun.bat +++ b/scripts/NadekoAutoRun.bat @@ -29,7 +29,7 @@ CD /D %~dp0NadekoBot\src\NadekoBot dotnet run --configuration Release ECHO Updating... SET "FILENAME=%~dp0\Latest.bat" -powershell -Command "Invoke-WebRequest https://github.com/Kwoth/NadekoBot/raw/master/scripts/Latest.bat -OutFile '%FILENAME%'" +powershell -Command "Invoke-WebRequest https://github.com/Kwoth/NadekoBot/raw/dev/scripts/Latest.bat -OutFile '%FILENAME%'" ECHO NadekoBot Dev Build (latest) downloaded. SET root=%~dp0 CD /D %root% @@ -43,7 +43,7 @@ CD /D %~dp0NadekoBot\src\NadekoBot dotnet run --configuration Release ECHO Updating... SET "FILENAME=%~dp0\Stable.bat" -powershell -Command "Invoke-WebRequest https://github.com/Kwoth/NadekoBot/raw/master/scripts/Stable.bat -OutFile '%FILENAME%'" +powershell -Command "Invoke-WebRequest https://github.com/Kwoth/NadekoBot/raw/dev/scripts/Stable.bat -OutFile '%FILENAME%'" ECHO NadekoBot Stable build downloaded. SET root=%~dp0 CD /D %root% From 731330467b83dc166445ae2cd7d0631a1c7f6834 Mon Sep 17 00:00:00 2001 From: samvaio Date: Mon, 13 Mar 2017 10:45:51 +0530 Subject: [PATCH 276/496] better installation for 32bit users --- scripts/Latest.bat | 57 +++++++++++++++++++++++++-------------- scripts/NadekoAutoRun.bat | 22 +++++++-------- scripts/NadekoRun.bat | 4 +-- scripts/Stable.bat | 57 +++++++++++++++++++++++++-------------- 4 files changed, 87 insertions(+), 53 deletions(-) diff --git a/scripts/Latest.bat b/scripts/Latest.bat index 6460a618..13248a96 100644 --- a/scripts/Latest.bat +++ b/scripts/Latest.bat @@ -1,24 +1,25 @@ @ECHO off TITLE Downloading Latest Build of NadekoBot... ::Setting convenient to read variables which don't delete the windows temp folder -SET root=%~dp0 -CD /D %root% -SET rootdir=%cd% -SET build1=%root%NadekoInstall_Temp\NadekoBot\Discord.Net\src\Discord.Net.Core\ -SET build2=%root%NadekoInstall_Temp\NadekoBot\Discord.Net\src\Discord.Net.Rest\ -SET build3=%root%NadekoInstall_Temp\NadekoBot\Discord.Net\src\Discord.Net.WebSocket\ -SET build4=%root%NadekoInstall_Temp\NadekoBot\Discord.Net\src\Discord.Net.Commands\ -SET build5=%root%NadekoInstall_Temp\NadekoBot\src\NadekoBot\ -SET installtemp=%root%NadekoInstall_Temp\ +SET "root=%~dp0" +CD /D "%root%" +SET "rootdir=%cd%" +SET "build1=%root%NadekoInstall_Temp\NadekoBot\Discord.Net\src\Discord.Net.Core\" +SET "build2=%root%NadekoInstall_Temp\NadekoBot\Discord.Net\src\Discord.Net.Rest\" +SET "build3=%root%NadekoInstall_Temp\NadekoBot\Discord.Net\src\Discord.Net.WebSocket\" +SET "build4=%root%NadekoInstall_Temp\NadekoBot\Discord.Net\src\Discord.Net.Commands\" +SET "build5=%root%NadekoInstall_Temp\NadekoBot\src\NadekoBot\" +SET "installtemp=%root%NadekoInstall_Temp\" ::Deleting traces of last setup for the sake of clean folders, if by some miracle it still exists -IF EXIST %installtemp% ( RMDIR %installtemp% /S /Q >nul 2>&1) +IF EXIST "%installtemp%" ( RMDIR "%installtemp%" /S /Q >nul 2>&1) +timeout /t 5 ::Checks that both git and dotnet are installed dotnet --version >nul 2>&1 || GOTO :dotnet git --version >nul 2>&1 || GOTO :git ::Creates the install directory to work in and get the current directory because spaces ruins everything otherwise :start -MKDIR NadekoInstall_Temp -CD /D %installtemp% +MKDIR "%root%NadekoInstall_Temp" +CD /D "%installtemp%" ::Downloads the latest version of Nadeko ECHO Downloading Nadeko... ECHO. @@ -28,28 +29,28 @@ TITLE Installing NadekoBot, please wait... ECHO. ECHO Installing Discord.Net(1/4)... ::Building Nadeko -CD /D %build1% +CD /D "%build1%" dotnet restore >nul 2>&1 ECHO Installing Discord.Net(2/4)... -CD /D %build2% +CD /D "%build2%" dotnet restore >nul 2>&1 ECHO Installing Discord.Net(3/4)... -CD /D %build3% +CD /D "%build3%" dotnet restore >nul 2>&1 ECHO Installing Discord.Net(4/4)... -CD /D %build4% +CD /D "%build4%" dotnet restore >nul 2>&1 ECHO. ECHO Discord.Net installation completed successfully... ECHO. ECHO Installing NadekoBot... -CD /D %build5% +CD /D "%build5%" dotnet restore >nul 2>&1 dotnet build --configuration Release >nul 2>&1 ECHO. ECHO NadekoBot installation completed successfully... ::Attempts to backup old files if they currently exist in the same folder as the batch file -IF EXIST "%root%NadekoBot\" (GOTO :backupinstall) +IF EXIST "%root%NadekoBot\" (GOTO :backupinstall) ELSE (GOTO :freshinstall) :freshinstall ::Moves the NadekoBot folder to keep things tidy ECHO. @@ -106,7 +107,7 @@ IF EXIST "%root%NadekoBot\" (GOTO :backupinstall) :giterror ECHO. ECHO Git clone failed, trying again - RMDIR %installtemp% /S /Q >nul 2>&1 + RMDIR "%installtemp%" /S /Q >nul 2>&1 GOTO :start :copyerror ::If at any point a copy error is encountered @@ -127,12 +128,28 @@ ECHO. ECHO Your System Architecture is 32bit... timeout /t 5 ECHO. -ECHO Downloading libsodium.dll and opus.dll... +ECHO Getting 32bit libsodium.dll and opus.dll... +IF EXIST "%root%NadekoBot\src\NadekoBot\_libs\32\libsodium.dll" (GOTO copysodium) ELSE (GOTO downloadsodium) +:copysodium +del "%root%NadekoBot\src\NadekoBot\libsodium.dll" +copy "%root%NadekoBot\src\NadekoBot\_libs\32\libsodium.dll" "%root%NadekoBot\src\NadekoBot\libsodium.dll" +ECHO libsodium.dll copied. +ECHO. +timeout /t 5 +IF EXIST "%root%NadekoBot\src\NadekoBot\_libs\32\opus.dll" (GOTO copyopus) ELSE (GOTO downloadopus) +:downloadsodium SET "FILENAME=%~dp0\NadekoBot\src\NadekoBot\libsodium.dll" powershell -Command "Invoke-WebRequest https://github.com/Kwoth/NadekoBot/raw/dev/src/NadekoBot/_libs/32/libsodium.dll -OutFile '%FILENAME%'" ECHO libsodium.dll downloaded. ECHO. timeout /t 5 +IF EXIST "%root%NadekoBot\src\NadekoBot\_libs\32\opus.dll" (GOTO copyopus) ELSE (GOTO downloadopus) +:copyopus +del "%root%NadekoBot\src\NadekoBot\opus.dll" +copy "%root%NadekoBot\src\NadekoBot\_libs\32\opus.dll" "%root%NadekoBot\src\NadekoBot\opus.dll" +ECHO opus.dll copied. +GOTO end +:downloadopus SET "FILENAME=%~dp0\NadekoBot\src\NadekoBot\opus.dll" powershell -Command "Invoke-WebRequest https://github.com/Kwoth/NadekoBot/raw/dev/src/NadekoBot/_libs/32/opus.dll -OutFile '%FILENAME%'" ECHO opus.dll downloaded. diff --git a/scripts/NadekoAutoRun.bat b/scripts/NadekoAutoRun.bat index 69060962..4441e25b 100644 --- a/scripts/NadekoAutoRun.bat +++ b/scripts/NadekoAutoRun.bat @@ -2,8 +2,8 @@ @TITLE NadekoBot -SET root=%~dp0 -CD /D %root% +SET "root=%~dp0" +CD /D "%root%" CLS ECHO Welcome to NadekoBot Auto Restart and Update! @@ -25,28 +25,28 @@ IF ERRORLEVEL 1 GOTO latestar :latestar ECHO Auto Restart and Update with Dev Build (latest) ECHO Bot will auto update on every restart! -CD /D %~dp0NadekoBot\src\NadekoBot +CD /D "%~dp0NadekoBot\src\NadekoBot" dotnet run --configuration Release ECHO Updating... SET "FILENAME=%~dp0\Latest.bat" powershell -Command "Invoke-WebRequest https://github.com/Kwoth/NadekoBot/raw/dev/scripts/Latest.bat -OutFile '%FILENAME%'" ECHO NadekoBot Dev Build (latest) downloaded. -SET root=%~dp0 -CD /D %root% +SET "root=%~dp0" +CD /D "%root%" CALL Latest.bat GOTO latestar :stablear ECHO Auto Restart and Update with Stable Build ECHO Bot will auto update on every restart! -CD /D %~dp0NadekoBot\src\NadekoBot +CD /D "%~dp0NadekoBot\src\NadekoBot" dotnet run --configuration Release ECHO Updating... SET "FILENAME=%~dp0\Stable.bat" powershell -Command "Invoke-WebRequest https://github.com/Kwoth/NadekoBot/raw/dev/scripts/Stable.bat -OutFile '%FILENAME%'" ECHO NadekoBot Stable build downloaded. -SET root=%~dp0 -CD /D %root% +SET "root=%~dp0" +CD /D "%root%" CALL Stable.bat GOTO stablear @@ -54,12 +54,12 @@ GOTO stablear ECHO Normal Auto Restart ECHO Bot will not auto update on every restart! timeout /t 3 -CD /D %~dp0NadekoBot\src\NadekoBot +CD /D "%~dp0NadekoBot\src\NadekoBot" dotnet run --configuration Release goto autorun :Exit -SET root=%~dp0 -CD /D %root% +SET "root=%~dp0" +CD /D "%root%" del NadekoAutoRun.bat CALL NadekoInstaller.bat diff --git a/scripts/NadekoRun.bat b/scripts/NadekoRun.bat index 207fb278..73c66b17 100644 --- a/scripts/NadekoRun.bat +++ b/scripts/NadekoRun.bat @@ -1,9 +1,9 @@ @ECHO off @TITLE NadekoBot -CD /D %~dp0NadekoBot\src\NadekoBot +CD /D "%~dp0NadekoBot\src\NadekoBot" dotnet run --configuration Release ECHO NadekoBot has been succesfully stopped, press any key to close this window. TITLE NadekoBot - Stopped -CD /D %~dp0 +CD /D "%~dp0" PAUSE >nul 2>&1 del NadekoRunNormal.bat diff --git a/scripts/Stable.bat b/scripts/Stable.bat index b2f6a9eb..a3ffb6f4 100644 --- a/scripts/Stable.bat +++ b/scripts/Stable.bat @@ -1,24 +1,25 @@ @ECHO off TITLE Downloading Stable Build of NadekoBot... ::Setting convenient to read variables which don't delete the windows temp folder -SET root=%~dp0 -CD /D %root% -SET rootdir=%cd% -SET build1=%root%NadekoInstall_Temp\NadekoBot\Discord.Net\src\Discord.Net.Core\ -SET build2=%root%NadekoInstall_Temp\NadekoBot\Discord.Net\src\Discord.Net.Rest\ -SET build3=%root%NadekoInstall_Temp\NadekoBot\Discord.Net\src\Discord.Net.WebSocket\ -SET build4=%root%NadekoInstall_Temp\NadekoBot\Discord.Net\src\Discord.Net.Commands\ -SET build5=%root%NadekoInstall_Temp\NadekoBot\src\NadekoBot\ -SET installtemp=%root%NadekoInstall_Temp\ +SET "root=%~dp0" +CD /D "%root%" +SET "rootdir=%cd%" +SET "build1=%root%NadekoInstall_Temp\NadekoBot\Discord.Net\src\Discord.Net.Core\" +SET "build2=%root%NadekoInstall_Temp\NadekoBot\Discord.Net\src\Discord.Net.Rest\" +SET "build3=%root%NadekoInstall_Temp\NadekoBot\Discord.Net\src\Discord.Net.WebSocket\" +SET "build4=%root%NadekoInstall_Temp\NadekoBot\Discord.Net\src\Discord.Net.Commands\" +SET "build5=%root%NadekoInstall_Temp\NadekoBot\src\NadekoBot\" +SET "installtemp=%root%NadekoInstall_Temp\" ::Deleting traces of last setup for the sake of clean folders, if by some miracle it still exists -IF EXIST %installtemp% ( RMDIR %installtemp% /S /Q >nul 2>&1) +IF EXIST "%installtemp%" ( RMDIR "%installtemp%" /S /Q >nul 2>&1) +timeout /t 5 ::Checks that both git and dotnet are installed dotnet --version >nul 2>&1 || GOTO :dotnet git --version >nul 2>&1 || GOTO :git ::Creates the install directory to work in and get the current directory because spaces ruins everything otherwise :start -MKDIR NadekoInstall_Temp -CD /D %installtemp% +MKDIR "%root%NadekoInstall_Temp" +CD /D "%installtemp%" ::Downloads the latest version of Nadeko ECHO Downloading Nadeko... ECHO. @@ -28,28 +29,28 @@ TITLE Installing NadekoBot, please wait... ECHO. ECHO Installing Discord.Net(1/4)... ::Building Nadeko -CD /D %build1% +CD /D "%build1%" dotnet restore >nul 2>&1 ECHO Installing Discord.Net(2/4)... -CD /D %build2% +CD /D "%build2%" dotnet restore >nul 2>&1 ECHO Installing Discord.Net(3/4)... -CD /D %build3% +CD /D "%build3%" dotnet restore >nul 2>&1 ECHO Installing Discord.Net(4/4)... -CD /D %build4% +CD /D "%build4%" dotnet restore >nul 2>&1 ECHO. ECHO Discord.Net installation completed successfully... ECHO. ECHO Installing NadekoBot... -CD /D %build5% +CD /D "%build5%" dotnet restore >nul 2>&1 dotnet build --configuration Release >nul 2>&1 ECHO. ECHO NadekoBot installation completed successfully... ::Attempts to backup old files if they currently exist in the same folder as the batch file -IF EXIST "%root%NadekoBot\" (GOTO :backupinstall) +IF EXIST "%root%NadekoBot\" (GOTO :backupinstall) ELSE (GOTO :freshinstall) :freshinstall ::Moves the NadekoBot folder to keep things tidy ECHO. @@ -106,7 +107,7 @@ IF EXIST "%root%NadekoBot\" (GOTO :backupinstall) :giterror ECHO. ECHO Git clone failed, trying again - RMDIR %installtemp% /S /Q >nul 2>&1 + RMDIR "%installtemp%" /S /Q >nul 2>&1 GOTO :start :copyerror ::If at any point a copy error is encountered @@ -127,12 +128,28 @@ ECHO. ECHO Your System Architecture is 32bit... timeout /t 5 ECHO. -ECHO Downloading libsodium.dll and opus.dll... +ECHO Getting 32bit libsodium.dll and opus.dll... +IF EXIST "%root%NadekoBot\src\NadekoBot\_libs\32\libsodium.dll" (GOTO copysodium) ELSE (GOTO downloadsodium) +:copysodium +del "%root%NadekoBot\src\NadekoBot\libsodium.dll" +copy "%root%NadekoBot\src\NadekoBot\_libs\32\libsodium.dll" "%root%NadekoBot\src\NadekoBot\libsodium.dll" +ECHO libsodium.dll copied. +ECHO. +timeout /t 5 +IF EXIST "%root%NadekoBot\src\NadekoBot\_libs\32\opus.dll" (GOTO copyopus) ELSE (GOTO downloadopus) +:downloadsodium SET "FILENAME=%~dp0\NadekoBot\src\NadekoBot\libsodium.dll" powershell -Command "Invoke-WebRequest https://github.com/Kwoth/NadekoBot/raw/dev/src/NadekoBot/_libs/32/libsodium.dll -OutFile '%FILENAME%'" ECHO libsodium.dll downloaded. ECHO. timeout /t 5 +IF EXIST "%root%NadekoBot\src\NadekoBot\_libs\32\opus.dll" (GOTO copyopus) ELSE (GOTO downloadopus) +:copyopus +del "%root%NadekoBot\src\NadekoBot\opus.dll" +copy "%root%NadekoBot\src\NadekoBot\_libs\32\opus.dll" "%root%NadekoBot\src\NadekoBot\opus.dll" +ECHO opus.dll copied. +GOTO end +:downloadopus SET "FILENAME=%~dp0\NadekoBot\src\NadekoBot\opus.dll" powershell -Command "Invoke-WebRequest https://github.com/Kwoth/NadekoBot/raw/dev/src/NadekoBot/_libs/32/opus.dll -OutFile '%FILENAME%'" ECHO opus.dll downloaded. From 07aa25c56f7dc3f7a9971806e9775fffb213518e Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 14 Mar 2017 08:08:13 +0100 Subject: [PATCH 277/496] You can now use permissions module to disable individual custom reactions. Not fully tested, seems to work. public bot global cooldown reduced to 750ms, slot cooldown from 2 to 1 second --- .../CustomReactions/CustomReactions.cs | 70 +++++++------------ .../Modules/Gambling/Commands/Slots.cs | 2 +- .../Modules/Permissions/Permissions.cs | 34 ++++----- src/NadekoBot/NadekoBot.cs | 1 + src/NadekoBot/Services/CommandHandler.cs | 47 +++++++++++-- .../Database/Models/CustomReaction.cs | 2 + .../Impl/GuildConfigRepository.cs | 5 +- .../TypeReaders/BotCommandTypeReader.cs | 44 ++++++++++++ 8 files changed, 136 insertions(+), 69 deletions(-) diff --git a/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs b/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs index efd3717e..bbe73e51 100644 --- a/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs +++ b/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs @@ -13,9 +13,27 @@ using Discord.WebSocket; using System; using Newtonsoft.Json; using NadekoBot.DataStructures; +using NLog.Fluent; namespace NadekoBot.Modules.CustomReactions { + public static class CustomReactionExtensions + { + public static Task Send(this CustomReaction cr, IUserMessage context) + { + var channel = context.Channel; + + CustomReactions.ReactionStats.AddOrUpdate(cr.Trigger, 1, (k, old) => ++old); + + CREmbed crembed; + if (CREmbed.TryParse(cr.Response, out crembed)) + { + return channel.EmbedAsync(crembed.ToEmbed(), crembed.PlainText ?? ""); + } + return channel.SendMessageAsync(cr.ResponseWithContext(context)); + } + } + [NadekoModule("CustomReactions", ".")] public class CustomReactions : NadekoTopLevelModule { @@ -25,7 +43,7 @@ namespace NadekoBot.Modules.CustomReactions public static ConcurrentDictionary ReactionStats { get; } = new ConcurrentDictionary(); - private static new readonly Logger _log; + private new static readonly Logger _log; static CustomReactions() { @@ -43,11 +61,11 @@ namespace NadekoBot.Modules.CustomReactions public void ClearStats() => ReactionStats.Clear(); - public static async Task TryExecuteCustomReaction(SocketUserMessage umsg) + public static async Task TryGetCustomReaction(SocketUserMessage umsg) { var channel = umsg.Channel as SocketTextChannel; if (channel == null) - return false; + return null; var content = umsg.Content.Trim().ToLowerInvariant(); CustomReaction[] reactions; @@ -70,26 +88,9 @@ namespace NadekoBot.Modules.CustomReactions var reaction = rs[new NadekoRandom().Next(0, rs.Length)]; if (reaction != null) { - if (reaction.Response != "-") - { - CREmbed crembed; - if (CREmbed.TryParse(reaction.Response, out crembed)) - { - try { await channel.EmbedAsync(crembed.ToEmbed(), crembed.PlainText ?? "").ConfigureAwait(false); } - catch (Exception ex) - { - _log.Warn("Sending CREmbed failed"); - _log.Warn(ex); - } - } - else - { - try { await channel.SendMessageAsync(reaction.ResponseWithContext(umsg)).ConfigureAwait(false); } catch { } - } - } - - ReactionStats.AddOrUpdate(reaction.Trigger, 1, (k, old) => ++old); - return true; + if (reaction.Response == "-") + return null; + return reaction; } } } @@ -103,29 +104,10 @@ namespace NadekoBot.Modules.CustomReactions return ((hasTarget && content.StartsWith(trigger + " ")) || content == trigger); }).ToArray(); if (grs.Length == 0) - return false; + return null; var greaction = grs[new NadekoRandom().Next(0, grs.Length)]; - if (greaction != null) - { - CREmbed crembed; - if (CREmbed.TryParse(greaction.Response, out crembed)) - { - try { await channel.EmbedAsync(crembed.ToEmbed(), crembed.PlainText ?? "").ConfigureAwait(false); } - catch (Exception ex) - { - _log.Warn("Sending CREmbed failed"); - _log.Warn(ex); - } - } - else - { - try { await channel.SendMessageAsync(greaction.ResponseWithContext(umsg)).ConfigureAwait(false); } catch { } - } - ReactionStats.AddOrUpdate(greaction.Trigger, 1, (k, old) => ++old); - return true; - } - return false; + return greaction; } [NadekoCommand, Usage, Description, Aliases] diff --git a/src/NadekoBot/Modules/Gambling/Commands/Slots.cs b/src/NadekoBot/Modules/Gambling/Commands/Slots.cs index ea20b4b1..79dbe75a 100644 --- a/src/NadekoBot/Modules/Gambling/Commands/Slots.cs +++ b/src/NadekoBot/Modules/Gambling/Commands/Slots.cs @@ -223,7 +223,7 @@ namespace NadekoBot.Modules.Gambling { var _ = Task.Run(async () => { - await Task.Delay(2000); + await Task.Delay(1500); _runningUsers.Remove(Context.User.Id); }); } diff --git a/src/NadekoBot/Modules/Permissions/Permissions.cs b/src/NadekoBot/Modules/Permissions/Permissions.cs index bc95d158..837bea9d 100644 --- a/src/NadekoBot/Modules/Permissions/Permissions.cs +++ b/src/NadekoBot/Modules/Permissions/Permissions.cs @@ -12,6 +12,7 @@ using Discord.WebSocket; using System.Diagnostics; using Microsoft.EntityFrameworkCore; using NadekoBot.DataStructures; +using NadekoBot.TypeReaders; using NLog; namespace NadekoBot.Modules.Permissions @@ -89,6 +90,7 @@ namespace NadekoBot.Modules.Permissions var gc = uow.GuildConfigs.For(oc.Key, set => set.Include(x => x.Permissions)); var oldPerms = oc.Value.RootPermission.AsEnumerable().Reverse().ToList(); + uow._context.Set().RemoveRange(oldPerms); gc.RootPermission = null; if (oldPerms.Count > 2) { @@ -316,27 +318,27 @@ namespace NadekoBot.Modules.Permissions [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] - public async Task SrvrCmd(CommandInfo command, PermissionAction action) + public async Task SrvrCmd(CommandOrCrInfo command, PermissionAction action) { await AddPermissions(Context.Guild.Id, new Permissionv2 { PrimaryTarget = PrimaryPermissionType.Server, PrimaryTargetId = 0, SecondaryTarget = SecondaryPermissionType.Command, - SecondaryTargetName = command.Aliases.First().ToLowerInvariant(), + SecondaryTargetName = command.Name.ToLowerInvariant(), State = action.Value, }); if (action.Value) { await ReplyConfirmLocalized("sx_enable", - Format.Code(command.Aliases.First()), + Format.Code(command.Name), GetText("of_command")).ConfigureAwait(false); } else { await ReplyConfirmLocalized("sx_disable", - Format.Code(command.Aliases.First()), + Format.Code(command.Name), GetText("of_command")).ConfigureAwait(false); } } @@ -370,28 +372,28 @@ namespace NadekoBot.Modules.Permissions [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] - public async Task UsrCmd(CommandInfo command, PermissionAction action, [Remainder] IGuildUser user) + public async Task UsrCmd(CommandOrCrInfo command, PermissionAction action, [Remainder] IGuildUser user) { await AddPermissions(Context.Guild.Id, new Permissionv2 { PrimaryTarget = PrimaryPermissionType.User, PrimaryTargetId = user.Id, SecondaryTarget = SecondaryPermissionType.Command, - SecondaryTargetName = command.Aliases.First().ToLowerInvariant(), + SecondaryTargetName = command.Name.ToLowerInvariant(), State = action.Value, }); if (action.Value) { await ReplyConfirmLocalized("ux_enable", - Format.Code(command.Aliases.First()), + Format.Code(command.Name), GetText("of_command"), Format.Code(user.ToString())).ConfigureAwait(false); } else { await ReplyConfirmLocalized("ux_disable", - Format.Code(command.Aliases.First()), + Format.Code(command.Name), GetText("of_command"), Format.Code(user.ToString())).ConfigureAwait(false); } @@ -428,7 +430,7 @@ namespace NadekoBot.Modules.Permissions [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] - public async Task RoleCmd(CommandInfo command, PermissionAction action, [Remainder] IRole role) + public async Task RoleCmd(CommandOrCrInfo command, PermissionAction action, [Remainder] IRole role) { if (role == role.Guild.EveryoneRole) return; @@ -438,21 +440,21 @@ namespace NadekoBot.Modules.Permissions PrimaryTarget = PrimaryPermissionType.Role, PrimaryTargetId = role.Id, SecondaryTarget = SecondaryPermissionType.Command, - SecondaryTargetName = command.Aliases.First().ToLowerInvariant(), + SecondaryTargetName = command.Name.ToLowerInvariant(), State = action.Value, }); if (action.Value) { await ReplyConfirmLocalized("rx_enable", - Format.Code(command.Aliases.First()), + Format.Code(command.Name), GetText("of_command"), Format.Code(role.Name)).ConfigureAwait(false); } else { await ReplyConfirmLocalized("rx_disable", - Format.Code(command.Aliases.First()), + Format.Code(command.Name), GetText("of_command"), Format.Code(role.Name)).ConfigureAwait(false); } @@ -493,28 +495,28 @@ namespace NadekoBot.Modules.Permissions [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] - public async Task ChnlCmd(CommandInfo command, PermissionAction action, [Remainder] ITextChannel chnl) + public async Task ChnlCmd(CommandOrCrInfo command, PermissionAction action, [Remainder] ITextChannel chnl) { await AddPermissions(Context.Guild.Id, new Permissionv2 { PrimaryTarget = PrimaryPermissionType.Channel, PrimaryTargetId = chnl.Id, SecondaryTarget = SecondaryPermissionType.Command, - SecondaryTargetName = command.Aliases.First().ToLowerInvariant(), + SecondaryTargetName = command.Name.ToLowerInvariant(), State = action.Value, }); if (action.Value) { await ReplyConfirmLocalized("cx_enable", - Format.Code(command.Aliases.First()), + Format.Code(command.Name), GetText("of_command"), Format.Code(chnl.Name)).ConfigureAwait(false); } else { await ReplyConfirmLocalized("cx_disable", - Format.Code(command.Aliases.First()), + Format.Code(command.Name), GetText("of_command"), Format.Code(chnl.Name)).ConfigureAwait(false); } diff --git a/src/NadekoBot/NadekoBot.cs b/src/NadekoBot/NadekoBot.cs index 7da895d6..6673cacb 100644 --- a/src/NadekoBot/NadekoBot.cs +++ b/src/NadekoBot/NadekoBot.cs @@ -110,6 +110,7 @@ namespace NadekoBot //setup typereaders CommandService.AddTypeReader(new PermissionActionTypeReader()); CommandService.AddTypeReader(new CommandTypeReader()); + CommandService.AddTypeReader(new CommandOrCrTypeReader()); CommandService.AddTypeReader(new ModuleTypeReader()); CommandService.AddTypeReader(new GuildTypeReader()); diff --git a/src/NadekoBot/Services/CommandHandler.cs b/src/NadekoBot/Services/CommandHandler.cs index d6678d23..ae005e95 100644 --- a/src/NadekoBot/Services/CommandHandler.cs +++ b/src/NadekoBot/Services/CommandHandler.cs @@ -29,11 +29,7 @@ namespace NadekoBot.Services } public class CommandHandler { -#if GLOBAL_NADEKO - public const int GlobalCommandsCooldown = 1500; -#else public const int GlobalCommandsCooldown = 750; -#endif private readonly DiscordShardedClient _client; private readonly CommandService _commandService; @@ -274,9 +270,47 @@ namespace NadekoBot.Services // maybe this message is a custom reaction // todo log custom reaction executions. return struct with info - var crExecuted = await Task.Run(() => CustomReactions.TryExecuteCustomReaction(usrMsg)).ConfigureAwait(false); - if (crExecuted) //if it was, don't execute the command + var cr = await Task.Run(() => CustomReactions.TryGetCustomReaction(usrMsg)).ConfigureAwait(false); + if (cr != null) //if it was, don't execute the command + { + try + { + if (guild != null) + { + PermissionCache pc; + if (!Permissions.Cache.TryGetValue(guild.Id, out pc)) + { + using (var uow = DbHandler.UnitOfWork()) + { + var config = uow.GuildConfigs.For(guild.Id, + set => set.Include(x => x.Permissions)); + Permissions.UpdateCache(config); + } + Permissions.Cache.TryGetValue(guild.Id, out pc); + if (pc == null) + throw new Exception("Cache is null."); + } + int index; + if ( + !pc.Permissions.CheckPermissions(usrMsg, cr.Trigger, "ActualCustomReactions", + out index)) + { + //todo print in guild actually + var returnMsg = + $"Permission number #{index + 1} **{pc.Permissions[index].GetCommand(guild)}** is preventing this action."; + _log.Info(returnMsg); + return; + } + } + await cr.Send(usrMsg).ConfigureAwait(false); + } + catch (Exception ex) + { + _log.Warn("Sending CREmbed failed"); + _log.Warn(ex); + } return; + } var exec3 = Environment.TickCount - execTime; @@ -384,6 +418,7 @@ namespace NadekoBot.Services PermissionCache pc; if (context.Guild != null) { + //todo move to permissions module? if (!Permissions.Cache.TryGetValue(context.Guild.Id, out pc)) { using (var uow = DbHandler.UnitOfWork()) diff --git a/src/NadekoBot/Services/Database/Models/CustomReaction.cs b/src/NadekoBot/Services/Database/Models/CustomReaction.cs index 394e5084..695c1cd3 100644 --- a/src/NadekoBot/Services/Database/Models/CustomReaction.cs +++ b/src/NadekoBot/Services/Database/Models/CustomReaction.cs @@ -12,6 +12,8 @@ namespace NadekoBot.Services.Database.Models public string Trigger { get; set; } public bool IsRegex { get; set; } public bool OwnerOnly { get; set; } + + public bool IsGlobal => !GuildId.HasValue; } public class ReactionResponse : DbEntity diff --git a/src/NadekoBot/Services/Database/Repositories/Impl/GuildConfigRepository.cs b/src/NadekoBot/Services/Database/Repositories/Impl/GuildConfigRepository.cs index 428171b5..909a15d5 100644 --- a/src/NadekoBot/Services/Database/Repositories/Impl/GuildConfigRepository.cs +++ b/src/NadekoBot/Services/Database/Repositories/Impl/GuildConfigRepository.cs @@ -32,8 +32,9 @@ namespace NadekoBot.Services.Database.Repositories.Impl /// /// Gets and creates if it doesn't exist a config for a guild. /// - /// - /// + /// For which guild + /// Use to manipulate the set however you want + /// Config for the guild public GuildConfig For(ulong guildId, Func, IQueryable> includes = null) { GuildConfig config; diff --git a/src/NadekoBot/TypeReaders/BotCommandTypeReader.cs b/src/NadekoBot/TypeReaders/BotCommandTypeReader.cs index 9b4e06c2..0699ae43 100644 --- a/src/NadekoBot/TypeReaders/BotCommandTypeReader.cs +++ b/src/NadekoBot/TypeReaders/BotCommandTypeReader.cs @@ -1,6 +1,8 @@ using Discord.Commands; using System.Linq; using System.Threading.Tasks; +using NadekoBot.Modules.CustomReactions; +using NadekoBot.Services.Database.Models; namespace NadekoBot.TypeReaders { @@ -17,4 +19,46 @@ namespace NadekoBot.TypeReaders return Task.FromResult(TypeReaderResult.FromSuccess(cmd)); } } + + public class CommandOrCrTypeReader : CommandTypeReader + { + public override async Task Read(ICommandContext context, string input) + { + input = input.ToUpperInvariant(); + + if (CustomReactions.GlobalReactions.Any(x => x.Trigger.ToUpperInvariant() == input)) + { + return TypeReaderResult.FromSuccess(new CommandOrCrInfo(input)); + } + var guild = context.Guild; + if (guild != null) + { + CustomReaction[] crs; + if (CustomReactions.GuildReactions.TryGetValue(guild.Id, out crs)) + { + if (crs.Any(x => x.Trigger.ToUpperInvariant() == input)) + { + return TypeReaderResult.FromSuccess(new CommandOrCrInfo(input)); + } + } + } + + var cmd = await base.Read(context, input); + if (cmd.IsSuccess) + { + return TypeReaderResult.FromSuccess(new CommandOrCrInfo(((CommandInfo)cmd.Values.First().Value).Aliases.First())); + } + return TypeReaderResult.FromError(CommandError.ParseFailed, "No such command or cr found."); + } + } + + public class CommandOrCrInfo + { + public string Name { get; set; } + + public CommandOrCrInfo(string input) + { + this.Name = input; + } + } } From 506d058eccdbbf8717d59c9aee012d8fab4e91ee Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 14 Mar 2017 08:43:27 +0100 Subject: [PATCH 278/496] xkcd latest fixed --- src/NadekoBot/Modules/Searches/Commands/XkcdCommands.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Modules/Searches/Commands/XkcdCommands.cs b/src/NadekoBot/Modules/Searches/Commands/XkcdCommands.cs index b747f2bd..a4b031a3 100644 --- a/src/NadekoBot/Modules/Searches/Commands/XkcdCommands.cs +++ b/src/NadekoBot/Modules/Searches/Commands/XkcdCommands.cs @@ -26,12 +26,17 @@ namespace NadekoBot.Modules.Searches { var res = await http.GetStringAsync($"{_xkcdUrl}/info.0.json").ConfigureAwait(false); var comic = JsonConvert.DeserializeObject(res); - var sent = await Context.Channel.SendMessageAsync($"{Context.User.Mention} " + comic) + var embed = new EmbedBuilder().WithColor(NadekoBot.OkColor) + .WithImageUrl(comic.ImageLink) + .WithAuthor(eab => eab.WithName(comic.Title).WithUrl($"{_xkcdUrl}/{comic.Num}").WithIconUrl("http://xkcd.com/s/919f27.ico")) + .AddField(efb => efb.WithName(GetText("comic_number")).WithValue(comic.Num.ToString()).WithIsInline(true)) + .AddField(efb => efb.WithName(GetText("date")).WithValue($"{comic.Month}/{comic.Year}").WithIsInline(true)); + var sent = await Context.Channel.EmbedAsync(embed) .ConfigureAwait(false); await Task.Delay(10000).ConfigureAwait(false); - await sent.ModifyAsync(m => m.Content = sent.Content + $"\n`Alt:` {comic.Alt}"); + await sent.ModifyAsync(m => m.Embed = embed.AddField(efb => efb.WithName("Alt").WithValue(comic.Alt.ToString()).WithIsInline(false)).Build()); } return; } From ac671a7f0cc1ed7a5aed7ef46c52d859f66d5bc6 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 14 Mar 2017 09:03:21 +0100 Subject: [PATCH 279/496] Changes of heart no longer counts affinity removals, and counts each user only once --- .../Modules/Gambling/Commands/WaifuClaimCommands.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Modules/Gambling/Commands/WaifuClaimCommands.cs b/src/NadekoBot/Modules/Gambling/Commands/WaifuClaimCommands.cs index 7f3e4b03..5605e3e6 100644 --- a/src/NadekoBot/Modules/Gambling/Commands/WaifuClaimCommands.cs +++ b/src/NadekoBot/Modules/Gambling/Commands/WaifuClaimCommands.cs @@ -395,7 +395,7 @@ namespace NadekoBot.Modules.Gambling target = Context.User; WaifuInfo w; IList claims; - int divorces = 0; + int divorces; using (var uow = DbHandler.UnitOfWork()) { w = uow.Waifus.ByWaifuUserId(target.Id); @@ -494,7 +494,10 @@ namespace NadekoBot.Modules.Gambling int count; using (var uow = DbHandler.UnitOfWork()) { - count = uow._context.WaifuUpdates.Count(w => w.User.UserId == userId && w.UpdateType == WaifuUpdateType.AffinityChanged); + count = uow._context.WaifuUpdates + .Where(w => w.User.UserId == userId && w.UpdateType == WaifuUpdateType.AffinityChanged && w.New != null) + .GroupBy(x => x.New) + .Count(); } AffinityTitles title; From da60df7e5180dca282304a55dcd340fd1266a271 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 14 Mar 2017 21:02:31 +0100 Subject: [PATCH 280/496] Fixed warning --- src/NadekoBot/Modules/CustomReactions/CustomReactions.cs | 2 +- src/NadekoBot/Modules/Utility/Commands/MessageRepeater.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs b/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs index bbe73e51..e67cb64b 100644 --- a/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs +++ b/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs @@ -61,7 +61,7 @@ namespace NadekoBot.Modules.CustomReactions public void ClearStats() => ReactionStats.Clear(); - public static async Task TryGetCustomReaction(SocketUserMessage umsg) + public static CustomReaction TryGetCustomReaction(SocketUserMessage umsg) { var channel = umsg.Channel as SocketTextChannel; if (channel == null) diff --git a/src/NadekoBot/Modules/Utility/Commands/MessageRepeater.cs b/src/NadekoBot/Modules/Utility/Commands/MessageRepeater.cs index 21b3c67b..58752c28 100644 --- a/src/NadekoBot/Modules/Utility/Commands/MessageRepeater.cs +++ b/src/NadekoBot/Modules/Utility/Commands/MessageRepeater.cs @@ -246,7 +246,7 @@ namespace NadekoBot.Modules.Utility await Context.Channel.SendConfirmAsync( "🔁 " + GetText("repeater", - Format.Bold(rep.Repeater.Message), + Format.Bold(((IGuildUser)Context.User).GuildPermissions.MentionEveryone ? rep.Repeater.Message : rep.Repeater.Message.SanitizeMentions()), Format.Bold(rep.Repeater.Interval.Days.ToString()), Format.Bold(rep.Repeater.Interval.Hours.ToString()), Format.Bold(rep.Repeater.Interval.Minutes.ToString()))).ConfigureAwait(false); From b90bf3ac8a137f534795dd1bb8ebc9fa54425700 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Thu, 16 Mar 2017 09:12:15 +0100 Subject: [PATCH 281/496] fixed ~we when multiple weathers are received --- src/NadekoBot/Modules/Searches/Searches.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Modules/Searches/Searches.cs b/src/NadekoBot/Modules/Searches/Searches.cs index 72969f49..88d688c9 100644 --- a/src/NadekoBot/Modules/Searches/Searches.cs +++ b/src/NadekoBot/Modules/Searches/Searches.cs @@ -51,7 +51,7 @@ namespace NadekoBot.Modules.Searches .AddField(fb => fb.WithName("🌄 " + Format.Bold(GetText("sunrise"))).WithValue($"{data.sys.sunrise.ToUnixTimestamp():HH:mm} UTC").WithIsInline(true)) .AddField(fb => fb.WithName("🌇 " + Format.Bold(GetText("sunset"))).WithValue($"{data.sys.sunset.ToUnixTimestamp():HH:mm} UTC").WithIsInline(true)) .WithOkColor() - .WithFooter(efb => efb.WithText("Powered by openweathermap.org").WithIconUrl($"http://openweathermap.org/img/w/{string.Join(", ", data.weather.Select(w => w.icon))}.png")); + .WithFooter(efb => efb.WithText("Powered by openweathermap.org").WithIconUrl($"http://openweathermap.org/img/w/{data.weather[0].icon}.png")); await Context.Channel.EmbedAsync(embed).ConfigureAwait(false); } @@ -217,7 +217,7 @@ namespace NadekoBot.Modules.Searches if (string.IsNullOrWhiteSpace(ffs)) return; - await Context.Channel.SendConfirmAsync(await NadekoBot.Google.ShortenUrl($"")) + await Context.Channel.SendConfirmAsync("<" + await NadekoBot.Google.ShortenUrl($"http://lmgtfy.com/?q={ Uri.EscapeUriString(ffs) }") + ">") .ConfigureAwait(false); } From 1069cb17db84e0b4c9b42f830af386623a570f60 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Thu, 16 Mar 2017 09:19:12 +0100 Subject: [PATCH 282/496] $waifuinfo will now show up to 30 random waifus, down from 40 --- src/NadekoBot/Modules/Gambling/Commands/WaifuClaimCommands.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Gambling/Commands/WaifuClaimCommands.cs b/src/NadekoBot/Modules/Gambling/Commands/WaifuClaimCommands.cs index 5605e3e6..c1d16578 100644 --- a/src/NadekoBot/Modules/Gambling/Commands/WaifuClaimCommands.cs +++ b/src/NadekoBot/Modules/Gambling/Commands/WaifuClaimCommands.cs @@ -434,7 +434,7 @@ namespace NadekoBot.Modules.Gambling .AddField(efb => efb.WithName(GetText("likes")).WithValue(w.Affinity?.ToString() ?? nobody).WithIsInline(true)) .AddField(efb => efb.WithName(GetText("changes_of_heart")).WithValue($"{affInfo.Count} - \"the {affInfo.Title}\"").WithIsInline(true)) .AddField(efb => efb.WithName(GetText("divorces")).WithValue(divorces.ToString()).WithIsInline(true)) - .AddField(efb => efb.WithName($"Waifus ({claims.Count})").WithValue(claims.Count == 0 ? nobody : string.Join("\n", claims.OrderBy(x => rng.Next()).Take(40).Select(x => x.Waifu))).WithIsInline(true)); + .AddField(efb => efb.WithName($"Waifus ({claims.Count})").WithValue(claims.Count == 0 ? nobody : string.Join("\n", claims.OrderBy(x => rng.Next()).Take(30).Select(x => x.Waifu))).WithIsInline(true)); await Context.Channel.EmbedAsync(embed).ConfigureAwait(false); } From 07a9e9788edb823eec25293c2f1815c727c79fcb Mon Sep 17 00:00:00 2001 From: Kwoth Date: Thu, 16 Mar 2017 09:47:38 +0100 Subject: [PATCH 283/496] Some debugging thingy --- src/NadekoBot/Services/Database/Models/Permission.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/NadekoBot/Services/Database/Models/Permission.cs b/src/NadekoBot/Services/Database/Models/Permission.cs index 4367cd63..fe692221 100644 --- a/src/NadekoBot/Services/Database/Models/Permission.cs +++ b/src/NadekoBot/Services/Database/Models/Permission.cs @@ -62,6 +62,7 @@ namespace NadekoBot.Services.Database.Models int Index { get; set; } } + [DebuggerDisplay("{PrimaryTarget}{SecondaryTarget} {SecondaryTargetName} {State} {PrimaryTargetId}")] public class Permissionv2 : DbEntity, IIndexed { public int? GuildConfigId { get; set; } From 7f07508c7c4e9d9afb323af50b61c18c39ee6c43 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Thu, 16 Mar 2017 12:31:57 +0100 Subject: [PATCH 284/496] Permissions bugs fixed? --- src/NadekoBot/Modules/Permissions/Permissions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Permissions/Permissions.cs b/src/NadekoBot/Modules/Permissions/Permissions.cs index 837bea9d..ce04f75c 100644 --- a/src/NadekoBot/Modules/Permissions/Permissions.cs +++ b/src/NadekoBot/Modules/Permissions/Permissions.cs @@ -161,7 +161,7 @@ namespace NadekoBot.Modules.Permissions { using (var uow = DbHandler.UnitOfWork()) { - var config = uow.GuildConfigs.For(Context.Guild.Id, set => set); + var config = uow.GuildConfigs.For(Context.Guild.Id, set => set.Include(x => x.Permissions)); config.VerbosePermissions = action.Value; await uow.CompleteAsync().ConfigureAwait(false); UpdateCache(config); From 7f7c53af3466ca5ee28984544ff9e6a5789661be Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 17 Mar 2017 16:42:08 +0100 Subject: [PATCH 285/496] Spanish added --- .../Commands/LocalizationCommands.cs | 1 + .../Resources/ResponseStrings.es-ES.resx | 2251 +++++++++++++++++ 2 files changed, 2252 insertions(+) create mode 100644 src/NadekoBot/Resources/ResponseStrings.es-ES.resx diff --git a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs index 077eeb85..86a41f7a 100644 --- a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs +++ b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs @@ -30,6 +30,7 @@ namespace NadekoBot.Modules.Administration {"pt-BR", "Portuguese, Brazil"}, {"ru-RU", "Russian, Russia"}, //{"sr-Cyrl-RS", "Serbian, Serbia - Cyrillic"} + {"es-ES", "Spanish, Spain"}, {"sv-SE", "Swedish, Sweden"}, {"tr-TR", "Turkish, Turkey" } }.ToImmutableDictionary(); diff --git a/src/NadekoBot/Resources/ResponseStrings.es-ES.resx b/src/NadekoBot/Resources/ResponseStrings.es-ES.resx new file mode 100644 index 00000000..a4bf4b50 --- /dev/null +++ b/src/NadekoBot/Resources/ResponseStrings.es-ES.resx @@ -0,0 +1,2251 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Esa base ya fue reclamada o destruida. + + + Esa base ya fue destruida. + + + Esa base no ha sido reclamada. + + + **Destruida** la base #{0} en la guerrra contra {1} + + + {0} ha **liberado** la base #{1} en la guerra contra {2} + + + {0} reclamó la base #{1} en la guerra contra {2} + + + @{0} Ya has reclamado la base #{1}. No puedes reclamar otra. + + + La reclamación de @{0} en la guerra contra {1} ha expirado. + + + Enemigo + + + Información sobre la guerra contra {0} + + + Número de base inválido. + + + No es un tamaño de guerra válido. + + + Lista de guerras activas + + + no reclamada + + + No estás participando en esa guerra. + + + @{0} No estás participando en esa guerra o esa base ya fue destruida. + + + No hay guerra activa. + + + Tamaño + + + La guerra contra {0} ya ha iniciado. + + + La guerra contra {0} ha sido creada. + + + La guerra contra {0} ha terminado. + + + Esa guerra no existe. + + + ¡La guerra contra {0} ha iniciado! + + + Las estadísticas de los comandos personalizados han sido borradas. + + + Comando personalizado eliminado + + + Insuficientes permisos. Necesitas administrar propiamente el Bot para comandos globales y ser administrador del servidor para locales. + + + Lista de todos los comandos personalizados + + + Comandos personalizados + + + Nuevo comando personalizado + + + No se ha encontrado el comando. + + + No se ha encontrado ningún comando con esa ID. + + + Respuesta + + + Estadísticas de los comandos personales + + + Estadísticas borradas para el comando personalizado {0}. + + + No se encontraron estadísticas. + + + Escribe + + + Hentai automático detenido. + + + Sin resultados. + + + {0} ya ha sido derrotado. + + + {0} ya tiene todo su HP. + + + Tu tipo ya es {0} + + + usó {0}{1} en {2}{3} y le hizo {4} de daño. + Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage. + + + ¡No puedes atacar de nuevo sin ser atacado! + + + No puedes atacarte a ti mismo. + + + ¡{0} ha sido derrotado! + + + se curó {0} con una {1} + + + {0} le queda {1} de HP. + + + No puedes usar {0}. Escribe `{1}ml` para ver la lista de movimientos que puedes usar. + + + Lista de movimientos para el tipo {0} + + + No es efectivo. + + + No tienes suficientes {0} + + + revivido {0} con una {1} + + + Te has revivido con una {0} + + + Tu tipo ha cambiado a {0} por una {1} + + + Es efectivo. + + + ¡Es superefectivo! + + + ¡Has usado muchos movimientos seguidos, así que no puedes moverte! + + + El tipo de {0} es {1} + + + No encuentro ese usuario. + + + ¡Ya no puedes continuar! + + + **Rol autoasignable** en usuarios que ingresen **desactivado**. + + + **Rol autoasignable** en usuarios que ingresen **activado**. + + + Adjuntos + + + Avatar cambiado + + + Has sido bloqueado del servidor {0}. +Razón: {1} + + + Bloqueado + PLURAL + + + Usuario bloqueado + + + Cambiado el nombre del Bot a {0} + + + Cambiado el estado del bot a {0} + + + Eliminación automática de mensajes de despedida desactivada. + + + Los mensajes de despedida serán eliminados después de {0} segundos. + + + El mensaje de despedida actual es: {0} + + + Activa los mensajes de despedida escribiendo {0} + + + Nuevo mensaje de despedida configurado. + + + Anuncio de despedida desactivado. + + + Anuncio de despedida activado en este canal. + + + Nombre del canal cambiado. + + + Nombre anterior + + + Tema del canal cambiado + + + Ordenado. + + + Contenido + + + Rol creado con éxito {0} + + + Canal de texto {0} creado. + + + Canal de voz {0} creado. + + + Ensordecimiento satisfactorio. + + + Servidor eliminado {0} + + + Detenida la eliminación automática de comandos de invocación. + + + Eliminación automática de comandos de invocación activada. + + + Canal de texto {0} eliminado. + + + Canal de voz {0} eliminado. + + + MP de + + + Añadido nuevo donador satisfactoriamente. Total donado por este usuario: {0} 👑 + + + ¡Gracias a las personas enlistadas por apoyar el proyecto! + + + Enviaré los MPs a todos los administradores. + + + Enviaré los MPs solamente al primer administrador. + + + Redirigiré los MPs desde ahora. + + + Ya no redirigiré los MPs. + + + Eliminación automática de los mensajes de bienvenida desactivada. + + + Los mensajes de bienvenida serán eliminados después de {0} segundos. + + + Actual mensaje de bienvenida por MP: {0} + + + Activa los mensajes de bienvenida por MP escribiendo {0} + + + Nuevo mensaje de bienvenida por MP configurado. + + + Anuncio de bienvenida por mensaje privado desactivado. + + + Anuncio de bienvenida por mensaje privado activado. + + + Mensaje de bienvenida actual: {0} + + + Activa los mensajes de bienvenida escribiendo {0} + + + Nuevo mensaje de bienvenida configurado. + + + Bienvenida desactivada. + + + Bienvenida activada en este canal. + + + No puedes usar este comando con usuarios que tienen un rol más alto o igual al tuyo. + + + ¡Imágenes cargadas después de {0} segundos! + + + Formato de entrada no válido. + + + Parámetros no válidos. + + + {0} ha entrado {1} + + + Has sido expulsado del servidor {0}. +Razón: {1} + + + Usuario expulsado: + + + Lista de lenguajes + + + El lenguaje local del servidor ahora es {0} - {1} + + + El lenguaje local del Bot ahora es {0} - {1} + + + Lenguaje del Bot configurado {0} - {1} + + + No pude configurar el lenguaje local. Revisa la ayuda. + + + El lenguaje del servidor fue configurado a {0} - {1} + + + {0} ha salido {1} + + + Servidor abandonado {0} + + + Registrando los eventos {0} en este canal. + + + Registrando todos los eventos en este canal. + + + Registro deshabilitado. + + + Registro de eventos a los que te puedes suscribir: + + + El registro ignorará {0}. + + + El registro no ignorará {0}. + + + El registro del {0} evento fue detenido. + + + {0} ha pedido mención de los siguientes roles: + + + Mensaje de {0} `[Administrador del Bot]`: + + + Mensaje enviado. + + + {0} movido de {1} a {2} + + + Mensaje eliminado en #{0} + + + Mensaje actualizado en #{0} + + + Silenciados. + PLURAL (users have been muted) + + + Silenciado. + singular "User muted." + + + No tengo los permisos necesarios. + + + Nuevo rol de Silenciar definido. + + + Necesito permisos de **administrador** para hacer eso. + + + Nuevo mensaje. + + + Nuevo apodo. + + + Nuevo tema. + + + Apodo cambiado. + + + No se puede encontrar ese servidor. + + + No encontré un fragmento con esa ID. + + + Mensaje anterior + Creo que "anterior" suena más acorde. + + + Apodo anterior + + + Tema anterior + + + Error. Creo que no tengo suficientes permisos. + + + Los permisos de este servidor han sido reiniciados. + + + Protecciones activas + + + {0} ha sido **desactivado** en este servidor. + + + {0} activado + + + Error. Necesito permisos para administrar roles. + + + Sin protección activada. + + + La entrada del usuario debe ser entre {0} y {1}. + + + Si {0} o más usuarios entran entre {1} segundos, los voy a {2} + + + El tiempo debe ser entre {0} y {1} segundos. + + + He removido todos los roles del usuario {0} + + + No pude mover los roles. No tengo suficientes permisos. + + + El color del rol {0} ha sido cambiado. + + + Ese rol no existe. + + + Los parámetros especificados no son válidos. + + + Error debido a un color no válido o insuficiencia de permisos. + + + He removido satisfactoriamente el rol {0} del usuario {1}. + + + No pude remover el rol. Insuficientes permisos. + + + Rol renombrado. + + + No pude renombrar el rol. No tengo suficientes permisos. + + + No puedes editar roles con más poder que el tuyo. + + + Removido el mensaje de juego: {0} + + + El rol {0} ha sido añadido a la lista. + + + No encontré {0}. + Fuzzy + + + El rol {0} ya está en la lista. + + + Añadido. + + + Rotación de estados desactivada. + + + Rotación de estado activada. + + + Aquí está la lista de rotaciones de estado: {0} + + + No hay rotaciones de estado configuradas. + + + Ya tienes el rol {0}. + + + Ya tienes el rol autoasignable exclusivo {0}. + + + Ahora los roles autoasignables son exclusivos. + + + Hay {0} roles autoasignables. + + + Ese rol no es autoasignable. + + + No tienes el rol {0}. + + + Los roles autoasignables ya no son exclusivos. + + + No puedo añadirte ese rol. No puedo añadirle roles a administradores u otros roles con rangos más altos. + + + {0} ha sido removido de la lista de roles autoasignables. + + + Ya no tienes el rol {0}. + + + Ahora tienes el rol {0}. + + + Añadido satisfactoriamente el rol {0} al usuario {1}. + + + No pude añadir el rol. Insuficientes permisos. + + + Nuevo avatar configurado. + + + Nuevo nombre del canal configurado. + + + Nuevo juego configurado. + + + Nueva transmisión configurada. + + + Nuevo tema del canal configurado. + + + Fragmento {0} reconectado. + + + Fragmento {0} reconectando. + + + Apagando + + + Los usuarios no pueden enviar más de {0} mensajes cada {1} segundos. + + + Modo lento desactivado. + + + Modo lento iniciado + + + advertido (expulsado) + PLURAL + + + {0} ignorará este canal. + + + {0} no ignorará este canal. + + + Si un usuario publica {0} el mismo mensaje rápidamente, voy a {1}. +__CanalesIgnorados__: {2} + + + Canal de texto creado. + + + Canal de texto removido. + + + Ensordecimiento removido. + + + Desilenciado + singular + + + Usuario + + + Usuario cambiado + + + Usuarios + + + Usuario bloqueado + + + {0} ha sido **silenciado** en chat. + + + {0} ahora puede escribir en el chat. + + + Usuario se unió. + + + Usuario se fue. + + + {0} ha sido **silenciado** de chat y voz. + + + Rol del usuario añadido + + + Rol del usuario removido + + + {0} ahora está {1} + + + {0} ha sido removido del mundo de los silenciados. + + + {0} ha entrado al canal de voz {1}. + + + {0} ha salido del canal de voz {1}. + + + {0} movido del canal de voz {1} a {2}. + + + {0} ha sido **silenciado de voz** + + + {0} ya puede hablar por voz. + + + Canal de voz creado + + + Canal de voz destruido + + + Desactivada la opción de voz + texto. + + + Activada la opción de voz + texto. + + + No tengo los permisos para **administrar roles** y/o **administrar canales**, así que no puedo ejecutar `voz+texto` en el servidor {0}. + + + Estás activando o desactivando esto y **no poseo permisos de administración**. Esto puede causar problemas y tendrás que arreglar los canales tú mismo después. + + + Necesito permisos para **administrar roles** y **administrar canales** para hacer esto. De preferencia permisos de Administración. + + + Usuario {0} de chat. + + + Usuario {0} de chat y voz. + + + Usuario {0} del chat de voz + + + Has sido advertido en el servidor {0}. +Razón: {1} + + + Usuario desbloqueado: + + + ¡Migración terminada! + + + Error al migrar, revisa la consola para más información. + + + Actualizaciones de presencia + + + Usuario advertido + + + le ha regalado {0} a {1} + + + Suerte la próxima. + + + ¡Felicitaciones! Ganaste {0} por sacar sobre {1} + + + Mazo reconstruido. + + + lanzó {0} + User flipped tails. + + + ¡Adivinaste! Ganas {0} + + + Número especificado no es válido. Puedes lanzar de 1 a {0} monedas. + + + Añade la reacción {0} a este mensaje para obtener {1} + + + Este evento estará activo por {0} horas. + + + ¡Inicia el evento de reacción! + + + le ha regalado {0} a {1} + X has gifted 15 flowers to Y + + + {0} tiene {1} + X has Y flowers + + + Cara + + + Marcador + + + Enviados {0} a {1} usuarios en el rol {2}. + + + No puedes apostar más de {0} + + + No puedes apostar menos de {0} + + + No tienes suficientes {0} + + + No hay más cartas en el mazo. + + + Usuario escogido: + + + Sacaste {0}. + + + Apostó + + + ¡Cielos! ¡Felicitaciones! x{0} + + + Solo una {0}, x{1} + + + ¡Guau! ¡Suertudo! ¡Tres iguales! x{0} + + + ¡Buen trabajo! Dos {0} - Apostado x{1} + + + Ganó + + + Los usuarios deben escribir un código secreto para obtener {0}. Quedan {1} segundos. No le digas a nadie. + + + El evento de Estado Escurridizo ha terminado. {0} recibieron el premio. + + + Evento de Estado Escurridizo iniciado + + + Cruz + + + le quitó {0} a {1} + + + no pudo quitarle {0} a {1} porque el usuario no tiene tal cantidad {2}. + + + Regresar a la tabla de contenidos + + + Solo el dueño del Bot. + + + Requiere {0} permisos del canal. + + + Puedes apoyar el proyecto en Patreon: <{0}> o PayPal: <{1}> + + + Comandos y alias + + + Lista de comandos regenerada. + + + Escribe `{0}h NombreDelComando` para recibir ayuda específica. Ej: `{0}h >8ball` + + + No puedo encontrar ese comando. Por favor verifica que el comando exista y trata de nuevo. + + + Descripción + + + Puedes apoyar el proyecto de NadekoBot en +Patreon <{0}> o +PayPal <{1}> +No olvides dejar tu usuario de Discord o ID en el mensaje. + +*Gracias** ♥ + + + **Lista de comandos**. <{0}> +**Las guías para albergar y documentos pueden ser encontradas aquí**: <{1}> + + + Lista de comandos + + + Lista de módulos + + + Escribe `{0}cmds NombreDelMódulo` para obtener una lista de comandos en ese módulo. Ej: `{0}cmds games` + + + Ese módulo no existe. + + + Requiere {0} permisos del servidor + + + Tabla de contenidos + + + Uso + + + Hentai automático iniciado. Publicando cada {0}s con los siguientes tags: +{1} + + + Tag + + + Carrera de animales + + + No pude iniciar la carrera porque no hay suficientes participantes. + + + ¡Todo listo! ¡Allá vamos! + + + {} entró como un {1} + + + {0} entró como un {1} y apostó {2}. + + + Escribe {0}jr para entrar en la carrera. + + + Empezaremos en 20 segundos o cuando ya no haya lugar. + + + Empezando con {0} participantes. + + + {0} como un {1} ganó la carrera. + + + {0} como {1} ganó la carrera y {2}. + + + Número especificado no válido. Puedes lanzar {0}-{1} dados a la vez. + + + sacaste {0} + Someone rolled 35 + + + Dado lanzado: {0} + Dice Rolled: 5 + + + No pude iniciar la carrera. Probablemente otra está en curso. + + + No hay carrera en este servidor. + + + El segundo número debe ser más largo que el primero. + + + Cambios de opinión + + + Reclamado por + + + Divorcios + + + Le gusta + + + Precio + + + Ninguna waifu ha sido reclamada aún. + + + Top de waifus + + + tu afinidad ya ha sido configurada hacia esa waifu o intentas remover tu afinidad sin tenerla. + + + cambió su afinidad de {0} a {1}. + +*Esto es moralmente cuestionable.* 🤔 + Make sure to get the formatting right, and leave the thinking emoji + + + Debes esperar {0} horas y {1} minutos para cambair tu afinidad otra vez. + + + Tu afinidad ha sido reiniciada. Ya no tienes una persona que te guste. + + + quiere ser la waifu de {0}. Aww <3 + + + reclamó a {0} como su waifu por {1} + + + Te has divorciado de una waifu que te quería. Monstruo sin corazón. {0} recibió {1} como compensación. + + + no puedes configurar tu afinidad hacia ti mismo, rarito. + + + 🎉 ¡Su amor es correspondido! 🎉 +¡El nuevo valor de {0} es {1}! + + + Ninguna waifu es tan barata. Debes pagar al menos {0} para obtener una waifu, aunque su valor actual sea bajo. + + + ¡Debes pagar {0} o más para reclamar esa waifu! + + + Esa waifu no es tuya. + + + No puedes reclamarte a ti mismo. + + + Te divorciaste recientemente. Debes esperar {0} horas y {1} minutos para divorciarte otra vez. + + + Nadi + + + Te has divorciado de uan waifu que no te querías. Recibes {0} de regreso. + + + Bola 8 + + + Acrofobia + + + El juego terminó sin oraciones. + + + Nadie votó. El juego ha terminado sin ganador. + + + El acrónimo era {0}. + + + Acrofobia ya se está ejecutando en este canal. + + + Inicia el juego. Crea una oración con el siguiente acrónimo: {0}. + + + Tienes {0} segundos. + + + {0} enviaron sus oraciones. ({1} en total) + + + Vota escribiendo el número correspondiente. + + + ¡{0} votaron! + + + El ganador es {0} con {1} puntos. + + + ¡{0} gana por ser el único que envió una oración! + + + Pregunta + + + ¡Empate! Ambos eligieron {0} + + + ¡{0} gana! {1} vence {2} + + + Envíos cerrados + + + La carrera de animales ya está en ejecución. + + + Total: {0} Promedio: {1} + + + Categoría + + + Cleverbot desactivado en este servidor. + + + Cleverbot activado en este servidor. + + + La regeneración ha sido desactivada en este canal. + + + La regeneración ha sido activada en este canal. + + + {0} {1} apareció. + plural + + + ¡Una {0} apareció! + + + No pue cargar la pregunta. + + + Inicia el juego + + + Juego del ahorcado iniciado + + + Un juego del ahorcado ya se está ejecutando. + + + Error iniciando el ahorcado. + + + Lista de "{0}hangman" términos: + + + Marcador + + + No tienes suficientes {0} + + + Sin resultados + + + tomó {0} + Kwoth picked 5* + + + {0} plantó {1} + Kwoth planted 5* + + + Ya se está ejecutando una trivia en este servidor. + + + Trivia + + + ¡{0} adivinó! La respuesta era: {1} + + + No se está ejecutando ninguna trivia en este servidor. + + + {0} tiene {1} puntos + + + La trivia se detendrá luego de esta pregunta. + + + ¡Tiempo! La respuesta correcta era {0} + + + ¡{0} adivinó y ganó el juego! La respuesta era: {1} + + + No puedes jugar contra ti mismo. + + + El juego de Tres en raya ya se ha iniciado en este canal. + + + ¡Empate! + + + ha creado un juego de Tres en raya. + + + ¡{0} gana! + + + Hizo coincidir tres + + + ¡No quedan más movimientos! + + + ¡Tiempo! + + + Movimiento de {0} + + + {0} vs {1} + + + Intentando añadir a la cola {0} canciones... + + + Reproducción automática desactivada. + + + Reproducción automática activada. + + + El volumen por defecto configurado en {0}% + + + Directorio completo + + + Juego sucio + + + Canción finalizada + + + Juego sucio desactivado. + + + Juego sucio activado. + + + De la posición + + + ID + + + Entrada no válida. + + + Tiempo de reproducción sin límite. + + + Tiempo de reproducción máximo configurado en {0} segundo(s). + + + Tamaño máximo de la cola configurada en ilimitado. + + + Tamaño máximo de la cola configurado en {0} pista(s). + + + Tienes que estar en un canal de voz. + + + Nombre + + + Reproduciendo + + + No hay reproducción activa. + + + Sin resultados. + + + Música pausada. + + + Cola - Página {0}/{1} + + + Reproduciendo + + + `#{0}` - **{1}** por *{2}* ({3} canciones) + + + Página {0} de listas de reproducción guardadas. + + + Lista de reproducción eliminada. + + + No pude eliminar esa lista. O no existe, o no eres el autor. + + + No existe una lista con tal ID. + + + Cola de lista de reproducción completa. + + + Lista de reproducción guardada + + + Límite de {0} + + + Cola. + + + Canción en cola. + + + Se eliminó la cola de música. + + + La cola está llena con {0}. + + + Canción eliminada: + context: "removed song #5" + + + Repitiendo la canción actual + + + Repitiendo lista de reproducción + + + Repitiendo pista + + + Repetición de la pista actual detenida. + + + Reproducción resumida + + + Repetición de listas de reproducción desactivada. + + + Repetición de listas de reproducción activada. + + + Desde ahora publicaré la reproducción, finalización, pausa y eliminación de canciones en este canal. + + + Saltado a `{0}:{1}` + + + Canciones reorganizadas. + + + Canción movida + + + {0}h {1}m {2}s + + + A la posición + + + ilimitada + + + El volumen debe ser entre 0 y 100. + + + Volumen definido en {0}% + + + Desactivado el uso de todos los módulos en el canal {0}. + + + Activado el uso de todos los módulos en el canal {0}. + + + Permitido + + + Desactivado el uso de todos los módulos para el rol {0}. + + + Activado el uso de todos los módulos para el rol {0}. + + + Desactivado el uso de todos los módulos en este servidor. + + + Activado el uso de todo los módulos en este servidor. + + + Desactivado el uso de todos los módulos para el usuario {0}. + + + Activado el uso de todos los módulos para el usuario {0}. + + + Enviado a la lista negra a: {0} con la ID: {1} + + + El comando {0} ahora tiene {1} de enfriamiento. + + + El comando {0} ya no se está enfriando y todos los tiempos de enfriamiento han sido reiniciados. + + + No se ha configurado tiempo de enfriamiento. + + + Costo del comando + + + Desactivado el uso de {0} {1} en el canal {2}. + + + Activado el uso de {0} {1} en el canal {2}. + + + Prohibido + + + Se ha añadido la palabra {0} a la lista de groserías. + + + Lista de palabras filtradas + + + Removida la palabra {0} de la lista de palabras filtradas. + + + Segundo parámetro no válido. (Debe ser un número entre {0} y {1}) + + + Filtro de invitaciones desactivado en este canal. + + + Filtro de invitaciones activado en este canal. + + + Filtro de invitaciones desactivado en este servidor. + + + Filtro de invitaciones activado en este servidor. + + + Permiso {0} movido de #{1} a #{2} + + + No puedo encontrar el permiso en #{0} + + + No hay costo configurado. + + + comando + Gen (of command) + + + módulo + Gen. (of module) + + + Página de permisos {0} + + + El rol de permisos actual es {0} + + + Los usuarios ahora requieren el rol {0} para editar permisos. + + + No se encontraron permisos. + + + permisos removidos #{0} - {1} + + + Desactivado el uso de {0} {1} para el rol {2}. + + + Activado el uso de {0} {1} para el rol {2}. + + + seg. + Short of seconds. + + + Desactivado el uso de {0} {1} en este servidor. + + + Activado el uso de {0} {1} en este servidor. + + + Removido de la lista negra a: {0} con la ID: {1} + + + ineditable + + + Desactivado el uso de {0} {1} para el usuario {2}. + + + Activado el uso de {0} {1} para el usuario {2}. + + + No mostraré más advertencias de permisos. + + + Desde ahora mostraré las advertencias de permisos. + + + Filtro de groserías activado en este canal. + + + Filtro de groserías activado en este canal. + + + Filtro de groserías desactivado en este servidor. + + + Filtro de groserías activado en este servidor. + + + Habilidades + + + No tiene anime favorito aún + + + Iniciada la traducción automática de mensajes en este canal. Los mensajes del usuario serán eliminados automáticamente. + + + tu lenguaje de traducción automática ha sido removido. + + + Tu lenguaje de traducción automática ha sido configurado a {0}>{1} + + + Iniciada la traducción automática de mensajes en este canal. + + + Detenida la traducción automática de mensajes en este canal. + + + Mal formato o algo salió mal. + + + No encontré esa carta. + + + hecho + + + Capítulos + + + Cómic # + + + Pérdidas en competitivo + + + Juegos en competitivo + + + Rango en competitivo + + + Victorias en competitivo + + + Completada + + + Condición + + + Costo + + + Fecha + + + Defininir: + + + Eliminadas + + + Episodios + + + Ocurrió un error. + + + Ejemplo + + + No encontré ese anime. + + + No encontré ese manga. + + + Géneros + + + No encontré una definición para ese tag. + + + Altura/Peso + + + {0}m/{1}kg + + + Humedad + + + Búsqueda de imagen para: + + + No encontré esa película. + + + Fuente o lenguaje no válido. + + + No se cargaron las bromas. + + + Lat/Long + + + Nivel + + + Lista de tags en {0}place + Don't translate {0}place + + + Locación + + + Objetos mágicos no cargados. + + + Perfil de MAL de {0} + + + El dueño del Bot no especificó una clave MashapeApi. No puedes usar esto. + + + Mín/Máx + + + No encontré ese canal. + + + Sin resultados. + + + En espera + + + Original + + + Se requiere una clave de API de osu! + + + No pude encontrar esa firma de osu! + + + Encontré alrededor de {0} imágenes. Mostrando {0} aleatorias. + + + ¡Usuario no encontrado! Por favor revisa la región y BattleTag antes de intentar de nuevo. + + + Planeadas + + + Plataforma + + + No encontré tal habilidad. + + + No encontré ese Pokémon. + + + Enlace al perfil: + + + Atributo: + + + Reproducción rápida: + + + Victorias rápidas + + + Rating + + + Puntuación: + + + Búsqueda para: + + + No pude acortar ese enlace. + + + Acortada + + + Algo salió mal. + + + Por favor especifica parámetros de búsqueda. + + + Estado + + + Depósito de enlace + + + El usuario {0} está desconectado. + + + El usuario {0} está en línea con {1} espectadores. + + + Estás siguiendo {0} transmisiones en este servidor. + + + No estás siguiendo ninguna transmisión en este servidor. + + + No existe esa transmisión. + + + La transmisión probablemente no existe. + + + Removida la transmisión de {0} ({1}) de las notificaciones. + + + Notificaré en este canal cuando el estado cambie. + + + Salida del sol + + + Puesta del sol + + + Temperatura + + + Título: + + + Top 3 de anime favoritos: + + + Traducción: + + + Tipos: + + + No pude encontrar una definición para ese término. + + + Enlace + + + Espectadores + + + Mirando + + + No pude encontrar ese término en la Wikia especificada. + + + Por favor ingresa la Wikia seguido por el término de búsqueda. + + + Página no encontrada. + + + Velocidad del viento + + + Los {0} campeones bloqueados + + + No pude yodificar tu oración + + + Entró + + + `{0}.` {1} [{2:F2}/s] - {3} en total + /s and total need to be localized to fit the context - +`1.` + + + Página de actividad #{0} + + + {0} usuarios en total. + + + Autor + + + ID del Bot + + + Lista de funciones en el comando {0}calc + + + {0} de este canal es {1} + + + Tema del canal + + + Comandos ejecutados + + + {0} {1} es igual a {2} {3} + + + Unidades que pueden ser usadas por el conversor + + + No pude convertir {0} a {1}: Unidades no encontradas + + + No pude convertir {0} a {1}: el tipo de unidad no es igual + + + Creada el + + + Entró al canal del cruce de servidor. + + + Salió del canal del cruce de servidor. + + + Este es tu token CSC + + + Emoticones personales + + + Error + + + Características + + + ID + + + Entrada fuera de rango + + + Lista de usuarios en el rol {0} + + + No tienes permitido usar este comando en roles con muchos usuarios para prevenir abuso. + + + Valor {0} no válido. + Invalid months value/ Invalid hours value + + + Ingresó a Discord + + + Ingresó al servidor + + + ID: {0} +Miembros: {1} +ID del admin: {2} + + + No encontré servidores en esa página. + + + Lista de repetidores + + + Miembros + + + Memoria + + + Mensajes + + + Repetidor de mensajes + + + Nombre + + + Apodo + + + Nadie está jugando eso. + + + No hay repeticiones activas + + + No hay roles en esta página. + + + No hay fragmentos en esta página. + + + No hay tema configurado. + + + Administrador + + + ID del administrador + + + En + + + {0} servidores +{2} canales de texto +{2} canales de voz + + + Eliminadas todas las citas con la palabra clave {0} + + + Página {0} de citas + + + No hay citas en esta página + + + No hay citas que puedas remover + + + Cita añadida + + + Cita #{0} eliminada. + + + Región + + + Registrado el + + + Le recordaré a {0} que {1} en {2} `({3:d.M.yyyy.} a las {4:HH:mm})` + + + Formato de tiempo no válido. Revisa la lista de comandos. + + + Nueva plantilla de recordatorio configurada. + + + Repitiendo {0} cada {1} día(s), {2} hora(s) y {3} minuto(s). + + + Lista de repeticiones + + + No hay repetidores ejecutándose. + + + #{0} detenido. + + + No hay repeticiones de mensajes en este servidor. + + + Resultado + + + Roles + + + Página #{0} de todos los roles en este servidor. + + + Página #{0} de roles para {1} + + + Los colores no están en el formato correcto. Usa `#00ff00` por ejemplo. + + + Iniciada la rotación de colores para el rol {0}. + + + Detenida la rotación de colores para el rol {0} + + + {0} de este servidor es {1} + + + Información del servidor + + + Fragmento. + + + Estadísticas del fragmento. + + + Fragmento **#{0}** está en estado {1} con {2} servidores. + + + **Nombre:** {0} **Enlace:** {1} + + + No encontré emoticones especiales. + + + Reproduciendo {0} canciones, {1} en cola. + + + Canales de texto + + + Aquí está el enlace a tu cuarto: + + + Tiempo en línea + + + {0} del usuario {1} es {2} + Id of the user kwoth#1234 is 123123123123 + + + Usuarios + + + Canales de voz + + + ¡Ya entraste a esta carrera! + + + Resultados de la encuesta + + + Sin votos. + + + Ya hay una encuesta en ejecución. + + + 📃 {0} ha creado una encuesta que requiere de tu atención. + + + `{0}.` {1} con {2} votos. + + + {0} votó. + Kwoth voted. + + + Envíame un mensaje privado con el número correspondiente a la respuesta. + + + Envía un mensaje aquí con el número correspondiente a la respuesta. + + + Gracias por votar, {0} + + + {0} votos totales. + + + Atrápala escribiendo `{0}pick` + + + Atrápala escribiendo `{0}pick` + + + No encontré ese usuario. + + + página {0} + + + debes estar en un canal de voz. + + + No hay roles para el canal de voz. + + + {0} ha sido **silenciado** de chat y voz por {1} minutos. + + + Los usuarios que entren al canal de voz {0} obtendrán el rol {1}. + + + Los usuarios que entren al canal de voz {0} ya no obtendrán un rol. + + + Roles para el canal de voz + + + \ No newline at end of file From a60f0bb1e9aed8a5211a3108e8e4de3d69dc77c6 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Fri, 17 Mar 2017 16:43:28 +0100 Subject: [PATCH 286/496] Update ResponseStrings.zh-CN.resx (POEditor.com) From 6ec32045d3a216ba38abc86673ba65ba1748fc34 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Fri, 17 Mar 2017 16:43:30 +0100 Subject: [PATCH 287/496] Update ResponseStrings.zh-TW.resx (POEditor.com) --- .../Resources/ResponseStrings.zh-TW.resx | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx b/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx index 74edb3a9..f299b7f2 100644 --- a/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx +++ b/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx @@ -803,7 +803,7 @@ 成員身分組已移除 - {0} 改名為 {1} + {0} 現在 {1} 已**開放** {0} 的__文字和語音聊天__。 @@ -1340,10 +1340,10 @@ Paypal <{1}> 正在排 {0} 首歌... - 已停用自動撥放。 + 已停用自動播放。 - 已啟用自動撥放。 + 已啟用自動播放。 預設音量設定為 {0}％ @@ -1352,10 +1352,10 @@ Paypal <{1}> 目錄載入完成。 - 公平撥放 + 公平播放 - 完成撥放 + 完成播放 停用公平播放。 @@ -1379,10 +1379,10 @@ Paypal <{1}> 每首音樂最長長度設定為{0}秒。 - 撥放清單大小現在沒有限制了。 + 播放清單大小現在沒有限制了。 - 撥放清單最多可以排序{0}首。 + 播放清單最多可以排序 {0} 首。 你必須要進入在此伺服器上的語音頻道。 @@ -1391,19 +1391,19 @@ Paypal <{1}> 名稱 - 正在撥放 + 正在播放 - 沒有正在運行中的撥放器。 + 沒有正在運行中的播放器。 沒有搜尋結果。 - 暫停撥放音樂。 + 暫停播放音樂。 - 撥放清單 - 第 {0} / {1} 頁 + 播放清單 - 第 {0} / {1} 頁 正在播放 @@ -1412,22 +1412,22 @@ Paypal <{1}> `#{0}` - **{1}** by *{2}* ({3}首歌) - 已儲存的撥放清單第 {0} 頁 + 已儲存的播放清單第 {0} 頁 - 撥放清單已刪除。 + 播放清單已刪除。 刪除清單失敗。清單要不是不存在，或你不是該清單的作者。 - 此撥放清單代號並不存在。 + 此播放清單代號並不存在。 - 撥放清單載入完成。 + 播放清單載入完成。 - 撥放清單已儲存 + 播放清單已儲存 {0} 秒限制 @@ -1449,34 +1449,34 @@ Paypal <{1}> context: "removed song #5" - 重複撥放目前歌曲 + 重複播放目前歌曲 - 重複撥放目前清單 + 重複播放目前清單 重複曲目 - 停止重複撥放目前歌曲。 + 停止重複播放目前歌曲。 - 繼續撥放音樂。 + 繼續播放音樂。 - 停用重複撥放清單 + 停用重複播放清單 - 啟用重複撥放清單。 + 啟用重複播放清單。 - 我將在此頻道輸出撥放、暫停、結束和移除的歌曲。 + 我將在此頻道輸出播放、暫停、結束和移除的歌曲。 跳至 ‘{0}:{1}’ - 隨機撥放 + 隨機播放 歌曲移至 @@ -2035,7 +2035,7 @@ Paypal <{1}> 成員 - 記憶 + 記憶體 訊息 @@ -2169,7 +2169,7 @@ Paypal <{1}> 找不到特殊的表情符號。 - 撥放 {0} 首歌，{1} 首已排序。 + 正在播放 {0} 首歌，{1} 首已點播。 文字頻道 From 0beac938e95c6fba9cfe161379eb03450d935231 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Fri, 17 Mar 2017 16:43:33 +0100 Subject: [PATCH 288/496] Update ResponseStrings.nl-NL.resx (POEditor.com) --- src/NadekoBot/Resources/ResponseStrings.nl-NL.resx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.nl-NL.resx b/src/NadekoBot/Resources/ResponseStrings.nl-NL.resx index 7c8f1723..9b49d118 100644 --- a/src/NadekoBot/Resources/ResponseStrings.nl-NL.resx +++ b/src/NadekoBot/Resources/ResponseStrings.nl-NL.resx @@ -152,7 +152,8 @@ Ongeldige basis nummer - Ongeldige oorlogs formaat. + Ongeldig oorlogs +formaat. Fuzzy From 08808730f849d96aeef7a49d96e4f9ab419c1ee5 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Fri, 17 Mar 2017 16:43:36 +0100 Subject: [PATCH 289/496] Update ResponseStrings.en-US.resx (POEditor.com) From d5c049ba90ec1ba2209f95a9c48c6d6885cf162b Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Fri, 17 Mar 2017 16:43:38 +0100 Subject: [PATCH 290/496] Update ResponseStrings.fr-FR.resx (POEditor.com) --- .../Resources/ResponseStrings.fr-FR.resx | 41 +++++++++---------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.fr-FR.resx b/src/NadekoBot/Resources/ResponseStrings.fr-FR.resx index c061305e..a6a0fa29 100644 --- a/src/NadekoBot/Resources/ResponseStrings.fr-FR.resx +++ b/src/NadekoBot/Resources/ResponseStrings.fr-FR.resx @@ -476,8 +476,7 @@ Raison : {1} Fuzzy - Listes des langues -{0} + Listes des langues Fuzzy @@ -673,20 +672,20 @@ Raison : {1} Le rôle {0} est déjà présent dans la liste. - Ajouté. + Ajouté - Rotation du statut de jeu désactivée. + Alternance du statut de jeu désactivé. - Rotation du statut de jeu activée. + Alternance du statut de jeu activé. - Voici une liste des rotations de statuts : + Liste des statuts alternants: {0} - Aucune rotation de statuts en place. + Aucun statut alternant défini. Vous avez déjà le rôle {0}. @@ -1164,7 +1163,7 @@ N'oubliez pas de mettre votre nom discord ou ID dans le message. Top Waifus - votre affinité est déjà liée à cette waifu ou vous êtes en train de retirer votre affinité avec quelqu'un alors que vous n'en possédez pas. + Votre affinité est déjà liée à cette waifu ou vous êtes en train de retirer votre affinité avec quelqu'un alors que vous n'en possédez pas. Affinités changées de de {0} à {1}. @@ -1176,16 +1175,16 @@ N'oubliez pas de mettre votre nom discord ou ID dans le message. Vous devez attendre {0} heures et {1} minutes avant de pouvoir changer de nouveau votre affinité. - Votre affinité a été réinitialisée. Vous n'avez désormais plus la personne que vous aimez. + Votre affinité a été réinitialisée. Vous n'aimez plus personne désormais. veut être la waifu de {0}. Aww <3 - a revendiqué {0} comme sa waifu pour {1} + a revendiqué {0} comme sa waifu pour {1}! - Vous avez divorcé avec une waifu qui vous aimais. Monstre sans cœur. {0} a reçu {1} en guise de compensation. + Vous avez divorcé d'une waifu qui vous aimait. Monstre sans cœur. {0} a reçu {1} en guise de compensation. vous ne pouvez pas vous lier d'affinité avec vous-même, espèce d'égocentrique. @@ -1309,7 +1308,7 @@ Fuzzy Partie de pendu commencée. - Une partie de pendu est déjà en cours sur ce canal. + Une partie de pendu est déjà en cours sur ce salon. Initialisation du pendu erronée. @@ -2104,7 +2103,7 @@ Fuzzy Index hors limites. - Voici une liste des utilisateurs dans ces rôles : + Liste des utilisateurs ayant le rôle {0}: Fuzzy @@ -2168,7 +2167,7 @@ OwnerID: {2} Ne pas confondre Shard et Shared ;) Dans discord, le mot shard n'a pas d'équivalent francophone. - Aucun sujet choisi. + Aucun sujet défini. Propriétaire @@ -2251,10 +2250,10 @@ OwnerID: {2} Aucune couleur n'est dans le bon format. Utilisez `#00ff00` par exemple. - Couleurs alternées pour le rôle {0} activées. + Alternance de couleurs pour le rôle {0} activée. - Couleurs alternées pour le rôle {0} arrêtées + Alternance de couleurs pour le rôle {0} désactivée. {0} de ce serveur est {1} @@ -2353,22 +2352,22 @@ Fuzzy page {0} - Vous devez être sur un canal vocal sur ce serveur. + Vous devez être sur un salon vocal sur ce serveur. - Il n'y a pas de rôle de canal vocal. + Il n'y a pas de rôle de salon vocal. {0} est désormais **muet** du chat textuel et vocal pour {1} minutes. - Les utilisateurs rejoignant le canal vocal {0} obtiendrons le rôle {1}. + Les utilisateurs rejoignant le salon vocal {0} obtiendront le rôle {1}. - Les utilisateurs rejoignant le canal vocal {0} n’obtiendrons plus de rôle. + Les utilisateurs rejoignant le salon vocal {0} n’obtiendront plus de rôle. - Rôles du canal vocal + Rôles du salon vocal \ No newline at end of file From a4411f24c6946bbfee287b666924dc1e80a6c0cb Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Fri, 17 Mar 2017 16:43:41 +0100 Subject: [PATCH 291/496] Update ResponseStrings.de-DE.resx (POEditor.com) From 79ea4c8270d145220a08f441b6238e6e8f1c4104 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Fri, 17 Mar 2017 16:43:44 +0100 Subject: [PATCH 292/496] Update ResponseStrings.ja-JP.resx (POEditor.com) --- .../Resources/ResponseStrings.ja-JP.resx | 129 +++++++++--------- 1 file changed, 65 insertions(+), 64 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.ja-JP.resx b/src/NadekoBot/Resources/ResponseStrings.ja-JP.resx index cd347e9f..b4c12bf6 100644 --- a/src/NadekoBot/Resources/ResponseStrings.ja-JP.resx +++ b/src/NadekoBot/Resources/ResponseStrings.ja-JP.resx @@ -227,7 +227,7 @@ - カスタム反応が見つかりませんでした。 + カスタムリアクションが見つかりませんでした。 Fuzzy @@ -710,7 +710,7 @@ Fuzzy - + エラー。管理権限が必要です。 保護は有効になっていません。 @@ -898,13 +898,13 @@ Fuzzy - + 低速モードは無効です。 - + 低速モードが初期化しました。 - + ソフトバン（キック） PLURAL @@ -928,7 +928,7 @@ Fuzzy - + ミュート解除 singular @@ -1056,8 +1056,7 @@ Fuzzy 存在の更新 - And this is where using exiled screws me over.. again lol - + ユーザはソフトバン Fuzzy @@ -1273,16 +1272,16 @@ Paypal <{1}> - + アニマルレース - + 十分な参加者がいなかったのでスタートできませんでした。 - + レースは満員になりました。すぐにスタートします。 - + {0} は {1} として参加しました。 @@ -1291,10 +1290,10 @@ Paypal <{1}> - + 部屋がいっぱいになるか、20秒後にスタートします。 - + {0} 人の参加者でスタートします。 @@ -1303,24 +1302,25 @@ Paypal <{1}> - + 数が正しくありません。一度に {0}-{1} のダイスを触れます。 - + ロール状{0} + Someone rolled 35 - + サイコロ振りました。: {0} Dice Rolled: 5 - + レーズが開始できませんでした。他のレースが行われているかもしれません。 - + このサーバーでは、どのレースも存在していません。 - + 最初の数よりも２番めの数が大きくなければなりません。 @@ -1393,7 +1393,7 @@ Paypal <{1}> - + エイトボール @@ -1420,7 +1420,7 @@ Paypal <{1}> - + 数字を入力して投票 @@ -1432,7 +1432,7 @@ Paypal <{1}> - + 質問 @@ -1450,13 +1450,13 @@ Paypal <{1}> - + カテゴリー - + このサーバーではCleverbotが有効です。 @@ -1469,22 +1469,22 @@ Paypal <{1}> plural - + ランダム {0} が出現！ - + 質問のロードに失敗しました。 - + ゲームが始まりました。 - + ハングマンゲームが始まりました。 - + ハングマンゲームはすでにこのチャンネルで開始されています。 - + ハングマンのスタート時にエラーが起きました。 @@ -1537,13 +1537,13 @@ Paypal <{1}> - + 引き分け - + {0} の勝ち！ @@ -1564,16 +1564,16 @@ Paypal <{1}> - + オートプレイは無効です。 - + オートプレイは有効です。 - + デフォルトの音量を{0}% にしました。 - + ディレクトリのキューが完了しました。 @@ -1598,19 +1598,19 @@ Paypal <{1}> - + 最大再生時間は制限ありません。 - + 最大再生時間を {0} 秒にセットしました。 - + 最大の音楽キューサイズを無制限にしました。 - + 最大の音楽キューサイズを {0} トラックに設定しました。 - + このサーバーのボイスチャンネルにいる必要があります。 曲名 @@ -1620,56 +1620,56 @@ Paypal <{1}> Fuzzy - + アクティブな音楽再生がありません。 検索結果なし - + 音楽の再生を一時停止します。 - + キュー　Page {0}/{1} - + 音楽を再生しています。 - + `#{0}` - **{1}** by *{2}* ({3} 曲) - + 保存されたリストの {0} ページ目 - + プレイリストは削除されました。 - + プレイリストの削除に失敗しました。存在しないか、権限がありません。 - + そのIDのプレイリストは存在しません。 - + プレイリストのキューは完了しました。 - + プレイリストを保存しました。 - + {0} の上限です 次に聞く曲一覧 - + キューに追加した曲 Does this mean "the song was added to the queue" ? - + キューの音楽はクリアされました。 - + キュー( {0}/{0} ) はいっぱいです。 @@ -1733,28 +1733,29 @@ Paypal <{1}> - + 役割 {0}　のすべてのモジュールの使用は無効になりました。 - + 役割 {0}　のすべてのモジュールの使用は有効になりました。 - + このサーバーのすべてのモジュールの使用が無効になりました。 - + このサーバーのすべてのモジュールの使用が有効になりました。 - + ユーザー {0} へのすべてのモジュールの使用を無効にしました。 - + ユーザー {0} へのすべてのモジュールの使用を有効にしました。 - + {0} (ID {1})をブラックリストに登録しました。 + Cooldown? From e8ec73306ea0bdc66951db69ea425ba22bb45441 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Fri, 17 Mar 2017 16:43:46 +0100 Subject: [PATCH 293/496] Update ResponseStrings.nb-NO.resx (POEditor.com) --- src/NadekoBot/Resources/ResponseStrings.nb-NO.resx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.nb-NO.resx b/src/NadekoBot/Resources/ResponseStrings.nb-NO.resx index db86bfe2..e634ce06 100644 --- a/src/NadekoBot/Resources/ResponseStrings.nb-NO.resx +++ b/src/NadekoBot/Resources/ResponseStrings.nb-NO.resx @@ -2287,22 +2287,22 @@ Eier ID: {2} side {0} - + Du må være i en talekanal på denne serveren - + Det finnes ingen stemmekanal-roller - + {0} har blitt **dempet** fra tekst og tale i {1} minutt(er) - + Brukere som blir med i talekanalen {0} får rollen {1}. - + Brukere som blir med i talekanalen {0} får ikke lenger noen rolle. - + Stemmekanal-roller \ No newline at end of file From 0811ae7454d2c8b480da6f47c96e8bb5fa42dafa Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Fri, 17 Mar 2017 16:43:49 +0100 Subject: [PATCH 294/496] Update ResponseStrings.pl-PL.resx (POEditor.com) --- .../Resources/ResponseStrings.pl-PL.resx | 89 ++++++++++--------- 1 file changed, 46 insertions(+), 43 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.pl-PL.resx b/src/NadekoBot/Resources/ResponseStrings.pl-PL.resx index ca2d82dc..62b2df49 100644 --- a/src/NadekoBot/Resources/ResponseStrings.pl-PL.resx +++ b/src/NadekoBot/Resources/ResponseStrings.pl-PL.resx @@ -191,13 +191,13 @@ Wojna przeciwko {o} zaczęła się! - + Wszystkie statystyki niestandardowych reakcji zostały wyczyszczone. Własne reakcje zostały usunięte - + Niewystarczające uprawnienia. Wymagane są uprawnienia właściciela dla globalnych niestandardowych reakcji oraz uprawnienia administratora dla niestandardowych reakcji na serwerze. Lista własnych reakcji @@ -218,7 +218,7 @@ Odpowiedź - + Statystyki niestandardowych reakcji @@ -416,7 +416,8 @@ Powód: {1} Od teraz nie będę wysyłać prywatnych wiadomości. - + Automatyczne usuwanie wiadomości powitalnych zostało wyłączone. + Wiadomości powitalne będą usuwane po {0} sekundach. @@ -458,10 +459,10 @@ Powód: {1} Obrazki załadowane po {0} sekundach. - + Niepoprawny format zmiennej. - + Niepoprawne parametry. {0} dołączył do {1} @@ -1086,16 +1087,16 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Zaczyna z {0} uczestnikami. - {0} jako {1} wygrał wyścig! + {1} czyli {0} wygrał wyścig! - {0} jako {1} wygrał wyścig i {2}! + {1} czyli {0} wygrał wyścig i {2}! - + wyrzucono {0} Someone rolled 35 @@ -1186,7 +1187,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Rozwiodłeś się z waifu, która cię nie lubi. W zamian dostałeś {0}. - + Magiczna kula nr 8 @@ -1195,10 +1196,10 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + Brak głosów. Gra zakończyła się bez zwycięzcy. - + Akronim to {0}. @@ -1252,10 +1253,10 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Włączono cleverbota na tym serwerze. - + Generowanie przychodów zostało wyłączone na tym kanale. - + Generowanie przychodów zostało włączone na tym kanale. @@ -1334,7 +1335,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Remis! - + stworzył grę w kółko i krzyżyk. {0} wygrał! @@ -1388,7 +1389,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś ID - + Niepoprawna zmienna. Maksymalny czas grania ustawiony na: bez limitu. @@ -1418,7 +1419,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Brak wyników - + Odtwarzanie muzyki wstrzymane. @@ -1479,7 +1480,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Powtarzanie aktualnego utworu zatrzymane. - + Odtwarzanie muzyki wznowione. Powtarzanie playlisty wyłączone. @@ -1521,7 +1522,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Włączono użycie WSZYSTKICH MODÓŁÓW na kanale {0}. - + Dozwolone Wyłączono użycie WSZYSTKICH MODÓŁÓW dla roli {0}. @@ -1671,7 +1672,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Zdolności - Brak ulubionego zwierzęcia + Brak ulubionego anime Zaczęto automatyczne tłumaczenie wiadomości na tym kanale. Wiadomości użytkowników będą automatycznie usuwane. @@ -1701,7 +1702,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Rozdziały - + Komiks # Przegrane rywalizacje @@ -1728,7 +1729,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Data - + Zdefiniuj: @@ -1837,7 +1838,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + Link profilowy: @@ -1849,13 +1850,13 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + Ocena - + Wynik: - + Szukaj: Skracanie tego url'u nie powiodło się @@ -1870,7 +1871,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + Status @@ -1909,7 +1910,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Temperatura - + Tytuł: 3 ulubione anime: @@ -1927,7 +1928,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Url - + Widzowie: @@ -1965,7 +1966,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + Autor ID bota @@ -1977,7 +1978,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + Temat kanału @@ -1995,7 +1996,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + Stworzono w @@ -2007,13 +2008,13 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + Niestandardowe emotikony Błąd - + Funkcje ID @@ -2038,7 +2039,9 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Dołączył do serwera - + ID: {0} +Członkowie: {1} +ID właściciela: {2} Nie znaleziono serwerów na tej stronie. @@ -2127,7 +2130,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + Powtarzanie {0} co {1} dni, {2} godzin i {3} minut. @@ -2136,7 +2139,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + #{0} zatrzymany. @@ -2221,10 +2224,10 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + `{0}.` {1} z {2} głosami. - + {0} głosów. Kwoth voted. @@ -2252,22 +2255,22 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + Musisz znajdować się w kanale głosowym na tym serwerze. - + {0} został **wyciszony** w kanałach tekstowych oraz głosowych na {1} minut. - + Użytkownicy którzy dołączą do kanału głosowego {0} , otrzymają rolę {1}. - + Uprawnienia kanału głosowego \ No newline at end of file From d570e7c7bda8c550bd29e83690cf335849fc07ae Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Fri, 17 Mar 2017 16:43:51 +0100 Subject: [PATCH 295/496] Update ResponseStrings.pt-BR.resx (POEditor.com) --- .../Resources/ResponseStrings.pt-BR.resx | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx b/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx index 40aa59b7..147fd952 100644 --- a/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx +++ b/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx @@ -2327,34 +2327,34 @@ OwnerID: {2} Total de {0} votos proferidos. - + Pegue digitando `{0}pick` - + Pegue digitando `{0}pick` - + Nenhum usuário encontrado. - + Página {0} - + Você deve estar em um canal de voz neste servidor. - + Não há cargos de canais de voz. - + {0} foi **mutado** nos chats de texto e voz por {1} minutos. - + Usuários que entrarem no canal de voz {0} receberão o cargo {1}. - + Usuários que entrarem no canal de voz {0} não irão mais receber um cargo. - + Cargos de canais de voz \ No newline at end of file From 1846dc167966e753edf65f39bc0a2540011d04fe Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Fri, 17 Mar 2017 16:43:54 +0100 Subject: [PATCH 296/496] Update ResponseStrings.ru-RU.resx (POEditor.com) From f2fa6e1032638f4228159a28bbfc763db9903978 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Fri, 17 Mar 2017 16:43:57 +0100 Subject: [PATCH 297/496] Update ResponseStrings.sr-cyrl-rs.resx (POEditor.com) --- .../Resources/ResponseStrings.sr-cyrl-rs.resx | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx b/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx index e444eee6..17eb5bdc 100644 --- a/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx +++ b/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx @@ -127,7 +127,7 @@ Та база није под захтевом. - **DESTROYED** base #{0} in a war against {1} + **УНИШТЕНА** база #{0} у рату против {1} {0} је **ПОНИШТИО ЗАХТЕВ** за базу #{1} у рату против {2} @@ -1174,10 +1174,10 @@ Lasts {1} seconds. Don't tell anyone. Shhh. хоће да буде waifu од {0} - + је присвојио {0} као своју waifu за {1}! - + Развео си waifu којој се свиђаш. Душмане! {0} је добио {1} као компензацију. не можеш ставити афинитет на себе, егоманијаче. @@ -1415,7 +1415,7 @@ Lasts {1} seconds. Don't tell anyone. Shhh. Максимални плејтајм више нема лимит. - + Максимално време пуштања је сада {0} секунди. Максимална величина реда је неограничена. @@ -1509,7 +1509,7 @@ Lasts {1} seconds. Don't tell anyone. Shhh. Понављање плејлисте је упаљено. - + Исписиваћу поруке за почетак, крај, паузу и брисање песме у овом каналу. Прескочено на `{0}:{1}` @@ -1563,7 +1563,7 @@ Lasts {1} seconds. Don't tell anyone. Shhh. Укључено коришћење СВИХ МОДУЛА за корисника {0}. - + {0} сa ИДем {1} је стављен на црну листу. Команда {0} сада има {1}с кулдаун. @@ -1659,7 +1659,7 @@ Lasts {1} seconds. Don't tell anyone. Shhh. Укључено коришћење {0} {1} на овом серверу. - + {0} сa ИДем {1} је скинут са црне листе. неизмењиво @@ -1725,13 +1725,13 @@ Lasts {1} seconds. Don't tell anyone. Shhh. Стрип # - + Такмичарских партија изгубљено - + Такмичарских партија играно - + Такмичарски ранг Такмичних победа @@ -1803,7 +1803,7 @@ Lasts {1} seconds. Don't tell anyone. Shhh. Ниво - + Листа {0}place тагова Don't translate {0}place @@ -2019,10 +2019,10 @@ Lasts {1} seconds. Don't tell anyone. Shhh. Направљен - + Прикључен у међусерверни канал. - + Међусерверни канал напуштен. Ово је твој CSC токен @@ -2150,7 +2150,7 @@ Lasts {1} seconds. Don't tell anyone. Shhh. Fuzzy - + Подсетићу {0} да {1} у {2} `({3:d.M.yyyy.} at {4:HH:mm})` Није исправан формат времена. Проверите листу команди. @@ -2280,25 +2280,25 @@ Lasts {1} seconds. Don't tell anyone. Shhh. Покупите их куцајући `{0}pick` - + Покупи тако што укуцаш `{0}pick` - + Нема корисника. - + страница {0} - + Мораш бити у гласовном каналу на овом серверу. - + Нема рола за говорне канале. - + {0} је **занемљен** из текстовних и гласовних канала на {1} минута. - + Корисници који уђу у говорни канал {0} ће добити ролу {1}. From 5474a9761407cfcdd2d2420eff57739cf2e4ecaa Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Fri, 17 Mar 2017 16:43:59 +0100 Subject: [PATCH 298/496] Update ResponseStrings.sv-SE.resx (POEditor.com) --- .../Resources/ResponseStrings.sv-SE.resx | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.sv-SE.resx b/src/NadekoBot/Resources/ResponseStrings.sv-SE.resx index 79aa14d5..7ecb7286 100644 --- a/src/NadekoBot/Resources/ResponseStrings.sv-SE.resx +++ b/src/NadekoBot/Resources/ResponseStrings.sv-SE.resx @@ -376,7 +376,7 @@ Text kanal {0} skapad. - Röst kanal {0} skapad. + Röstkanal {0} skapad. Dövning lyckats. @@ -394,7 +394,7 @@ Text kanal {0} raderad. - Röst kanal {0} raderad. + Röstkanal {0} raderad. Meddelande från @@ -853,11 +853,11 @@ __IgnoreradeKannaler_: {2} {0} har blivit **röst omutad**- - Röst Kanal Skapad + Röstkanal Skapad Fuzzy - Röst Kanal Förstörd + Röstkanal Förstörd Fuzzy @@ -2318,22 +2318,22 @@ Medlemmar: {1} sida {0} - + Du måste vara i en röstkanal på denna server. - + Det finns inga röstkanalsroller. - + {0} har blivit **mutad** från text och röstchatt i {1} minuter. - + Användare som går in i röstkanalen {0} får rollen {1}. - + Användare som går - + Röstkanalsroller \ No newline at end of file From 2a30b6d23e52516822b6fd18921eaaa9a5708473 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Fri, 17 Mar 2017 16:44:02 +0100 Subject: [PATCH 299/496] Update ResponseStrings.tr-TR.resx (POEditor.com) --- .../Resources/ResponseStrings.tr-TR.resx | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.tr-TR.resx b/src/NadekoBot/Resources/ResponseStrings.tr-TR.resx index f38f1a21..b807152e 100644 --- a/src/NadekoBot/Resources/ResponseStrings.tr-TR.resx +++ b/src/NadekoBot/Resources/ResponseStrings.tr-TR.resx @@ -190,8 +190,7 @@ Tüm özel reaksiyon istatistikleri temizlendi. - Özel reaksiyonlar silindi. - Fuzzy + Özel reaksiyon silindi Yetersiz yetki.Global özel reaksiyonlar için bot sahibi yetkisi gerkirken, server tabanlı özel reaksiyonlar için Administrator yetkisi gerekir. @@ -255,8 +254,7 @@ {0} bayıldı! - {1} kullanarak {0} iyileştirildi. - Fuzzy + Bir {1} kullanılarak {0} iyileştirildi {0} canı {1} kaldı. @@ -469,8 +467,7 @@ Sebep: {1} Sebep: {1} - Kullanıcı Atıldı - Fuzzy + Kullanıcı atıldı Dil Listesi @@ -2005,8 +2002,7 @@ Fuzzy Dizin aralık dışında. - {0} rolündeki kullanıcıların listesi - Fuzzy + {0} rolüne sahip kullanıcı listesi Kötüye kullanımını önlemek için bu komutlar, çok sayıda kullanıcısı olan rollerde kullanmanıza izin verilmez. @@ -2095,8 +2091,7 @@ Kurucu Kimliği: {2} Alıntı Eklendi - Rastgele alıntı silindi. - Fuzzy + {0} numaralı alıntı silindi. Bölge From f157a0ba90fc43d1bddd862e4f3e8d64408cc316 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Fri, 17 Mar 2017 16:44:05 +0100 Subject: [PATCH 300/496] Update ResponseStrings.es-ES.resx (POEditor.com) --- .../Resources/ResponseStrings.es-ES.resx | 234 +++++++++--------- 1 file changed, 117 insertions(+), 117 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.es-ES.resx b/src/NadekoBot/Resources/ResponseStrings.es-ES.resx index a4bf4b50..fe1f8793 100644 --- a/src/NadekoBot/Resources/ResponseStrings.es-ES.resx +++ b/src/NadekoBot/Resources/ResponseStrings.es-ES.resx @@ -1,121 +1,121 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Esa base ya fue reclamada o destruida. From 60dda075a5374cd9da49678f18352a8921f20afe Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 18 Mar 2017 02:18:31 +0100 Subject: [PATCH 301/496] Fixed permissions duplication bug WOOHOO --- .../Modules/Administration/Administration.cs | 2 +- .../Modules/Permissions/Permissions.cs | 12 +++--- src/NadekoBot/Services/CommandHandler.cs | 2 +- .../Repositories/IGuildConfigRepository.cs | 1 + .../Impl/GuildConfigRepository.cs | 43 ++++++++++++++++--- 5 files changed, 46 insertions(+), 14 deletions(-) diff --git a/src/NadekoBot/Modules/Administration/Administration.cs b/src/NadekoBot/Modules/Administration/Administration.cs index d98458b4..4eb9d28c 100644 --- a/src/NadekoBot/Modules/Administration/Administration.cs +++ b/src/NadekoBot/Modules/Administration/Administration.cs @@ -59,7 +59,7 @@ namespace NadekoBot.Modules.Administration { using (var uow = DbHandler.UnitOfWork()) { - var config = uow.GuildConfigs.For(Context.Guild.Id, set => set.Include(x => x.Permissions)); + var config = uow.GuildConfigs.GcWithPermissionsv2For(Context.Guild.Id); config.Permissions = Permissionv2.GetDefaultPermlist; await uow.CompleteAsync(); UpdateCache(config); diff --git a/src/NadekoBot/Modules/Permissions/Permissions.cs b/src/NadekoBot/Modules/Permissions/Permissions.cs index ce04f75c..2d21630d 100644 --- a/src/NadekoBot/Modules/Permissions/Permissions.cs +++ b/src/NadekoBot/Modules/Permissions/Permissions.cs @@ -87,7 +87,7 @@ namespace NadekoBot.Modules.Permissions if (i % 3 == 0) log.Info("Migrating Permissions #" + i + " - GuildId: " + oc.Key); i++; - var gc = uow.GuildConfigs.For(oc.Key, set => set.Include(x => x.Permissions)); + var gc = uow.GuildConfigs.GcWithPermissionsv2For(oc.Key); var oldPerms = oc.Value.RootPermission.AsEnumerable().Reverse().ToList(); uow._context.Set().RemoveRange(oldPerms); @@ -126,7 +126,7 @@ namespace NadekoBot.Modules.Permissions { using (var uow = DbHandler.UnitOfWork()) { - var config = uow.GuildConfigs.For(guildId, set => set.Include(x => x.Permissions)); + var config = uow.GuildConfigs.GcWithPermissionsv2For(guildId); //var orderedPerms = new PermissionsCollection(config.Permissions); var max = config.Permissions.Max(x => x.Index); //have to set its index to be the highest foreach (var perm in perms) @@ -161,7 +161,7 @@ namespace NadekoBot.Modules.Permissions { using (var uow = DbHandler.UnitOfWork()) { - var config = uow.GuildConfigs.For(Context.Guild.Id, set => set.Include(x => x.Permissions)); + var config = uow.GuildConfigs.GcWithPermissionsv2For(Context.Guild.Id); config.VerbosePermissions = action.Value; await uow.CompleteAsync().ConfigureAwait(false); UpdateCache(config); @@ -185,7 +185,7 @@ namespace NadekoBot.Modules.Permissions using (var uow = DbHandler.UnitOfWork()) { - var config = uow.GuildConfigs.For(Context.Guild.Id, set => set); + var config = uow.GuildConfigs.GcWithPermissionsv2For(Context.Guild.Id); if (role == null) { await ReplyConfirmLocalized("permrole", Format.Bold(config.PermissionRole)).ConfigureAwait(false); @@ -247,7 +247,7 @@ namespace NadekoBot.Modules.Permissions Permissionv2 p; using (var uow = DbHandler.UnitOfWork()) { - var config = uow.GuildConfigs.For(Context.Guild.Id, set => set.Include(x => x.Permissions)); + var config = uow.GuildConfigs.GcWithPermissionsv2For(Context.Guild.Id); var permsCol = new PermissionsCollection(config.Permissions); p = permsCol[index]; permsCol.RemoveAt(index); @@ -278,7 +278,7 @@ namespace NadekoBot.Modules.Permissions Permissionv2 fromPerm; using (var uow = DbHandler.UnitOfWork()) { - var config = uow.GuildConfigs.For(Context.Guild.Id, set => set.Include(x => x.Permissions)); + var config = uow.GuildConfigs.GcWithPermissionsv2For(Context.Guild.Id); var permsCol = new PermissionsCollection(config.Permissions); var fromFound = from < permsCol.Count; diff --git a/src/NadekoBot/Services/CommandHandler.cs b/src/NadekoBot/Services/CommandHandler.cs index ae005e95..297b606b 100644 --- a/src/NadekoBot/Services/CommandHandler.cs +++ b/src/NadekoBot/Services/CommandHandler.cs @@ -423,7 +423,7 @@ namespace NadekoBot.Services { using (var uow = DbHandler.UnitOfWork()) { - var config = uow.GuildConfigs.For(context.Guild.Id, set => set.Include(x => x.Permissions)); + var config = uow.GuildConfigs.GcWithPermissionsv2For(context.Guild.Id); Permissions.UpdateCache(config); } Permissions.Cache.TryGetValue(context.Guild.Id, out pc); diff --git a/src/NadekoBot/Services/Database/Repositories/IGuildConfigRepository.cs b/src/NadekoBot/Services/Database/Repositories/IGuildConfigRepository.cs index c71b2824..cca54609 100644 --- a/src/NadekoBot/Services/Database/Repositories/IGuildConfigRepository.cs +++ b/src/NadekoBot/Services/Database/Repositories/IGuildConfigRepository.cs @@ -15,5 +15,6 @@ namespace NadekoBot.Services.Database.Repositories IEnumerable GetAllFollowedStreams(); void SetCleverbotEnabled(ulong id, bool cleverbotEnabled); IEnumerable Permissionsv2ForAll(); + GuildConfig GcWithPermissionsv2For(ulong guildId); } } diff --git a/src/NadekoBot/Services/Database/Repositories/Impl/GuildConfigRepository.cs b/src/NadekoBot/Services/Database/Repositories/Impl/GuildConfigRepository.cs index 909a15d5..150d671d 100644 --- a/src/NadekoBot/Services/Database/Repositories/Impl/GuildConfigRepository.cs +++ b/src/NadekoBot/Services/Database/Repositories/Impl/GuildConfigRepository.cs @@ -67,19 +67,25 @@ namespace NadekoBot.Services.Database.Repositories.Impl })); _context.SaveChanges(); } - else if (config.Permissions == null) - { - config.Permissions = Permissionv2.GetDefaultPermlist; - _context.SaveChanges(); - } return config; } public GuildConfig LogSettingsFor(ulong guildId) { - return _set.Include(gc => gc.LogSetting) + var config = _set.Include(gc => gc.LogSetting) .ThenInclude(gc => gc.IgnoredChannels) .FirstOrDefault(); + + if (config == null) + { + _set.Add((config = new GuildConfig + { + GuildId = guildId, + Permissions = Permissionv2.GetDefaultPermlist + })); + _context.SaveChanges(); + } + return config; } public IEnumerable OldPermissionsForAll() @@ -108,6 +114,31 @@ namespace NadekoBot.Services.Database.Repositories.Impl return query.ToList(); } + public GuildConfig GcWithPermissionsv2For(ulong guildId) + { + var config = _set + .Where(gc => gc.GuildId == guildId) + .Include(gc => gc.Permissions) + .FirstOrDefault(); + + if (config == null) // if there is no guildconfig, create new one + { + _set.Add((config = new GuildConfig + { + GuildId = guildId, + Permissions = Permissionv2.GetDefaultPermlist + })); + _context.SaveChanges(); + } + else if (config.Permissions == null || !config.Permissions.Any()) // if no perms, add default ones + { + config.Permissions = Permissionv2.GetDefaultPermlist; + _context.SaveChanges(); + } + + return config; + } + public IEnumerable GetAllFollowedStreams() => _set.Include(gc => gc.FollowedStreams) .SelectMany(gc => gc.FollowedStreams) From 2331b2ea20923b94e3a42158553cc1c249ec6a9e Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 18 Mar 2017 09:33:13 +0100 Subject: [PATCH 302/496] .v+t missing perms string was missing --- .../Modules/Administration/Commands/VoicePlusTextCommands.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Administration/Commands/VoicePlusTextCommands.cs b/src/NadekoBot/Modules/Administration/Commands/VoicePlusTextCommands.cs index 7302b09d..b7a7b326 100644 --- a/src/NadekoBot/Modules/Administration/Commands/VoicePlusTextCommands.cs +++ b/src/NadekoBot/Modules/Administration/Commands/VoicePlusTextCommands.cs @@ -166,7 +166,7 @@ namespace NadekoBot.Modules.Administration var botUser = await guild.GetCurrentUserAsync().ConfigureAwait(false); if (!botUser.GuildPermissions.ManageRoles || !botUser.GuildPermissions.ManageChannels) { - await ReplyErrorLocalized("vt_no_perms").ConfigureAwait(false); + await ReplyErrorLocalized("vt_perms").ConfigureAwait(false); return; } From 0d1e870325ddc14281280d19a2dec6cae5c0a7d8 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 18 Mar 2017 13:23:39 +0100 Subject: [PATCH 303/496] .vcrole will try twice to remove role from leaving users --- .../Administration/Commands/VcRoleCommands.cs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Modules/Administration/Commands/VcRoleCommands.cs b/src/NadekoBot/Modules/Administration/Commands/VcRoleCommands.cs index a6211d3d..672d85f9 100644 --- a/src/NadekoBot/Modules/Administration/Commands/VcRoleCommands.cs +++ b/src/NadekoBot/Modules/Administration/Commands/VcRoleCommands.cs @@ -71,8 +71,17 @@ namespace NadekoBot.Modules.Administration { if (gusr.RoleIds.Contains(role.Id)) { - await gusr.RemoveRolesAsync(role).ConfigureAwait(false); - await Task.Delay(500).ConfigureAwait(false); + try + { + await gusr.RemoveRolesAsync(role).ConfigureAwait(false); + await Task.Delay(500).ConfigureAwait(false); + } + catch + { + await Task.Delay(200).ConfigureAwait(false); + await gusr.RemoveRolesAsync(role).ConfigureAwait(false); + await Task.Delay(500).ConfigureAwait(false); + } } } //add new From 7e6411e25b6b803bdb9afcdfca730de99951c37c Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 18 Mar 2017 20:23:26 +0100 Subject: [PATCH 304/496] .crad and .crdm added :O --- .../20170318190018_crad-and-crdm.Designer.cs | 1264 +++++++++++++++++ .../20170318190018_crad-and-crdm.cs | 35 + .../NadekoSqliteContextModelSnapshot.cs | 4 + .../CustomReactions/CustomReactions.cs | 112 +- .../Resources/CommandStrings.Designer.cs | 56 +- src/NadekoBot/Resources/CommandStrings.resx | 20 +- .../Resources/ResponseStrings.Designer.cs | 36 + src/NadekoBot/Resources/ResponseStrings.resx | 12 + src/NadekoBot/Services/CommandHandler.cs | 5 + .../Database/Models/CustomReaction.cs | 3 + 10 files changed, 1539 insertions(+), 8 deletions(-) create mode 100644 src/NadekoBot/Migrations/20170318190018_crad-and-crdm.Designer.cs create mode 100644 src/NadekoBot/Migrations/20170318190018_crad-and-crdm.cs diff --git a/src/NadekoBot/Migrations/20170318190018_crad-and-crdm.Designer.cs b/src/NadekoBot/Migrations/20170318190018_crad-and-crdm.Designer.cs new file mode 100644 index 00000000..1bfcd350 --- /dev/null +++ b/src/NadekoBot/Migrations/20170318190018_crad-and-crdm.Designer.cs @@ -0,0 +1,1264 @@ +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using NadekoBot.Services.Database; +using NadekoBot.Services.Database.Models; +using NadekoBot.Modules.Music.Classes; + +namespace NadekoBot.Migrations +{ + [DbContext(typeof(NadekoContext))] + [Migration("20170318190018_crad-and-crdm")] + partial class cradandcrdm + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { + modelBuilder + .HasAnnotation("ProductVersion", "1.1.0-rtm-22752"); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Action"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Seconds"); + + b.Property("UserThreshold"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId") + .IsUnique(); + + b.ToTable("AntiRaidSetting"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AntiSpamSettingId"); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.HasKey("Id"); + + b.HasIndex("AntiSpamSettingId"); + + b.ToTable("AntiSpamIgnore"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Action"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("MessageThreshold"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId") + .IsUnique(); + + b.ToTable("AntiSpamSetting"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("ItemId"); + + b.Property("Type"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("BlacklistItem"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BetflipMultiplier"); + + b.Property("Betroll100Multiplier"); + + b.Property("Betroll67Multiplier"); + + b.Property("Betroll91Multiplier"); + + b.Property("BufferSize"); + + b.Property("CurrencyDropAmount"); + + b.Property("CurrencyGenerationChance"); + + b.Property("CurrencyGenerationCooldown"); + + b.Property("CurrencyName"); + + b.Property("CurrencyPluralName"); + + b.Property("CurrencySign"); + + b.Property("DMHelpString"); + + b.Property("DateAdded"); + + b.Property("ErrorColor"); + + b.Property("ForwardMessages"); + + b.Property("ForwardToAllOwners"); + + b.Property("HelpString"); + + b.Property("Locale"); + + b.Property("MigrationVersion"); + + b.Property("MinimumBetAmount"); + + b.Property("OkColor"); + + b.Property("RemindMessageFormat"); + + b.Property("RotatingStatuses"); + + b.Property("TriviaCurrencyReward"); + + b.HasKey("Id"); + + b.ToTable("BotConfig"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BaseDestroyed"); + + b.Property("CallUser"); + + b.Property("ClashWarId"); + + b.Property("DateAdded"); + + b.Property("SequenceNumber"); + + b.Property("Stars"); + + b.Property("TimeAdded"); + + b.HasKey("Id"); + + b.HasIndex("ClashWarId"); + + b.ToTable("ClashCallers"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("EnemyClan"); + + b.Property("GuildId"); + + b.Property("Size"); + + b.Property("StartedAt"); + + b.Property("WarState"); + + b.HasKey("Id"); + + b.ToTable("ClashOfClans"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("CommandName"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Seconds"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("CommandCooldown"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("CommandName"); + + b.Property("DateAdded"); + + b.Property("Price"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.HasIndex("Price") + .IsUnique(); + + b.ToTable("CommandPrice"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("InternalTrigger"); + + b.Property("Modifier"); + + b.Property("UnitType"); + + b.HasKey("Id"); + + b.ToTable("ConversionUnits"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Amount"); + + b.Property("DateAdded"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("Currency"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Amount"); + + b.Property("DateAdded"); + + b.Property("Reason"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.ToTable("CurrencyTransactions"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AutoDeleteTrigger"); + + b.Property("DateAdded"); + + b.Property("DmResponse"); + + b.Property("GuildId"); + + b.Property("IsRegex"); + + b.Property("OwnerOnly"); + + b.Property("Response"); + + b.Property("Trigger"); + + b.HasKey("Id"); + + b.ToTable("CustomReactions"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AvatarId"); + + b.Property("DateAdded"); + + b.Property("Discriminator"); + + b.Property("UserId"); + + b.Property("Username"); + + b.HasKey("Id"); + + b.HasAlternateKey("UserId"); + + b.ToTable("DiscordUser"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Amount"); + + b.Property("DateAdded"); + + b.Property("Name"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("Donators"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("Text"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("EightBallResponses"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("GuildConfigId1"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.HasIndex("GuildConfigId1"); + + b.ToTable("FilterChannelId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Word"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("FilteredWord"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("GuildId"); + + b.Property("Type"); + + b.Property("Username"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("FollowedStream"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("GCChannelId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AutoAssignRoleId"); + + b.Property("AutoDeleteByeMessages"); + + b.Property("AutoDeleteByeMessagesTimer"); + + b.Property("AutoDeleteGreetMessages"); + + b.Property("AutoDeleteGreetMessagesTimer"); + + b.Property("AutoDeleteSelfAssignedRoleMessages"); + + b.Property("ByeMessageChannelId"); + + b.Property("ChannelByeMessageText"); + + b.Property("ChannelGreetMessageText"); + + b.Property("CleverbotEnabled"); + + b.Property("DateAdded"); + + b.Property("DefaultMusicVolume"); + + b.Property("DeleteMessageOnCommand"); + + b.Property("DmGreetMessageText"); + + b.Property("ExclusiveSelfAssignedRoles"); + + b.Property("FilterInvites"); + + b.Property("FilterWords"); + + b.Property("GreetMessageChannelId"); + + b.Property("GuildId"); + + b.Property("Locale"); + + b.Property("LogSettingId"); + + b.Property("MuteRoleName"); + + b.Property("PermissionRole"); + + b.Property("RootPermissionId"); + + b.Property("SendChannelByeMessage"); + + b.Property("SendChannelGreetMessage"); + + b.Property("SendDmGreetMessage"); + + b.Property("TimeZoneId"); + + b.Property("VerbosePermissions"); + + b.Property("VoicePlusTextEnabled"); + + b.HasKey("Id"); + + b.HasIndex("GuildId") + .IsUnique(); + + b.HasIndex("LogSettingId"); + + b.HasIndex("RootPermissionId"); + + b.ToTable("GuildConfigs"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("GuildId"); + + b.Property("Interval"); + + b.Property("Message"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("GuildRepeater"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("LogSettingId"); + + b.HasKey("Id"); + + b.HasIndex("LogSettingId"); + + b.ToTable("IgnoredLogChannels"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("LogSettingId"); + + b.HasKey("Id"); + + b.HasIndex("LogSettingId"); + + b.ToTable("IgnoredVoicePresenceCHannels"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelCreated"); + + b.Property("ChannelCreatedId"); + + b.Property("ChannelDestroyed"); + + b.Property("ChannelDestroyedId"); + + b.Property("ChannelId"); + + b.Property("ChannelUpdated"); + + b.Property("ChannelUpdatedId"); + + b.Property("DateAdded"); + + b.Property("IsLogging"); + + b.Property("LogOtherId"); + + b.Property("LogUserPresence"); + + b.Property("LogUserPresenceId"); + + b.Property("LogVoicePresence"); + + b.Property("LogVoicePresenceId"); + + b.Property("LogVoicePresenceTTSId"); + + b.Property("MessageDeleted"); + + b.Property("MessageDeletedId"); + + b.Property("MessageUpdated"); + + b.Property("MessageUpdatedId"); + + b.Property("UserBanned"); + + b.Property("UserBannedId"); + + b.Property("UserJoined"); + + b.Property("UserJoinedId"); + + b.Property("UserLeft"); + + b.Property("UserLeftId"); + + b.Property("UserMutedId"); + + b.Property("UserPresenceChannelId"); + + b.Property("UserUnbanned"); + + b.Property("UserUnbannedId"); + + b.Property("UserUpdated"); + + b.Property("UserUpdatedId"); + + b.Property("VoicePresenceChannelId"); + + b.HasKey("Id"); + + b.ToTable("LogSettings"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("ModuleName"); + + b.Property("Prefix"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("ModulePrefixes"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Author"); + + b.Property("AuthorId"); + + b.Property("DateAdded"); + + b.Property("Name"); + + b.HasKey("Id"); + + b.ToTable("MusicPlaylists"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("MutedUserId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("NextId"); + + b.Property("PrimaryTarget"); + + b.Property("PrimaryTargetId"); + + b.Property("SecondaryTarget"); + + b.Property("SecondaryTargetName"); + + b.Property("State"); + + b.HasKey("Id"); + + b.HasIndex("NextId") + .IsUnique(); + + b.ToTable("Permission"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Index"); + + b.Property("PrimaryTarget"); + + b.Property("PrimaryTargetId"); + + b.Property("SecondaryTarget"); + + b.Property("SecondaryTargetName"); + + b.Property("State"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("Permissionv2"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("Status"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("PlayingStatus"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("MusicPlaylistId"); + + b.Property("Provider"); + + b.Property("ProviderType"); + + b.Property("Query"); + + b.Property("Title"); + + b.Property("Uri"); + + b.HasKey("Id"); + + b.HasIndex("MusicPlaylistId"); + + b.ToTable("PlaylistSong"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AuthorId"); + + b.Property("AuthorName") + .IsRequired(); + + b.Property("DateAdded"); + + b.Property("GuildId"); + + b.Property("Keyword") + .IsRequired(); + + b.Property("Text") + .IsRequired(); + + b.HasKey("Id"); + + b.ToTable("Quotes"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("Icon"); + + b.Property("Name"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("RaceAnimals"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("IsPrivate"); + + b.Property("Message"); + + b.Property("ServerId"); + + b.Property("UserId"); + + b.Property("When"); + + b.HasKey("Id"); + + b.ToTable("Reminders"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildId"); + + b.Property("RoleId"); + + b.HasKey("Id"); + + b.HasIndex("GuildId", "RoleId") + .IsUnique(); + + b.ToTable("SelfAssignableRoles"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("UnmuteAt"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("UnmuteTimer"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("UserId"); + + b.Property("type"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("PokeGame"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("RoleId"); + + b.Property("VoiceChannelId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("VcRoleInfo"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AffinityId"); + + b.Property("ClaimerId"); + + b.Property("DateAdded"); + + b.Property("Price"); + + b.Property("WaifuId"); + + b.HasKey("Id"); + + b.HasIndex("AffinityId"); + + b.HasIndex("ClaimerId"); + + b.HasIndex("WaifuId") + .IsUnique(); + + b.ToTable("WaifuInfo"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("NewId"); + + b.Property("OldId"); + + b.Property("UpdateType"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("NewId"); + + b.HasIndex("OldId"); + + b.HasIndex("UserId"); + + b.ToTable("WaifuUpdates"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig") + .WithOne("AntiRaidSetting") + .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b => + { + b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting") + .WithMany("IgnoredChannels") + .HasForeignKey("AntiSpamSettingId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig") + .WithOne("AntiSpamSetting") + .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("Blacklist") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b => + { + b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar") + .WithMany("Bases") + .HasForeignKey("ClashWarId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("CommandCooldowns") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("CommandPrices") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("EightBallResponses") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FilterInvitesChannelIds") + .HasForeignKey("GuildConfigId"); + + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FilterWordsChannelIds") + .HasForeignKey("GuildConfigId1"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FilteredWords") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FollowedStreams") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("GenerateCurrencyChannelIds") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b => + { + b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting") + .WithMany() + .HasForeignKey("LogSettingId"); + + b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission") + .WithMany() + .HasForeignKey("RootPermissionId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("GuildRepeaters") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b => + { + b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting") + .WithMany("IgnoredChannels") + .HasForeignKey("LogSettingId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b => + { + b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting") + .WithMany("IgnoredVoicePresenceChannelIds") + .HasForeignKey("LogSettingId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("ModulePrefixes") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("MutedUsers") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b => + { + b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next") + .WithOne("Previous") + .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("Permissions") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("RotatingStatusMessages") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b => + { + b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist") + .WithMany("Songs") + .HasForeignKey("MusicPlaylistId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("RaceAnimals") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("UnmuteTimers") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("VcRoleInfos") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => + { + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity") + .WithMany() + .HasForeignKey("AffinityId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer") + .WithMany() + .HasForeignKey("ClaimerId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu") + .WithOne() + .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => + { + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New") + .WithMany() + .HasForeignKey("NewId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old") + .WithMany() + .HasForeignKey("OldId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + } + } +} diff --git a/src/NadekoBot/Migrations/20170318190018_crad-and-crdm.cs b/src/NadekoBot/Migrations/20170318190018_crad-and-crdm.cs new file mode 100644 index 00000000..898a19ca --- /dev/null +++ b/src/NadekoBot/Migrations/20170318190018_crad-and-crdm.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using Microsoft.EntityFrameworkCore.Migrations; + +namespace NadekoBot.Migrations +{ + public partial class cradandcrdm : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "AutoDeleteTrigger", + table: "CustomReactions", + nullable: false, + defaultValue: false); + + migrationBuilder.AddColumn( + name: "DmResponse", + table: "CustomReactions", + nullable: false, + defaultValue: false); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "AutoDeleteTrigger", + table: "CustomReactions"); + + migrationBuilder.DropColumn( + name: "DmResponse", + table: "CustomReactions"); + } + } +} diff --git a/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs b/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs index 9fd15cad..11f9bad5 100644 --- a/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs +++ b/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs @@ -310,8 +310,12 @@ namespace NadekoBot.Migrations b.Property("Id") .ValueGeneratedOnAdd(); + b.Property("AutoDeleteTrigger"); + b.Property("DateAdded"); + b.Property("DmResponse"); + b.Property("GuildId"); b.Property("IsRegex"); diff --git a/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs b/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs index e67cb64b..024e79b5 100644 --- a/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs +++ b/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs @@ -11,26 +11,24 @@ using NLog; using System.Diagnostics; using Discord.WebSocket; using System; -using Newtonsoft.Json; using NadekoBot.DataStructures; -using NLog.Fluent; namespace NadekoBot.Modules.CustomReactions { public static class CustomReactionExtensions { - public static Task Send(this CustomReaction cr, IUserMessage context) + public static async Task Send(this CustomReaction cr, IUserMessage context) { - var channel = context.Channel; + var channel = cr.DmResponse ? await context.Author.CreateDMChannelAsync() : context.Channel; CustomReactions.ReactionStats.AddOrUpdate(cr.Trigger, 1, (k, old) => ++old); CREmbed crembed; if (CREmbed.TryParse(cr.Response, out crembed)) { - return channel.EmbedAsync(crembed.ToEmbed(), crembed.PlainText ?? ""); + return await channel.EmbedAsync(crembed.ToEmbed(), crembed.PlainText ?? ""); } - return channel.SendMessageAsync(cr.ResponseWithContext(context)); + return await channel.SendMessageAsync(cr.ResponseWithContext(context)); } } @@ -341,6 +339,108 @@ namespace NadekoBot.Modules.CustomReactions } } + [NadekoCommand, Usage, Description, Aliases] + public async Task CrDm(int id) + { + if ((Context.Guild == null && !NadekoBot.Credentials.IsOwner(Context.User)) || + (Context.Guild != null && !((IGuildUser)Context.User).GuildPermissions.Administrator)) + { + await ReplyErrorLocalized("insuff_perms").ConfigureAwait(false); + return; + } + + CustomReaction[] reactions = new CustomReaction[0]; + + if (Context.Guild == null) + reactions = GlobalReactions; + else + { + GuildReactions.TryGetValue(Context.Guild.Id, out reactions); + } + if (reactions.Any()) + { + var reaction = reactions.FirstOrDefault(x => x.Id == id); + + if (reaction == null) + { + await ReplyErrorLocalized("no_found_id").ConfigureAwait(false); + return; + } + + var setValue = reaction.DmResponse = !reaction.DmResponse; + + using (var uow = DbHandler.UnitOfWork()) + { + uow.CustomReactions.Get(id).DmResponse = setValue; + uow.Complete(); + } + + if (setValue) + { + await ReplyConfirmLocalized("crdm_enabled", Format.Code(reaction.Id.ToString())).ConfigureAwait(false); + } + else + { + await ReplyConfirmLocalized("crdm_disabled", Format.Code(reaction.Id.ToString())).ConfigureAwait(false); + } + } + else + { + await ReplyErrorLocalized("no_found").ConfigureAwait(false); + } + } + + [NadekoCommand, Usage, Description, Aliases] + public async Task CrAd(int id) + { + if ((Context.Guild == null && !NadekoBot.Credentials.IsOwner(Context.User)) || + (Context.Guild != null && !((IGuildUser)Context.User).GuildPermissions.Administrator)) + { + await ReplyErrorLocalized("insuff_perms").ConfigureAwait(false); + return; + } + + CustomReaction[] reactions = new CustomReaction[0]; + + if (Context.Guild == null) + reactions = GlobalReactions; + else + { + GuildReactions.TryGetValue(Context.Guild.Id, out reactions); + } + if (reactions.Any()) + { + var reaction = reactions.FirstOrDefault(x => x.Id == id); + + if (reaction == null) + { + await ReplyErrorLocalized("no_found_id").ConfigureAwait(false); + return; + } + + var setValue = reaction.AutoDeleteTrigger = !reaction.AutoDeleteTrigger; + + using (var uow = DbHandler.UnitOfWork()) + { + uow.CustomReactions.Get(id).AutoDeleteTrigger = setValue; + uow.Complete(); + } + + if (setValue) + { + await ReplyConfirmLocalized("crad_enabled", Format.Code(reaction.Id.ToString())).ConfigureAwait(false); + } + else + { + await ReplyConfirmLocalized("crad_disabled", Format.Code(reaction.Id.ToString())).ConfigureAwait(false); + } + } + else + { + await ReplyErrorLocalized("no_found").ConfigureAwait(false); + } + } + [NadekoCommand, Usage, Description, Aliases] [OwnerOnly] public async Task CrStatsClear(string trigger = null) diff --git a/src/NadekoBot/Resources/CommandStrings.Designer.cs b/src/NadekoBot/Resources/CommandStrings.Designer.cs index 2a679ee2..385c67e6 100644 --- a/src/NadekoBot/Resources/CommandStrings.Designer.cs +++ b/src/NadekoBot/Resources/CommandStrings.Designer.cs @@ -1976,6 +1976,60 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to crad. + /// + public static string crad_cmd { + get { + return ResourceManager.GetString("crad_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Toggles whether the message triggering the custom reaction will be automatically deleted.. + /// + public static string crad_desc { + get { + return ResourceManager.GetString("crad_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}crad 59`. + /// + public static string crad_usage { + get { + return ResourceManager.GetString("crad_usage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to crdm. + /// + public static string crdm_cmd { + get { + return ResourceManager.GetString("crdm_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Toggles whether the response message of the custom reaction will be sent as a direct message.. + /// + public static string crdm_desc { + get { + return ResourceManager.GetString("crdm_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}crad 44`. + /// + public static string crdm_usage { + get { + return ResourceManager.GetString("crdm_usage", resourceCulture); + } + } + /// /// Looks up a localized string similar to createinvite crinv. /// @@ -2373,7 +2427,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to `{0}delq abc`. + /// Looks up a localized string similar to `{0}delq 123456`. /// public static string deletequote_usage { get { diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx index 638735a0..5f16e07b 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -3186,4 +3186,22 @@ `{0}vcrole SomeRole` or `{0}vcrole` - + + crad + + + Toggles whether the message triggering the custom reaction will be automatically deleted. + + + `{0}crad 59` + + + crdm + + + Toggles whether the response message of the custom reaction will be sent as a direct message. + + + `{0}crad 44` + + \ No newline at end of file diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index 8d70613f..53939695 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -2017,6 +2017,42 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Message triggering the custom reaction with id {0} won't get automatically deleted.. + /// + public static string customreactions_crad_disabled { + get { + return ResourceManager.GetString("customreactions_crad_disabled", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Message triggering the custom reaction with id {0} will get automatically deleted.. + /// + public static string customreactions_crad_enabled { + get { + return ResourceManager.GetString("customreactions_crad_enabled", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Response message for the custom reaction with id {0} won't be sent as a DM.. + /// + public static string customreactions_crdm_disabled { + get { + return ResourceManager.GetString("customreactions_crdm_disabled", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Response message for the custom reaction with id {0} will be sent as a DM.. + /// + public static string customreactions_crdm_enabled { + get { + return ResourceManager.GetString("customreactions_crdm_enabled", resourceCulture); + } + } + /// /// Looks up a localized string similar to Custom Reaction deleted. /// diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index c0728a53..fda3abc3 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -2248,4 +2248,16 @@ Owner ID: {2} Voice channel roles + + Message triggering the custom reaction with id {0} won't get automatically deleted. + + + Message triggering the custom reaction with id {0} will get automatically deleted. + + + Response message for the custom reaction with id {0} won't be sent as a DM. + + + Response message for the custom reaction with id {0} will be sent as a DM. + \ No newline at end of file diff --git a/src/NadekoBot/Services/CommandHandler.cs b/src/NadekoBot/Services/CommandHandler.cs index 297b606b..5841d879 100644 --- a/src/NadekoBot/Services/CommandHandler.cs +++ b/src/NadekoBot/Services/CommandHandler.cs @@ -303,6 +303,11 @@ namespace NadekoBot.Services } } await cr.Send(usrMsg).ConfigureAwait(false); + + if (cr.AutoDeleteTrigger) + { + try { await msg.DeleteAsync().ConfigureAwait(false); } catch { } + } } catch (Exception ex) { diff --git a/src/NadekoBot/Services/Database/Models/CustomReaction.cs b/src/NadekoBot/Services/Database/Models/CustomReaction.cs index 695c1cd3..25bb34fb 100644 --- a/src/NadekoBot/Services/Database/Models/CustomReaction.cs +++ b/src/NadekoBot/Services/Database/Models/CustomReaction.cs @@ -10,8 +10,11 @@ namespace NadekoBot.Services.Database.Models public Regex Regex { get; set; } public string Response { get; set; } public string Trigger { get; set; } + public bool IsRegex { get; set; } public bool OwnerOnly { get; set; } + public bool AutoDeleteTrigger { get; set; } + public bool DmResponse { get; set; } public bool IsGlobal => !GuildId.HasValue; } From 0bc839ebe361f04e3d0be4fb6236d18083f4fe24 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sun, 19 Mar 2017 15:48:12 +0100 Subject: [PATCH 305/496] embed and image support for .savechat --- .../Administration/Commands/MuteCommands.cs | 2 +- src/NadekoBot/Modules/Utility/Utility.cs | 26 ++++++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Modules/Administration/Commands/MuteCommands.cs b/src/NadekoBot/Modules/Administration/Commands/MuteCommands.cs index 0c49ef9e..0a130383 100644 --- a/src/NadekoBot/Modules/Administration/Commands/MuteCommands.cs +++ b/src/NadekoBot/Modules/Administration/Commands/MuteCommands.cs @@ -113,7 +113,7 @@ namespace NadekoBot.Modules.Administration public static async Task UnmuteUser(IGuildUser usr) { StopUnmuteTimer(usr.GuildId, usr.Id); - await usr.ModifyAsync(x => x.Mute = false).ConfigureAwait(false); + try { await usr.ModifyAsync(x => x.Mute = false).ConfigureAwait(false); } catch { } try { await usr.RemoveRolesAsync(await GetMuteRole(usr.Guild)).ConfigureAwait(false); } catch { /*ignore*/ } using (var uow = DbHandler.UnitOfWork()) { diff --git a/src/NadekoBot/Modules/Utility/Utility.cs b/src/NadekoBot/Modules/Utility/Utility.cs index 2b809781..ee92b771 100644 --- a/src/NadekoBot/Modules/Utility/Utility.cs +++ b/src/NadekoBot/Modules/Utility/Utility.cs @@ -466,7 +466,31 @@ namespace NadekoBot.Modules.Utility var title = $"Chatlog-{Context.Guild.Name}/#{Context.Channel.Name}-{DateTime.Now}.txt"; var grouping = msgs.GroupBy(x => $"{x.CreatedAt.Date:dd.MM.yyyy}") - .Select(g => new { date = g.Key, messages = g.OrderBy(x => x.CreatedAt).Select(s => $"【{s.Timestamp:HH:mm:ss}】{s.Author}:" + s.ToString()) }); + .Select(g => new + { + date = g.Key, + messages = g.OrderBy(x => x.CreatedAt).Select(s => + { + var msg = $"【{s.Timestamp:HH:mm:ss}】{s.Author}:"; + if (string.IsNullOrWhiteSpace(s.ToString())) + { + if (s.Attachments.Any()) + { + msg += "FILES_UPLOADED: " + string.Join("\n", s.Attachments.Select(x => x.Url)); + } + else if (s.Embeds.Any()) + { + //todo probably just go through all properties and check if they are set, if they are, add them + msg += "EMBEDS: " + string.Join("\n--------\n", s.Embeds.Select(x => $"Description: {x.Description}")); + } + } + else + { + msg += s.ToString(); + } + return msg; + }) + }); await Context.User.SendFileAsync( await JsonConvert.SerializeObject(grouping, Formatting.Indented).ToStream().ConfigureAwait(false), title, title).ConfigureAwait(false); } From f680c476a67b9da303e7ec160dbda7dc9643156f Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 20 Mar 2017 10:53:04 +0100 Subject: [PATCH 306/496] Command aliasing added - `.alias` and `.aliases` commands --- ...0170320090138_command-aliasing.Designer.cs | 1291 +++++++++++++++++ .../20170320090138_command-aliasing.cs | 45 + .../NadekoSqliteContextModelSnapshot.cs | 27 + .../Utility/Commands/CommandMapCommands.cs | 149 ++ .../Resources/CommandStrings.Designer.cs | 54 + src/NadekoBot/Resources/CommandStrings.resx | 18 + .../Resources/ResponseStrings.Designer.cs | 45 + src/NadekoBot/Resources/ResponseStrings.resx | 15 + src/NadekoBot/Services/CommandHandler.cs | 20 + .../Services/Database/Models/GuildConfig.cs | 24 + .../Impl/GuildConfigRepository.cs | 1 + 11 files changed, 1689 insertions(+) create mode 100644 src/NadekoBot/Migrations/20170320090138_command-aliasing.Designer.cs create mode 100644 src/NadekoBot/Migrations/20170320090138_command-aliasing.cs create mode 100644 src/NadekoBot/Modules/Utility/Commands/CommandMapCommands.cs diff --git a/src/NadekoBot/Migrations/20170320090138_command-aliasing.Designer.cs b/src/NadekoBot/Migrations/20170320090138_command-aliasing.Designer.cs new file mode 100644 index 00000000..0017cd76 --- /dev/null +++ b/src/NadekoBot/Migrations/20170320090138_command-aliasing.Designer.cs @@ -0,0 +1,1291 @@ +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using NadekoBot.Services.Database; +using NadekoBot.Services.Database.Models; +using NadekoBot.Modules.Music.Classes; + +namespace NadekoBot.Migrations +{ + [DbContext(typeof(NadekoContext))] + [Migration("20170320090138_command-aliasing")] + partial class commandaliasing + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { + modelBuilder + .HasAnnotation("ProductVersion", "1.1.0-rtm-22752"); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Action"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Seconds"); + + b.Property("UserThreshold"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId") + .IsUnique(); + + b.ToTable("AntiRaidSetting"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AntiSpamSettingId"); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.HasKey("Id"); + + b.HasIndex("AntiSpamSettingId"); + + b.ToTable("AntiSpamIgnore"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Action"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("MessageThreshold"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId") + .IsUnique(); + + b.ToTable("AntiSpamSetting"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("ItemId"); + + b.Property("Type"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("BlacklistItem"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BetflipMultiplier"); + + b.Property("Betroll100Multiplier"); + + b.Property("Betroll67Multiplier"); + + b.Property("Betroll91Multiplier"); + + b.Property("BufferSize"); + + b.Property("CurrencyDropAmount"); + + b.Property("CurrencyGenerationChance"); + + b.Property("CurrencyGenerationCooldown"); + + b.Property("CurrencyName"); + + b.Property("CurrencyPluralName"); + + b.Property("CurrencySign"); + + b.Property("DMHelpString"); + + b.Property("DateAdded"); + + b.Property("ErrorColor"); + + b.Property("ForwardMessages"); + + b.Property("ForwardToAllOwners"); + + b.Property("HelpString"); + + b.Property("Locale"); + + b.Property("MigrationVersion"); + + b.Property("MinimumBetAmount"); + + b.Property("OkColor"); + + b.Property("RemindMessageFormat"); + + b.Property("RotatingStatuses"); + + b.Property("TriviaCurrencyReward"); + + b.HasKey("Id"); + + b.ToTable("BotConfig"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BaseDestroyed"); + + b.Property("CallUser"); + + b.Property("ClashWarId"); + + b.Property("DateAdded"); + + b.Property("SequenceNumber"); + + b.Property("Stars"); + + b.Property("TimeAdded"); + + b.HasKey("Id"); + + b.HasIndex("ClashWarId"); + + b.ToTable("ClashCallers"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("EnemyClan"); + + b.Property("GuildId"); + + b.Property("Size"); + + b.Property("StartedAt"); + + b.Property("WarState"); + + b.HasKey("Id"); + + b.ToTable("ClashOfClans"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Mapping"); + + b.Property("Trigger"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("CommandAlias"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("CommandName"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Seconds"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("CommandCooldown"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("CommandName"); + + b.Property("DateAdded"); + + b.Property("Price"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.HasIndex("Price") + .IsUnique(); + + b.ToTable("CommandPrice"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("InternalTrigger"); + + b.Property("Modifier"); + + b.Property("UnitType"); + + b.HasKey("Id"); + + b.ToTable("ConversionUnits"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Amount"); + + b.Property("DateAdded"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("Currency"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Amount"); + + b.Property("DateAdded"); + + b.Property("Reason"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.ToTable("CurrencyTransactions"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AutoDeleteTrigger"); + + b.Property("DateAdded"); + + b.Property("DmResponse"); + + b.Property("GuildId"); + + b.Property("IsRegex"); + + b.Property("OwnerOnly"); + + b.Property("Response"); + + b.Property("Trigger"); + + b.HasKey("Id"); + + b.ToTable("CustomReactions"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AvatarId"); + + b.Property("DateAdded"); + + b.Property("Discriminator"); + + b.Property("UserId"); + + b.Property("Username"); + + b.HasKey("Id"); + + b.HasAlternateKey("UserId"); + + b.ToTable("DiscordUser"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Amount"); + + b.Property("DateAdded"); + + b.Property("Name"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("Donators"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("Text"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("EightBallResponses"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("GuildConfigId1"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.HasIndex("GuildConfigId1"); + + b.ToTable("FilterChannelId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Word"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("FilteredWord"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("GuildId"); + + b.Property("Type"); + + b.Property("Username"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("FollowedStream"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("GCChannelId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AutoAssignRoleId"); + + b.Property("AutoDeleteByeMessages"); + + b.Property("AutoDeleteByeMessagesTimer"); + + b.Property("AutoDeleteGreetMessages"); + + b.Property("AutoDeleteGreetMessagesTimer"); + + b.Property("AutoDeleteSelfAssignedRoleMessages"); + + b.Property("ByeMessageChannelId"); + + b.Property("ChannelByeMessageText"); + + b.Property("ChannelGreetMessageText"); + + b.Property("CleverbotEnabled"); + + b.Property("DateAdded"); + + b.Property("DefaultMusicVolume"); + + b.Property("DeleteMessageOnCommand"); + + b.Property("DmGreetMessageText"); + + b.Property("ExclusiveSelfAssignedRoles"); + + b.Property("FilterInvites"); + + b.Property("FilterWords"); + + b.Property("GreetMessageChannelId"); + + b.Property("GuildId"); + + b.Property("Locale"); + + b.Property("LogSettingId"); + + b.Property("MuteRoleName"); + + b.Property("PermissionRole"); + + b.Property("RootPermissionId"); + + b.Property("SendChannelByeMessage"); + + b.Property("SendChannelGreetMessage"); + + b.Property("SendDmGreetMessage"); + + b.Property("TimeZoneId"); + + b.Property("VerbosePermissions"); + + b.Property("VoicePlusTextEnabled"); + + b.HasKey("Id"); + + b.HasIndex("GuildId") + .IsUnique(); + + b.HasIndex("LogSettingId"); + + b.HasIndex("RootPermissionId"); + + b.ToTable("GuildConfigs"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("GuildId"); + + b.Property("Interval"); + + b.Property("Message"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("GuildRepeater"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("LogSettingId"); + + b.HasKey("Id"); + + b.HasIndex("LogSettingId"); + + b.ToTable("IgnoredLogChannels"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("LogSettingId"); + + b.HasKey("Id"); + + b.HasIndex("LogSettingId"); + + b.ToTable("IgnoredVoicePresenceCHannels"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelCreated"); + + b.Property("ChannelCreatedId"); + + b.Property("ChannelDestroyed"); + + b.Property("ChannelDestroyedId"); + + b.Property("ChannelId"); + + b.Property("ChannelUpdated"); + + b.Property("ChannelUpdatedId"); + + b.Property("DateAdded"); + + b.Property("IsLogging"); + + b.Property("LogOtherId"); + + b.Property("LogUserPresence"); + + b.Property("LogUserPresenceId"); + + b.Property("LogVoicePresence"); + + b.Property("LogVoicePresenceId"); + + b.Property("LogVoicePresenceTTSId"); + + b.Property("MessageDeleted"); + + b.Property("MessageDeletedId"); + + b.Property("MessageUpdated"); + + b.Property("MessageUpdatedId"); + + b.Property("UserBanned"); + + b.Property("UserBannedId"); + + b.Property("UserJoined"); + + b.Property("UserJoinedId"); + + b.Property("UserLeft"); + + b.Property("UserLeftId"); + + b.Property("UserMutedId"); + + b.Property("UserPresenceChannelId"); + + b.Property("UserUnbanned"); + + b.Property("UserUnbannedId"); + + b.Property("UserUpdated"); + + b.Property("UserUpdatedId"); + + b.Property("VoicePresenceChannelId"); + + b.HasKey("Id"); + + b.ToTable("LogSettings"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("ModuleName"); + + b.Property("Prefix"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("ModulePrefixes"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Author"); + + b.Property("AuthorId"); + + b.Property("DateAdded"); + + b.Property("Name"); + + b.HasKey("Id"); + + b.ToTable("MusicPlaylists"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("MutedUserId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("NextId"); + + b.Property("PrimaryTarget"); + + b.Property("PrimaryTargetId"); + + b.Property("SecondaryTarget"); + + b.Property("SecondaryTargetName"); + + b.Property("State"); + + b.HasKey("Id"); + + b.HasIndex("NextId") + .IsUnique(); + + b.ToTable("Permission"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Index"); + + b.Property("PrimaryTarget"); + + b.Property("PrimaryTargetId"); + + b.Property("SecondaryTarget"); + + b.Property("SecondaryTargetName"); + + b.Property("State"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("Permissionv2"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("Status"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("PlayingStatus"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("MusicPlaylistId"); + + b.Property("Provider"); + + b.Property("ProviderType"); + + b.Property("Query"); + + b.Property("Title"); + + b.Property("Uri"); + + b.HasKey("Id"); + + b.HasIndex("MusicPlaylistId"); + + b.ToTable("PlaylistSong"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AuthorId"); + + b.Property("AuthorName") + .IsRequired(); + + b.Property("DateAdded"); + + b.Property("GuildId"); + + b.Property("Keyword") + .IsRequired(); + + b.Property("Text") + .IsRequired(); + + b.HasKey("Id"); + + b.ToTable("Quotes"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("Icon"); + + b.Property("Name"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("RaceAnimals"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("IsPrivate"); + + b.Property("Message"); + + b.Property("ServerId"); + + b.Property("UserId"); + + b.Property("When"); + + b.HasKey("Id"); + + b.ToTable("Reminders"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildId"); + + b.Property("RoleId"); + + b.HasKey("Id"); + + b.HasIndex("GuildId", "RoleId") + .IsUnique(); + + b.ToTable("SelfAssignableRoles"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("UnmuteAt"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("UnmuteTimer"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("UserId"); + + b.Property("type"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("PokeGame"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("RoleId"); + + b.Property("VoiceChannelId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("VcRoleInfo"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AffinityId"); + + b.Property("ClaimerId"); + + b.Property("DateAdded"); + + b.Property("Price"); + + b.Property("WaifuId"); + + b.HasKey("Id"); + + b.HasIndex("AffinityId"); + + b.HasIndex("ClaimerId"); + + b.HasIndex("WaifuId") + .IsUnique(); + + b.ToTable("WaifuInfo"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("NewId"); + + b.Property("OldId"); + + b.Property("UpdateType"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("NewId"); + + b.HasIndex("OldId"); + + b.HasIndex("UserId"); + + b.ToTable("WaifuUpdates"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig") + .WithOne("AntiRaidSetting") + .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b => + { + b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting") + .WithMany("IgnoredChannels") + .HasForeignKey("AntiSpamSettingId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig") + .WithOne("AntiSpamSetting") + .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("Blacklist") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b => + { + b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar") + .WithMany("Bases") + .HasForeignKey("ClashWarId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("CommandAliases") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("CommandCooldowns") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("CommandPrices") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("EightBallResponses") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FilterInvitesChannelIds") + .HasForeignKey("GuildConfigId"); + + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FilterWordsChannelIds") + .HasForeignKey("GuildConfigId1"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FilteredWords") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FollowedStreams") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("GenerateCurrencyChannelIds") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b => + { + b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting") + .WithMany() + .HasForeignKey("LogSettingId"); + + b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission") + .WithMany() + .HasForeignKey("RootPermissionId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("GuildRepeaters") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b => + { + b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting") + .WithMany("IgnoredChannels") + .HasForeignKey("LogSettingId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b => + { + b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting") + .WithMany("IgnoredVoicePresenceChannelIds") + .HasForeignKey("LogSettingId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("ModulePrefixes") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("MutedUsers") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b => + { + b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next") + .WithOne("Previous") + .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("Permissions") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("RotatingStatusMessages") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b => + { + b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist") + .WithMany("Songs") + .HasForeignKey("MusicPlaylistId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("RaceAnimals") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("UnmuteTimers") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("VcRoleInfos") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => + { + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity") + .WithMany() + .HasForeignKey("AffinityId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer") + .WithMany() + .HasForeignKey("ClaimerId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu") + .WithOne() + .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => + { + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New") + .WithMany() + .HasForeignKey("NewId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old") + .WithMany() + .HasForeignKey("OldId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + } + } +} diff --git a/src/NadekoBot/Migrations/20170320090138_command-aliasing.cs b/src/NadekoBot/Migrations/20170320090138_command-aliasing.cs new file mode 100644 index 00000000..d3ee3411 --- /dev/null +++ b/src/NadekoBot/Migrations/20170320090138_command-aliasing.cs @@ -0,0 +1,45 @@ +using System; +using System.Collections.Generic; +using Microsoft.EntityFrameworkCore.Migrations; + +namespace NadekoBot.Migrations +{ + public partial class commandaliasing : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "CommandAlias", + columns: table => new + { + Id = table.Column(nullable: false) + .Annotation("Sqlite:Autoincrement", true), + DateAdded = table.Column(nullable: true), + GuildConfigId = table.Column(nullable: true), + Mapping = table.Column(nullable: true), + Trigger = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_CommandAlias", x => x.Id); + table.ForeignKey( + name: "FK_CommandAlias_GuildConfigs_GuildConfigId", + column: x => x.GuildConfigId, + principalTable: "GuildConfigs", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + }); + + migrationBuilder.CreateIndex( + name: "IX_CommandAlias_GuildConfigId", + table: "CommandAlias", + column: "GuildConfigId"); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "CommandAlias"); + } + } +} diff --git a/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs b/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs index 11f9bad5..18195d44 100644 --- a/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs +++ b/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs @@ -207,6 +207,26 @@ namespace NadekoBot.Migrations b.ToTable("ClashOfClans"); }); + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Mapping"); + + b.Property("Trigger"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("CommandAlias"); + }); + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b => { b.Property("Id") @@ -1078,6 +1098,13 @@ namespace NadekoBot.Migrations .OnDelete(DeleteBehavior.Cascade); }); + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("CommandAliases") + .HasForeignKey("GuildConfigId"); + }); + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") diff --git a/src/NadekoBot/Modules/Utility/Commands/CommandMapCommands.cs b/src/NadekoBot/Modules/Utility/Commands/CommandMapCommands.cs new file mode 100644 index 00000000..51fa03d1 --- /dev/null +++ b/src/NadekoBot/Modules/Utility/Commands/CommandMapCommands.cs @@ -0,0 +1,149 @@ +using Discord; +using Discord.Commands; +using Microsoft.EntityFrameworkCore; +using NadekoBot.Attributes; +using NadekoBot.Extensions; +using NadekoBot.Services; +using NadekoBot.Services.Database; +using NadekoBot.Services.Database.Models; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using System; + +namespace NadekoBot.Modules.Utility +{ + public partial class Utility + { + + public class CommandAliasEqualityComparer : IEqualityComparer + { + public bool Equals(CommandAlias x, CommandAlias y) => x.Trigger == y.Trigger; + + public int GetHashCode(CommandAlias obj) => obj.Trigger.GetHashCode(); + } + + [Group] + public class CommandMapCommands : NadekoSubmodule + { + //guildId, (trigger, mapping) + public static ConcurrentDictionary> AliasMaps { get; } = new ConcurrentDictionary>(); + + static CommandMapCommands() + { + var eq = new CommandAliasEqualityComparer(); + AliasMaps = new ConcurrentDictionary>( + NadekoBot.AllGuildConfigs.ToDictionary( + x => x.GuildId, + x => new ConcurrentDictionary(x.CommandAliases + .Distinct(eq) + .ToDictionary(ca => ca.Trigger, ca => ca.Mapping)))); + } + + [NadekoCommand, Usage, Description, Aliases] + [RequireUserPermission(GuildPermission.Administrator)] + [RequireContext(ContextType.Guild)] + public async Task Alias(string trigger, [Remainder] string mapping = null) + { + var channel = (ITextChannel)Context.Channel; + + if (string.IsNullOrWhiteSpace(trigger)) + return; + + trigger = trigger.Trim().ToLowerInvariant(); + + if (string.IsNullOrWhiteSpace(mapping)) + { + ConcurrentDictionary maps; + string throwaway; + if (!AliasMaps.TryGetValue(Context.Guild.Id, out maps) || + !maps.TryRemove(trigger, out throwaway)) + { + await ReplyErrorLocalized("alias_remove_fail", Format.Code(trigger)).ConfigureAwait(false); + return; + } + + using (var uow = DbHandler.UnitOfWork()) + { + var config = uow.GuildConfigs.For(Context.Guild.Id, set => set.Include(x => x.CommandAliases)); + var toAdd = new CommandAlias() + { + Mapping = mapping, + Trigger = trigger + }; + config.CommandAliases.RemoveWhere(x => x.Trigger == trigger); + uow.Complete(); + } + + await ReplyConfirmLocalized("alias_removed", Format.Code(trigger)).ConfigureAwait(false); + return; + } + AliasMaps.AddOrUpdate(Context.Guild.Id, (_) => + { + using (var uow = DbHandler.UnitOfWork()) + { + var config = uow.GuildConfigs.For(Context.Guild.Id, set => set.Include(x => x.CommandAliases)); + config.CommandAliases.Add(new CommandAlias() + { + Mapping = mapping, + Trigger = trigger + }); + uow.Complete(); + } + return new ConcurrentDictionary(new Dictionary() { + {trigger.Trim().ToLowerInvariant(), mapping.ToLowerInvariant() }, + }); + }, (_, map) => + { + using (var uow = DbHandler.UnitOfWork()) + { + var config = uow.GuildConfigs.For(Context.Guild.Id, set => set.Include(x => x.CommandAliases)); + var toAdd = new CommandAlias() + { + Mapping = mapping, + Trigger = trigger + }; + config.CommandAliases.RemoveWhere(x => x.Trigger == trigger); + config.CommandAliases.Add(toAdd); + uow.Complete(); + } + map.AddOrUpdate(trigger, mapping, (key, old) => mapping); + return map; + }); + + await ReplyConfirmLocalized("alias_added", Format.Code(trigger), Format.Code(mapping)).ConfigureAwait(false); + } + + + [NadekoCommand, Usage, Description, Aliases] + [RequireContext(ContextType.Guild)] + public async Task AliasList(int page = 1) + { + var channel = (ITextChannel)Context.Channel; + page -= 1; + + if (page < 0) + return; + + ConcurrentDictionary maps; + if (!AliasMaps.TryGetValue(Context.Guild.Id, out maps) || !maps.Any()) + { + await ReplyErrorLocalized("aliases_none").ConfigureAwait(false); + return; + } + + var arr = maps.ToArray(); + + await Context.Channel.SendPaginatedConfirmAsync(page + 1, (curPage) => + { + return new EmbedBuilder().WithOkColor() + .WithTitle(GetText("alias_list")) + .WithDescription(string.Join("\n", + arr.Skip((curPage - 1) * 10).Take(10).Select(x => $"`{x.Key}` => `{x.Value}`"))); + + }, arr.Length / 10).ConfigureAwait(false); + } + } + } +} \ No newline at end of file diff --git a/src/NadekoBot/Resources/CommandStrings.Designer.cs b/src/NadekoBot/Resources/CommandStrings.Designer.cs index 385c67e6..045f5885 100644 --- a/src/NadekoBot/Resources/CommandStrings.Designer.cs +++ b/src/NadekoBot/Resources/CommandStrings.Designer.cs @@ -248,6 +248,60 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to alias cmdmap. + /// + public static string alias_cmd { + get { + return ResourceManager.GetString("alias_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Create a custom alias for a certain Nadeko command. Provide no alias to remove the existing one.. + /// + public static string alias_desc { + get { + return ResourceManager.GetString("alias_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}alias allin $bf 100 h` or `{0}alias "linux thingy" >loonix Spyware Windows`. + /// + public static string alias_usage { + get { + return ResourceManager.GetString("alias_usage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to aliaslist cmdmaplist aliases. + /// + public static string aliaslist_cmd { + get { + return ResourceManager.GetString("aliaslist_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Shows the list of currently set aliases. Paginated.. + /// + public static string aliaslist_desc { + get { + return ResourceManager.GetString("aliaslist_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}aliaslist` or `{0}aliaslist 3`. + /// + public static string aliaslist_usage { + get { + return ResourceManager.GetString("aliaslist_usage", resourceCulture); + } + } + /// /// Looks up a localized string similar to allchnlmdls acm. /// diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx index 5f16e07b..14a6e44a 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -3204,4 +3204,22 @@ `{0}crad 44` + + aliaslist cmdmaplist aliases + + + Shows the list of currently set aliases. Paginated. + + + `{0}aliaslist` or `{0}aliaslist 3` + + + alias cmdmap + + + Create a custom alias for a certain Nadeko command. Provide no alias to remove the existing one. + + + `{0}alias allin $bf 100 h` or `{0}alias "linux thingy" >loonix Spyware Windows` + \ No newline at end of file diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index 53939695..48c4a4f8 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -5656,6 +5656,51 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Typing {0} will now be an alias of {1}.. + /// + public static string utility_alias_added { + get { + return ResourceManager.GetString("utility_alias_added", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to List of aliases. + /// + public static string utility_alias_list { + get { + return ResourceManager.GetString("utility_alias_list", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Trigger {0} didn't have an alias.. + /// + public static string utility_alias_remove_fail { + get { + return ResourceManager.GetString("utility_alias_remove_fail", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Trigger {0} no longer has an alias.. + /// + public static string utility_alias_removed { + get { + return ResourceManager.GetString("utility_alias_removed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No alias found. + /// + public static string utility_aliases_none { + get { + return ResourceManager.GetString("utility_aliases_none", resourceCulture); + } + } + /// /// Looks up a localized string similar to Author. /// diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index fda3abc3..d954325d 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -2260,4 +2260,19 @@ Owner ID: {2} Response message for the custom reaction with id {0} will be sent as a DM. + + No alias found + + + Typing {0} will now be an alias of {1}. + + + List of aliases + + + Trigger {0} no longer has an alias. + + + Trigger {0} didn't have an alias. + \ No newline at end of file diff --git a/src/NadekoBot/Services/CommandHandler.cs b/src/NadekoBot/Services/CommandHandler.cs index 5841d879..17521cab 100644 --- a/src/NadekoBot/Services/CommandHandler.cs +++ b/src/NadekoBot/Services/CommandHandler.cs @@ -320,6 +320,26 @@ namespace NadekoBot.Services var exec3 = Environment.TickCount - execTime; string messageContent = usrMsg.Content; + if (guild != null) + { + ConcurrentDictionary maps; + if (Modules.Utility.Utility.CommandMapCommands.AliasMaps.TryGetValue(guild.Id, out maps)) + { + string newMessageContent; + if (maps.TryGetValue(messageContent.Trim().ToLowerInvariant(), out newMessageContent)) + { + _log.Info(@"--Mapping Command-- + GuildId: {0} + Trigger: {1} + Mapping: {2}", guild.Id, messageContent, newMessageContent); + var oldMessageContent = messageContent; + messageContent = newMessageContent; + + try { await usrMsg.Channel.SendConfirmAsync($"{oldMessageContent} => {newMessageContent}").ConfigureAwait(false); } catch { } + } + } + } + // execute the command and measure the time it took var exec = await Task.Run(() => ExecuteCommand(new CommandContext(_client, usrMsg), messageContent, DependencyMap.Empty, MultiMatchHandling.Best)).ConfigureAwait(false); diff --git a/src/NadekoBot/Services/Database/Models/GuildConfig.cs b/src/NadekoBot/Services/Database/Models/GuildConfig.cs index a1c12ba1..00693f16 100644 --- a/src/NadekoBot/Services/Database/Models/GuildConfig.cs +++ b/src/NadekoBot/Services/Database/Models/GuildConfig.cs @@ -71,10 +71,34 @@ namespace NadekoBot.Services.Database.Models public HashSet UnmuteTimers { get; set; } = new HashSet(); public HashSet VcRoleInfos { get; set; } + public HashSet CommandAliases { get; set; } = new HashSet(); //public List ProtectionIgnoredChannels { get; set; } = new List(); } + public class CommandAlias : DbEntity + { + public string Trigger { get; set; } + public string Mapping { get; set; } + + //// override object.Equals + //public override bool Equals(object obj) + //{ + // if (obj == null || GetType() != obj.GetType()) + // { + // return false; + // } + + // return ((CommandAlias)obj).Trigger.Trim().ToLowerInvariant() == Trigger.Trim().ToLowerInvariant(); + //} + + //// override object.GetHashCode + //public override int GetHashCode() + //{ + // return Trigger.Trim().ToLowerInvariant().GetHashCode(); + //} + } + public class VcRoleInfo : DbEntity { public ulong VoiceChannelId { get; set; } diff --git a/src/NadekoBot/Services/Database/Repositories/Impl/GuildConfigRepository.cs b/src/NadekoBot/Services/Database/Repositories/Impl/GuildConfigRepository.cs index 150d671d..7098888d 100644 --- a/src/NadekoBot/Services/Database/Repositories/Impl/GuildConfigRepository.cs +++ b/src/NadekoBot/Services/Database/Repositories/Impl/GuildConfigRepository.cs @@ -16,6 +16,7 @@ namespace NadekoBot.Services.Database.Repositories.Impl _set.Include(gc => gc.LogSetting) .ThenInclude(ls => ls.IgnoredChannels) .Include(gc => gc.MutedUsers) + .Include(gc => gc.CommandAliases) .Include(gc => gc.UnmuteTimers) .Include(gc => gc.VcRoleInfos) .Include(gc => gc.GenerateCurrencyChannelIds) From a24b151b2a9f916953ce8d81ab941289b25806f9 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 20 Mar 2017 13:45:36 +0100 Subject: [PATCH 307/496] Now even compiles and runs! --- src/NadekoBot/Modules/Searches/Searches.cs | 3 ++- src/NadekoBot/project.json | 8 ++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/NadekoBot/Modules/Searches/Searches.cs b/src/NadekoBot/Modules/Searches/Searches.cs index 88d688c9..472a17d5 100644 --- a/src/NadekoBot/Modules/Searches/Searches.cs +++ b/src/NadekoBot/Modules/Searches/Searches.cs @@ -22,6 +22,7 @@ using Configuration = AngleSharp.Configuration; using NadekoBot.Attributes; using Discord.Commands; using ImageSharp.Processing.Processors; +using ImageSharp; namespace NadekoBot.Modules.Searches { @@ -605,7 +606,7 @@ namespace NadekoBot.Modules.Searches return; var img = new ImageSharp.Image(50, 50); - img.ApplyProcessor(new BackgroundColorProcessor(ImageSharp.Color.FromHex(color)), img.Bounds); + img.BackgroundColor(ImageSharp.Color.FromHex(color)); await Context.Channel.SendFileAsync(img.ToStream(), $"{color}.png").ConfigureAwait(false); } diff --git a/src/NadekoBot/project.json b/src/NadekoBot/project.json index cd69d074..fe93d0d3 100644 --- a/src/NadekoBot/project.json +++ b/src/NadekoBot/project.json @@ -23,12 +23,8 @@ "Google.Apis.Urlshortener.v1": "1.19.0.138", "Google.Apis.YouTube.v3": "1.20.0.701", "Google.Apis.Customsearch.v1": "1.20.0.466", - "ImageSharp": "1.0.0-alpha2-*", - "ImageSharp.Processing": "1.0.0-alpha2-*", - "ImageSharp.Formats.Png": "1.0.0-alpha2-*", - "ImageSharp.Formats.Jpeg": "1.0.0-alpha2-*", - "ImageSharp.Drawing": "1.0.0-alpha2-*", - "ImageSharp.Drawing.Paths": "1.0.0-alpha2-*", + "ImageSharp": "1.0.0-alpha4-00031", + "ImageSharp.Drawing": "1.0.0-alpha4-00031", "Microsoft.EntityFrameworkCore": "1.1.0", "Microsoft.EntityFrameworkCore.Design": "1.1.0", "Microsoft.EntityFrameworkCore.Sqlite": "1.1.0", From 4ba487534e94b2873c50ef231fbafc317f013065 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 20 Mar 2017 18:19:11 +0100 Subject: [PATCH 308/496] Added a missed string --- .../Modules/Searches/Commands/OverwatchCommands.cs | 2 +- src/NadekoBot/Resources/ResponseStrings.Designer.cs | 9 +++++++++ src/NadekoBot/Resources/ResponseStrings.resx | 3 +++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Searches/Commands/OverwatchCommands.cs b/src/NadekoBot/Modules/Searches/Commands/OverwatchCommands.cs index 199c9b53..99ce317d 100644 --- a/src/NadekoBot/Modules/Searches/Commands/OverwatchCommands.cs +++ b/src/NadekoBot/Modules/Searches/Commands/OverwatchCommands.cs @@ -58,7 +58,7 @@ namespace NadekoBot.Modules.Searches .AddField(fb => fb.WithName(GetText("compet_loses")).WithValue($"{model.Games.Competitive.lost}").WithIsInline(true)) .AddField(fb => fb.WithName(GetText("compet_played")).WithValue($"{model.Games.Competitive.played}").WithIsInline(true)) .AddField(fb => fb.WithName(GetText("compet_rank")).WithValue(rank).WithIsInline(true)) - .AddField(fb => fb.WithName(GetText("compet_played")).WithValue($"{model.Playtime.competitive}").WithIsInline(true)) + .AddField(fb => fb.WithName(GetText("compet_playtime")).WithValue($"{model.Playtime.competitive}").WithIsInline(true)) .AddField(fb => fb.WithName(GetText("quick_playtime")).WithValue($"{model.Playtime.quick}").WithIsInline(true)) .WithColor(NadekoBot.OkColor); await Context.Channel.EmbedAsync(embed).ConfigureAwait(false); diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index 48c4a4f8..fec34b11 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -4900,6 +4900,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Competitive playtime. + /// + public static string searches_compet_playtime { + get { + return ResourceManager.GetString("searches_compet_playtime", resourceCulture); + } + } + /// /// Looks up a localized string similar to Competitive rank. /// diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index d954325d..56ada3ed 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -2275,4 +2275,7 @@ Owner ID: {2} Trigger {0} didn't have an alias. + + Competitive playtime + \ No newline at end of file From f9f0fc31b5549c24bef33bc45b7be6652151a6ff Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 21 Mar 2017 04:54:14 +0100 Subject: [PATCH 309/496] Update ResponseStrings.zh-CN.resx (POEditor.com) --- .../Resources/ResponseStrings.zh-CN.resx | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/NadekoBot/Resources/ResponseStrings.zh-CN.resx b/src/NadekoBot/Resources/ResponseStrings.zh-CN.resx index baf824c3..57e2e91c 100644 --- a/src/NadekoBot/Resources/ResponseStrings.zh-CN.resx +++ b/src/NadekoBot/Resources/ResponseStrings.zh-CN.resx @@ -2353,5 +2353,35 @@ Fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From abeaba2173515bd2332ed71f75a42211664b486c Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 21 Mar 2017 04:54:16 +0100 Subject: [PATCH 310/496] Update ResponseStrings.zh-TW.resx (POEditor.com) --- .../Resources/ResponseStrings.zh-TW.resx | 34 +++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx b/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx index f299b7f2..d42f47bc 100644 --- a/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx +++ b/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx @@ -1382,7 +1382,7 @@ Paypal <{1}> 播放清單大小現在沒有限制了。 - 播放清單最多可以排序 {0} 首。 + 播放清單最多可以點播 {0} 首。 你必須要進入在此伺服器上的語音頻道。 @@ -1470,7 +1470,7 @@ Paypal <{1}> 啟用重複播放清單。 - 我將在此頻道輸出播放、暫停、結束和移除的歌曲。 + 我將在此頻道輸出播放、暫停、結束和移除歌曲的訊息。 跳至 ‘{0}:{1}’ @@ -2254,5 +2254,35 @@ Paypal <{1}> 語音頻道身分組 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 031bfb25fdb05f550184b957b471f96b5f0266a9 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 21 Mar 2017 04:54:19 +0100 Subject: [PATCH 311/496] Update ResponseStrings.nl-NL.resx (POEditor.com) --- .../Resources/ResponseStrings.nl-NL.resx | 351 ++++++++++-------- 1 file changed, 191 insertions(+), 160 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.nl-NL.resx b/src/NadekoBot/Resources/ResponseStrings.nl-NL.resx index 9b49d118..15bc2419 100644 --- a/src/NadekoBot/Resources/ResponseStrings.nl-NL.resx +++ b/src/NadekoBot/Resources/ResponseStrings.nl-NL.resx @@ -1296,10 +1296,10 @@ Fuzzy Er is al een spel galgje aan de gang in dit kanaal. - + Galgje kon niet opstarten vanwege een fout. - + lijst van {0}Galgje term types: Scoreboard @@ -1319,7 +1319,7 @@ Fuzzy Kwoth planted 5* - + Trivia spel is al bezig in deze server. Trivia spel @@ -1328,25 +1328,25 @@ Fuzzy {0} heeft 'm geraden! Het antwoord was: {1} - + Trivia is niet bezig in deze server. {0} heeft {1} punten - + Stopt na deze vraag. - + Tijd is op! Het goede antwoord was {0} - + {0} heeft het antwoord geraden en wint het spel! Het antwoord was: {1} Je kan niet tegen jezelf spelen. - + BoterKaasenEieren spel is al bezig in dit kannal. Gelijkspel! @@ -1358,10 +1358,10 @@ Fuzzy {0} heeft gewonnen! - + Drie op een rij - + Geen zetten over! Tijd voorbij! @@ -1370,7 +1370,7 @@ Fuzzy {0}'s beurt - + {0} tegen {1} Aan het proberen om {0} liedjes in de wachtrij te zetten... @@ -1385,25 +1385,25 @@ Fuzzy Standaard volume op {0}% gezet - + Map afspeellijst geladen/compleet. - + Eerlijk spel. Liedje afgelopen - + Eerlijk spel uitgeschakeld. - + Eerlijk spel ingeschakeld. van positie - + ID ongeldige invoer. @@ -1440,13 +1440,13 @@ Fuzzy Muziek gepauzeerd. - + Speler afspeellijst - Pagina {0}/{1} - + Liedje aan het spelen - + `#{0}` - **{1}** van *{2}* ({3} liedjes) Pagina {0} van opgeslagen afspeellijsten @@ -1456,13 +1456,13 @@ Fuzzy Afspeellijst verwijderd - + Fout bij het verwijderen van de afspeellijst. Of het bestaat niet of U bent niet de auteur. - + Afspeellijst met dat ID bestaat niet. - + Speler afspeellijst afgerond. Afspeellijst opgeslagen @@ -1474,7 +1474,8 @@ Fuzzy Wachtrij - + Gekozen nummer + Muziek wachtrij leeggemaakt. @@ -1493,25 +1494,25 @@ Fuzzy Huidige afspeellijst word herhaald - + Herhaal nummer - + Huidig nummer herhaling gestopt. - + Nummer word hervat. - + Herhaal afspeellijst uitgeschakeld. - + Herhaal afspeellijst ingeschakeld. - + Muziek dat wordt gespeeld, afloopt, gepauzeerd en wordt verwijder laat ik in dit kanaal zien. - + Overslaan naar `{0}:{1}` Liedjes geschud @@ -1535,34 +1536,34 @@ Fuzzy Volume op {0}% gezet - + Uitgeschakelde gebruik op alle moddelen in dit kanaal {0}. - + Ingeschakelde gebruik op alle moddelen in dit kanaal {0}. Toegestaan - + Uitgeschakelde gebruik op alle moddelen voor deze rol {0}. - + Ingeschakelde gebruik op alle moddelen voor deze rol{0}. - + Uitgeschakelde gebruik op alle moddelen in deze server. - + ingeschakelde gebruik op alle moddelen in deze server. - + Uitgeschakelde gebruik op alle moddelen voor deze gebruiker{0}. - + Ingeschakelde gebruik op alle moddelen voor deze gebruiker{0}. - + Blacklisted {0} met ID {1} Commando {0} heeft nu een {1}s afkoel tijd. @@ -1574,49 +1575,49 @@ Fuzzy Geen commando afkoeltijden ingesteld. - + Command kosten - + Uitgeschakelde gebruik van {0} {1} in kanaal {2}. - + Ingeschakelde gebruik van {0} {1} in kanaal {2}. Geweigerd - + Woord {0} tegevoegd aan de lijst met foute woorden. Lijst van gefilterde worden - + Woord {0} verwijderd van de lijst met foute woorden. - + Ongeldige tweede parameter.(Moet een number zijn tussen {0} en {1}) - + Uitnodiging filter uitgeschakeld in dit kanaal. - + Uitnodiging filter ingeschakeld in dit kanaal. - + Uitnodiging filter uitgeschakeld in deze server. - + Uitnodiging filter ingeschakeld in deze server. - + Verplaat toestemming {0} voor #{1} naar #{2} - + Kan geen toestemming vinden in inhoudsopgave #{0} - + Geen kosten ingesteld. Commando @@ -1630,77 +1631,77 @@ Fuzzy Rechten pagina {0} - + Actueel toestemming rol is {0}. - + Gebruiker heeft nu {0} rol om toestemmingen te veranderen. - + Geen toestemming gevonden in de inhoudsopgave. - + Verwijderd toestemming #{0} - {1} - + Uitgeschakelde gebruik van {0} {1} voor rol {2}. - + Ingeschakelde gebruik van {0} {1} voor rol {2}. - + Seconden Short of seconds. - + Uitgeschakelde gebruik van {0} {1} op deze server. - + Ingeschakelde gebruik van {0} {1} op deze server. - + Unblacklisted {0} met ID {1} - + Niet veranderbaar - + Uitgeschakelde gebruik van {0} {1} voor gebruiker {2}. - + Ingeschakelde gebruik van {0} {1} voor gebruiker {2}. - + Ik zal geen permissie waarschuwingen meer weergeven. - + Ik zal permissie waarschuwingen weergeven. - + Woord filter gedeactiveerd in dit kanaal. - + Woord filter geactiveerd in dit kanaal. - + Woord filter gedeactiveerd in deze server. - + Woord filter geactiveerd in deze server. - + Talenten - + Nog geen favoriete anime Gestart met het automatisch vertalen van berichten op dit kanaal. Gebruiker berichten worden automatisch verwijderd. - + Jouw automatisch translatie taal is verwijderd. - + Jouw automatisch translatie taal is aangepast naar {0}>{1} Gestart met het automatisch vertalen van berichten op dit kanaal. @@ -1709,10 +1710,10 @@ Fuzzy Gestopt met het automatisch vertalen van berichten op dit kanaal. - + Verkeerde invoer formaat, of ging er iets mis. - + Gekozen kaart is niet gevonden. feit @@ -1721,19 +1722,19 @@ Fuzzy hoofdstukken - + Stripboek # - + Competitief verloren - + Competitief gespeeld - + Competitief rang - + Competitief Gewonnen Voltooid @@ -1774,13 +1775,13 @@ Fuzzy Genres - + Definitie vinden voor de label is mislukt. Lengte/Gewicht - + {0}m/{1}kg Vochtigheid @@ -1792,35 +1793,35 @@ Fuzzy Mislukt in het vinden van die film. - + Invalide taal -bron of -doel. Grapjes niet geladen. - + Lengte- en breedtegraad - + Niveau - + Lijst van {0}plaats labels Don't translate {0}place Lokatie - + Magische Items niet geladen. {0}'s MAL profiel - + Je kunt deze functie niet gebruiken. Bot eigenaar heeft MashapeApiKey niet gedefinieërd. - + Minimaal/Maximaal Geen kanaal gevonden. @@ -1829,7 +1830,7 @@ Fuzzy Geen resultaten gevonden. - + On-hold Originele URL @@ -1838,64 +1839,64 @@ Fuzzy Een osu! API sleutel is vereist. - + Kon het osu! handtekening niet ontvangen. - + Meer dan {0} afbeeldingen gevonden. Willekeurig Resultaat {0}. - + Gebruiker niet gevonden! Check de Regio en de BattleTag voordat je het opnieuw probeert. - + Van plan om te bekijken. - + Platform - + Geen talent gevonden. - + Geen Pokémon gevonden. - + Profiel link: Kwaliteit: - + Snel kijktijd - + Snelle overwinningen. - + Beoordeling - + Score: - + Zoekopdracht voor: - + Fout bij het inkorten van de URL. - + Korte URL - + Er is iets mis gegaan. - + Specificeer zoek parameters alsjeblieft. - + Status - + Winkel URL Streamer {0} is offline. @@ -1910,16 +1911,16 @@ Fuzzy Je volgt geen streams op deze server. - + Stream niet gevonden. - + Stream bestaat mogelijk niet. - + Verwijderd {0}'s stream ({1}) van notificaties. - + Ik zal dit kanaal op de hoogte houden wanneer de status verandert. Zon's opgang @@ -1934,7 +1935,7 @@ Fuzzy Titel: - + Top 3 favoriete anime: Vertaling: @@ -1943,22 +1944,22 @@ Fuzzy Types - + Fout bij het opzoeken van definitie voor die term. - + Url Kijkers - + Kijken/Bekijken <-- ga even na welke correct is.!!! - + Mislukt met het vinden van de term op de gespecificeerde Wikia. - + Vul een Wikia doel in alsjeblieft, gevolgd door een zoek query. Pagina niet gevonden @@ -1970,13 +1971,13 @@ Fuzzy De {0} meest verbannen kampioenen. - + Het yodifying van jou zin is mislukt. - + Aangesloten - + `{0}.` {1} [{2:F2}/s] - {3} totaal /s and total need to be localized to fit the context - `1.` @@ -1993,10 +1994,10 @@ Fuzzy Bot ID - + Lijst van functies in {0}calc commando - + {0} van dit kanaal is {1} Kanaal onderwerp @@ -2020,10 +2021,10 @@ Fuzzy Gemaakt op - + Aangesloten cross server kanaal. - + Verbroken cross server kanaal. Dit is je CSC token @@ -2055,10 +2056,10 @@ Fuzzy Invalid months value/ Invalid hours value - + Bij Discord aangesloten - + Bij server aangesloten ID: {0} @@ -2093,7 +2094,7 @@ Eigenaar ID: {2} Niemand speelt dat spel. - + Geen actieve herhaling Geen rollen op deze pagina. @@ -2147,10 +2148,10 @@ Eigenaar ID: {2} Ik zal {0} herinneren om {1} in {2} `({3:d.M.yyyy.} op {4:HH:mm})` - + Incorrecte tijd formaat. Controleer de commandolijst. - + Nieuwe herinnering sjabloon. Herhalen van {0} elke {1} dagen, {2} uren en {3} minuten. @@ -2162,25 +2163,25 @@ Eigenaar ID: {2} Geen repeaters actief op deze server. - + #{0} gestopt. - + Geen herhalende berichten gevonden op deze server. - + Resultaat - + Rollen - + Pagina #{0} van alle rollen op deze server: - + Pagina #{0} van kleuren voor {1} - + Kleuren staan niet in de correcte format. Gebruik #00ff00` als voorbeeld. Begonnen met het routeren van kleuren voor de rol {0} @@ -2219,7 +2220,7 @@ Eigenaar ID: {2} Hier is de link naar je sessie: - + Uptime {0} van de gebruker {1} is {2} @@ -2235,65 +2236,95 @@ Eigenaar ID: {2} Je maakt al deel uit van deze race! - + Huidige poll resultaten - + Geen stemmen ingediend. - + Poll is al actief op deze server. - + 📃 {0} heeft een poll gecreëerd dat vraagt om uw aandacht: - + `{0}.` {1} met {2} stemmen. {0} gestemd. Kwoth voted. - + Stuur mij een privé bericht met het overeenkomende nummer van het antwoord. - + Stuur een bericht hier met de overeenkomende nummer van het antwoord. - + Bedankt voor het stemmen, {0} - + Totaal aantal stemmen: {0}. - + Raap hun op door te typen `{0}pick` - + Raap het op door te typen `{0}pick` - + Geen gebruiker gevonden. - + pagina {0} - + U moet zich in een spreekkanaal bevinden op deze server. - + Er zijn geen spreekkanaal rollen. - + {0} is **gedempt** van text en spreek chat voor {1} minuten. - + Gebruikers die aansluiten op {0} geluid kanaal krijgen {1} rol. - + Gebruiker dat aansloot {0} geluid kanaal krijgt niet langer meer een rol. - + Spreekkanaal rollen + + + Bericht triggering met aangepaste reactie id {0} wordt niet automatisch gedeletet. + + + Bericht triggering met aangepaste reactie id {0} wordt automatisch gedeletet. + + + Response-bericht van aangepaste reactie met id {0} wordt niet privé verstuurd. + + + Response-bericht van aangepaste reactie met id {0} wordt verstuurd als privé bericht. + + + Geen alias gevonden. + + + Trigger {0} heeft nu de alias {1}. + + + Lijst van aliassen + + + Trigger {0} heeft geen alias meer. + + + Trigger {0} had geen alias + + + Competitieve speeltijd \ No newline at end of file From 0cc9879136320dafd216197c2ff65e0d80714d3e Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 21 Mar 2017 04:54:22 +0100 Subject: [PATCH 312/496] Update ResponseStrings.en-US.resx (POEditor.com) --- .../Resources/ResponseStrings.en-US.resx | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/NadekoBot/Resources/ResponseStrings.en-US.resx b/src/NadekoBot/Resources/ResponseStrings.en-US.resx index 25c6550d..c384f48e 100644 --- a/src/NadekoBot/Resources/ResponseStrings.en-US.resx +++ b/src/NadekoBot/Resources/ResponseStrings.en-US.resx @@ -2248,5 +2248,35 @@ Owner ID: {2} Voice channel roles + + Message triggering the custom reaction with id {0} won't get automatically deleted. + + + Message triggering the custom reaction with id {0} will get automatically deleted. + + + Response message for the custom reaction with id {0} won't be sent as a DM. + + + Response message for the custom reaction with id {0} will be sent as a DM. + + + No alias found + + + Typing {0} will now be an alias of {1}. + + + List of aliases + + + Trigger {0} no longer has an alias. + + + Trigger {0} didn't have an alias. + + + Competitive playtime + \ No newline at end of file From 81d0205e5128db996ee288b8088958f24fc6c2ab Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 21 Mar 2017 04:54:24 +0100 Subject: [PATCH 313/496] Update ResponseStrings.fr-FR.resx (POEditor.com) --- .../Resources/ResponseStrings.fr-FR.resx | 77 +++++++++++++------ 1 file changed, 54 insertions(+), 23 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.fr-FR.resx b/src/NadekoBot/Resources/ResponseStrings.fr-FR.resx index a6a0fa29..ee351ef0 100644 --- a/src/NadekoBot/Resources/ResponseStrings.fr-FR.resx +++ b/src/NadekoBot/Resources/ResponseStrings.fr-FR.resx @@ -339,7 +339,7 @@ Raison: {1} Les annonces de départ seront supprimées après {0} secondes. - Annonce de départ actuelle : {0} + Annonce de départ actuelle: {0} Activez les annonces de départ en entrant {0} @@ -469,7 +469,7 @@ Raison: {1} Vous avez été expulsé du serveur {0}. -Raison : {1} +Raison: {1} Utilisateur expulsé @@ -510,7 +510,7 @@ Raison : {1} Enregistrement désactivé. - Événements enregistrés que vous pouvez suivre : + Événements enregistrés que vous pouvez suivre: L'enregistrement ignorera désormais {0} @@ -525,7 +525,7 @@ Raison : {1} {0} a émis une notification pour les rôles suivants - Message de {0} `[Bot Owner]` : + Message de {0} `[Propriétaire du bot]`: Message envoyé. @@ -1082,7 +1082,7 @@ N'oubliez pas de mettre votre nom discord ou ID dans le message. Usage - Autohentai commencé. Publie toutes les {0}s avec l'un des tags suivants : + Autohentai commencé. Publie toutes les {0}s avec l'un des tags suivants: {1} @@ -1127,7 +1127,7 @@ N'oubliez pas de mettre votre nom discord ou ID dans le message. Someone rolled 35 - Dé tiré au sort: {0} + Dés lancés: {0} Dice Rolled: 5 @@ -1140,8 +1140,9 @@ N'oubliez pas de mettre votre nom discord ou ID dans le message. Le deuxième nombre doit être plus grand que le premier. - Changements de Coeur - Fuzzy + Changements d'avis + La plus proche traduction pour cette expression serait "Changement d'avis" +Fuzzy Revendiquée par @@ -1263,14 +1264,14 @@ La nouvelle valeur de {0} est {1} ! {0} a gagné ! {1} bat {2}. - Inscriptions terminées. + Soumissions fermées. Fuzzy Une course d'animaux est déjà en cours. - Total : {0} Moyenne : {1} + Total: {0} Moyenne: {1} Catégorie @@ -1314,7 +1315,7 @@ Fuzzy Initialisation du pendu erronée. - Liste des "{0}hangman" types de termes : + Liste des types de termes pour "{0}hangman": Classement @@ -1370,7 +1371,7 @@ Fuzzy a créé une partie de Morpion. - {0} a gagné ! + {0} a gagné! Fuzzy @@ -1381,7 +1382,7 @@ Fuzzy Aucun mouvement restant ! - Le temps a expiré ! + Le temps a expiré! Fuzzy @@ -1456,7 +1457,7 @@ Fuzzy Pas de résultat. - Lecteure mise en pause. + Lecture mise en pause. File d'attente - Page {0}/{1} @@ -1510,7 +1511,7 @@ Fuzzy context: "removed song #5" - Répétition de la piste en cours de lecture + Répétition de la piste actuelle Fuzzy @@ -1540,7 +1541,7 @@ Fuzzy Saut à `{0}:{1}` - Lecture aléatoire activée. + Pistes mélangées. Fuzzy @@ -1876,7 +1877,7 @@ Fuzzy Fuzzy - Url originale + Url d'origine Fuzzy @@ -1912,11 +1913,11 @@ Fuzzy Qualité - Durée en Jeux Rapides + Temps en parties rapides Fuzzy - Victoires Rapides + Parties rapides gagnées Fuzzy @@ -2107,7 +2108,7 @@ Fuzzy Fuzzy - Vous ne pouvez pas utiliser cette commande sur un rôle incluant beaucoup d'utilisateurs afin d'éviter les abus. + Vous ne pouvez pas utiliser cette commande sur les rôles associés à beaucoup d'utilisateurs afin d'éviter les abus. Fuzzy @@ -2124,7 +2125,7 @@ Fuzzy ID: {0} Membres: {1} -OwnerID: {2} +ID du propriétaire: {2} Fuzzy @@ -2210,7 +2211,7 @@ OwnerID: {2} Fuzzy - Je vais vous rappeler {0} pour {1} dans {2} `({3:d.M.yyyy} à {4:HH:mm})` + Je vais rappeler {0} de {1} dans {2} `({3:d.M.yyyy} à {4:HH:mm})` Format de date non valide. Vérifiez la liste des commandes. @@ -2241,7 +2242,7 @@ OwnerID: {2} Rôles - Page #{0} de tout les rôles sur ce serveur. + Page #{0} de tous les rôles de ce serveur: Page #{0} des rôles pour {1} @@ -2369,5 +2370,35 @@ Fuzzy Rôles du salon vocal + + Le message déclenchant la réaction personnalisée avec l'ID {0} ne sera pas automatiquement effacé. + + + Le message déclenchant la réaction personnalisée avec l'ID {0} sera automatiquement effacé. + + + Le message de réponse pour la réaction personnalisée avec l'ID {0} ne sera pas envoyé en MP. + + + Le message de réponse pour la réaction personnalisée avec l'ID {0} sera envoyé en MP. + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 351b85977597ce35b02eeed3695a19a94aade6eb Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 21 Mar 2017 04:54:27 +0100 Subject: [PATCH 314/496] Update ResponseStrings.de-DE.resx (POEditor.com) --- .../Resources/ResponseStrings.de-DE.resx | 34 +++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.de-DE.resx b/src/NadekoBot/Resources/ResponseStrings.de-DE.resx index 34346f0c..db44d4ac 100644 --- a/src/NadekoBot/Resources/ResponseStrings.de-DE.resx +++ b/src/NadekoBot/Resources/ResponseStrings.de-DE.resx @@ -2329,10 +2329,10 @@ ID des Besitzers: {2} Fuzzy - Sammel sie durch das Schreiben von `{0}pick` + sammel sie durch das Schreiben von `{0}pick` - Sammel sie durch das Schreiben von `{0}pick + sammel sie durch das Schreiben von `{0}pick Kein Benutzer gefunden. @@ -2358,5 +2358,35 @@ ID des Besitzers: {2} Rollen für Sprachkanäle + + Auslösende Nachricht der benutzerdefinierten Reaktion mit der ID {0} wird nicht automatisch gelöscht. + + + Auslösende Nachricht der benutzerdefinierten Reaktion mit der ID {0} wird automatisch gelöscht. + + + Reaktionsnachricht für die benutzerdefinierte Reaktion mit der ID {0} wird nicht als DN gesendet. + + + Reaktionsnachricht für die benutzerdefinierte Reaktion mit der ID {0} wird nicht als DN gesendet. + + + + + + + + + + + + + + + + + + + \ No newline at end of file From ebdaadee650f4d4c40d50978f88970e048e9c2f5 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 21 Mar 2017 04:54:30 +0100 Subject: [PATCH 315/496] Update ResponseStrings.ja-JP.resx (POEditor.com) --- .../Resources/ResponseStrings.ja-JP.resx | 88 ++++++++++++++----- 1 file changed, 67 insertions(+), 21 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.ja-JP.resx b/src/NadekoBot/Resources/ResponseStrings.ja-JP.resx index b4c12bf6..6e52fbe0 100644 --- a/src/NadekoBot/Resources/ResponseStrings.ja-JP.resx +++ b/src/NadekoBot/Resources/ResponseStrings.ja-JP.resx @@ -925,7 +925,8 @@ Fuzzy - + 逆の聴覚障害を成功させる。 + ミュート解除 @@ -1284,10 +1285,10 @@ Paypal <{1}> {0} は {1} として参加しました。 - + {0}は{1}と{2}に参加しました！ - + レースに参加するには{0} jrと入力してください。 部屋がいっぱいになるか、20秒後にスタートします。 @@ -1296,10 +1297,12 @@ Paypal <{1}> {0} 人の参加者でスタートします。 - + {0}を{1}としてレースを獲得しました！ + - + {0}を{1}に、レースを{2}獲得しました！ + 数が正しくありません。一度に {0}-{1} のダイスを触れます。 @@ -1323,53 +1326,66 @@ Paypal <{1}> 最初の数よりも２番めの数が大きくなければなりません。 - + 「心」の変化 - + が主張する + - + 離婚 + - + 好き - + 価格 - + waifusはまだ主張されていません。 - + トップワイフス + - + あなたの親和性はすでにそのwaifuに設定されているか、親和性を持たずに削除しようとしています。 + - + {0}から{1}にアフィニティを変更しました。 + +*これは道徳的に疑問です。*🤔 Make sure to get the formatting right, and leave the thinking emoji - + アフィニティを再度変更するには、{0}時間と{1}分を待つ必要があります。 + - + 親和性がリセットされます。あなたはもはや好きな人がいません。 + - + {0}のwaifuになりたいAww <3 - + {1}のウェイフとして{0}が主張されています！ + - + あなたが好きな人と離婚しました。あなたは無情な怪物です。 +{0}は補償として{1}を受け取りました。 - + あなたは自分自身に親和性を設定することはできません。 + - + +🎉彼らの愛が成就した！ 🎉 +{0}の新しい値は{1}です！ @@ -2481,5 +2497,35 @@ Paypal <{1}> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From ff5eddd64d414629a1148ec9bdce962ad6c16534 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 21 Mar 2017 04:54:32 +0100 Subject: [PATCH 316/496] Update ResponseStrings.nb-NO.resx (POEditor.com) --- .../Resources/ResponseStrings.nb-NO.resx | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/NadekoBot/Resources/ResponseStrings.nb-NO.resx b/src/NadekoBot/Resources/ResponseStrings.nb-NO.resx index e634ce06..f566494b 100644 --- a/src/NadekoBot/Resources/ResponseStrings.nb-NO.resx +++ b/src/NadekoBot/Resources/ResponseStrings.nb-NO.resx @@ -2304,5 +2304,35 @@ Eier ID: {2} Stemmekanal-roller + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 384f58669fd3132c5b1499eb530b550b81f914df Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 21 Mar 2017 04:54:35 +0100 Subject: [PATCH 317/496] Update ResponseStrings.pl-PL.resx (POEditor.com) --- .../Resources/ResponseStrings.pl-PL.resx | 84 +++++++++++++------ 1 file changed, 57 insertions(+), 27 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.pl-PL.resx b/src/NadekoBot/Resources/ResponseStrings.pl-PL.resx index 62b2df49..6517d703 100644 --- a/src/NadekoBot/Resources/ResponseStrings.pl-PL.resx +++ b/src/NadekoBot/Resources/ResponseStrings.pl-PL.resx @@ -432,10 +432,10 @@ Powód: {1} Nowa prywatna wiadomość powitalna została ustawiona. - + Prywatne ogłoszenie powitalne zostało włączone - + Prywatne ogłoszenie powitalne zostało wyłączone Aktualna wiadomość powitalna: {0} @@ -504,10 +504,10 @@ Powód: {1} - + Logowanie wszystkich wydarzeń na tym kanale. - + Logowanie wyłączone. @@ -516,7 +516,7 @@ Powód: {1} - + Logowanie nie będzie ignorowało {0} @@ -551,7 +551,7 @@ Powód: {1} Nie mam wystarczających uprawnień aby to zrobić. - + Nowa wyciszająca rola ustawiona. Potrzebuję uprawnień **administratora* żeby to zrobić. @@ -597,7 +597,7 @@ Powód: {1} Uprawnienia tego serwera zostały zresetowane. - + Aktywne zabezpieczenia {0} został **wyłączony** na tym serwerze. @@ -609,7 +609,7 @@ Powód: {1} Wystąpił błąd. Potrzebuję uprawnień zarządzania rolami - + Żadne zabezpieczenie nie jest aktywne. @@ -773,7 +773,7 @@ Powód: {1} Kanał tekstowy został usunięty. - + wyciszenie wyłączone Odciszony @@ -876,7 +876,7 @@ Powód: {1} Fuzzy - + Migracja zakończona! @@ -908,7 +908,7 @@ Powód: {1} Zgadłeś! Wygrałeś {0} - + Użyty numer jest niepoprawny. Możesz rzucić 1 do {0} monet Dodaj reakcję {0} do tej wiadomości, aby dostać {1} @@ -962,16 +962,16 @@ Powód: {1} ŁAAAAAAAAAAAAŁ!!! Gratulacje!!! x{0} - + Pojedyńczy {0}, x{1} - + Wow! Szczęściarz! Trójka! x{0} - + Nieźle! Dwójka {0} - stawka x{1} - + Wygrana Użytkownicy muszą wpisać tajny kod aby dostać {0}. @@ -994,13 +994,13 @@ Trwa {0} sekund. Nie nikomu. Ciiii. nie był w stanie wziąć {0} od {1}, ponieważ użytkownik nie ma tylu {2}! - + Powrót do ToC Tylko właściciel bota - + Wymagane {0} uprawnienie kanału. Możesz wspierać ten projekt na patreonie: <{0}> albo poprzez paypala: <{1}> @@ -1050,7 +1050,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + Spis treści Użycie @@ -1093,7 +1093,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś {1} czyli {0} wygrał wyścig i {2}! - + Użyty numer jest nie poprawny. Możesz rzucić {0}-{1} kośćmi na raz wyrzucono {0} @@ -1302,22 +1302,22 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Kwoth planted 5* - + Trivia jest aktywna na tym serwerze - + Trivia {0} zgadł! Odpowiedź to: {1} - + Trivia nie jest aktywna na tym serwerze {0} posiada {1} punktów - + Koniec po tym pytaniu Koniec czasu! Prawidłowa odpowiedź to {0} @@ -1431,7 +1431,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + Strona {0} zapisanych playlist Playlista usunięta. @@ -1443,7 +1443,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Playlista z takim ID nie istnieje. - + Kolejka do playlisty zakończona Playlista zapisana @@ -1835,7 +1835,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + Pokemon nieznaleziony Link profilowy: @@ -1949,7 +1949,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + Problem z napisaniem Twojego zdania w stylu Yody Dołączył @@ -2272,5 +2272,35 @@ ID właściciela: {2} Uprawnienia kanału głosowego + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From b91fa24d16ecc63ae777b75119574c00e1b73447 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 21 Mar 2017 04:54:37 +0100 Subject: [PATCH 318/496] Update ResponseStrings.pt-BR.resx (POEditor.com) --- .../Resources/ResponseStrings.pt-BR.resx | 32 ++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx b/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx index 147fd952..1fa1070b 100644 --- a/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx +++ b/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx @@ -284,7 +284,7 @@ Você reviveu a si mesmo com uma {0} - Seu tipo foi mudado de {0} para {1} + Seu tipo foi mudado para {0} por uma {1} É mais ou menos efetivo. @@ -2356,5 +2356,35 @@ OwnerID: {2} Cargos de canais de voz + + A mensagem que ativa a reação personalizada com id {0} não será deletada automaticamente. + + + A mensagem que ativa a reação personalizada com id {0} será deletada automaticamente. + + + A resposta para a reação personalizada com o id {0} não será enviada como mensagem direta. + + + A resposta para a reação personalizada com o id {0} será enviada como mensagem direta. + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 94f55d46156ef5174e878b4b57844282b080db3b Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 21 Mar 2017 04:54:40 +0100 Subject: [PATCH 319/496] Update ResponseStrings.ru-RU.resx (POEditor.com) --- .../Resources/ResponseStrings.ru-RU.resx | 176 +++++++++++------- 1 file changed, 109 insertions(+), 67 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx b/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx index 5f333da0..250cb254 100644 --- a/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx +++ b/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx @@ -139,7 +139,7 @@ @{0} Вы уже захватили базу #{1}. Вы не можете захватить новую базу. - Время действия запроса от @{0} на войну против {1} истёкло. + Время действия запроса от @{0} на войну против {1} истекло. Враг @@ -163,7 +163,7 @@ Вы не участвуете в этой войне. - @{0} Вы либо не участвуете в этой войне, либо эта база разрушена. + @{0} Вы либо не участвуете в этой войне, либо эта база уже разрушена. Нет активных войн. @@ -175,13 +175,13 @@ Война против {0} уже началась. - Война против {0} была начата. + Война против {0} начата. - Закончилась война против {0}. + Война против {0} закончилась. - Эта война не существует. + Этой войны не существует. Война против {0} началась! @@ -193,7 +193,7 @@ Настраиваемая реакция удалена - Недостаточно прав. Необходимо владеть Бот-ом для глобальных настраиваемых реакций или быть Администратором для реакций по серверу. + Недостаточно прав. Необходимо иметь права владельца бота для глобальных настраиваемых реакций, и права Администратора для реакций по серверу. Список всех настраиваемых реакций @@ -217,7 +217,7 @@ Статистика настраеваемых реакций - Статистика удалена для настраеваемой реакции {0}. + Статистика для настраиваемой реакции {0} очищена. Не найдено статистики для этого активатора, никаких действий не применено. @@ -226,10 +226,10 @@ Активатор - Авто-хентай остановлен :( + Авто-хентай остановлен. - Запрос не найден. + Результатов не найдено. {0} уже потерял сознание. @@ -245,10 +245,10 @@ Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage. - Нельзя атаковать два раза подряд. + Вы не можете атаковать два раза подряд. - Нельзя атаковать самого себя. + Вы не можете атаковать самого себя. {0} потерял сознание! @@ -266,10 +266,10 @@ Список приёмов {0} типа - Эта атака не эффективна. + Эта атака неэффективна. - У вас не достаточно {0} + У вас недостаточно {0} воскресил {0}, использовав один {1} @@ -287,7 +287,7 @@ Эта атака очень эффективна! - Вы использовали слишком много приёмов подряд и не можете двигаться! + Вы использовали слишком много приёмов подряд, поэтому вы не можете двигаться! Тип {0} — {1} @@ -296,7 +296,7 @@ Пользователь не найден. - Вы не можете использовать приёмы потому-что ваш покемон потерял сознание! + Вы потеряли сознание, поэтому вы не можете двигаться! ***Авто выдача роли*** каждому новому пользователю **отключена** @@ -305,13 +305,13 @@ ***Авто выдача роли*** каждому новому пользователю **включена** - Приложения + Вложения Аватар изменён - Вас забанили с сервера {0}. Причина бана: {1}. + Вы были забанены на сервере {0}. Причина бана: {1}. забанены @@ -321,10 +321,10 @@ Пользователь забанен. - Имя Бот-а сменено на {0} + Имя бота изменено на {0} - Статус Бот-а сменён на {0} + Статус бота изменен на {0} Автоматическое удаление прощальных сообщений отключено. @@ -339,7 +339,7 @@ Чтобы включить прощальные сообщения введите {0} - Установлено новое прощальное сообщение. + Новое прощальное сообщение было установлено. Прощальные сообщения выключены. @@ -348,13 +348,13 @@ Прощальные сообщения включены на этом канале. - Имя канал изменено. + Имя канала изменено Старое имя. - Тема канала сменена. + Тема канала изменена Чат очищен. @@ -363,13 +363,13 @@ Содержание - Успешно создана роль {0}. + Роль {0} создана успешно - Создан текстовый канал {0}. + Текстовый канал {0} создан. - Создан голосовой канал {0}. + Голосовой канал {0} создан. Успешное оглушение. @@ -381,22 +381,22 @@ Отключено автоматическое удаление успешно выполненных команд. - Включено автоматическое удаление успешно выполненных команд. + Включено автоматическое удаление сообщений для успешно выполненных команд. - Удалён текстовый канал {0}. + Текстовый канал {0} удален. - Удален голосовой канал {0}. + Голосовой канал {0} удален. - ПМ от + ЛС от Успешно добавлен новый донатор. Общее количество пожертвований от этого пользователя: {0} 👑 - Спасибо всем, указанным ниже, что помогли этому проекту! + Спасибо ниже перечисленным людям за помощь в развитии этого проекта! Я буду перенаправлять личные сообщения всем владельцам. @@ -405,10 +405,10 @@ Я буду перенаправлять личные сообщения только первому владельцу. - Я буду перенаправлять личные сообщения. + Теперь я буду перенаправлять ЛС. - Я прекращаю перенаправление личных сообщений. + Теперь я прекращу перенаправлять ЛС. Автоматическое удаление приветственных сообщений выключено. @@ -417,10 +417,10 @@ Приветственные сообщения будут удаляться через {0} секунд. - Приветственное ЛС, используемое в настоящий момент: {0} + Текущее приветственное ЛС: {0} - Чтобы включить приветственное ЛС, напишите {0} + Включите приветственные ЛС, написав {0} Новое приветственное ЛС установлено. @@ -432,19 +432,19 @@ Приветственные ЛС включены. - Текущее привественное сообщение: {0} + Текущее приветственное сообщение: {0} - Чтобы включить привественные сообщения введите {0} + Чтобы включить приветственные сообщения введите {0} - Установлено новое приветствие. + Новое приветственное сообщение установлено. - Привественные сообщения выключены. + Приветственные сообщения выключены. - Привественные сообщения включены на этом канале. + Приветственные сообщения включены на этом канале. Вы не можете использовать эту команду на пользователях равным или более высоким в иерархии ролей. @@ -463,7 +463,7 @@ Вы были выгнаны с сервера {0}. -По причине: {1} +Причина: {1} Пользователь выгнан @@ -475,16 +475,16 @@ Язык вашего сервера теперь {0} - {1} - Язык Бот-а по умолчанию теперь {0} - {1} + Язык бота по умолчанию теперь {0} - {1} - Язык Бот-а теперь установлен как {0} - {1} + Язык бота установлен как {0} - {1} Не удалось выставить язык. Проверьте справку к этой команде. - Язык этого сервера теперь установлен как {00} - {1} + Язык этого сервера установлен как {0} - {1} {0} покинул {1} @@ -505,10 +505,10 @@ Регистрируйте события, на которые Вы можете подписаться: - Регистрация будет пропускать {0}. + Регистрация будет игнорировать {0}. - Регистрация не будет пропускать {0}. + Регистрация не будет игнорировать {0}. Прекращена регистрация события {0}. @@ -540,7 +540,7 @@ singular "User muted." - Скорее всего, у меня нет необходимых прав. + Похоже, у меня нет необходимых прав. Новая роль заглушения установлена. @@ -561,7 +561,7 @@ Имя изменено - Сервер не найден + Не могу найти этот сервер Не найдено Shard-а с таким ID. @@ -579,7 +579,7 @@ Ошибка. Скорее всего мне не хватает прав. - Права для этого сервера + Права для этого сервера были сброшены. Активные защиты от рейдов @@ -588,13 +588,13 @@ {0} был **отключён** на этом сервере. - {0} влючён + {0} включен Ошибка. Требуется право на управление ролями. - Нет защит от рейдов + Защита от рейдов отключена. Порог пользователей должен лежать между {0} и {1}. @@ -606,7 +606,8 @@ Время должно быть между {0} и {1} секунд. - Успешно убраны все роли пользователя {0}. + Все роли пользователя {0} были успешно убраны с него + Fuzzy Не удалось убрать роли. Отсутвуют требуемые разрешения. @@ -640,12 +641,13 @@ Удалено повторяющееся сообщение: {0} + Fuzzy Роль {0} добавлена в лист. - {0} не найдена. Чат очищен. + Роль {0} не найдена. Чат очищен. Роль {0} уже есть в списке. @@ -654,10 +656,10 @@ Добавлено. - Отключены чередующиеся статусы. + Чередующиеся статусы отключены. - Чередующиеся статусы отключены. + Чередующиеся статусы включены. Список чередующихся статусов: @@ -670,7 +672,8 @@ У вас уже есть роль {0} - У Вас уже есть исключающая самоназначенная роль {0}. + У Вас уже есть исключенная самоназначенная роль {0}. + Я не понял что значит "исключающая", заменил на "исключенная". Самоназначенные роли теперь взаимоисключающие! @@ -691,10 +694,10 @@ Не удалось добавить Вам эту роль. 'Нельзя добавлять роли владельцам или другим ролям, находящимся выше моей роли в ролевой иерархии' - {0} убрана из списка самоназначенных ролей. + Роль {0} убрана из списка самоназначаемых ролей. - У вас больше нету роли {0} + У вас больше нет роли {0} Теперь у вас есть роль {0} @@ -703,7 +706,7 @@ Успешно добавлена роль {0} пользователю {1} - Не удалось добавить роль. Нет достаточных разрешений. + Не удалось добавить роль. Недостаточно прав. Новый аватар установлен! @@ -715,7 +718,7 @@ Новая игра установлена! - Новый стрим установлен! + Новая трансляция установлена! Новая тема канала установлена. @@ -730,13 +733,13 @@ Выключение - Пользователи не могут посылать более {0} сообщений в {1} секунд. + Пользователи не могут писать более {0} сообщений в {1} секунд. Медленный режим выключен. - Медленный режим включен. + Медленный режим включен выгнаны @@ -752,7 +755,7 @@ Если пользователь пишет {0} одинаковых сообщений подряд, я {} их. __Игнорируемые каналы__: {2} - Создан текстовый канал + Создан текстовый канал. Уничтожен текстовый канал. @@ -810,7 +813,8 @@ {0} покинул голосовой канал {1}. - {0} переместил из голосового канала {1} в {2}. + {0} переместился из голосового канала {1} в {2}. + Забыли "ся" в "переместил" **Выключен микрофон** у {0}. @@ -831,10 +835,10 @@ Включены голосовые + текстовые функции. - Нет разрешений **Управление ролями** и/или **Управление каналами**, поэтому нельзя использовать команду 'voice+text' на сервере {0}. + Нет разрешения на **Управление ролями** и/или **Управление каналами**, поэтому нельзя использовать команду 'voice+text' на сервере {0}. - Вы пытаетесь включить/отключить это свойство и **отсутвует разрешение АДМИНИСТРАТОР**. Это может вызвать ошибки, и Вам придётся удалять текст в текстовых каналах самостоятельно. + Вы пытаетесь включить/отключить это свойство и **отсутствует разрешение АДМИНИСТРАТОР**. Это может вызвать ошибки, и вам придётся удалять текст в текстовых каналах самостоятельно. Для этого свойства требуются как минимум разрешения **управление ролями** и **управление каналами**. (Рекомендуется разрешение Администратор) @@ -983,6 +987,7 @@ Команды и альтернативные имена команд + Fuzzy Список команд создан. @@ -1351,7 +1356,8 @@ Paypal <{1}> Отключено справедливое воспроизведение. - Fuzzy + "Честное воспроизведение" не подойдет? +Fuzzy Включено справедливое воспроизведение. @@ -1820,7 +1826,7 @@ Paypal <{1}> Качество: - Время игры в Быстрой Игре + Время в Быстрой игре Is this supposed to be Overwatch Quick Play stats? @@ -2249,5 +2255,41 @@ IDВладельца: {2} Роли голосовых каналов + + Сообщение, инициирующее настраеваемую реакцию с ИД {0}, не будет автоматически удалено. + Fuzzy + + + Сообщение, инициирующее настраеваемую реакцию с ИД {0}, будет автоматически удалено. + + + Ответное сообщение для настраеваемой реакцией с ИД {0} не будет отправлено в ЛС. + + + Ответное сообщение для настраиваемой реакцией с ИД {0} будет отправлено в ЛС. + + + Альтернативная команда не найдена + Fuzzy + + + {0} будет теперь альтернативной командой для {1}. + Fuzzy + + + Список альтернативных команд + Fuzzy + + + У триггера {0} больше нет альтернативных команд. + Fuzzy + + + У триггера {0} не было альтернативных команд. + Fuzzy + + + Время в игре + \ No newline at end of file From e8335a25e921e00a2c495d5a556dc0972ff1f6ba Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 21 Mar 2017 04:54:43 +0100 Subject: [PATCH 320/496] Update ResponseStrings.sr-cyrl-rs.resx (POEditor.com) --- .../Resources/ResponseStrings.sr-cyrl-rs.resx | 56 +++++++++++++------ 1 file changed, 38 insertions(+), 18 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx b/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx index 17eb5bdc..8fe7d18e 100644 --- a/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx +++ b/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx @@ -152,11 +152,9 @@ Величина рата није валидна. - Fuzzy - Листа Ратова У Току - Fuzzy + Листа ратова у току нема захтева @@ -169,7 +167,6 @@ Нема ратова у току. - Fuzzy Величина @@ -209,7 +206,6 @@ Реакција по избору није нађена. - Fuzzy Није нађена реакција са тим идентификатором. @@ -471,7 +467,7 @@ Reason: {1} Reason: {1} - User Kicked + Кикован корисник Fuzzy @@ -583,16 +579,13 @@ Reason: {1} No shard with that ID found. - Old Message - Fuzzy + Стара порука - Old Nickname - Fuzzy + Стари надимак - Old Topic - Fuzzy + Стара тема Error. Most likely I don't have sufficient permissions. @@ -601,8 +594,7 @@ Reason: {1} Permissions for this server are reset. - Active Protections - Fuzzy + Активне заштите {0} has been **disabled** on this server. @@ -614,8 +606,7 @@ Reason: {1} Error. I need ManageRoles permission - No protections enabled. - Fuzzy + Нема активних заштита. User threshold must be between {0} and {1}. @@ -774,8 +765,7 @@ Reason: {1} __IgnoredChannels__: {2} - Text Channel Destroyed - Fuzzy + Уништен текстуелни канал Text Channel Destroyed @@ -2306,5 +2296,35 @@ Lasts {1} seconds. Don't tell anyone. Shhh. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 1871c2d76dd13acfbef91438299e60c58cf594e4 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 21 Mar 2017 04:54:46 +0100 Subject: [PATCH 321/496] Update ResponseStrings.es-ES.resx (POEditor.com) --- .../Resources/ResponseStrings.es-ES.resx | 174 ++++++++++-------- 1 file changed, 102 insertions(+), 72 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.es-ES.resx b/src/NadekoBot/Resources/ResponseStrings.es-ES.resx index fe1f8793..4e34bf78 100644 --- a/src/NadekoBot/Resources/ResponseStrings.es-ES.resx +++ b/src/NadekoBot/Resources/ResponseStrings.es-ES.resx @@ -315,7 +315,7 @@ Razón: {1} - Bloqueado + bloqueados PLURAL @@ -376,7 +376,7 @@ Razón: {1} Ensordecimiento satisfactorio. - Servidor eliminado {0} + Servidor {0} eliminado Detenida la eliminación automática de comandos de invocación. @@ -400,10 +400,10 @@ Razón: {1} ¡Gracias a las personas enlistadas por apoyar el proyecto! - Enviaré los MPs a todos los administradores. + Redirigiré los MPs a todos los administradores. - Enviaré los MPs solamente al primer administrador. + Redirigiré los MPs solamente al primer administrador. Redirigiré los MPs desde ahora. @@ -427,10 +427,10 @@ Razón: {1} Nuevo mensaje de bienvenida por MP configurado. - Anuncio de bienvenida por mensaje privado desactivado. + Anuncio de bienvenida por MP desactivado. - Anuncio de bienvenida por mensaje privado activado. + Anuncio de bienvenida por MP activado. Mensaje de bienvenida actual: {0} @@ -442,10 +442,10 @@ Razón: {1} Nuevo mensaje de bienvenida configurado. - Bienvenida desactivada. + Anuncio de bienvenida desactivado. - Bienvenida activada en este canal. + Anuncio de bienvenida activado en este canal. No puedes usar este comando con usuarios que tienen un rol más alto o igual al tuyo. @@ -476,10 +476,10 @@ Razón: {1} El lenguaje local del servidor ahora es {0} - {1} - El lenguaje local del Bot ahora es {0} - {1} + Lenguaje local por defecto del Bot ahora es {0} - {1} - Lenguaje del Bot configurado {0} - {1} + Lenguaje del Bot configurado a {0} - {1} No pude configurar el lenguaje local. Revisa la ayuda. @@ -494,7 +494,7 @@ Razón: {1} Servidor abandonado {0} - Registrando los eventos {0} en este canal. + Registrando los eventos de {0} en este canal. Registrando todos los eventos en este canal. @@ -512,7 +512,7 @@ Razón: {1} El registro no ignorará {0}. - El registro del {0} evento fue detenido. + El registro de los eventos de {0} fue detenido. {0} ha pedido mención de los siguientes roles: @@ -611,7 +611,7 @@ Razón: {1} He removido todos los roles del usuario {0} - No pude mover los roles. No tengo suficientes permisos. + No pude remover los roles. No tengo suficientes permisos. El color del rol {0} ha sido cambiado. @@ -641,7 +641,7 @@ Razón: {1} No puedes editar roles con más poder que el tuyo. - Removido el mensaje de juego: {0} + Removido el mensaje de estado: {0} El rol {0} ha sido añadido a la lista. @@ -726,7 +726,7 @@ Razón: {1} Fragmento {0} reconectado. - Fragmento {0} reconectando. + Reconectando fragmento {0}. Apagando @@ -768,10 +768,10 @@ __CanalesIgnorados__: {2} singular - Usuario + Nombre de usuario - Usuario cambiado + Nombre de usuario cambiado Usuarios @@ -780,10 +780,10 @@ __CanalesIgnorados__: {2} Usuario bloqueado - {0} ha sido **silenciado** en chat. + {0} ha sido **silenciado** del chat. - {0} ahora puede escribir en el chat. + {0} ha sido **desilenciado** del chat. Usuario se unió. @@ -804,7 +804,7 @@ __CanalesIgnorados__: {2} {0} ahora está {1} - {0} ha sido removido del mundo de los silenciados. + {0} ha sido **desilenciado** de chat y voz. {0} ha entrado al canal de voz {1}. @@ -819,7 +819,7 @@ __CanalesIgnorados__: {2} {0} ha sido **silenciado de voz** - {0} ya puede hablar por voz. + {0} ha sido **desilenciado de voz**. Canal de voz creado @@ -837,7 +837,7 @@ __CanalesIgnorados__: {2} No tengo los permisos para **administrar roles** y/o **administrar canales**, así que no puedo ejecutar `voz+texto` en el servidor {0}. - Estás activando o desactivando esto y **no poseo permisos de administración**. Esto puede causar problemas y tendrás que arreglar los canales tú mismo después. + Estás activando o desactivando esto y **no poseo permisos de ADMINISTRADOR**. Esto puede causar problemas y tendrás que arreglar los canales tú mismo después. Necesito permisos para **administrar roles** y **administrar canales** para hacer esto. De preferencia permisos de Administración. @@ -877,7 +877,7 @@ Razón: {1} Suerte la próxima. - ¡Felicitaciones! Ganaste {0} por sacar sobre {1} + ¡Felicitaciones! Ganaste {0} por sacar sobre {1}. Mazo reconstruido. @@ -958,10 +958,10 @@ Razón: {1} Los usuarios deben escribir un código secreto para obtener {0}. Quedan {1} segundos. No le digas a nadie. - El evento de Estado Escurridizo ha terminado. {0} recibieron el premio. + El evento de EstadoEscurridizo ha terminado. {0} recibieron el premio. - Evento de Estado Escurridizo iniciado + Evento de EstadoEscurridizo iniciado Cruz @@ -970,7 +970,7 @@ Razón: {1} le quitó {0} a {1} - no pudo quitarle {0} a {1} porque el usuario no tiene tal cantidad {2}. + no pudo quitarle {0} a {1} porque el usuario no tiene tal cantidad de {2}. Regresar a la tabla de contenidos @@ -994,7 +994,7 @@ Razón: {1} Escribe `{0}h NombreDelComando` para recibir ayuda específica. Ej: `{0}h >8ball` - No puedo encontrar ese comando. Por favor verifica que el comando exista y trata de nuevo. + No puedo encontrar ese comando. Por favor verifica que el comando exista antes de tratar de nuevo. Descripción @@ -1009,7 +1009,7 @@ No olvides dejar tu usuario de Discord o ID en el mensaje. **Lista de comandos**. <{0}> -**Las guías para albergar y documentos pueden ser encontradas aquí**: <{1}> +**Las guías para albergar y documentos pueden ser encontrados aquí**: <{1}> Lista de comandos @@ -1049,7 +1049,7 @@ No olvides dejar tu usuario de Discord o ID en el mensaje. ¡Todo listo! ¡Allá vamos! - {} entró como un {1} + {0} entró como un {1} {0} entró como un {1} y apostó {2}. @@ -1067,7 +1067,7 @@ No olvides dejar tu usuario de Discord o ID en el mensaje. {0} como un {1} ganó la carrera. - {0} como {1} ganó la carrera y {2}. + {0} como un {1} ganó la carrera y {2}. Número especificado no válido. Puedes lanzar {0}-{1} dados a la vez. @@ -1135,14 +1135,14 @@ No olvides dejar tu usuario de Discord o ID en el mensaje. Te has divorciado de una waifu que te quería. Monstruo sin corazón. {0} recibió {1} como compensación. - no puedes configurar tu afinidad hacia ti mismo, rarito. + no puedes configurar tu afinidad hacia ti mismo, ególatra. 🎉 ¡Su amor es correspondido! 🎉 ¡El nuevo valor de {0} es {1}! - Ninguna waifu es tan barata. Debes pagar al menos {0} para obtener una waifu, aunque su valor actual sea bajo. + Ninguna waifu es tan barata. Debes pagar al menos {0} para obtener una waifu, aunque su valor actual sea menor. ¡Debes pagar {0} o más para reclamar esa waifu! @@ -1157,10 +1157,10 @@ No olvides dejar tu usuario de Discord o ID en el mensaje. Te divorciaste recientemente. Debes esperar {0} horas y {1} minutos para divorciarte otra vez. - Nadi + Nadie - Te has divorciado de uan waifu que no te querías. Recibes {0} de regreso. + Te has divorciado de una waifu que no te quería. Recibes {0} de regreso. Bola 8 @@ -1184,7 +1184,7 @@ No olvides dejar tu usuario de Discord o ID en el mensaje. Inicia el juego. Crea una oración con el siguiente acrónimo: {0}. - Tienes {0} segundos. + Tienes {0} segundos para enviar tu oración. {0} enviaron sus oraciones. ({1} en total) @@ -1193,7 +1193,7 @@ No olvides dejar tu usuario de Discord o ID en el mensaje. Vota escribiendo el número correspondiente. - ¡{0} votaron! + ¡{0} votó! El ganador es {0} con {1} puntos. @@ -1229,29 +1229,29 @@ No olvides dejar tu usuario de Discord o ID en el mensaje. Cleverbot activado en este servidor. - La regeneración ha sido desactivada en este canal. + La generación de moneda ha sido desactivada en este canal. - La regeneración ha sido activada en este canal. + La generación de moneda ha sido activada en este canal. - {0} {1} apareció. + {0} {1} aparecieron. plural ¡Una {0} apareció! - No pue cargar la pregunta. + No pude cargar la pregunta. - Inicia el juego + Juego iniciado Juego del ahorcado iniciado - Un juego del ahorcado ya se está ejecutando. + Un juego del ahorcado ya se está ejecutando en este canal. Error iniciando el ahorcado. @@ -1269,7 +1269,7 @@ No olvides dejar tu usuario de Discord o ID en el mensaje. Sin resultados - tomó {0} + recogió {0} Kwoth picked 5* @@ -1340,22 +1340,22 @@ No olvides dejar tu usuario de Discord o ID en el mensaje. Reproducción automática activada. - El volumen por defecto configurado en {0}% + El volumen por defecto configurado es {0}% Directorio completo - Juego sucio + Juego limpio Canción finalizada - Juego sucio desactivado. + Juego limpio desactivado. - Juego sucio activado. + Juego limpio activado. De la posición @@ -1376,7 +1376,7 @@ No olvides dejar tu usuario de Discord o ID en el mensaje. Tamaño máximo de la cola configurada en ilimitado. - Tamaño máximo de la cola configurado en {0} pista(s). + Tamaño máximo de la cola configurado en {0} canción(es). Tienes que estar en un canal de voz. @@ -1436,10 +1436,10 @@ No olvides dejar tu usuario de Discord o ID en el mensaje. Se eliminó la cola de música. - La cola está llena con {0}. + La cola está llena con {0}/{0}. - Canción eliminada: + Canción eliminada context: "removed song #5" @@ -1449,10 +1449,10 @@ No olvides dejar tu usuario de Discord o ID en el mensaje. Repitiendo lista de reproducción - Repitiendo pista + Repitiendo canción - Repetición de la pista actual detenida. + Repetición de la canción actual detenida. Reproducción resumida @@ -1518,13 +1518,13 @@ No olvides dejar tu usuario de Discord o ID en el mensaje. Activado el uso de todos los módulos para el usuario {0}. - Enviado a la lista negra a: {0} con la ID: {1} + Enviado a la lista negra a: {0} con el ID: {1} El comando {0} ahora tiene {1} de enfriamiento. - El comando {0} ya no se está enfriando y todos los tiempos de enfriamiento han sido reiniciados. + El comando {0} ya no tiene enfriamiento y todos los tiempos de enfriamiento han sido reiniciados. No se ha configurado tiempo de enfriamiento. @@ -1542,7 +1542,7 @@ No olvides dejar tu usuario de Discord o ID en el mensaje. Prohibido - Se ha añadido la palabra {0} a la lista de groserías. + Se ha añadido la palabra {0} a la lista de palabras filtradas. Lista de palabras filtradas @@ -1614,7 +1614,7 @@ No olvides dejar tu usuario de Discord o ID en el mensaje. Activado el uso de {0} {1} en este servidor. - Removido de la lista negra a: {0} con la ID: {1} + Removido de la lista negra a: {0} con el ID: {1} ineditable @@ -1632,7 +1632,7 @@ No olvides dejar tu usuario de Discord o ID en el mensaje. Desde ahora mostraré las advertencias de permisos. - Filtro de groserías activado en este canal. + Filtro de groserías desactivado en este canal. Filtro de groserías activado en este canal. @@ -1692,7 +1692,7 @@ No olvides dejar tu usuario de Discord o ID en el mensaje. Victorias en competitivo - Completada + Completadas Condición @@ -1707,7 +1707,7 @@ No olvides dejar tu usuario de Discord o ID en el mensaje. Defininir: - Eliminadas + Dejadas de ver Episodios @@ -1771,7 +1771,7 @@ No olvides dejar tu usuario de Discord o ID en el mensaje. Perfil de MAL de {0} - El dueño del Bot no especificó una clave MashapeApi. No puedes usar esto. + El dueño del Bot no especificó una MashapeApiKey. No puedes usar esto. Mín/Máx @@ -1786,7 +1786,7 @@ No olvides dejar tu usuario de Discord o ID en el mensaje. En espera - Original + Enlace original Se requiere una clave de API de osu! @@ -1801,7 +1801,7 @@ No olvides dejar tu usuario de Discord o ID en el mensaje. ¡Usuario no encontrado! Por favor revisa la región y BattleTag antes de intentar de nuevo. - Planeadas + Planeadas ver Plataforma @@ -1837,7 +1837,7 @@ No olvides dejar tu usuario de Discord o ID en el mensaje. No pude acortar ese enlace. - Acortada + Enlace acortado Algo salió mal. @@ -1849,7 +1849,7 @@ No olvides dejar tu usuario de Discord o ID en el mensaje. Estado - Depósito de enlace + Guardar enlace El usuario {0} está desconectado. @@ -1921,7 +1921,7 @@ No olvides dejar tu usuario de Discord o ID en el mensaje. Velocidad del viento - Los {0} campeones bloqueados + Los {0} campeones más bloqueados No pude yodificar tu oración @@ -2004,7 +2004,7 @@ No olvides dejar tu usuario de Discord o ID en el mensaje. No tienes permitido usar este comando en roles con muchos usuarios para prevenir abuso. - Valor {0} no válido. + Valor en {0} no válido. Invalid months value/ Invalid hours value @@ -2016,7 +2016,7 @@ No olvides dejar tu usuario de Discord o ID en el mensaje. ID: {0} Miembros: {1} -ID del admin: {2} +IDs de dueños: {2} No encontré servidores en esa página. @@ -2058,13 +2058,13 @@ ID del admin: {2} No hay tema configurado. - Administrador + Dueño - ID del administrador + ID del dueño - En + Presencia {0} servidores @@ -2218,10 +2218,10 @@ ID del admin: {2} {0} votos totales. - Atrápala escribiendo `{0}pick` + Tómalas escribiendo `{0}pick` - Atrápala escribiendo `{0}pick` + Tómala escribiendo `{0}pick` No encontré ese usuario. @@ -2247,5 +2247,35 @@ ID del admin: {2} Roles para el canal de voz + + El mensaje de ejecución del comando personalizado con la ID {0} no será eliminado automáticamente. + + + El mensaje de ejecución del comando personalizado con la ID {0} será eliminado automáticamente. + + + Respuesta del mensaje para el comando personalizado con la ID {0} no será enviada como MP. + + + Respuesta del mensaje para el comando personalizado con la ID {0} será enviada como MP. + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 45ee96170decf43a90f566d003eaeeb6c3d505db Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 21 Mar 2017 04:54:49 +0100 Subject: [PATCH 322/496] Update ResponseStrings.sv-SE.resx (POEditor.com) --- .../Resources/ResponseStrings.sv-SE.resx | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/NadekoBot/Resources/ResponseStrings.sv-SE.resx b/src/NadekoBot/Resources/ResponseStrings.sv-SE.resx index 7ecb7286..f5297053 100644 --- a/src/NadekoBot/Resources/ResponseStrings.sv-SE.resx +++ b/src/NadekoBot/Resources/ResponseStrings.sv-SE.resx @@ -2335,5 +2335,35 @@ Medlemmar: {1} Röstkanalsroller + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From bf82baf8847007dccbcac7990a88f146111190ff Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 21 Mar 2017 04:54:51 +0100 Subject: [PATCH 323/496] Update ResponseStrings.tr-TR.resx (POEditor.com) --- .../Resources/ResponseStrings.tr-TR.resx | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/NadekoBot/Resources/ResponseStrings.tr-TR.resx b/src/NadekoBot/Resources/ResponseStrings.tr-TR.resx index b807152e..b63550e8 100644 --- a/src/NadekoBot/Resources/ResponseStrings.tr-TR.resx +++ b/src/NadekoBot/Resources/ResponseStrings.tr-TR.resx @@ -2251,5 +2251,35 @@ Kurucu Kimliği: {2} Sesli kanal rolleri + + {0} kimliğiyle özel reaksiyonu tetikleyen mesaj otomatik olarak silinmeyecek. + + + {0} kimliğiyle özel reaksiyonu tetikleyen mesaj otomatik olarak silinecek. + + + {0} kimliğine sahip özel reaksiyon için verilen yanıt mesajı DM olarak gönderilmeyecek. + + + {0} kimliğine sahip özel reaksiyon için verilen yanıt mesajı bir DM olarak gönderilecek. + + + Takma ad bulunamadı + + + Yazma {0} şimdi {1} 'in bir takma adı olacak. + + + Takma ad listesi + + + Tetikleyici {0} artık bir takma ada sahip değil. + + + Tetikleyici {0} 'nin takma adı yoktu. + + + Rekabetçi oyun süresi + \ No newline at end of file From aeb671cec0bc7fe4eac2c63325ebc3f4bdedc186 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 21 Mar 2017 04:56:16 +0100 Subject: [PATCH 324/496] Updated supported language list --- .../Modules/Administration/Commands/LocalizationCommands.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs index 86a41f7a..c8c07fe2 100644 --- a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs +++ b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs @@ -20,16 +20,16 @@ namespace NadekoBot.Modules.Administration { {"zh-TW", "Chinese (Traditional), China" }, {"zh-CN", "Chinese (Simplified), China"}, - //{"nl-NL", "Dutch, Netherlands"}, + {"nl-NL", "Dutch, Netherlands"}, {"en-US", "English, United States"}, {"fr-FR", "French, France"}, {"de-DE", "German, Germany"}, //{"ja-JP", "Japanese, Japan"}, {"nb-NO", "Norwegian (bokmål), Norway"}, - //{"pl-PL", "Polish, Poland" } + {"pl-PL", "Polish, Poland" }, {"pt-BR", "Portuguese, Brazil"}, {"ru-RU", "Russian, Russia"}, - //{"sr-Cyrl-RS", "Serbian, Serbia - Cyrillic"} + {"sr-Cyrl-RS", "Serbian, Serbia - Cyrillic"}, {"es-ES", "Spanish, Spain"}, {"sv-SE", "Swedish, Sweden"}, {"tr-TR", "Turkish, Turkey" } From dde37f4be816633e23d03dd179d00a98440dd16a Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 21 Mar 2017 04:59:25 +0100 Subject: [PATCH 325/496] Updated version --- src/NadekoBot/Services/Impl/StatsService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Services/Impl/StatsService.cs b/src/NadekoBot/Services/Impl/StatsService.cs index bd8eff0b..72996002 100644 --- a/src/NadekoBot/Services/Impl/StatsService.cs +++ b/src/NadekoBot/Services/Impl/StatsService.cs @@ -16,7 +16,7 @@ namespace NadekoBot.Services.Impl private readonly DiscordShardedClient _client; private readonly DateTime _started; - public const string BotVersion = "1.23"; + public const string BotVersion = "1.25"; public string Author => "Kwoth#2560"; public string Library => "Discord.Net"; From 49fbbbd325dc2ff3e04b74875ff1d569c3a4329c Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 21 Mar 2017 07:12:43 +0100 Subject: [PATCH 326/496] $rolluo now works without arguments --- src/NadekoBot/Modules/Gambling/Commands/DiceRollCommand.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Gambling/Commands/DiceRollCommand.cs b/src/NadekoBot/Modules/Gambling/Commands/DiceRollCommand.cs index 8a0323b9..a9bfc8db 100644 --- a/src/NadekoBot/Modules/Gambling/Commands/DiceRollCommand.cs +++ b/src/NadekoBot/Modules/Gambling/Commands/DiceRollCommand.cs @@ -62,7 +62,7 @@ namespace NadekoBot.Modules.Gambling [NadekoCommand, Usage, Description, Aliases] [Priority(0)] - public async Task Rolluo(int num) + public async Task Rolluo(int num = 1) { await InternalRoll(num, false).ConfigureAwait(false); } From 30bef19e8c6aef29104ce1d237e189ee6107ae4a Mon Sep 17 00:00:00 2001 From: DogeOps97 Date: Tue, 21 Mar 2017 00:14:53 -0700 Subject: [PATCH 327/496] A slight edit on replacing OwnerID A slight edit on replacing OwnerID If people asks about it, then it's not clear enough(?) lol http://i.imgur.com/WxZiu3G.png --- docs/guides/Windows Guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/guides/Windows Guide.md b/docs/guides/Windows Guide.md index c0e62c76..0f141fad 100644 --- a/docs/guides/Windows Guide.md +++ b/docs/guides/Windows Guide.md @@ -45,7 +45,7 @@ ________________________________________________________________________________ - Again, copy the same `Client ID` and replace the `null` part of the `BotId` line with it. - Go to a server on discord and attempt to mention yourself, but put a backslash at the start like shown below - So the message `\@fearnlj01#3535` will appears as `<@145521851676884992>` after you send the message (to make it slightly easier, add the backslash after you type the mention out) -- The message will appear as a mention if done correctly, copy the numbers from the message you sent (`145521851676884992`) and replace the `0` on the `OwnerIds` section with your user ID shown earlier. +- The message will appear as a mention if done correctly, copy the numbers from the message you sent (`145521851676884992`) and replace the ID (By default, the ID is `105635576866156544`) on the `OwnerIds` section with your user ID shown earlier. - Save `credentials.json` (make sure you aren't saving it as `credentials.json.txt`) - If done correctly, you are now the bot owner. You can add multiple owners by seperating each owner ID with a comma within the square brackets. From e646debda5d4abd79c7c6adbb60d040e7441fb51 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 21 Mar 2017 08:46:13 +0100 Subject: [PATCH 328/496] Fixed a permission bug --- .../Modules/Gambling/Commands/DiceRollCommand.cs | 2 -- .../Modules/Permissions/PermissionExtensions.cs | 10 ++-------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/NadekoBot/Modules/Gambling/Commands/DiceRollCommand.cs b/src/NadekoBot/Modules/Gambling/Commands/DiceRollCommand.cs index a9bfc8db..5b992996 100644 --- a/src/NadekoBot/Modules/Gambling/Commands/DiceRollCommand.cs +++ b/src/NadekoBot/Modules/Gambling/Commands/DiceRollCommand.cs @@ -1,6 +1,5 @@ using Discord; using Discord.Commands; -using ImageSharp; using NadekoBot.Attributes; using NadekoBot.Extensions; using NadekoBot.Services; @@ -10,7 +9,6 @@ using System.IO; using System.Linq; using System.Text.RegularExpressions; using System.Threading.Tasks; -using ImageSharp.Formats; using Image = ImageSharp.Image; namespace NadekoBot.Modules.Gambling diff --git a/src/NadekoBot/Modules/Permissions/PermissionExtensions.cs b/src/NadekoBot/Modules/Permissions/PermissionExtensions.cs index d9afcc1f..db0fdfd6 100644 --- a/src/NadekoBot/Modules/Permissions/PermissionExtensions.cs +++ b/src/NadekoBot/Modules/Permissions/PermissionExtensions.cs @@ -106,19 +106,13 @@ namespace NadekoBot.Modules.Permissions switch (perm.PrimaryTarget) { case PrimaryPermissionType.User: - if (guild == null) - com += $"<@{perm.PrimaryTargetId}>"; - else - com += guild.GetUser(perm.PrimaryTargetId).ToString() ?? $"<@{perm.PrimaryTargetId}>"; + com += guild?.GetUser(perm.PrimaryTargetId).ToString() ?? $"<@{perm.PrimaryTargetId}>"; break; case PrimaryPermissionType.Channel: com += $"<#{perm.PrimaryTargetId}>"; break; case PrimaryPermissionType.Role: - if(guild == null) - com += $"<@&{perm.PrimaryTargetId}>"; - else - com += guild.GetRole(perm.PrimaryTargetId).ToString() ?? $"<@{perm.PrimaryTargetId}>"; + com += guild?.GetRole(perm.PrimaryTargetId)?.ToString() ?? $"<@&{perm.PrimaryTargetId}>"; break; case PrimaryPermissionType.Server: break; From 59f0fb56e2727194d6d77e6b9f26a754c698940c Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 21 Mar 2017 08:48:35 +0100 Subject: [PATCH 329/496] upped version --- src/NadekoBot/Services/Impl/StatsService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Services/Impl/StatsService.cs b/src/NadekoBot/Services/Impl/StatsService.cs index 72996002..676d7407 100644 --- a/src/NadekoBot/Services/Impl/StatsService.cs +++ b/src/NadekoBot/Services/Impl/StatsService.cs @@ -16,7 +16,7 @@ namespace NadekoBot.Services.Impl private readonly DiscordShardedClient _client; private readonly DateTime _started; - public const string BotVersion = "1.25"; + public const string BotVersion = "1.25a"; public string Author => "Kwoth#2560"; public string Library => "Discord.Net"; From 655b98d16d5e3401ce122bb6222c05f8a6a365d6 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 21 Mar 2017 13:12:47 +0100 Subject: [PATCH 330/496] slot max bet increased to 9999 --- .../Modules/Gambling/Commands/Slots.cs | 2 +- src/NadekoBot/Services/Impl/ImagesService.cs | 2 +- .../data/images/slots/background2.png | Bin 0 -> 103813 bytes 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 src/NadekoBot/data/images/slots/background2.png diff --git a/src/NadekoBot/Modules/Gambling/Commands/Slots.cs b/src/NadekoBot/Modules/Gambling/Commands/Slots.cs index 79dbe75a..f4cf201a 100644 --- a/src/NadekoBot/Modules/Gambling/Commands/Slots.cs +++ b/src/NadekoBot/Modules/Gambling/Commands/Slots.cs @@ -145,7 +145,7 @@ namespace NadekoBot.Modules.Gambling return; } - if (amount > 999) + if (amount > 9999) { GetText("slot_maxbet", 999 + CurrencySign); await ReplyErrorLocalized("max_bet_limit", 999 + CurrencySign).ConfigureAwait(false); diff --git a/src/NadekoBot/Services/Impl/ImagesService.cs b/src/NadekoBot/Services/Impl/ImagesService.cs index 1b37e976..97e1c129 100644 --- a/src/NadekoBot/Services/Impl/ImagesService.cs +++ b/src/NadekoBot/Services/Impl/ImagesService.cs @@ -21,7 +21,7 @@ namespace NadekoBot.Services.Impl private const string _currencyImagesPath = _basePath + "currency"; private const string _diceImagesPath = _basePath + "dice"; - private const string _slotBackgroundPath = _basePath + "slots/background.png"; + private const string _slotBackgroundPath = _basePath + "slots/background2.png"; private const string _slotNumbersPath = _basePath + "slots/numbers/"; private const string _slotEmojisPath = _basePath + "slots/emojis/"; diff --git a/src/NadekoBot/data/images/slots/background2.png b/src/NadekoBot/data/images/slots/background2.png new file mode 100644 index 0000000000000000000000000000000000000000..5be870f26397fda00c27a240bb0e218be04b8632 GIT binary patch literal 103813 zcmafaRajh2(=D#S9fAgT*Wfz1ySrO(hu{QvcXubaYjAgh1c%_xoFVV`U!RN7{p{V{ z)m>Gqs#ZlP%1a_4;3I&6fgu5;#FW9nAZS1@YB(6sKULG-9iR{JZ_1J)U^P>pk3m16 zEQIBR!NBTc5nqjq^Ti1oxCB$hc;{-wnB9s=k zn-hEuz|mc2V{>y;PZabn3I&h~3h_8G*v`2~Kgr1%(H^fRutc(Ej^A3|mfQ_ZsH6G*tiRy&4>E=Cf z9EsL-e59x)uk={*z~<_f=ikKz3QL1G??c0n;o*Ig)QU}CCGX4K#eCR65 z_s2^WHUCE9C36MB3rV^Bm0BPFznRrSuHgY0l8;q$qI}uIL~12@lAmtB#6s+T2=7o$ zl<)VjstEfgt0a<_Z_NzwU9HpfzZqF$tR26nyLGdbB_Z;&j8Nb54$T4a!&77bZLGYV z5Z?x{#93$l%~>`?zfqS~ZfIik-*iS&X5{Y)Xtj)cCRi}M&Lhhl!?gd+#TNct_eDim z+am^R#zs@N_`8SJe+$$^IM;}OG388d6=+&f504y2*`@gNZ*xr;n*>9?pTWp2kJnS& zwi};>y_Egm1!D2$-Rca+WEFy$(@fFgZjZ75i3{pnkY%V5FrVyfjp3DDc(5rdIx2LEdqs!@I)6PTOg8daJgwF_g5D*Y@!*lidZ@Ys*dneJU z_HS;TdNVPOfh98gWlEa2s;{?Ry>Dm^SpSWT(u86w#Mfsm=RT^mciebbRB>{*sD^nt zExF6^Pdg6J1Kj*1gLC3c;u7YTPrlL#VI{Bs-?dnj^GAFoPhZL)uJF!Rh^zV2?^~7n zyVWnEH{xMAz}3MTjR{ISucr6wQv2w$vojBBPSCKOb~Eyqohv{mYm&?QV`*tKGb|dK z=B|T~ty)!Df2OT&L2^|Vye7ZH-xYip-Gc*6X<0pgWU*`4pUzVK3S+ozH*fgb$N4fi zJ~sF!EacwPz>zNU_$wnlx?sA5pD<~8MT7707q96*5v_kw0HPiG*?OI?Lye0{(#hQ_ zI1cLWXQwXLY#lW~ikd0V8O;(TYieAlYXLftC)cjTV@Zec%$&*)eI3UEHqa;>wE!hM zqy4#=o7qfXv!FB!7Xli%jV>b3hTS%M(ELAiE=v%-De*;tmcqCLC~>`iTq#$V0$lk@ z0sYncUBt1ynM09zNarc6$SE^N(01+H!cItKSrxfW3!%qWmFu*@VD85`IgEuk-=_>e zelli9YGCX1Xt-y+Renr(3hqarkS%t2Q2*D5Coyz=Vx3c|Mw-@Fa3lJZwWMI3^ zqNPbQuM5_0C{b0kqTgB)WWD6H->j5*$j4x;UH3cEGPN!6fMyqR%6fiTI}3HY2U68c ze~5?+YptFEbKO0vuPKalWLQJkS|Wuxk~4WXmBPHbRzh4nWED*Sy*a-K%u7CXaQ#_* zra*kz-_m^9dp81cnQl;q1Ppp^%c-4ey7WWj4$Mvb{;6)Z^%*6b&Iq|*o7?AGLm!LS zuM({=S4YP<58uCBC3+^MYQ#|~h)X_{ER4@YU-Y4oUKDictrkiSQ~&q0#5}?^#d`kMw9;tkA6xLoHEGXIZ1U6IbbpPwE&kRZq&`|V!taG zYP#-mcKKsy{I`){c0Ipi6Dq968TQNo<*1P_yzrl*KGa3{H^x=sovHajWbQB6NVN;m z2_Nm=M2l%837lEGo+4mZ@+?EN&RtW7%e>m@5K`%d(malM?;Kgpzk}b7Y}W&fax+&C z*-v9L3nbSqHfv#MfQ4OY`el2?G|ybhY$&(?wN7^oY)PIE?}fjswQ^ABZE1GaZy~>Q zT0dMP2(@PiZm!AhQhwL?!zM4dT2d|P+YT^5kdBL#x{zX z0~bV<`C|R)$!=yZtS9g>)d~}vzu8Iv$0iw5HW^R)MjykmgL>Fy{af~s5PX*e^6t6c zspY2c3JmA3m;E6EtX$yATkZd5Xl4o9B5B*h(4Q6Ao#OUKiqyd}67FT1oegS5bpo0! z#Tr6AU6-!Zdxz<&w;zs_nkMe-1tp|sG4BCadqd|qYPQTZ_Bl+!V97c_u_CkeoL^7( z*T;#5i^A!7QLF3*z8#=+ZHKWpo?bcZCJ3@OL4LzncW7iO&0tz;G}SI_YLcz+KS{IZVJ$Jm9T1~{u53bec+wfkt8c7PW62lTvtW9_ z!~wYs`OWC9-oB68`{!92T5NL>DGvDyPY(2Ne0B$s3B2$G&8RpyMYR7iTJ`9#`rvumPCGV}1w(pNWxiiG~dQ?XMIWg=`_#DX65u{J)nMlNc_Whd4cTx9^{A>qG*v7 zyqJ;giYs}oYioXHM$7TmhUJ$wkE@QqI#z2f?zzamgb&qQZX^U+a>?0X?*h($tXCEE zLVvMo{ItAPsWs?aZKoL0P+?> zu)oGx_JD-IKrO$bg`*jAvHC&FqYp2_X7h~^+eSlXtL)-6j{()G?-!9qh=PUODl-O$Z+K;uXKbsY*5U|^~NQ&}#C(gzBU+W$E zr?)%WArQENg^X-jJ@YsvYlpdg>Kf9^6bB%A@@V#(pbsjP1X{&rIERuH3{O%?y-u(@ z6Yr;UWTR(VZsg*opeQD?n#g-Nd#Tst*`|Fj%99Ghml)1_@JaW0IsH_o`#HDD0c)V6 z!wwh`Y3|lV6Z2#?tMN8k0g#EEE`3mF{_cUL2uPJr)}V-=XnbY$DHS zyn;3u4mfB@|8Sr52dUnuC4ZrzN+@%^r@!r{h-&Sb0%3)yo+sCxHkmQ2^j)R#pXYy6 z-u4_sTQv88iz_v!I7HojyV&qrU9SFhZQ&m(O(?g1|McD)ArmxWhNh+n6PZSaV zcIAy`;e{kLm1;;d7I;b;HuMr%(mvWyRHttN%4YIid1Yvcl=YL^vjCiM_}i z0iX03M3>RF8_+F+a*;QexOTrNT3D{kyaSt0cwHuE*)%2=oG*K8%L}{ad8(-12kA4K zFRzJwdj_k~8my+3YKlOZN&_(|epQC6q)@oFs)8&Lrz*z5(!!w9D3uy<+h#E7+w9d? zgZ}Tj{VhNEs!zQYDYEPk7^?m;Gaao&9$A({eZc$Aea zjgVzwaF2yE1FYUWZgpTY@g09>XINo@27+TbaZ~Dz;ji5--^+h|x^`0Y`M;(*evIO-r znrI~MgqR!%;HDi!K};xFnpQog@~)KJ98C1Lb7)zzVyf^fvT7EK!`FPTSA88fOE4}- zsyp&{uI1%^FQA&9Ip#tq{@y;tH@S9e@4i!Hj)3C<8?5fXnP02bt>frr!C)XdG96Oz z5e_#`xAuI(9m+VGJqB*LFW6WGXRO{`L}bzL=EHsF@%`BZINh?V`&=k$Ch2;;JJ~QS z=;mMS2jSA{FBv;v*%qa}iKkNH<>(feuaqHZ4JI8+BVSjy)8>($+KDtzHJk)N;Sp*b zN#C9uFTcT)E zw*Jzl(q*mFcN?5buhWeGGUFT;ai+{~+p1UjiVoc6hw4}c>HEST5_d%OwLSw_ijz#0 zK493iuASCvLlJ&F4eA`3n#S)yNs2UhnZe`o>qAWhsEl>;?Z7|DhIoV3_3(XDmEWudVZ1N z9wh*MuHtZJI#gbF#{VkgTxI!^o7--)W}q@Ar_1?wKT@g`&UC;=UfoeDuAYgP2)ZVo z2$^w&f?--5E>aNt%_D&{OcKtURXJ@UnRi^oGNyG#q;P2vGEU?tvJhG5cY+8GYBcH2 zV^6v_hopUSs)Wb|sa@ASe1H@ukv1U#fx?`sa~UpT{jjINC|gw%jek_3T4F{LW?c3Q zm{tr>(&xt(oT9_X5FJ=4b%6I$k=-=WuJHi9{_DjYQb*ID;)&Lcip=+!(`a6I5O4^c zYcd(}-|)W8`W4#k@^-%T2W5w$puMuCp$g|6t?%%vTiyqHe~ZCDf}4~ z2b+xJR@dnYLZoCuq{KPIiS*C3-L04peF zH+b6c*RNvz-3s$ri@}AZ)(sz4*>VOGhEeFC897Z&Ww|obPc}kwi}AB#3#Q_IoXl_F zlIobjY{{S6^@^cKafg@;5^Sc3Bz%<|J6C7(gMuL7A2^7NZi6lasb-=~VLgtX{+2yG zNs;u!A6g$h{+8)`*DueKf-t~UDH&#Myr5b`B7S$@HMx_RS*Wp~PV0mONl1oOvFIDvI;VqEGgiNo~V#8ON#<0Yal zuF6HKOsi9tYR&&a&pPOeQ;W4*co$mtxCx2^BqPI^9-mx}_AGw^-m{@ATSB5L5dpvP zSMMz87(scptTl^YKZ>U;1Kfys?=~_b2b;xja$jykbAJUU;xzy9dJJZ_vg`NZ9f*tg zwq{{^fUBx#h{f%4eSMXIzA~$}T};?Cvo5R^gd!^9jDNmjjl7&(67)%q$rBbg_oVOr zhn$trY{1@4BhJv^q>heWkHn6uwR{^(@4bz3JM*LpCP7tm!Qf+Cl*~e(YsAex$w9hP z(N~Jd4U}s#yayL0f#D>~4MAZ5OPn;ZG?q=VvWg-J99r!dyk^1QvH6DdC@y~r0ep}F zcEw|jmrH2%nt1>Em>nKv#%{CzQVK>nXZsSExO!`om}LjbV~kL;TP+qs(o>Iykoc)B zdmOe3@5xtf`YGDdMlgrWRq0)7?Ox+QwG7MvZ{ZPCvL!w5U&WhC4Wu@bwwG~bho(jN zIv&c7tnlzdD6~ekBavrO!=3xC=&~(kjvhF8Ci{T{sEUeE6n~6z;xM4s*`Qrs|IkvG zSw^2VujG=BPfP&hlZH{Cl~X`E%25fEWAtA{$b_cQtY;?4}z3Tn#F_?#C-12w(I`aS_8T5oTwTsk$Xwvi2WwJ zQOc|hIf~-D@aLwN9bT|r=K@~#a@(_P{>1aB-^#G{hT_ zDT>VzVroJIng{#pgpMzK(-yV#a1{nmztM!!5I zmHmke5iz$5=?id$-?Zo9SD;;FLX8UyzCl0*X2)34+UeH zz;7Ki(bv?*yJOd^)?{A`&-Inqd7p+{&0q2gqb27>y5eP74h?Rf>|g6cEZq!>@tWE`hOU?vS3jY>A#cqI~lKy*8n-IEss#dVclQk zaeIKPtvy2TGWQ<}YwRXD+kmSwhB$@k_sUnrgP6y~soBP=qOleNS5k4?(E+1F;6;1X zG2BNq>&FfEgOB)uMK4eSVKXgUp$C00~Y<@+#l^`YK8kCNyn@noKPX6^u#cC%3;t6}tB9FW zsw8jcav$?NPdD~;1e$zsIguR3Ght^PCu03rbboDYa`5ShXxIA*6aMG7bSPax8Rv$% z;2Fb%X0yNq2$m!PP`QSkqPXOkXhVU+jG0n^=kO35gOG}lM)g^N!|K{ybKwm)3U@y*z{5a5c}r9W;(gaweF zHJwp|G}=;BL|rwdW@A8a2G@l)QBK^WuM!E38K7cjuTV=B1~Lk;x}qm}a(iBdE}cG| zCG%k!xEwv@POd$?UA%Hwq^BR9E%HtOWI_O~2{-?ve$b1Dl?Q21Z&mwO%Xt2x5Za*m z&ucveHqhHI~}{pFcJDHUDpb{ zi4iSrGOzE*@l%sK^SaygehvDi8Y)$O-$hsw-t$p(jKMDp`ixh2%x!q>u>Nho&|4N0 zcCN}DkKM1Qt^HtTn4tU~1ifGV6aQ4(a+~}*_PguX!Ohi90q1pj%vIFr%Ob+w?uXxXT`1=a=x-%2M| zP9rV8UB50)c~JdV>XAeOB_1gb4!dLc{?u-eMP+wgoM{P5erFiUP3zrt_eQ}7zGpDN z!fZI+ukB!=p5UP+dgRh#4%G$c6>2=k_9}x@9IxIO2dVyc6bNplgQ7XeckC5}>ZY)5 zb96&0zsTl)mGUxgnXS|3_@M^P3F{)S=x8ZP!Toplvo!>AQAB=UJ2g>7mg*l$#3wmg zee8tZIA$j~o}*Wh{(c5!MG}hXo8#t1g%e5|nq;*_7({Z3D0R|eQ?rc$q6NR3j>o}0KG!n0#yGCD5syh;)$0w(g03NU3aEsY{(J5qYx z;d%^YXd{n6+>-z6239@?_iQ)YsMQ}0DyA*n3mnWG>Ew9nW~HAThTe53t2QM7lI_mecikV`+f*&^4HCg z!45)s*6b)H1wkSrfaC}P>QM5-Za+BotkC(gg76NjvILe2EyyYp*&W29!8ndjKkbg( zuGrLkzV|nDAm=C^7Wk>#t>y-JGs+b<=(ZnUcLF+c7zWios*NT;Lf!av>dVJpVso63 zpX9M?wiq)NgxW!ASd=u%cUizYNn%jOWKCf?Z+o_ARj9)uiKVyovsMkBlBZU>`c{sIHBTIw!(AtTP9RU za9JpqNhCe{SJ{@D;)Kk~8d*?S%B7(!q3MWH<&?!yR1^@t5_}fs8OkxyRu9N`dRr-H4vRD+N3Dx}DjieXiFjFhfKM#8555)03in4%BO|D2hQ8D@W=d3^Dwd=Qx_8E{r1EOkX6b>XAzU|f&m~RktCzc zOWid}R*Z{^nYKCFCH2;GF~-EKsQH;h?3-5-d;2)I=b4uAbgQeXTKcMygNzPT@bSr_ z6bV;k{c+pP^5s?uLTMkaBez!Vw(H}k0?WU)-N-u*i|+di9Icx^<4!r!8$J*d-7jW_ z3Qn#cRi!it5fUcdo=Q87WqZLm;U2%z{H`}(W}|K5uM7wScu<7R6&90o7agS`1XrS% zWT=WHPEN~M{`#y}dxnAIu(8_qGTKt!Q=7fiom%L-r_O)Qy!Lt>wsrZ%x@@AiKASlq z)C_VeK?-Ra;j<>`@7XJng)nVcMGQr$yf&eTUN=LmpgTBhI8B|nej-;l=4v&JH0wYG zBwmTE%Ho|?o(JN%{URu3?OP!=qd0Qn0cA7~*L;tBIob zP>Ws{#7(Gt8sDqh!9BR5ydMF(-`el_RO0eQoqpeLzvUaNiES7c?0?1V&nlkVQx}(R zL|=;+Ipy`+-bE_ZH=6Wnjil(90?92??c4GOlB}qXHdNReXs7jD`> zd|QE7ZiL_Z+%DUHyKyyi)d9?1$!09)U^8(i~! zNE&T}*O8Rpbz9F<#UCQ3ixW*J$R%0-gqasz!UE;aPJyW;U8g`Qyhl&|2H!Q@YifRZ zO+h*x|8ZE-VMVCjL24pwT`C&w2sNpN;Of^2h|27Y+GsH;583D6^BUNgJw8^qC41a4 zIX}@C&2}EQt(CMqOY`-%6+&gxI-VaxPNC<1(glWC-E5g)$?@GYvdB!P))EXI9_{lkpY(cy#bd%j+E#%7y$$TO*uIYO-@n|{R}N?C=@n|0T8Tj zZ2)2$t0xaNJqYpus{8_lDO)Dexm4lka6)EBIQZcLsZOJ@0BP?t^4c) zc-~G9C|PYs&O3uoN(#CBwe_Dk3VLI*e&Ta^{5oUd%z*KNRUg@gi6L&Zp70aw*$J06 z!HfBw*LC>_-C(To?r*(Sqi}iZ&L2`_fu8n< z$NRv|Gxm2Pp^~nm?xHR8Vj+9H400O%cs#8S?g~EB5&1XbeKaPZB045EgY1FOs&LqQ zyAX^vwThzb?yfOl)}$gTVq8=%Xwdp%%g+m&K$Zm>3R($T0;5kw4h!$0F>LJFX<)3Y z4fXso-i&kSnTPfIbQ=1=)ayIS*ivjaS(tXymzT^Yvh{6;5~?jp`2-9d&V)WBK@!C0 z2a+e+?ux&J%9UN;QEl={KoZidmt3+gg~2@7l$^5HZM_*~`iVl6j;W$AUz;E1;JCWv zJK}&uAn5QbRq)Qr)R^>_yCKqRy9v->_?K>r^Xb+e%NDp1Rwyf}j8OXZEh2XRq!FHW z*Lgs08~=yR(iCCq*ut0vx5U>H36;xom(;y2Rbs;dieO<@(?E`cISWDsOC&h>9Sdsf zPLhGVqodMB6_~_{bv%)@4MY+-Cx1uMxhe!9bcq>qPG^ytwxM007d5vgf#C^U#7=_B zyp*$a!_F`3ahDinR<;CykW^ca+L68+V?<=+OidU~7JnmELf1{{xbpViOSMXt)FliM zFw9v-r70KVvmOY=per8aX8;gMt)|LJJWSZk^`%l#mS2x0zq*1aA6-uUb$my_)9ByR zWCSo{~47NeHVHF+HlQYJy^{WK8IL6)GmP~zonSmPQbk;j%bAYA8pP9eg(h?vypvFWd3+H&W!#s}{mn{Y zwv4l#xDrk+tP~LyMU^U_JKKR1K6;IqADI9_(vWl+F}ag(LJ`bT?sf1eD?o|l;%d=c9xeQ zuWqNvv(jhgQMz}|d3oO8RR+>WJgbBep}}m#P){lB{%zf#L;Q7Uxxf@p40`U$-Xy@TqA) z?TLY$jx$(yqe)j$eIcbW0mvNX@eFe$ciC&aPk<_$gT0Yj9lOSV5RtzRzvrKTyDu!k z{*uJa2@EnFwy`$@%wja`4b+;BhqJ(Ux#%e>ld!PVtI{ODgy-d;u|78J5J?-2Rf!Z( zrcD`@9xn(e5cP7Pu({=(8}V5+=aB07knr=@&f*oS`LGeP}b*O z(HqqE!{ixFC)by76PR52&`U@hN%Q;xa$!t7uC!OTh-mL9(F^YPP*&*=x5}fX5|4=o z1LuJ4SfKRt!V42?=exmZ@H5hA6$~-Fe5nk+kNh9@$Fv`n2DzV}kN6ur6cx}~s?5zh@6JpejrAeT(&+P{Ts!h~Re2>h!n@Dk>^Mh>R>vt!<+qR3y_>JOqqy7pO`n z1+9s5(2&F;=EiyRJZm{5_f}wKCjDvmxH7H|`Z4ne;*+Ev-;h)$o5;j{VrHhVum#0M zHG;0hOO@hL*#6&rxh`iO!d3<`SLKgAd&&-h7xndsfmq0S$~4x# z?e#JtD?ACTbgS&OI86hb^Lz4gzx%i(s?fNKPM4<#GX;Q8rwzv4JMs zT`%LFo$u)Td!oqA&&k2I+X_Lg7Zg{AHE_93RRjd=q!{lHUsxZQa;>H%Y5XcV;a^6Y z$HvA;soXEg%4yn9BQKMaGqsAvl_fsGCmE>p`m#Yk5>Swr66QyackC8Y1Y`(+?4GVv z@g1)2XTsdvEb-b{j+z-W$rrIC{^IWayKNe8AXHY5EYbWP zxRRuN;<+l#Pkxur@CH94g6Z{Sd`f`w_Z;tl^`D|zS_^e}$H1W%)8(^>pqmQWbZVL; zErFfN-QVY5_6?1ME$~r4%R4u?%yXAWy?2SRw#|l-3ozzVyRF?`OoSp6{Gsm(AzGgW*GNJx(9d}iBYtr zmWY`Pdqzhn)F8(KG)0LSn*Tnycb|T3+p2@V$p%3h=f{=~2UA5&RnjWv@XnwD#3)is z2eD=&1hiSRtw1BD+6^~_ZSUJNyRdRZ4N^3n`54i6rHvAz>UN~_ici@ioc@ole=(h~ z{(10;=j^aM5#Ajt7QZQ0yU82}UgWg6teV_u2v0`JUs~}qyB070SQ=_(qmMj%6o_z9 z`Lab|0yNftyqCsQtn=P0t$+XOL9b|PM^C@8EeEPfvPM#_o7tJ z&6jWur}GX_bmKJ&+HsJRYool6gv7pb_C#OBV3a}hl>xA8?o1~aGbm^<2kwp|xzfJF zk;#dXqR+I_@UGpmDbb(B&@mE6%NZd}M<~XUfG?UL3we6VMd>XtL&KZ^Ww%B_gw&OL zOBDTD1MkG|AM_QSL6_T{o2#)mgESwc{bX`Ii%>Z{qJZtB-suopg2ir9w8kOHU(}ViDGMYY_|$1 zn%!g-siPwZHC{eyew1%kJtBM_mr+zwvClvNrMo?qShEn|C$BmFSX2ZK`O~moMUqe9 za(?C5V)@PJ7@^K+3QZxv$*9KK1%;kk8knwHaT^kRa-Ee%Cz&!u3Q#f%5*({$nKv78 zIZnI`0Uo{{u(9qk5ywXua8hLwuv6$8G*Mazri782cuA3sFK1Rc;*w{5&zn&)Og1jv zG92r7N0%-ZqjBH3^VR(XegNCU0$m%RsA^r)z4u#C$!9?y>+(l#^I4qo@o)!=)5W;V zE-%ORfx;&Kq|Q%@iA}EXeSSvFB=%sF+;*2nFHmk&KU(|l9q=#y-;)2sxXGUS6;F;4r1vRp@}6-`hT04m`^Ce@@&`0GmbmreUkDW}jz>I}xk& zdR-i6tP4-(R&-7Z3tK>=smN%+P(j6`wnywNNRe^-QYCQwGUh$FJSnHBXc*1C(H=Ep zMf_R<3GyUCXYU2YEnl`5^59p6#Gf;hA-CPh>+9=9SlNTW&?UnIh2BmkjFjrhDbi^z zBVFaNsL_~+EaEGiqpx>*>@)8@82z95BPLeeT$RIa{m|Q~8DE%konLbL zn9p0u(HE3f(6L%Jd6X!EM*SB*JK%sqWL=DPaqu6=4(%R@xhCk!6*}(3_k4PCHV_W$ zHv7CB&|qSNlcXV}M_>sp^|qVtBCq7I zDS-_Zv7^6g&O@wns=rylAxMjekkK$QQXaOW%(-n;^**`$^dj=8UyQHfC;SXORJHJerk?JB8JuKS4?cj_Z2R=R&Rjpwcc(J&s9T>4<4(lQjM zHQls9g(neE(~PHQa;m`*6sRD}u4h6+_`=(a@+q1Y%e@vlW~~t<6FChQ8z6%};Ta}A zR+vmN0{W0#P7iOfRfqoh@kz6nJxHNd4jmtm=6EymAiF?xcC)J~T@YQlzj#$CbDxt>$^^AsaTDlRf+U1_1{RjS!v_d0-YJx>Wyg%-Loq zM(V;1BTb+Z<4E8^d%Bgq!6@OivG^rWa>1^fW<2gp8jIV5Fa^h{_yp~R-RAcY>{e35d=}$_ zRd^(^61#}msY(UjQ-XbO=prni8x7@FnVw4?Yd2|$2tjDh7mHB z98+kMWb|T^21ze z3MmdUN4_bkKOG;E-(C^FnDffm)GtfmK{=DFVbRuo)?^M%to|(KE>~r{we)c zt3+!RCg18m>sRDRpDJhvAj5B^n*FAcaJ0P~S5}S)_*GF&?sW~(7m42CM!++(5p(v` zKtVG#frApaMXPD1+Cq$<|1Cj0#emvp2A=;-6v`}7O*(0Jocc!_j4}kbNiS_6FLwz< z$gqJb%*4b*rCuk5>C#u7nV-NigSad8l?aGOc_dtZo36GBiq0Fk5pYpAVu2S;2Cg`$ zl1~=&+U`A0nfio7+aTif6fr?=@88$gp#Bp%@0jf1WGE$G6`U%0b#9Xuw7#AIgO5LU^JV}dUjANgPX(i z^2NnOLT;#zqztX30(v7(koXJ?;+eZ^|P;N%$ zXL%vS2cM#H!%tJIgQqJ`ILIahttISZbH!tnhM=So_WMgSsPRFGWod-|h|Nyd^f@I4 zP4(}koJ9qijz0X`HffGuVatNBepnGJvBdBHvA`EhE);x|9*>GD4^pn^=2s#k>kpPE z7J5>VpY4kj#?n)RE^aFlyA&8u&b#-a?sHpZwonmzf&tX`u}Q?9LR`Ow$2PCB+igA! zfWUYMZlnE%^Oau=HQ^N%XQ9zVH*mH{E_P{h?H<3=aB)eBoZs~78l~EP)v6caUvk^C z!*ZiSVg7*NVMB7v8${Avbv^nOHFmS?5uMhQXFEOn&GayTK4{>}E2HL&l_4$6JOsL< ziyCLU^bT&+XiiW+RsTW|zAYI8HA9+o?~w{T0(7Wk@TqGrmTEe8hgEYN0Tf)}0y2My z{AX-*0NT%|ClryQPf5vNh?`05<<`-2mo@>8)4%u6Ebu8PEcdX_-M*KL+%|~q=|q%M zi#^o6RCAQmQz$e#j|SGR!;duO5;aa73dZM!x(&WeEbZTpWYD*dmUs&W>!Vbxl-Y;H z_o8MGA*#3}V9+DdO9%uS^>z3i2Q{9K1Gvfkh&ncMkQi&sg+3jIQ7T zzX&W*&VtZ1j4I2DNHRG;tX9g-=*o3&JMuB*d)3lo(YM2%^F3x)wt}!hJ;aT>+sgL} z(QT()Ymn11;YB(>1CD97jB^Dtt>5|ipH-RlmCYN&r`3#2`BJ;Q)0gZ|##!GQN(V;o z8!1uZiW+lsNb1Q#i%E=Bxb?%~$wx1^4jOeJTk$$q#I^aZN-HYA`qfi`cS)iG8NW;I zH$`=HpS2YlV(Yl zv{3rsGe`V4V0@qSa%cbsht4*9k-2H{ly3b~<-_@zYN=@+RMYAC-}gZtx==z;y474) z**cmd;D{&5{Y22MtSv$#NUs)6{z5>wL2005Q&Qh&wdA4nqoe824hH(V`|0QQXi0TD z!DL8)7x#^Zop1N)-{Zr*!>Yf)_tw6>ZPi*I_MPf>WWA=#$0v*7Ut7{Um=p3NQX~$c zs>Lg)pzcOf`Q~v?Pk0}LUt)oIJ9!PrsQt-CV-a$)lxoG#fF%;CSOdLss~4Fgzv6|5 z5ege=3_kQ33v&2$<}fHeISK*6S4yADjWQ0NXA_Ht*4fyiS9pGn_Uad&WAeA0;eJT} zjI=bVuD8YRuV2)LLiRn~DsnKlOS8M1^ouR26@v+75>hhqnuAHMh!XablQk@@zm&V| z{xxyFfyb;e)%02qU`06mvukOiTT>JwQNa(HbEczgze>)0tQF8C^G7ZPLv3#6GB?TMJP})jc}sF4VB-sr4}bd&M*0WU6C8R z1D!24xd60Bpz6~py}k$|`g0GtBC|;0E>tc7N8Dc&H2u&dt^J-4b`OyCQ%*W4vjyrg z!obL-ztKwQRmH+&6dkdH(}c#UT63;u)D+Wcvb^GQsmse=4(`8p4eMV2;7lFb73S;3 z*4At-VdX-`sNm@1;8X@BErU`!3vA$duN__Ux0y|?z{a+dOypm`E`Q{7KSqV8c@#cP z=NFY@(U=B)E14tS8EZTgdG_YmVfqpxGe8^&O-P=3&OyrOTa;4K1 zarQ2llb?(5CO6AOfI4BuVNn_o*@E52<`W( z1Ty%FF9R%ENE?#C9k}n}WhS@?Uxb#B8nK%s3CsZHV%L5NDZVxh7314FH z^E@|BVFcaqSkoAqnL(Um_GgaV>)(!B61;1%Yk5t`pK{xFBHLC-xT1boCT?|P_chFFIJKE#&JMr$L$MM%5EcvgjK&m zviVDC%0a*7%tlx6B`lGrtz97^U_3~K#{%ghPwMM?CBu;NCFVGbo%<0GsQN1)pmmWn zNzi5?DH5`+g<1GHyShmYn|VN~*w+acR3q0(tyDz?_<{sSS?jy}y0cxRW$*99QyEIN zA1!IQcf13Kf^I+yUdOqNa>KE~Ua5~(y)DW=jN6!uEzl5-WVV|okCaaJN;{sH%&z$; ze~wpSyjDXuA3li_bkevGeSI{T(*5ZxhS16Z!`qNi;AM=ieEXS*;?p7`M9^KxJ258X zbR~FWcf!o5r80oesCh~Ym7Eh2CJPWfMl249h>5`boCW?lR+Mb-788SGY}~gj9m1HF zvXLZ_g>|L@elw198#6Be-y7yr;AajeSyo;OZe&>`(gZkY#N(^4n=QcoMftapTgzGF z+wJgJFTMTjw~_xx(pfN6^?Y5}pph<>hD$d}cXMej-7VeSEnS!Hx^yF*QqtX_NJ)41 zdw&1-E6h2wXJ+kZtvzYo=%hRQ%hu}#C)JTVt2v^P4}AnBLVR|jrc7_LdUG>FtK&|u zQplxO*PadnU-+7mjWB_|=&|*Y&GlvRZNBn@cEDT16|S#l@AIAt^F`M80lnxM3w)d&d|D`RssFY$f~R$VL`g{VJia+>YzkWy%}&n01t zy_0}5`t|)u@Js-^W`L#y8U9L6SUP*IqH%Xd z#d&0#zn-H4o~daE`IQ@eGG+iJvd1BGBT2cgu4pnORtMJZw$cCT@)NcD9Du~6DX9tHkL!4j zf{6>y%@L+NFsro3i~Aln&V^fE38(U9@#JGp*IOl-qQC&Sq%CI+>m24@7s^g^IVO-*zMBIKGGV+BGe3#Ed;uUhW1MhZ1s*p{POu#$wied-4Z;QRAl)ufa)1sn_ zT3%e`6Bo+R*j9Ovd1fMAz{I68F_l%NK(9vlYJXi87(=2c?K2_BY}B=F!r+9T?jGi% zlv^QXlvJ9ryM0O83U8KU<}Xfb$<}nsKK3l`_lFXyafEii_sUWuuv-&|fwSK%G}ygs z^L<^gxx!|Q0Pd~&)XYH5x5pXfI>qvm(o8UCUdD{W6n0El&MRDRc?@6Z!&H&_AD+it z{o~3l>j97|O8w+Y-sX|zeF^00E>>nN_Ken221U!G8um|Q+-v#c-n9v98HsE*&n3al zPpo`)yiL)8w`*^!sMa9ZiOpo5BS0aqCaf;y38KrI-K{}sg#g`^Gqk_~Ssr*q%ueS- z`i$>BP*D8tc7Nz$y>}IY(;@BRviFhC$&%J6CnU7xpG!0D!&t|f`_)tV_wKn)y1Y>9 zruOhKx;GLX;KQ80|1aalYgs$)Q<#RJr2>=g<;_L>;31NQ^wYiN3M%=PYa4RrYL%ar z{O-%ep#WfLy+A>`_c2c{FR{;Dl>xn&IE9>5&7}MiR3QFAo>+Wv^tVZp!VhV|VpXSi zVw6Lp=2v{l=&KON%OojQqc#Bfmva5x2Et0%SYb6FdcCjU3Qf9!UKo|Hb^4|zNqQve z)~xnljyXE*+&R{NJM;^}eBm$W&cjzVv`Df-Pn@Y|H{z8VkunWOUDUH;6byG(($-Zf z?r~fx=p0{h_p~2w%k~zd+>((4(-LIHLmCdJ(g&(|uG-w@i-Ti zYmG9WMpOU{dviprZx(0Xbl;U6fR8ZYcQ<_mi4(FLRWtBf1lUd*v|j6P-TZ#h&@ECp z8)tbwJQeVo=$qRomb1_6WjZ87HNb6*%`0z7!j&?M|4Yd=oR|lKywrxPrY=?@)_E#w zE}fYip$Rg}C>V4}NG-Mb5Vo9D=LnW(Hx)rspk$dTy@I-H@;{1A*9#*nMs6FKCQ(Q+ zF%0zFmZye3LUVE|O9JLVc&cTs&JVCWnD9u!Gx+*Pn5f!bS{hQl?J0S^;m)^>^nd|) z%bVmB98E3Ea=XeVj1!K9GH`mJ!Hlc~d+Qynq5RaJ_=+LN9v54;;oIP!fZ9@H6-Lhp zy8X!;;_lkU(VuKJ73vdw0>s6!MUzcOh6yyKxmzw=j>LdG-89|edfRhWCLH#~rniG| zb5T7o3!$R<#GmncJxz*~XXiGc4I0z5J2b2Z5IQLReP2-i0T%f1HEhOOFIwvc)$Q2{ zk8?}xWd{o6iqq0W1O?E;p(V)r#qolD!J(HcB(j`Npb{FSq_J~_E?ly+xx>Ps8Sbjw zs9AN{Bpz?Fy<)53c=&luo{|0ICoQo#Wu{>?bB&E;I6TI|3K; znh=>nAMiYm7Y6QQ?{#2ry~i0l*{N~DDll$Y}&B)jO_RsPa;TyBMBeT z;pk|dh%*u~IN0%rMrGIW$t7m~1xLc;UuAf;hOEIc-IYVN&YCppoQuZ;%Jk*dmN|Cj zKMrL!GsRNYj%xo~pi=os766GsM(h12Fn9s@14)+)C1;yD`Sd!ss)_OPnU!)ARBE~= zo<1Uz+irNVvU{xiKp&;4wDhSkH%3L9jjEYJXmu8uBIAJH+mD=$nRUR46=Gf^fWi3(Gkz3Fvqz-V)aAsy# z(Ntca%#4;>oT5mgB1KV@wpkhJW9dKq>PuylsAw4Zo9>d;b{23qWZm=QRknMY5@2aC zlj5@!+^f3mk!@&ze&`usVtGV}$$mbhS$BOQa8%)ZKQi~X&iR{O#|fnL+p)-!Z-t$h zdw7L2ukkUbhNZ-;_!A^NtaMml2Hm( z2)NUZaUF$-UfJSg=6W@#mvZBuS-V9p{mO7|r;pyp^Y@C~8B82$2N5y8jd+Qqe{R>K zoh@#wcPOZxeno(y+)}mb=O9wzSLoN|@^BNi(D^bm{HJXFz!p*AkK3iEB`pQAAlL6O z1(&8@3Aue6Pa+>VjZVzIemJANFM2I~-dt?@n?3P7NMy{=*;`gSSPS0OH`|&uo8tB+ zsCnaBqxya9NVg|dcw7-4WfYB|X2h*i((cLjZ`wI)wuu)_-J^^EJZRjJ&l4+w8TYcn z<0+c|I-Fb!Rq;UneW*XTcJ0qvGXJm{(ziTdkY9?QjIi0WnYq#Rf zSY2E>S!>m_H`P5j6VpEV+vS{IUBUA6yRw@tY?TUt7rtO#ce&>GxY$g%=EJDT`eCyb z?f64I`h>@36El44N@A;+MW4(2df~ke@b`KgKQ*>%1sW;OSH7!4$T_wF2%eW91 z9bcCZ^eDO3mCR^arja8m?w(%}b)G-gVu@n0Jt+KOyd~X97=(`lpU+BdSBJ&jG2vz- zK`x^Im?SIAVbl5MDB7*NQZb*9l#eDu^mX$dI;-GOMgZq`gVFjPX3g)e3O)V!R2`F) zWkgS2S=5D2=Z&CWkWs@msViQS^tZz$BQ89h z>ND$U3Sjqk5t+hg>1)(O(YDdjf?vfuh_#<_aZ!F$vFDKqiv+5TYx_>4d`wiK;Kbf!%WQ+3Id5K(d+;ChxDaGo`9amWg{2yYH1-KC|%n zk>TO2PS;IQ`bEa;KUtx-0s2zkp4T3KB`2*(-Pd>j&eoH*gkhA?H^>X70XmkbkuWkX zB@&Oi*hp&7lzSt{k#L3>Ekob(>YUTs zSaHAU;S;dDmdE-^**CjoAX5sLSVk>S7k~R`GtG9;A;JeQX1O=Lmjg7BVQS4r70J$< zyF#B<=DP!f)$0OGC-~*c2NK#_$w2A97q-5%?SB&I%zNMWB*dO2Ll&qlCt43^Gkg4y znJ?gB=kcovVht`^^UckTs${Q}(NT(@+ zePN)p5qQY;lH0U0W_Q4wo>y7Xazq$hB>lmH;V0<8r}r-)E5JTIcGnDc|>@oTI zWv;P@i}>N%a&gpgxMg`%vHG_knc-^$>V65!Z~6|G*~Tl*1N_$e-nb}w$_X<7dZSxv z*tNI-T=%C<$H%p;TJ3_*fGfx7Yue4y$P6+6ZG$UJAGe2Dpm!b?&?|L?O|yI@TJ zxD~P`>*nFqLoDD9r0^cLx zzh0l-jmR51U=GVEV)IJeS#r0l?1a4AVdS9Fui5g!*;%nQ*TPK<`IfO;ZD?k+$l{k$ zvVT<<8)-NKm%u->{_?g5#&2L3Q5Pz#b#Z}F>^&8*ZLh?bEZl?iVODN2UDPaUNqaN+g=cCVtUxYS1f;`3QGfk~PNr;SgmmRMM)F{`->!$jQlh zC^6_U=sgqfFF@Cw%D0%AGWjJT#Fh)t7rjc*N(Y zpJ`2~P*PaTg8c9_c=F0vZTtn(bJn_lZgfN%KVbU2?s9R|kC@d>5p86IultIWV`!XD zdfq3<(+5CIHa98=8|(9OM(UgwWmaxKwbrHU#rfkjm%&s1R5rLJB~V(=SE`WyipfOF z394H~se(f1%wz7VsO#Zgkiz+)0fkhR3~4B=_#+V(^qNXbE>}ZcC^PIohB~87k8kY@ z@?zuJAK-W#;+v^JszUCv;vPt?E*tf7bjm2jOR&iew)5=)oR}bUoHEQ3?utEuLVwEa zF8^9)E7aubd8Gwg<3LFD*yH<(X!0j9ii)mRS3}bCbKrHJ#TAF{o2~u>J^W)fS}ymx zR25G1XYWU$=F{Vr9D1yBLC{CboK_zI_FUpg&1^WHek&7vC)*R@I(5gxfUUwlRkHW? z5cy!abaGaMT&B3bX3Iq_3QcYfh$JKB_Uu0brN(Uw(k@3SOzX?Jrs4-%kXk-s<;GCX zo8bioCBKq|fus;{G+6Y+k%~R1(tGpOwJemtUS5%TrTkv;bS}|pFM&bt*7y&rIf@R9 z=*z|w^0W~<-RVck_bnr~o1*v}-EJwG^#F%gH3^Am70FH;+cZ}H^BOWV9hXH#MpJ~_ zfnDth*6sVW^TN0=`lW3HrH!&&F>3uDVb2OB9~SsIZvV34pEG4(yfeO>R-I==l5YFq z{br`Y!z!Z@B~S!9AedHs?gRhi7VO{0R^#keM^_a&Y`AAMpYjmzKO;|&R=`gGS`fzp=RZZKSB|Yix>ZS-d9~o z1>L7th?nbn*g)0C@6v;u>=&@oxcaM>W1&fp_0PDH#n8txWZ0$=N|{fROl&SU(;dy5 zBfZE6VR`Z$o_bSLt0Wv#ZKlEz6v1`3d2uLQsKoLwh|*1nDog@euDh!FZ6s$W!JC9j z+7m`l#yqC3H%Jr_7ehg^s|bZ!kY1eSZ)6A{38Xx!87D%(Mt;W{?&zo(cuDeq_e(No zRE!w|NwG2LpA#|PemiOnz&Ttbe&EC+^#&L>&mY1fHK>cHBgUv~1GTQ}=jI0PwWJCf zb*=Ap3*7{SNOY8cId!`4b_1GhWcGnNxge;b&mVZ;gq2oggO)usUF3 zHYpy6$0PXbQ>0|ZK|+8F-7LviBl%Prqv zS8%ugh!g41hMyNuBV}!suj}QSx`V!OnaQB^kL&F!9THSlfK651ayBrxb*8j{oMeKn>;VO#ZE&nMcbEMEWV;$-O7RzdjT@)i&V zG5n!;=tz-@-Pbz#L;1OX0<^wr3hoH6f;GIW)r5YV zC^`|J#M9Gr2+GiiE6Sylw45A>$Ne51OFHd?_xe1e&778y>0aJpPfk-C>?ebv5 zQ|+7EXFe8uOerlzstP*#S9PhV3{8?b%}1iA+~WDxv)=h#5q*q>b|#ZW4b?W~=VgP> z4y}d3^33C{PADx>rt^==jW)?|J7YB zpG(=-7e4eXdiEqylDs;xa%);NLU-cf+*TK{q3~hU2{#f}w^0_~Z2acaE!J*dmN1^X zwbu1C*XOKnL_|X7_t}7SOLN5Sa`1^=)!2@BRoUt8%8a}qv$7orN|x}={1;sP|tjjr}r2Iaor=RjSv*bo;!-T4}n)pg%(ITB*iC$g@K|3KGo zfe)m<#3g!e*XWf=6xeca(Z~wiFhc|4jeXQr#6P@!jS^E4BJcJ;?TZeEKYW31F$z01d#Bfs8K6MZ)RIR+kp~(j|9&7M!I!Jf z=9USn&Y1@yLM*$g%SR$W%ICu%L7w?0Ph~4idm*7?-!l}XWV|HRpz9@8Q;yM%Y>_ry zzF(lSQ*9A8^&sD@E|MzK;E5`%#nI{ZF_0AE~jd5-kQmax1xf zW7a2F0%#Z!H2?ia(s1#In^eCqekXhfKSNp>bW`nD2%CW;sM2?EVpq2Q@hn{`(~T5t z(BNj?KSbBPZZT`J6pK&%pimI0G3qFf@a%0NAf?en-t1b>DfaUN>B3KN`+6mhw`wwu z`pH^H(eWDpQ&3|rj>;ER${b;BFN8A2A?h8vg#K|cjWKjePgQik_(El4E5#g3+(fJL zHPP}B(`5}NJY0+ppPLV@yS`B!NY`Y{d^hpNw|v@k$PTl#bQ>c7El~Iq3JS9FZz=A>lAzy-HoTKthff(Pi6vd!1xcb_*yIo+ z=%ej~PTj!!WvhWcC3D~mN;rzad#KVcl-+YTy3TH@NAno@8v|?Wb*YFRP*qEW30gNk z#@KKNCKdIU(*rSR3NaLK$ussybv`HSk4mBn!AxCk9_q2i+dqi$qChp(? zc4OVUl4TR~n)rI-a=6l?iYD>!%7VXto_HN>Vq{PoYu%DASOu<#4>|!w*L_a6Mvnt|PkE zvF!=LbWKe9D0@M&(p8#M1tMpT)a7#x;zzrkQrO*o_(LwjcQaaDlA}~aHSZWUl`o5e zf(s`n=5^okaMUjNHpAj8?q}Uv<3db*`ww)gpU6;|o|-}RsoC>6=68c8(h`Ed!-C48 z>^-94WpXze+qsb3g^;+}hEVIR&yD-{MR#q0j50y`0l4;a{TE=<^^|}682-m{zT7;@ zaU8*A`EejVVpou)>G}kba^jKm<367DBpb7w@=ryE2IZK;+ISB>yUIUP7D^hLLj6@b z5=)QhLP}Icsw)^26f#if0qQolo;}W&U5ORvXgk5sBy;LgdXUuxh%)64-tyr7=L{S? zCKljFx*3SMRrgDj#6UFx2vl&&+Roa+Oy0LvMB6!3H~Z7ON?M zdR!)F88locqp>3Hd^)DsgnVCulGIeE4sW7W>B_0PQ3CBTDQeaPI)^%T2=_XJS4=-z zYGaUvcKe4@&r}qg@kBg11>HQcQ=bxaarNUY(i*i%X$w6Svh_9;ey(LF7IeNJh|>#; z9cX9l;{C50hyBeCzYTlUaR>$`4N#e4Jqd~)^8EwH6q;=+NxXLBF8|yYa|9wYu5(lb z%JbGzn^0AF7zt}42X~)McdsoLJ=M(m)411XjN!Y69WMs+6Yz2cA z0{D>gh_fo(1C*$=s@^AW)9H~A5K7duCnAeR&M%bNieU2^uwZO@?=aFuolmPMfjn#f z1>AT^`mm>TAjwlnH1|pW8|wqrZ-_5ne+Mc2RxD@5yI8t-w+*%LJiSn zb9l;bGfW0zE#QaKpI&}3tT>A%Eser?;%0p=?HE_U=m`oB3HmO~-U{TCx!bM)bmk_* ze{qfWBqXO8ukGPpvFi~sU};T(LF_W}hB|)Knq6+`wJNQ<#mt-AtJ}a8TMh>bjN74X zXKNhT&$t)2;u~FKopB1h*5UtpDd*14DQZ7MsRn3hbw8RhTn@k4UKv8Y#;T+XbhnGY zniHR&P?49(*-6~nLxN@z(YRDw9nO6R{gO&p-BlPacAJASj%4<~u)@Jvf72V3rT z`otZc3Q)lMTks_0#XUbc!Zszk4%n?>LHe^m=0k*(1+Nk$Pt#&@$Cm~|WZ9x0 z2R(?CfiB4tG({gmz<7HZ!s6=(Rga{vbGCb`)s;Xg9+P9-{vn?XhQeD1wMM>`?7RI(lF0Xh%NhH}R*xVqPE`y;#m8@~gq{Y93H(%)&HuL$d1X%qYTPs0fL`Z!jKZBR>zp6C~lI;DvR`?+wWhkOu z-f2?Hlz0vzHL|kc45vb@W=>L4h7tdmG~CPALpKt7t9A43HWvSbS!thv|1$fpMev~Z zz~;B988&{0vjQnEPQ1Ik2|)nO(@e$U(ftr;!IXWOMyarsDv zoK)8ao4YFVky8R_+Nq0*ow7Vl;>c5&*B}U~Q~y(!yR@ri!h;h7ycx2(y#N_W`o1^| zcY%N(klcVcXtO6w-nC_X>?V51qi_4$^=uKq6hD|2Mnng8NTk}esVinQ(*x(VFE!V5 z{^DzR4bgvlM)2I9_#u}Zjfh4?f=tG0>OC!n z=VX4i$BSV=)*V9qA&kCvvhl~@E*qtWhAWvXgog=$kEs1j5n2&Wxvc0^1vvVL@QWfUTb7V zC+^a!n(;~&O2_V%KP|t~31+kybV{R$eT`Tg!!Dl!x#iS!7N^x?R=QB1&3#cXUfZtZ zF7uD3g1>rzOPDjfrlr-9c7hNs`)*fys1_^d+$M?pLl?d#SDh%`kJR5hg+5r<8) z*yriD_g{xA-sI=cyd;bk;FgVB(x|B=Rh0*%(JOx08fukYY(R-9$t^x3>y5rdbwU35 zrjj|1bRT7poK71e#|=JrCg9ydX=8#-&`@im6%_PJ)2T_)vlp0-yssp8WL}gG7-hmH zCXvg*6O4aG9|2oA5uLYrCa>K(r#vqZ(S_iJw$@;{?^EQ+k&ipJ-!#`2s|uJA)ot<9;HQ|4-;uaC#HEWJ!AwoVC^jgvRWAGR+MV#q)Wz#B zx-m)8N6nMn=|nTUb~HoV>Tq|p6Iu5o1^)GJ^)I}<_U*&xRUEEy;Pm-NDZcyFp`nDb zoQ!k$6NB=2NkZlQAlOlkx`SAIqj zn^#5Y0A|v1v1(%rELU1lxlbA;eA)E&MWYTJM>2>Co;HeQ(@sKCVu%-vRLP*69|-C_ zMyHEDqcn>!f^F*amw9DLl*fdui7q1{UC|_8-O5Nv04kb2^vEy!?oWrP=yNAnT>8y< zn`1gZQcFc!*Dy9^bAkBmZhd(_|0~5tS9o_AuKvwTjt-T;E0op%x@WRxFreM)^Netg zhC&cm`pqyQ7|KBGyi%IIi9Pyrj=&p@V%^<>xl2%6`#+pi=+^P5b9YbcG-Ufq#<{O3 zm)}=GN!SH=MZ_t;R@_he(r`8%zQi!$d~pIMld$HK#=I;}Jy4d+NYY2y)`E~<9dN-U zwIbmSWz1iWlI}+GW2mwW8V7;9Tvp5tz?rb7_|>R2VYe}I9jIzCOqs}?bnAOZCm1Mz z25)j^+#pSWJrn~+bT}UmacKXNtDm^yv8bP>-}<&HseFb4n*ay=?spcrpyUf(1O|SV z&8P~6w1fh78GW7%YH?`Vwt2Y1`QF9NFtf#d*zVp9X= zL#=31jea9%G_-WdH2aaVtV}{9fbB*Uo8y&_3mo)l3;A4wtcMQ*n^=~Ojp8yg4Jckp z3mXRHb*O$@s4V@M7&+$vA=xcylYk>V5j$<{=1HWT4#fYbe{iPnZr>X*i>;V*D*pCQ6JL+S2m!v;Vp~$=xa- z&c*@6O-^cZg@M+xYDn#UFAd-nO9SF&o2+i?<>BA|8f%;F5L-`P>_Fvk=M=N5p z!1$M(h@79QpJH#vc7P|*h;}Y6n4Y8{5B6>zt1LO2#I!g=!M}Gj3pY zHrr#pOC-onmzu@+y(@~WF>RSonq5wvqI0{i*OJRFOv)=AQow2!KRI_vV?Lst`a zFU&F7FwNIE7)h5~Z}SZE{ReG-sdvj%&5?LH#k`C{Sy_GkG(RLYsoQq&cUYFZ`p;Xn zP>HLjO1K2E9xS%)zr#_c|Db4-{>MW9thP7>hy`Ek9)+U3|6|@k7Vocwfa@O@WO@?r zu?q)$(4NBIN=PTC+yMq%YZVG$c-cuW{HqqILHNg~x)K=__0o1I3%_&O)5_2cF51h| zzV5%+BT>(Tt?4!7n%cL>Hn9NXgJ2T<@Up)I%5l^8K2}f*{2) z$c)7~!&k{sQ6)1d5`NoR~Mqefp z0jL+`b)EN&FdO3B+6VO1{^DMGC5HyBReil*liFRzgMli{Kw#!LMoe^txaJp~&Sl** z@j}k|NO^CdhwnO+^6mJsi{=ChbXtZDU2wJ69rb}{MM)b1n6j1~#%n{#(knlyuC>_0 zwOe|Ul}1M*y^^L^Gti^K^6Z;=zcPXA>L!z8E$Ua1^G8FCmoZ_r;x-{GhI#v6r2t5# zp?FP06LN8ZDxHsaFQ*yUcU(odI2>%KSY-y^7zl(ig0G`GK9|^n0ImzROs$48vh@`D zS>Tg?bNFIoR1iEOM+nSUP;jfbvlw$uq#l7BS8ENw0tWI}n>zW?v^|g*27LAF&4j&R z3r3M))dvoa3~~BMISe#)iQ2KF89SU)`P#_YN_kCS)Q@D9_uOl_Z>|9V!3fy@iDVjd zBjq9VILWvaQ|yjUbp)3M4eafVVjCR{;{IK%ce?D_U4L1#N61Clboir$|7v;OPJW&3 z6|&$wHpeMhU>FH9*%X98zuoKB&rczgJx$|OWWR=BUqxO9_cuOft9G&4b{QaimSLy@ zW4MpZt`q!5!Ar&51Y-JBKTArfJs;(l_Zms-n~I~V<20IaHCZMlRie2M{~I6-^`%S3 z#U+i7L|Hs!Wx^A`TWj-71bMDa)6?ruG>4k0-GA~ziGa}maE^PR;e8XU*+12hUszZGgEg&|<1N0z1NQ1iY z9=AIw7AuGyd*OnDUp}F8*(hwurh~WiB53X*X65>+#d7seHt&@y(V};Ml3C)v8s1u` z%RiakaXC>Tc+?<@ribMyy7$=0R{y0zEl;--!UT@v`N`*O=3eIV)>|NLiUx9PA^i66D8` z50}%c{b9{v?dmh*9QJ_lvUd2x=oa9YDYJ%qcHQ%zk=(^zeItVD$1wI=XR$aFzWgJl z6IpQ)v#P4Rp<3Pdf>k50)iHf1NnI-vB!XD$?x}KJdNZy23sW5hzJ4mFrW1k6{Ynd| zDpgJ^XvukC|MQSr=jrGPO~U)c6jZ=xIyP4Yy6vG9(PUmP?F2AV7LvqK0%j;*i6W#( zV(UXi0!>goBsrH(Gj3_U!{b3Z?ZL2HWhA(&P00wUShzBu`zA-usEfGe(gz~QvMt5TAaq4!fbCY=v@Zg7_I<*=AA5%8Xr4rNFRXA#_PwAG zuurEI=v4oi@6i!ShSF1>crPSAwFq~bA!<~UYY~1`5xjf7`;!QI?DDai9AF3lQT;k_ z&*DtV6ZUtyJ<*#tlNlanC&AY{XVqxoTJc_UukxVA7fpWS8Ps_W~ zAnr?ive|SxAac}kPHU;*7C#~47r|qXx%@!|N%oIpeDQ6qJb{XfI<@`%II=L`^LW+I zBMST;B)Q2t-+B-EVsSF#xnfyXuU=f9WBash5Y~Y1k&w+Yq?;cBC@1oH6AIG4gO)Dh zu&OiE9;C6A>EbdnYpRR#{udBS;G~R&@1T^?HPP(SDM{`RX7=}8lt(uOI&uU=j^prU zzcxq{mz=QD-xLH=wY5Y5(JO^8D>T`(yqQ+(sicuV^z%GhIeB`QMs2@#&{x}Lb5j1&Vl=Bn( zN5NfCk9@O`GksD)#+T0Toh6UYk|wJ_vaDDxlNsE{Tyh z|0;OJXS?!zhmKkWK{6zcv|`t4XTc?GfYm$hBpS!uXVMeUHhp75F&AHXi<_^x8cN9g zcJnhkAhd`7hytQV)P%grRKCh3M0&GM^J0mD{ZU)Px*>0;R_7!#CUmg@YurW_Cahg zY-a3TNOByzboHQoy$Dr3;w^%pI4}+;@{=!TvY&iPKq;AJ=GAYIyAY8P3nx_#o;dmU z1?K~a)d<#yKS`F8I?OElY`dY0?pGLPr?r7EzsE~@^85!+0Y7CLZP8vBl*{mnk-(_$ zKZz<33&B^pFg;cCEEJReNtB; zgVZ>)$nRj$&wbZ(wFYZJT>Q0{+TKTM5zy|J7E_Tb`w@ELcbhLhi zir8@#8q&i*_?=j&Qr5Kn19XKPk_2TR2CM0dBw&myxh+I|pt%~O9%rY~aVcrkpWl=f zq^e1Q5t!aG6oQLd-%fml(!Vwy&TD$`7*HbT@;!Y~<5ie3fiPKU2X}lZ?Cw18spa&J z%btBGv03rGLjK**^qm0M`2%G8*uFfM%LMpzi@Au@5jB>_Zw%ssF8$aO>vW0U_5N`_ zs`^Uq{d9ZhUm!C|Y1!Ft$507@#iR3QebOsIU$^Q~`+oBJr^BT8)F@QMqM_*LG`>R2 z%()Ugm4=g~jqzfIzOmK!^5(4$yv(oJI?Fha^i=Bq{jy1{7elA`t?m9ljvi+o!P~d_ zTa7X@{pg-)3_c`zusb-oefI)aX_?K$(0$_lw%+cM&#X)lR>LzlN);t-;$u&;$zju! zVTq`ToXCre&d!v&q!OBdR+;Qbli;-_tNdTUu!IFY94bh7#(Gba5DD zY^kyF(QgQr>-%&T6PNH(L(sW=3i)GlxJ zI6sufwkEG5$*f#=5h@D7-)Equ`(n<7OaD$bDJco6Q!NOWo~zYeT)D0oX|0J4r4nUJ zXo?_`07hKN7?cE;u}+omIvDU$ORLTfgHGcaJk!%CX}`row{#eaKwr&3O3$G6R}yEZK2GGw!ej&M zlBs3*;bSP`ad+17=wPZD#o)m!b3=kr4d7+7XmeX6Et|3Kcf=tHihP);SdzO;#fR0h z0%0C;Li;l=eUUE3^DrjqJem-bFDZd}06LI&;|#v(Erji5Akt07E3VGbVkCk+Mf37X z#g!#?EUiFv?YWGMvZ&V-d{R%$E-gmZ)!|YVZ!d3`TQNd$xAg_P9@RJx>iXv-pR?r2PZg+d~EHnxb}TNKNv} zdItS@HzNf`vjO$aa>h|_@^VB_&;|ce%$Q#BFcPEV=)8{f-;_D2-9_AG4`}?yDf+$k z6kg*Bw@j?uSe&GQid6*yFD{3@fL#?IRfA6(*Tj6^7u-FViE%)6i&iTOY1JVV$|e&R z&h@YeOgT@32VV>g2rzpMEo*d7)+61Q93C|QZ=&SaPifM^&n}xsf*hOixKBA^q(q4x z9tin|y~FZ%#JKM(pu^J$T%Las#@VLOKMa~Pvuyn^%btIZ(HNjg$tTKI+5dhi33{id z`D^yqU7c~O2++$U0z0n>=d8I<;uX{@C#u4}BLnxwqZBn$(?!AUyXtWmh$dm|;E>j( zCBeEHIs?&5nb{o}=uN^nyQ%S35ljmL=o(#by}x8=i00OYhkSr3C6aNE8_JDFDk+n@ zn*dv4-JHsgQx^#gVdR(av;Py^;>Rxf$frK_$#|Pt{4Xu8N0H(0F-z|u=hW38D7MQ6 zE|2eiiic?k5GyhLm_Qx!@kh6Jt)6+n4_wvPZ*dsc5o9y#SD$=QUdy%>sh_LPdKcJT za-a9}fF`iepRF-VL?#jok%-YWCt7=Y*x!5H#2y`xk?c{{gr)9 zW)%|>-QB=H&_XSzT5<+A=YH1b8Rqx(!Jy2^N$24Yc7!!wD!-ton4(tMkUaD?I}!M! zPDqx)=yBQ#%<_Lki(_2Kz8p!R5Zi4&=)hnNs{B@7{st-WOCh)$&JZgEINeI}aVofiz2e`el|l@h0JLR3VX>CkBuFzZ#`1&oo2+H%ZJu(C(`968=iBASr8jz{zze_dmbxo z_z#^tJ+6OY%dnBinGbJPzj8}du;fgm{X(8*Z+zPuCARMTQDQxc{#dZgIHCOpdi|cs zi!@|k=a&rlc8mNZ1L(wX7T`%78h+o0x0Xt=%A=M(X_K{bK1p`Da)z6g-y}~L2Sk>> z8P3X>u>ev0b&*6m9OSif{XJeil>m0=l9*k+6pD}akaiv_PH3`4@>T)T`XuoSPe+ak zQakC_U;kN39y6;^J~<@-7AXR!(X~w95PDF9Gdt^N#l4Pr{@aUrda5$Y1r-TvUhqjX zbS<+kihs!gic8cjtpCuKK(mq4pRZz{Ul^nBm#~)Js&hxwe1jm8?voNQMZ56|%(&h> zwth%boS*f%m}5#?Gw@e9>mEvLki`_=_}gA^D7eyZks^H^_0G%RRS02ptM_)lA>0l8B6~qWX{-oYRE!*9rJXv83+24PNm9{U9~y<@EpL7i$H{afP-ZU!(a4HJ>&9aTVyVe60Z^+o^T&q$k@{NkGT?zURXi1)jp`U(z}QHQRtX(*QT9pcRpf&yt|m@?)60Te;&zM&09cBRLv zSCmz=Ev}?+I7Xq$f;LlY)}mA5>uEihSC^G+7lpo*Az|-1HWhboHsK9M{76S6+PP=U z)mww)oQen;bBiP*bdj}qKoCh_O|ix20ZFp$;rxWrFq7O4zAqJz^^3=u3j7f;J*1p2 zV9y1gVR=!WpCr-W&n5SkT&+<_L8<%juwZg|@)mM$@eM(ok7-iH7o2qyEIG1m(+)4@ z`&mNN2*Oz*_#E4Mp4wEQAc@_Uk(aTFGNnW*54K#C{pQJC-7#81!3DW*%OfZq^m~ZM zUYzF@syHYLVA6BLb7o0-g_=NqpV(IObo+YWiR8{aLBg18rip$Ne_$bqR%2@&px+zm=K+Z_6SE+A8S6PN zq795Tgw|ZpIMEm0OWGzzq}CKTL~@gCB<*;S^8Ybr+45KTX-#4_F>#+s?+yIL*yEz@KoRYj8;Gy9SqN=Fy^$NW z=S2lkf=|6-#l6`O`W(VP56@)I^0Tx}lV`!E=TQbLiFjx-BHtVJJylR*+4XS`vKOBs zg;xTZ?Kl*3pA-(q07CLM>1Ao)C`1xi1#O}8PkHH$chx;?E@ zWo;N`=By(^J`{5sZ&)!(oFBZ-;3W6!@4ZEmXL^ zWjU5lNty$jNRSoeBeE7LaU0$lIA$ACCe?s~CRZ$-Zer?Ie6>wNqo6n{6qE_p)x|Oc zSTqGCjX4i`JkP@3cl=U3M9DdJCly&yR=mS_Ho(K(w{^d-?~o(@l*8dD3289mYw2Zy zVqwh`0y+*v?GVa&C*+&UV8@wv;P9Ra6_86$ZAsp4X zt%52f@Xvt%*7INsot2y5Ull-)ke z{uU!PxM`zy2%k-cuFEFwVg(_?*6?tzvut}I^+pa1X)x+9v@w4neU~z1leo6+sVI0R z@juA*{Z`J!$($Ol3`E1bk-Tb5Z%!ynHYiDPwfZo+|{VTr@tG0_Q?D{FXL&!9o;M zeTVJRcfvG9jG5ulW>OrPAv^~Ucgc$eszMbNHb;nXe9@UgTKsEM_K~#AY;i>m=N29o zl$6-Ei*>(2ew*Z6aSiK$g+rNKEc&ZSvip@a|G2oeW#Cv@tIUOlBZz&=PUN(MJpT#S zkxcuq11Lw*vB2RP(-hW#NG4dUOv&R?6Ufmb9UBD7xcHhIM3Zb%=PVCju-9QhVSz;z zzDVr3XoWs=h|nv|)K`d6;hkMK=&w$niKofoaFkf9q~JwGrdRf*3$5qyD7@aNZ^d2M z1iIa6+I`T@py-wrA-=S8P3*bK>`@pL8@7XD1^yJ)fCwJl_8h9h>y5MvsXyvtIOa*; zr_&Mps{n=8OzqU*RLeR!e#JvvOT+CWH%Z#0ld{en))-rY$l{! zk33!dNlYtUaxW-1))Zef1QLy*qmcF^37lQ60Zzm0_9CY2B>p?jk`S4KGEQ*lwG~hd z(BYdKvW$$hI36VXtIYzTEKmUPULialS&of?Xff%UQK<~8=lF^6vMUJw>xlYv*#l`^ zSnCQd_={V4{lJM`I4-I(C%Hh2AgugfDQ~JVaqh*jZ z%oJ38Q0hBm8)|HM;_=`1|3u%1FlikKa{Jf{ zt7{k0HV~FI)P6EWiA0FB+}YOQrg*9x4#yCvmjjJndU23Q%oH$U(!FegWMO(j+^o$& zE(O|vX{(yT+0_~_A8yvDly(g1<8~|0RV(p7FA~hxmV!Dv?DR)SeaD@uxnK${&js@$ zEKR5*giM^)_{|uE_MOOnD;@9ow$li%$n~A4NLYxNT#H^u)_(<^d!-fmZA<|cGiiSa zi?;@(S(mm2xxe)~@ovNv`lI*I+$b?az_}FR-|TY%1qhDKrjotv3`yv^oc6?)Kbtjy zRQ|ZeQnqGEaBod{$5MyuGP%;{{et+)3uxW}hvV#a;S6k!qGk;E7GX;4RRLczWF%(J z_gTdI!#@yDm&4&0LUhi2F1Iz0`ozqXs#a$JoDM}lnEWFK5?-kYbkATk)2lBUht=*$>CKS%Fm8ls`W#Gm^(Ga zf^q?vf{?a_(XK5EuSsMtIj!ACK%3cu#XH11fSlZ~i7F9Bk<7FR>bulBqVJJlg|K3J zP$-+gq?|`FKxL}*?8WksYfC}RCTySGHbkSOn66;rybbw9*aC#wBO9yoIB}2jj>&zI z3;{=6>36Jh?M;5xF{R4Y{yxD><`&4>@yiuf=k4 z^%fG!m`9PD!x~I={F8uh0Xv#yj|C!REwzH8+u^e9-5s%*oZY)exQ^0yLM|99rYVqI zj@^eOx$7^BYuE-f#L~7AH3gLbf~0OjN&lZU6{aB=QCb^qVk*eY`_#ia9}$_=kaoh7 zAA%&w12>rcY^hNklPMc*vjYDeQ)_BLnL!zWT7fFom`Xxut=e%4&fO;JgLnp|-}!$x zN&DVkUb2ydexQ5TFtvsf8@2%1so}H>=Ua2@UYQHZ6tI<(wNlUVu&vTEa5!%TRI6Vj zy+8=<8>f$w8|RLx z%h_YZuam9_o=uWbnSqeToAEaY{b&>kY{@vz(sRR9jim_Ti>-BaR)U*OAU97QA?}lP zmKBIK6{(;3$Q?adO9qs$r#5u(l&VNW;Qt{hDG4bVO}E(M#x@Stn=Yld;7V8fxFLJ{?LiM%c3WYV zLe2VO`O|kD@BOXA2T5=f-F3jVHgyWRCg4ylB`k!}XDiE$61>~UD61@s5LVv-8EBWB zvvCz@4(AUKeR;Y|FOm?3Y(~TdJo=OD^@|ABD74e}x_pXw-8!c#KHK)nI@RoD)+eJf z75D@oIzfA^v_lUZwSt5(3CQ55VhyOatld5p|3zDf*SQlU^mAPYi25{^j?mFivSFT~ zUydXGYj%*ZPjqHyoTI6u^O|7Od?Wj;q@=uf{DcI2p>vSLF&Rw~X9Q)*04R~RjHFS+ zP~tuaI#6pARSASEvx*O%`_!RS8DK1T4|m-X*RBCNz<9L(uK0(IpxZ3G9xV7qX^&AM zc$Ulw@5Xb7T1L|E1IDc)UN_H@z%EQ3DS91jbuP%|1nZKtZ47#(49T_v=Y-SU5AhJGc^iI4fw`HHr6%JVXdc=P|wRG z)PX7KPZgtQK9=W#P-d?UTf9}cwqeWV=Vpt19vD4KnQ9>s9p-73l-!NF@MK|s78bBn z7W9(@>FKR0MPLm0EEvj*19`CHrnsi%z^6&Bpg57-)u&1BN?ra9_+r6|VG0O=h4sf) z!1{o+{_M1;QqU=zI~{}PPP+}NjD#LNNBX`t^*U`3(6FI_M?o<( zSJp(%stdAx#2!3M zVlSQ+8Z_xUWUI6kp|UeGbr4}UgTw{j5Uy=pz;&55#TG^9Fv^#<2e~tD0eMpJn3O#z zlpRNMzxCoT%!hTdR0=DaycB1IfT`7oG86q7}?o6$rduQ zYF}X57^iw%Ch75a^(FcaiTFY1Jctqct4cr|mBrWhdiR!GYc8uH`=BCnT z!RU?cm|X3qkn~t*64hN7(ShaG)R&PJ|D(!P%Gs0J>zlamkZu{3M+YtQ50Sugf-?Ei z_B?->P6F>-B_0>g$co8XlhVI5{h_SZiGQ<6#J!um`Z4@(YzZP`*zL0dUjrPIHQ>6* zIyZWs@($jl56BaeIh`pnLEjaWDli4)53tP!zPsp&}M3D3qt(@_ae*3%8KS zb~?)`o)v3yA+Z$Q38(KgQ}B_I_+OS-G~J1FP9C^X)>g0*`R!zqv}3>UUd!4xNSyPN zoMe~gVzbNPa7-ooL&yIOWAc$;09Pm-&zOs2ew#<`r@NE;8TyjCZJ%~MNWpnO zaYMCBN$LYxdiU^8$B?YM7fJeYxtZ9SaA1%z^`LGaAC4yHww)mUn|H|ek+brgxVHH` z4@r?Vp79PVwAVH_?k*PgNJUKLKyzsZQ44H{7f<8a& z^czAsQ(OZ{1;T=vf`aHYY(`ZzN%(cCcH2s^cA5uasY(ab`y0>G-tQ?Xy6!7`S1^TY z3YZSHl@;YhM7mM`69}TUEGaRd^p%QeGJzz`lTY)YaGx!JHJ7bc9scoXk~m)On2wrb z2r)MYWnn={qJEr4(zfp>_fyyB9pl@%Tz?dN~}9sf5;ZI3vAqLPDlI>#QkA zn8YUVf`orEnmlm7ObYIM>q&m98;Sf%H!6?+WwA{{J8J@#5kxgk!A`B?KDgKJ*Ipt4IzE%8LQn61etd+u>)cKZUl#K zE9>$|uyt>gf@n5tEqnJjGgd_^X--=O3(7OEP}ww3WaCMuT{jE__TRP0Dxd@w3}aD7 zkfdI#El$LT%(U#bQf6!rln3eW_zsI~VmU?f!`N1g11nYhvi2V)1zDaXhOyc}ppd1F z*+mL21&F^k3=%iu9hH8IV^0{ogydW}O$u`L+cZP+_`dh!qC7utQQ>gRA-coNAHrF` zh>_cbQJ-1RQD|{grZ7TLIvolM3VoTM75J%2=4z%;A#GHUiMu4?6UKp-D$0ncF$FlGVyeyq|oaMDR~yCD$mo9AWGLrBT<}Hov4Z2S45vA z+Akz83;oFpIx326s+<0?)~W-Ai`~zOo^wb+TCOZ97P5p|ni&@ORBld3%5+5LSORLIu-nQ%e={gEd z&(@++?m;UiJFpr6N!C~e2);-8R5?i=pa|io?~kd)5TO_fPSzGaHxh6HjcUq7oGAnf z1gc|O`cA^i74x0k0+G2$7ZMDy)ijUtolYLIl#~>S?}8`~Po0phlQsXi_-o@Jv#|7= z$R-oWORD&=+cj5SJ_{%+eiHPJ*bH+x95o(44*Zw0;vnCOmqDcDfj5b1DbIR|;(D+m zya-DbA`&1^+@i?Cy>|pBO-zHZ(-^Ek@yMd1m@@h@WBZ0AbGB|&j!|TBWV+Za)E*i~ zS>18Rd_RShjewCd9!e6DtV!QVl6TZy{FQl>-7l1-^G6b{ zs;VkML3tjWqF<4kp0l+%HIN+6P$pG$(pFWWrk%U2kR*g2vr?hQbAb0sIMEuw)FTvI zSU{{nm?kt5#e@6%JRnhA+kB80M{qP{wwb+pC*7{jni2ccT$?0UgTpgxsfzh&8Yz9` zqkR`3WmI8_ZKG2bqnb@IDUt}s2Wy`6yNv1UW!tq>%8P>vtII;Z7Mo)Zhr?1`9r!Pm zB|(0br6EL;7tzinva#`b>6#?6(Re{QDb4lPZr6|$$GeblCj2mctaXXfOaajuY)09L zPsfnwVYh_iDY@sVZ`H8^MOk|C=*Ur0oIuZ+nOZ|ZIZJ_wobBvV9areCZ%HtT@2pFZ z71eC2#g+{Tp~9}XJqVNoHc=J?QBa7iuyo`t6xb8Dg^v4qc$&~}Kfd6vH;stU=8`n) zqHTa)E)7OZ9cdc^#T{8iQB7cFF*!M1RkffLVyeI^mzID?)v%%R}jCM=md^;t*$NU~b-!&_+11=K}iDA19U10`<13E+HgslqOX* zL>RHwQgSYdsu!j5bpG_XAD=y`J*IoJm{A{XK&_c4uN0zCbfd4hcBsV@OwvZL(tanL zvxOnYn1V{|q1#r(=VM7(rl*+$sSIZR3kx{5JjGRC0z8)Q* z&xZIONK%^aAt*1>Iw)Ld>Qov0?4;jCe>;U#Q{_UreQTtuJmhh8b=2o#^UUGA-N1rU zT@m6#Dne;1sxH;VK_rj9=n22hB@v&D78=EH+IR{7(?%w``6QA&U@^&AzMT|aJxj`S zy;QejOkM=v)R?`+mmfYbwMtc$5Y{Q}PqWW0+T$sKg@bW0MZ;tb@Ga2piz-7;ZeJk9 z;k4nl(K#z4QSNWptvwg)3rdT$Oh|)oVM=-lOck;FV@>N2nC-2Z7D1;8{~u|4=)mEB z!gdf4SXXS3@l}9!aBvc5x6exUV(XIkA$sg(>^&hHET&13o%HcJUy^s&jTBt)H!lR1 z_NRic4tgi z=0^W8m6R6xk@6RTv;#jND3sDNTbR^^q-q~C5hx0Q?~=7e|KP*IZZmtuIg;2zXK91r znxRIDtq>BoDJ(SFeOYNmu_;uU5~9KAu|j#P$hYpe1RoqGngi@*wRl zNt(Py_B}caOqE#bA0mP17TI@S5m0y|L_T%);V6=R}wYq_80@-Q>mwV~K- zb2x7Y{{CnGJ~r&qo%rx8Fs8+Yj$Hm&Ey;Cs94*6u2@-gz?F$muexc3xX9@7Rf#a@pT6#t{=Y>p)kQH|Q)Qi(1 zNZ@MuJ|69L7JpzSbYv$h*hojJ0b90_(3bK%7f`gU2_4l^Rb?|t}86gs%lFR8mr9O{P?t$?+Scy9JdR3W}bS+h+kR{ z{A*D#UB#LfP@$I=hzyf2~X0W^GYJI7qVl^B%H5e;+^2vAA~|>sW~(SEbUy61CCOTNN>G@rhIX3D2q9L4ye_ubj{;?~I7yJx z!_v|Owge8PxR30y+2UP+FB1j@wtVOEj(G@5iS}6EcOq^xR_NZbGkZx$W1ZtE9F?sF z)*yDDKE3D2-fPJ1W4lO5Bi(+5QUec*#4Xee)@3b2c$by?sBO7%e&78o$9M6lpSp&< zz5Snu^&Rt`!+_D>I1P4c$;C36GJ3)frw(kobNbL0Qdh*yo(XxRjhU@0*lMAjA8Ng5 z_eI64!&GwSp!|65j9VmI$C}ji=u8v4=|+sfpN}SIcWoqh#wzxK`F{&Qm0P{)w9F_G zg1j!aazMtsyHbFbgz&#t)z zOW9(Ap&vTw?cTUON>Iksr2(1=MdzL3(pmdHQlrQHw2_p5Q_z`7N( z<2kry1quF4H&ROIyws`@X5qD9**>ofnJw%ih}}n*W#-pJ5)pERFx!_2RaP=*9JWb; zHVI`1gi&SQ5jSzE^}yMd&EhEurm9fqrnX>xJOrT%K-MA~S%$0tBX>jL(66dggsI>; zyQjF0As;xAb7SVo-Z6-KJKa@>FhQHtHK3#907f0)|B16ob=BX%nCX3E< z`FXP5K3=74TeFOeA3k2St>+ajBHu=%$!4k~Uh2v01C}ETi_~HIhCL@%&|p8}B%2D-h&!u_^_94QQQ4rG3(SB1FsBNC80Sjpq;3esDN`;u0wcoHgO73xTBs z${up1;J!f+9?wQMv4Z2Zrfh<(LEey*A@Zu)!5=x1!%q5b&aOH0Nhp(D*%ncJY-AD? zqwVwN%l5f@)_mc3q;-VS4F%7|Uz-LBV@kgdr2~LHQ|HR|@j7J9qWNUpuyLwwJ{Qx( zalq(^QT<1KEUF!*Lx0$rYCGj>8|7l2KtY)^aSB;FXJ(y}9V6vgHxWWx8^GhA9i4}~ z??`qI)4v|;CQT>7Oyh~FzSe*OY|^$M`vy!VYbVbj!5=dFpbfi4*)?egiYOX(`;s8Z z6cU8l8a9Jx#AoBlQ&Us6n}{+33X(ivgVmwTM!|JtQuw3ux20tW_ZAiz_MB`XsF77y zKw>&1?PHHG;A1DU&0(tEJGODcbmIG^?j9o|&Dw}5IKs12VVB#ElkIcG%$dafE1fcr zdu(#K0TC2##2`xA#;ulPW&3!YvT(+9GG@pa)wZ9DX+m|4M`kH1PJNv|bQ&=FncBv< zm@iXCjU%%sOsG>bXZ!@>(o{EkMQs;2@YxzfY#=g2+7IMlr!lI>bm1p?LuO4XcZ@6} z8|i8R-EHC|?Bk4`d>@wP_&}yorSAzO`s?ZBMTG5(F`~euWKKsKd~1u?=}}cpk_T>( zor{p--pY))HGya+$=MQ}P~nvzafxj}vzoFBUHhI1&HmuAzq(5 zk>$h3>%Ctqhm9wGpUSUA+Spy<#w>?TwI51Fxo`HJg9y`jX2MPf!iutTsQ&rAPMI-o zJQ+P$z5VB6novb0u5aJIe=n*b#&H@r>W11zxR@_vhdGjoBkP{5@2YDwAV|k;b7&)q z+zae}&VQqRJPZ428XsvrYe%ZtOuBe9oGW@dk~xDkRvhVj3+>bqX;a$>iQBqp95~@?@YKV0;kQ7U`BW)*E&@K( zh~G!FbN^H$Zl606moGJPy{Q8^`jh;3n09#GU_gQAmpv}X)n*Q4`cVD%Ye`=x;!n?! zT^C``*7{4qshOQpz1B>=-wj>lN)eKXq0L{z{NCi z95`yBsD>D3WWO=Z=!(^98{lG|IP@PzwZp-6PMrD=Ca#}5XkU73LwpSZv%Rzri1X(o z$r$?~`o~0%=VG&w+VwD9Vohg{;(+Yv@?z5w!hVi^H$wXztSBWZmgR*|3zbb7ve~L+ zbH;kU!n`Y(wzRftwN+5XA67hNgjWcBG=3PadTtAU8%6>?(5(x>Aix$@vS+Y_G230y zQP<|p>OPbNGW(7Easnx}pgQ)w*+;b7z(8h3ca=7zj)+5l9GjDBf54??aU3uze{|Q; z{~)R(>NpJ;wOZ}RT+ESCWJs@pWMKEcby8Ne8l-*cA-2eXsss*-Yz9`J4;{#uPWGzD zGrRo&+41D8I45q!0;=WJQPFr$?AVViZ8MMrvzD4k`@|oZhv2-*L>OSI0;TV3D@?Y! zv|Lb5ki5;(nnE>!@MW9}5~ z!;gb$=dM#wAde1MSGC$25NVV?kv`kv^q3^xAC4q*+xAyIkNNEek|4%<2)Q@!n9Xvs zpdz-kUC)n3l0o#kVZRPt?1}5Ax`79*b0~vhE=oVCV@-$Zonu{-K|T6WWyMjYU*KYj zI1C)!Q&dOPfv2t754o5oR1+lq=nLBOmu_`Z`gZJ2+-YMXz4Wz_xD8HjtfOpj0|zqo zr{1c^)2m}Qa{aU6+I5kd-kOmrA}&}Tg#Aqhku~4;7nBw0J2ZM0MKM7E8mG$zf$cmx za93PdJ75|P$?s~*N`r!p@Ug(Oi?ziF%>jN4v3B!GS(fcBLqHY@LS;g$UaHTZnoMfl zo7`lcNlD^6F0OSS9W`+85rHF9jzu~3LdOfiRYle6l)V2!Z_m`+1s zMQQsxnhg~8+lRI>=f51P+bTU^6)w=NSK-!KBZ>N5)bxrzo?#UGu3&nBZs2!p@ zqR;T*!~f1{z~~ohKjdPX^zPJ~{Mx2dos~t+`^Xv(6d$uC7$GYiWtTVWqk1fm*)4j> z*0pM+N*gugu8_7BKpV9K4F}4$k7*uD{Vmw)yl9*e##)=8z#ptawOK<6MG8@A7x(Q| zf%8hTUsr3@jNz|=sRiktpZt7~>a(Ym0Y7yi2kG+yrAGQK1kVhT5Mo;FRZ^02pX98* zAX5Y+@qT|KnbW+N>Ulusf8ASt9#nC+b-_@Ca7)|AzJ|B#N`7n8ne1&Ow~Qta+Gx>0 z2tG=zbNbfC{Z!Aju1eSTUCBtUsF*E|14p}wDv3U$?MMHs_n_ zq0UODmOm5M4|O9%Od;4bSr!~+r^_8>_kZ4>{H$^;kk0gYT$tlQ7^OA7F;Cs2W%~}P zFE`Z-c||S-h-;e%rgP$d(G*3)6ooaBN2Y=(AyXQ6Aw<}M(J``&q7yXdx3F?qTTBmG zT5HQP1d!uIy5}KO27mLb>hmW__wRop>l^hYK~$-gekTd)=^($#>p)huTNEe*`{+A` zV^%vCylcNV?IlxCpkzHdX!~g@wgBa=kA?~RUf-~<_B#j?#aVK%(GJAfEzoYq>-`br zx0W4M&$%v3*LGc1`wA|Gh3X(-qDrCYonc1wntO2pL6-B5Q z!fgNAM?(e0NbOi4%NzHWt#8SkwFEkIOkJ_tV+AAYXFhS_+UA2KU)T;Z;MRpoyb|z{ zd9d}m_?LOSj5jYz2xOQ^sD1p@i&y%^JbBq33H`RFR(?P1w9t0izx<-A7e*?yM zLKIA`;JUufl>E52tOK|=?Wjkz_)Ya(BvHOoP*9NRxi-LbowT2AU)qypihX11wlwpR zxVCw~>cehpUelhc=ldqe!0v-o`wTAX!j+U-lKx!>s6L=|MLJT!Xh(YKQTE=Jz9`Rw zQ)CWqXi)op+e!6UAici(MbzK%7=^Z2Z z5In;fQw|6T2Ce-BdHnE#oJP;vzC(N`$8BhqCIMx z=fTNBdicbitHf_=kMakFB)+4@B8ECe=8`gOi}v2%7N;Qay#3PhXEKH=EXO|^s5cD= zfyDutZ);;356_LI)0nVcu@1ARRV+g|$1POpV$TQ8&`+Er#I4vKSYg@yv4Ru=&%7+LB>4OxM+Q>B6Uc%o47o)RK&_cObvCGHf|`-2$_>^x`8cYIV77@}j`0 zGqJ}i?Y1FH8~0K@21$m}MhCtE()!kRv@pxF`7R8~z6S4oTAL;&c57M=L zw>l$3TJ?~P9&K6HpLL#t9B({KFmI|I2c%oOZsgpjgSG1miQ955pRN!_nxE;1W+Jm? zMWOX+{ws@2-v+{YVR5N7sP2PlEooYXeKJIN$9lBwMh<>1kEFqR zFT!nKmO%-^vDy7XVA->#=pw9x;Y=l#v*PraB5LQOF} zA?-^NbCncR3JFGkJ43Kcm|KC@Qs8Ke{lfBPO(^-Jz4Bt2t9}_pE_@|V>IUB{bDg0r z0q>SnM@o|9{_CyEvxB6C3BN7VZV#Dd7yZUl%)gDom6W$kMhzHETtC+}CNOQ=0-@j? zAP-4*<5*nP1n+|8|) zn=)jR;6D@b=~y8=He=dBK?$mSQY^0V3Zdu6W=n-YQL+Y1zp>ks1o?$b&7h22Le|zv zg3=7XD521$4g9a3ddJBuGlE5y4rtWc5H5dw;Y!L|CR^I-UVcOgSescCQ3^=YE^QOC zt5wYk%Gmy+iPtB(-yn3>nj91_!qQ~v?}dVCuP~+Tkx?r9Rm%1@%!rvb-bHu9#f@4(Rkd&~nr+b$_rjA_o14u6 z9idR@O*$VcnEJA%p92c3vDPZ3*fKW?I=Q$G3sv_6c^;A?u4z3`AYkEOw-4*d>W&&k z7YeWRJ^Vx3v)qc}nUsRdf!b{e&fx_nlop`xEowlqN`3w*(<9bu z3p{t2E|QK3PR<+Kb3c@~UAU6+mdUM#x`xTxY@tE}$&3!&K651F`l;`imGSnYiQh+> z-$3BlYE9>ZwCcjP=&|Ikzx+x^g@VOFVM&6(AH`P30dqW($FbWF_)zy5VV<_ymyo1Q zp$xI*^`U$TY4>da!m}}oXZMBkTFf{|F8Nii%+^)`!rBB@F7_OKnP(pnOxBbH5Xv+B zyhwBouX#IgxJFfR)(IK{pQcw)+QATT-iI}nJ*MN|az7Lq=fVim<=X-jErd@6yX_0joyg{Px@!n0N%+H93o?R6HkOC|UT^F~wlMpG zDc%;-XecJAEIjG+u_Kw+eU$838Q*`j%rE7^4$Gfei=hfMoS`j2NG$m6OzrWzQ$>D3 zH|F`LVy!g=IbBR~4u?fYSxbu*$GET>~P*R?H#mbaU2$Ugo6r0*J zN=ox-bYIr(3^i!jIxi59PaVmO-s;cHs=cvo=8NB$hqC6( zO7T6p#GDhtt!vvt1Se=XlC#GWKnE7*zSbQF1lfIUWhpZSoVU`i=2{acGIoIav%ux; z6RxDZWpaa#jHSi^RaMQVs!9l3W*e0QKRT)IOHFpSW=4?>oUE!Si_s&hsutY}6~8e~ z!3BRop}D`sy5x0&b%RMw4nf1Z_b1)8Mg9$oJ5&0*hscA$Or;^j6x)}sxg5q zCX`k!>{n8Tu&3cMeD=1tT;Y!L|CP%;5HApbAn%j}0ehS;DTxqK7 z%xaPe{YDdi)`~JSHB(jk%Qz`_{52ke3{V4^bYR^w~zkyZ5nnY;EfFc5AR;frqip)%9k3oR+Tiin^ z1?+jT?;-@zVHQ1?M!+-3T0J3{a$>DkxV})J*mdBS1Z!cfK+h3=I?8EGJPX`{!bK@u zNqNgeIVv@${5?Wy*@ys`=rMhxwjVXwZYSS23e{NyoK|Z>==7D2g7kCYwP0}#(?C+Q zoR#Ng+ktgsAMMabi{}R=EST}1!2G{C2$3#R4`_c6fj@@YR2mv{jE1H4;Jjln$zC4Dj4;*tJ&a%D3A9sT6XIcXiku@jWap)TJ?2i14Xrtjtny@JFhUshp1_%YUVcipsNzaC%FU zz2zNsmrdb8PEqA~484bH`)38~?E6XHJ_tgU!h7?Mo9|Rh^;l%1O|sX|k_;sr{!VJg z!G((?R0rWo%G)Sg>Bv}F5fzoXWzs(9 z^wK|XDE63|dmfM^Q*xo`vkE<)yNOhpWY0lOe(yd?W@(fJN^Z)K&4Mo!oQ{oJaikn5 z%o|lB)8?|j3k_Fx6zA##$*E6=&Ji&Se zhf!sHA;J3et9kn}Br7|Q)>9fFP#iFAgX@ZE83_CzFp7tgs9c{FJR?xt4L#ex)APnU zYQKduFwPe~NNHns$(C)S+f>`0noRCDM(|xR^lUZyvn5kxVppc{A>rBs)jVD=To;QV()uUSO>?7C+%=&_EFzfO@iww z>`P_4Y61mnK@Zy~D3UXG*_UY!&!87CroFl?}wEM^!^`isXsMiNZdbjGHJU? zfg*_OtDK%RM_?gaPL)@+?VBqz=yQTxHKyKgHGxHGU#n5VHB{RN7cPc`D=A!rhI9>W zsL@~>Y8d~2_Ra$=ifjGDH$6sU@4YLcC{mOvMWxsfdzYespeP_Cnv~38FJs-Zs=Q3Ezu4I7|NzJ*i`hY??!P*p2UHe&eSc>Zo&7j@Bq8$xweJ zcia&{4wUbs%@Sc%&@k5d^0sRY8co}TvLe3$-5eS@q7wk#`bwcXTGnnD6J7bE`_`cQ zl+=!pDPanVJ>7h(RGvuY=onlOK3tP*3;vl{my`jHl$7BR-zPyGeG5sjnM7suvrgh; zL7!Q|p}*ru?L7?gBNJh1a3ZYpOMuP3^dVn~>~-Gq)|e74yMYfol3%XhH)w@+Uvv|$ z`E04Lw2X)0eGK(ttV4Z$%QGV}yf>chN5#XUz&P0G6$d+842Atohr%+yI7pD^%shXL zcmtfj$=)Lo-(zg&c$gm?2kX7#;1!Rdu-9!UY;P6E-e0~fQ6!)AzbGWRcOv9>On_B> z@vz-99$sq^53hQ}!?M5xNMid1>qnz}jlgV7i%5jk{wQ=_39uXAXAi#LR-XhI(TBf| zrr`fDsz)Ns4NHIxzVWaV>wY)BKS4il@`;DVK?#r-mB983Z+{hwS$5?4NyPdc+a&=O z1r=uIRrjIn=ZtQc2idaRY%rwk=!r8!dOfjsJY;lO0)}y2qMHlXnRIvXa|T4>i|(ict=Kb`v@bQIuMb1 zIucRPDMC-@h-f{Lo%BR?f-a2C&?Q<=*XSBGJu^7>MZ_1Kp6AuH7M~ zn?x*hk0E;K>CPdxCw#qSTvToM2KuNV4bt5?w6s#v%pl=_qzXva&|LzOlEX+!52YX} zFo>jpbeFWWbT^zmJn#Gd&+mLVA7SsAz4ltyx>nrlzUQaMZdX8Ti$x@?j(>=}R>iI5 zG+zJj*gO~E?zv^fxpMVYE;wiXqVAPelGrBBcJOaG!EpmE6G0423^|i$Oc)m%IM%ey zdv=>x0S;H$4(T<~Vloa?jdP9oi~^2fo^}FZ$yRoIwxQKW@5lL!f(ljCtSz!F@Q9WM zj>LocKB#W0O()g}{Kz`G(V^f@)R8G}(DArnT)#D4xE<%`!uX9D{!G=0>wPs|=wQ4c zHUU9M`JfY0`hEC@4dYzU&^=dWx1Z6(#3=$S@Q7$jMbjF#+{Z?WoV{d2)Q9F6n;+vR zs&r1@Be1#?5eY0$giQDphJC@id>>V~vvl5U1jgS8Y}_Jl9BpJ(FGEj=w|Ra$GBei^ z*~qfkH?ds!$4uei53i|o$7V50>gd^4n*9n!5O~9|iB2h^Df(tCM6AldJ%a}b)Ss#q zZTqiR(-)hrp({j3h0hmnLvLxtHS1)LymNU&)6I(&E@Ru5e~BmzO)6JhnOy3yDTF;0 z9ncWB{}4U(csWWaP~U|dx4!^ zM2pAB`~KI@*T;)pnTIm)6*nW{5y4*-*@$sov$Evi4LuGXLMfvB| zycf=G!#9yuT->LRQ8c|?#|cu+r5_?>2@W~Nz*JDVznQ%Lhzgs&oM4FbANs2Y+0u(^ z1K6B`jHW4xg1sLUiyUdCWf~vJo7BiR_-89!D+?BNGQk*OoUc@&K7>JrFaIjIrWOer zFu!=5OwPfL4T0p8oc*=P7wy7rRm4nCY-i$WX=LLTGLQo^r<71B0e|0X;R3yXqmzPU zqTkCN{{Z2F;10*4Z+x!92A0#(ii(PQqk9B@`-og>Jrzl%#GW=pO%$O00)!xAox~(Yke!TUm@-N%1U8WVW&ym2X%0kZO-ceg(r`<)JC>2?2_pHVNx+u@oQn$ zi*ujAU{|0dj?R6nAC@FQMm}QytxcoYb6~C{gac>4T|+68C$C8V7owU-)hD&cB-|RL zR(%^z7!$JCmYBoYSnD0zD{P+0SRA`@UXex%C%c;aqQ^+}n1w(&=6QI~11wt1(BFK& zu`Uw%Lb3(HIUXAKmEL27Hm3iIl+%h*jY`e_#oo@u^_pEyu0A(g@JRw*)C=fQ@LO)s zYVg~5GO$)FzRO!OGVLdii4hA-2r>le{gwBFYPj7v!Tm_dQg;EizXW| z{nNY8bS;xAKCyv5Q1Ax}G+n{>*Lzfa7^H&}IW^OkyWmK-pZ-t04|M80wrQ@;3pZ3q z{r20F%gs8~2Fr{CVPUZOMgrr&>u=n!nL1N=G8tLo;o3kOqh;3HoAb4-w$;A$oMgGt z_eg62P$`Y5Y4E{SQ>G=nb+c_d=q1?sXeG0LjCP}V2-{HXm0cR?O8oP})#*sMd^5fgq(T`+jNT|2+fMkM_r(upJ) zoXAn(0!NnUH{K7pIk#Gx2V1V690Jy|UXb@(^awNw23&u0g3(?u2Ar?xJ-mKyoaKLlddvd?728iA zDOqq%`Rpy2B|3bPcGXplqGt=mSPA9KvIu4Y?Bem-PWV*rz&hfRA-wT|nx8S*)Hgf!7(IB9b$(e~f zirB^>VhrdQzr6OOx1XvEef=lFMbTX-;7XALa-?)1;<+RB70E_O3#%(ba^f>cA$}+u zw}r7+IFJ+<+iZ!VkPSEW0coWh0No7{T6~40fva=NE@V zL{8tA%t_^*ymZ7qB8V9D6q1KNVg}ukfj2_wANvnQ$Xjjk_PL4{nh;)I8jw+O7hYu| z)M<}L{u#6&^)5jAoA86G=lS0>{2I?mh#nnH;4px%74di+4Oc$Rh>Z-_v4SJjv!F#4~}GnW7F7xZG+D-O(H%q2*f%$A8@tLi9ozTzfZTBT9n?1 zB?l{4e>}q64i1lo!-Mgj-iIT?zNJ&-yvQh6*a*u7;3wdz*=;cuQ!293$YM*Zd z+2D~4G)&-4U5ijwT@N6+cp7*UT+t8A``x#j_!{!&$0b#j_9x`guI!`nviWzLyrPyX z^S3wRMlf;}=(26g=j$^F0~Re zebuBB`MT7R4}LAaXFG1FiYxXjkQ|&7w(gYITIdT4U8^9f(>^@z`Iehl{bSsVNwId* zWF6oPZ1DLS81he&T)pGcXqWcFL`|v9SHI`3#}aUtt4ZgYD=bDoYd;KwO!hai6nuuQ zfEpMg1%V{`^hM=^{%ptIshAbyeb4_n#**nx&$F!P&&wZVn zNE>yYbMcZDghDMvYmy~oZ_oV*pZzY+DlQML23)Pzu(J4OeO;v9hncn+dnL}s1QXT<_~gp zd?{<}?$%gwD?suZHwLFOem4FFm)FD`QiL69^;;8?*MDO3pGCP+0zeN%PI7?)7)lq~ ztsqYMKR@Mgff{6H7_vk36A;W@_0>6O?OwJE-+Li{sLZf+L&gmHDgaWnwI-@F;o!#b z=N9sBxV0MbY|UE%>shCWoAg?J^gZ~dF{zQlAnhFp%I(XMJoU9p!PFP%}k+2O6mK2405^xpnH=wAC=`mLHBdt z*S)#Z;xnuYUQjV10%3Z+l_2j;x)~Njb&4|8@gK#0GVuoKJp6Cfc9-p6-AeojqEDL+$B(E>yqJ zT2Tvu6RMmRS=w~};aE{0t~Hj2k^!E!TDVmuKt@cg_Vd`|6B3C^Lb3_&YlWzc=>Atb zqgw7Cc5sFLFPl>@k}OtY>YX1kj((feP*#nKM+8V;Y5reICJoh%K0MJHEZ|gc^)E)K6A0WA>c+aH{En4M zhKblv>{v&gr*`~VRunH=`!Rbvc9OT^_Z`8BFGTjvjQ{x35{2avgbSXCFkoCOJT=<- z*GV|ly457#yrn-#>NAR-g0I>B%4Xi$6@dds#Yl_7S)~7_CnU6=5XWQ=u00rgQ=^H;6l2jw}*sli!q8JEatBYXXl-Qv7*r9`3NQfXb-eHr!l-R;`P9=*x=-8mFqfSdNRnJVtK zKpL-l+WtpN_xwVeA{ivzP^0E^x`%pS*C+C6y=*M?y~BDB?*#3L?KAC(ck4^9eRj(h z$E@JSy4|1geRBTxY)LaB?!%p~qdp=`92wIwLsg%F7mpWDnm;3>qZGiAouTy4hMN`l z+)gV~$NPRX8v__1ON>=k#bw@Bv1x*2d>Czc1bzJodi`s&w;_=kS)cSbGyb4?)84*6 ze(}e*?zrl#o6m5PQ2I=f2R!aGZcV?6wF?*i7*WP(E)7;6fx+MsASop6)O;^oI8Z)> zeUVGFnn$aShZ=|I zp$9I{NTpwFZsT>&qD`0NA{*&+;pA%qobUSrI_wM>DH_N-P^V^#v#nTHp#aA|_7IVW zV%x|BguV?C&q>`WOQdM>58U35pkL6*`un7HX)~Jx@3pF@6cPHhNrV zT$GnA8>VJ_fl`3AmH#yDc$I)GG5X$L{=QPc6`XUel5A58n|(O%cNk+@+$sPkg~t-J z4%bn`*TR+6qb_O0cq7wkY5H<}q03o5y#D^D+n(jNE8HhPHqIL7(kKsp>M-QZI@M3o?386_t0Zi)XC<%fKe>q1R2a!?DpH#?4=@A-ExP&?=q}X zOl8T>C3iG`Pk_N7;DE_{->-yVGhXXMdC6d)^kEy&q%1KL(=NGZn4GQoEXgWNunV7m z`n#v`No3EF!Ltt(e3r?<>j!Zu&f}HH_um}wKB|3OfrJ~9T;~4QKFWE>=nhPJIb2AT zrkd2CXmc&O7#+i#h3Q<;0M3SNf+48pwCt6dMo@L^`wE5T zZPG;&{fEIc(vhti!ECJfl7=KP^1;rGkK{&8nSv&pN$%ZDnljx)FnZ7^8jahWJ^pxg}@58LkBJ3#ig;Yn2loht6{{p`rJUKxrSs>F0>;j1tk^km_C z{*>4=%y+~xg0_y@`Zuz8-|9qsd}yJvj?jp5$Wv_e$wuwJotvcb677*>P3|(CfQvw? zu-k$I|xq*t$ed@v~j=4$k4LN2^cZ zg2uptCt_LUMmBw|lTFfr;8H7-v8}Ntg+3|kPbF(2(R&xIlyu9%=iP*>VU;7*&ZO4A zi*Q72CX3>gW2WqQjl%qfe5xC5YL0eSUcCBR{t5auss{niv<@tn+BkjTZ18907ZhMD z*0BmH*;Q|*=Ryh&M0O$Ne6901KCdqfG}%~#vyZ8XA3miB4%Q;G7cQO^$&s$fv&@zf z+`HX;caV*xX^2A>DZghGn^tLYQ3oxR+QSu|N_DoCWwmaG;o`4Ik+G1ysVn?zL()3y7KvL|vE7s!A(F zcV&2K7Zy(z1bp??$dFohRa(OP{}!`dbV;9k=rSM1nwY;LIrGJ`{@;zvU{I(_4tdvu zKR~#V{za9vY6vG;AT6TK2fRo(VZqHs5m?O|iwZ;_=dWoLKSk^;&&qH#8McJ*Z8 zx4>)&;$c&| zvzU`Av|IKyR9Kl%eF6QNR_}q+bLsPGlf`i9i@kkx7 zRi!>E^5kYfAURkXIhZ;t?JI3o5@9S8j}3+!{zehCJQM@a;-2PODrZ&@WZ>g?^iiGS zznY0kMgWCgwcG6b7aI%M9R)~vMSY|tg7iOtkYEG7gdj$uhj7{e1HPuRQG#;BLME6O zuq#!N^5$L$O9an)TMz0$3_ z@PGRB|7%e6<}(R&Xzw-Q56heSl?kD6f;IH33rNpaA{XQd6A{ifHiN}xR()Io|J72a z|KBG?2KAMe<^-C5fSZBT;5mb^ayXER$-1z)MXu*kuk^fJ{=digUOXv!{WZ-JfDHP6 zli`%dN$eJo4yxJF-p32r9MLp5uk-5v4?x~KscSiJ^3&21GCuYG*U+hHsX=gf5Z-iF zU?=* zrrz1&xog|)eAM2j;~6PVm$rFN%d3~J3Kn9k9b19igmW@Ng-)`Ew>NsNbEq7%WIgfz zg>x&lXG?#NMa*8=;-dQ#=LWiL7QZK-&mL_(cfv^Qj1HURuSi>b4))$}uUue!gb~>W zH$C}uUT$+JHo1SG;bk!a^Kw6xnf$)XL?_{e5lbgc*r}NrHe&TAd}3Y#Yi*zjlTzSy z7>{0A%W>^|kmvk&oLbm?(D&21aH8G$@Hp9XGKPQ?YQOUp*0a@V$Hhy=fOlB|7m;$Z zBX-9A*P=JqYG+%A1B)Z!M9vv;i+NZ?lNXGBXUsGHw-4%EcNu0HeUlw7SGT8~md5$& zoDVq~JeN2ce3!y9Pv=5Bd$T7TXX?AgQT}U$ur+?zuD{o92$9nzW9xOC%-db1-Se)( ztjg2EgMe6z^ZPwVD|sq=K-Q&C-E^}`t2^h|bV=BFdE=}1w10Q+pP7Rz~e;(Upva=^tRB{jFe)-vTvp*HVqj&Fj=zBRA2u*K#6SkPcR4i($ zz5C`jLodON02UE_`^=|zq?I#+w;GoV-D8`3Cz89BJ`L`d{4;I!je)nUH3M8kaSZ;L z^M7P+7sCUq{2`aWQ)o*lKj(#K1wPD5Sy}a;ndd;Y)Cs37--{ zamNO4hJNF^UoHxl^6oIF`Sj(7o12N6jBn`!qK^%p!^&^+XBrB#e+;dyCN=&*si9Dv zH7eUFGU7z~up-zo>O6X7LQ34&4A$5(<9GSm8I>beUH-!qb*`J0j>V`AlX;h33tN)$ ziK90|q>Dcmx9V?vAtF9mGa?h{y=GT#zJW{i#8%{e*thUXjZY+b7?3EV(y)g#RPh1) zJKv97hvqvAW6*?ZVyGKt0Zz?KEKW~I#Edn8bXczseJixoaSKN3e9?VCLXv3GS07Un zGF5+V;kEHm&vfmJuVCG!>3mR|)85`=iKv_cr>vHaef2F9uA}6#_>=}a77hTn#FDBE z0m@jjtoGULkI$(CfCl8*;ehPo?al7(Lg4Ks<7Mib%asY^DLG}V#oBrQ0h(hKML09(`M zowllbZA%tS-&GqHi$VK*M~!d_c&2MMKl3TlVD=k?zgy)tc-c&^t@M zmOTn2K2n-@ucLDaskuZ|>}PAN@lRV#d~JG=%x@fu=lJ?9!Jdu%GmY|xKbd$ZQ6o3= zZ8QnjB^n1DYaza_M6lOS;ZNQFwnU7+DEGK7U_nj&(95E=#n=dZ5=o+*@fi%;3oLwi zyILw)5|ZQNxAz!ldrg1Wcv0q(FrfJ<;8w~#HH62v686-{)^Yi5u84Sb*=@5~ji9*C6kl)5n^#c)a*h3AT8e;FCtp-y zML#Oy(~TdCH@$$lrO@)$ew!KGZMyv$5}4QQcYG|)Wos-*o$IgYApA{Suk43ITDov3 zD#yQ(F*ILL{4%u~8Q1^*_qR=#&EZUh*AAvr*@(U{NA&X*0E^5cK;NRbYq+ns@4kwl zs2%=M)J8rvIgf+})LQ?Wuf2eNnANK<6EHzB8hPj|J*c(fhrgjuGkPnYXgnFoFJQLwlf&Y^eKb-u_c-k`1E7^oZ zA!t8mF)J)hSunqu{T)K71vMPC`%LYD+ zxKx=>;TCDv%GAbg%f0q1D;}|Qab-n!MwGhyK6&FA&^CWDD+QhVfvv}Wy%y$((E#!~ z59Wy|Bv~}$mvrd>UWwq1De6JanleiXc_{bGuegbY8fFtgA626&7N5Py*-U|kD@?TG zDTVGRp<2EM{Z(3#vD0Uix$0%&o^L*#-`rKod6-Uv7aUL!0w>g}f5Yp@yUsLXEG*_G z7^WOdb8noT+yxk@+l%}o6`-0<6G>rrZz0jvZZ1stG8RHc#ll&*d^Y^6id zsc*+rzJ)zu)KemEfp!a-?~5C7sV-1AI&^!%v$D#WMEko*$@OqBg|^r=!NpZGiPp^W zk+;V*N~N}Pqe+!2C((IY{H}+t6Z}+()uhMSJ%t_*GaUl z71FHkBArL4RAj3KUf>*`TpzocI#BJ`Z%AiSajq0$MhZRy*h?svxUU52aZ`9?WYkpT zQ0M5JYA)0shR>;hpcQ_SuoGUDl78CfVwRNJIzzQ1*K%Auo4Y;a!PxB@!g8I@#>;^^ zmotSuZ&%7n&q{S0!XchbKfJ*@C3tI;LaQzJ!~srg2bVvtw(avNGWbG>e!6)ibg(`$ z-10fKFdUsU2Rj>3u;nuq_HN;rxw~>iW2y+Uaz3~?-YTU2$o*Rn3Q6Y2BIVEs^Twla zWw%&bbvV0#QYFA~Ul1oO%zhU2suK@SBIz>{G$iJeqRJ#;;G-^OH>|lY5UHD4$M+yJ zb75(Urirw2g4nSC%SU_Z2i2wW=DRr*hI%!8ho`1gJ*I|Y{5k<)N4M)aw{h2TVJk=n zwH1@g?(+G`0Ff*a_^XCBkciaWA|W{rk5jy(Cal?F zvc~EAmOsIY*6`fmMMiEev;U~In7q-a87NG*z zc=GPU{9II){b_yM_FUpRg>G5IWjl=Fl#oX3rH-{0y51NRQVZtd(h-v7XaqxH_J_KR zFgHj`?sM^rpO09zjA+XCl=|{{?T1pf473>uA5;wk>jtk=QXCARPRz4XuLg++j|=7e zv22trBq0zjCu}iY*C~-PJ4!D*bM$r_1@Tl zWd!Pf*P5(!P)Se@`MPW8&FXM|@X-Wv6U_pbr`J#n$A(Q|_qm2#wsAK^r?eSqvR~B) z(v|mr2uUPR8*HpZ(9-l5eo9%h#Dh4-(0oHtmxt1b+O>&Djff>9Fh3;8t7=KYrXs>7 zK@`Q8o%c@5l)R`HTa5Jnzh9F+=OrYc`gnlgb!DD6+>6@l6(pIPpk*!~?J=vB2)Z^| zX98-m76jdFD+slKz51LEPXP;mEV}#SXBVC==Nxci(U4#=0vJW0#9^DN0!D)(A|l?u z`Ejuzq<~9}ln#j!Bzs8Uq5hCo@OBm<(Sr{%S0(;KUA;Z$e<4?>k&zRlNo(&#Ls4AV zKa`;#!t5v#u}{kBENp@|`}VEr@91C__^@z|Rl#daN;G;miy2qD8>*Oxm19;dn<*ZeWN5>d;qs`+s0eN- zLw8MCt$?D6XGiacnO_N&rZ?X~mC<|6eq7xIHOIvCtOnDX{_nh{3DoHN`}#~?WhDo7 z=07hMdbCQ3q^@%5bh>o9G*N<5sP~QW^$!4y=Li-1Nf12}&Fv9SRu4MrXx$ z_P<(|v)@@IoUJg+1=n|2#+gkZF#ALPI_O+btxwm=dVRBXfa)oBr1Y}HJe0GlY~U@* zQH+EOK6Zo$SegAWZ4PkW4J9`AC*Fz)F4eFN9Dl7e>oDyE+BF4-0NdYO5$%cb6gz$Df1`d{ z@Q>$v!`3;h(_B9!hj!-lez3?;>MnPI8#?B`3lkGiU8fuAp(8Qj%qvE02DV}4915)D2T$|9AJ`PVnX`VRI7PE{+jC#WR@)?^9ZNcUJJp;m?Ej(=o1SNAGe!cQo-eYcLi9W|hJoM%a8eyXhKT$LTx-0Y#m7P>mI*Lac>H&aGK@gY(m_@(?>WO{uOO%K6st)tJhBy4ERars3(z+hIBqZHm>KVzW_5*_Bz7Q!JXyW;T#A)Jc_>vj92 zQ+uVp+Tw{}tOAZM3Cd=_qYY*N)mRP40Pmxycr&L?D;gGX{jj`W&|%qneWsX4QdmPn z!{YYAZXoF-(eJe`Q1M``X5jj0F&?rY_HFQV)9o`|;EXYzW?)KVsgIpq z+CRF>SKMwG;U270gCMpU#1Ynbk_-5T1cU8Tam+?c?l8(#Ps~THQ{?!bn{14ZhR+_ZGCMkQ-08c@~Xrp&+I@Zy9FVk&Pt8P4<;6`iSBnMrl$7&HOC((8ne(ci3iWN z6T}F>Y14{6BxB|e=CACNa*!vG9i|^D>_NTbBVzuRP~#OuqiX__^Iqp9w*2hgZUa&`9z2eBtop&@ z2t+)R`sMZ>sMh=^aOPdxR)d&>_RN*D@7wFnJH&=O3H5KM~vwR{5$a?N>xOQV!Sj7KvpK2ASO z-VW5@iW|cgs8lU^)B!oObLy zTkez^Zkm6`lA4pq@`iyS9CwBL+3wfJX%$?u>F5NGyoy6V3Got>)a}dKa}1Sow+=5= zjpsx7rR<^o1&18ePia$;iYgRy7Md{+XStLJ3>>9+3U}S|(wp70ZQ5-_l5gBRWu9&R7EZ%*% zoRl3WyI>)YBWgFk3c>9Q=KdidJ*=krSu0i51vK4IiT4Ss52BHLTl|AL2a!eQzS){Q z4b6wR3Y+qfR}j!VnpP7|dfu}L*ybPlpOwgxRAISV%N<20j2^3)aN;%^~wOc9zd4HlBMSnbjXz= zP4xEG5?<*ye%E>*?@!lnKyE35r^=Z$YfTr~oG`u&r70Ig598~_Bc@!}s-BQyd~FL; zH+pRdeX9jsZ`<;+pp+oGV3N>FCcB82LmSoXrnNonGK}M?9<PS;tJNCb->9+>FZ)?4b7>5}rSgZi?&Qb!@U8N_PZOn9#z)D!E%5jj!p`Fw!l zfqJz70*(wFvm1Bq;df%Nn{ebtAnrlfLw79xthLe*(2Bj_107|e(a{Od=ZO{<=Se23 ze;Jg8XH=x0Bcvy0Z!xyDe^)UlBGf-{Y>EkF;>Vh7Ux5XmI#dH9D2ta4<>md>s&``_ zgIBsuLA)FW0)p@=HpisJqLCO*!a46hzuYWJLJ*|aIH5&IueGn0gG!5x;a(^^>Mu}NaF_Q;52Y$V-eC5*FEw*WqhwOBm}mZ{G}h*t_BgjQ%GqL z3pj_?iX99zzSz;|3z0e2KVHc!$h^Z_9z_&eD1+liHjDWng&DM3ejn2koFciJX0-Dm z(l8GDd}w>xtEuvj-wrukE}eYKy}QVI;FS*NWV0tL+AYNPucR=ARIF^2OY3*`MqSB8 z^Io;rbF=4*ml)L&$7V>dJ24Y7KKbgy);=NoDIJG>v}n6PAE-XvmbQAz8oK$uH+v6a ze=-C++YN;Qmqk1dp?n~f*vy3_0EA)=a~%cw*)v=p5w_pbTmaX7`C06p+z%hSjtfju zG*%{S{61TNry5;8!#cbDoG{XpH9{+>r_x@OWpYXx=O$U|e4eQ;AJXCirHeTPjabb; zs(Zw#kqMw6;NA67G_^NG+e9z1B}C?8vLQTmIRwdG2omtAVg%2_}HrTr5>8hmIZf=jK{r&6D! z4b=tEa$U60z+BZ}+YeeX$VMvq^zfkyYi@Jh#9 zIrOuZ7IIiWv$t1S_`*043yTaThR`>Ghf=j$_t*Bj`}JY~3bz6!ATHefP^sk~>qQM) z7v=z2M&Muo!3+)6-1C*lhDwh#*jhcX1XPnJx)R$rhJV^2r?s!-*;iyVYxE7-aCD$i z=d}^l94ZmGmGI8g|-lZ-FfyapzHx=uUs#kzL$HXVS=X&v@9nsHtO}nd;d|{8&2C0 zMw3U<+AC19X zw$8wJY8fpS{=5su+1qFZB=wVK)lutS;hCrd=q2ul@9CGunUP#)E^*SDKe_{PJhU~H z4(()U<9L*2y=XvwdIt7(Si+y(Q5S9@ZfJl#eEut=h+2m4seA^cF>R_JX`tTaGR?xAhVYg#pX$muk4~5qIU&C7nC(! z^P?@~ys%(82LH1$9+Zw_WHTg46?U{yNIk8m4x|Gfrg`MxsVa*C*lv=+0=9=k3Xb;@ zr%jk~kH%oR?K?{^5d=XKH-fBwYG-^Kt&iDL7{Dp~^bgTuWUVHAW)FR;h-T2GK37T| zHAqUJ03gMqPl0Mj-n&AwFY4z1vF`0_5w2O;WUU zEprZ-@v;_amhUf*LUq68iM9>!DSt!KNqf*S_+1q@hn_98T^0!UbJxv`@H`C#c&qww zD_<45e29Ei?-z>Zc3`&LVGKU}L?RZr>UOkSs0GE{1)uNTJh+2!Z|cNL%~gs&Q{ezQ zaGZ8=ov$BSci5#D0Cw?xNBGtN8oTqURI=WVP$KwRa<#eoiaL#W$nqbriS5tSK|9i8 zVBCiXKO?pG_NoRj`G1DQ$v&nBzhDCSOXj-(nh`8({LH@c_uJ+jrAzKM7GAh$*2XKM zK|(I5^$qEF)m3(@5{WluzXt2Q`(tEAay7dX*@en3&PvqC?o<5@~(da?X!8cHdc9x z(7Aw1`ny-|h)Ew*7lRLL1tEWiaR5Mm-yfs^+};+Rb%)ip{tP|oRHOH&j{st2@6Dt9 zX=eHD?QTsf+CFr??q4y%Pb%tryJlV8IZt~Zs5qHVNTrCn##*`^Yre~V=r5Y*k7r<& zrv2LIjH}VJtw2XH-uC;|+b-*ZEgth5B+Oj?D%cz^);s=>_w@T}vpn%$_Q z<({xoI-mS^=oDP|a@8maF+s#X_`}(nSt2;mm$G%{$)RYTl@@okBUvH!5FaU^;qK$GmZY?Xux{iUK0UC`tF1ptqQB}#8K>_mCsXe zfHmGbb@b?c1$K!%h5DcheQ5!eXq1M_w>HbA$(=?4lPlkyoN_F{Pdv?YcCLn$7O*uK z^)U`t`9`A~w}+W4y9E2z|D=`xE>I?$DI0k2=6aVAKy9s;N1iS;%ssssV2roZX&z$j z;HWF&|klJ{;<9nyDzhib`31lmAOsDo=9OlQy zc!)``2*#tAzOSLv6sMhXaxlutFJY&Y^aH^20bY-J^|R@(r!AhjC6e{6ucm%BgwEAF z5eHmsSOLhrK9vOs7MUW2)_qm!9ddVOeY4P-Ia|-e`m6#CbNhuhoWH^_pi&~)tMofJ z4*=Xe+1KY1@Sk=s_Lg!v1(BuYId60dNoQC|W3z7&HkK+$j`cQ3VqAKQQ z^AsxlR@x#aOdgE#+Gn}C*enBB9$3(;eE~(xNu-kqqehqlC9!JHmF|~=*Zbjs zM^n?fB=$(-%6zxdIW+*>#xy>QR~(mp1sHljXCp*uT`*?vDZ|5Six#ZZpu=vQwkR<`PMEWj_LOh?fC&A(0~>fD6QrN)s~fx z&;Dq9NZ0b6a-uoSomQ0fo5DSOd$E_oVLs|WIz4O-^8up>Z?AU)0m9k!s<9D*=PqO- zdM7afdoj-iM)`oxmr3ui{9&L;FoBFcYgSmug%I#BDhkUqfTD9pHtteOqgqwy=<6M7 z2EjzMuKq|eK>v`4EOpcNpeNw!Tpd0FP;RR4{oy(OSH{bcPa-&7Z=$9CI9-Ibbcv2? zOGaJzPeWlboUC$nb0QR3M^mE;(cNMJpz+K~$(B77Hhh;xHJ-@>8sa}is`Re`bmN9H zEJa=co0QP_#`0fHGz5cjKlPzC;vh^6{X;6cbaB4&pA-g;$gtR%e^q$7KJMd$;W;<= z&!#wRDEbBcTAS8sYFfgAFi?Ip_+LAm0aU~3#Jp~=U5YgC%Z~pKn>vD*w|NSa)!4R^28&QIS$dHWZk*i_VizNc6KLz0KO#i9zxNoR0Y(#Zw$Nc zhN@Ke;Rn)??oLm!bs1FcJ^Mwoe!JmKr5g{=2Q$8otoAbv>cYw@yzkFeG1DIRS|vRN zx9mDLU5j1K-(F`mhh|r)qmUxHOrR&yN$7M2`Huk%p$e(pc@9N45#j`z{E&c~rxYon zjmYj-05}#flyS#5lC`^3yV^(@xkx1PA)vxmU6N^y(9xfZY0ig#xf5?@kOJa+k54vc zCZ3cT_*}Ql9s>|x45xL^@~^|8YYDFva|VXAg;*#Q-X5aT9?w|S5Wo)z#p~{`F(;Gd zC!$tP^!w2od4Q(_hKM5&0}KHj=qgsq=ScN9x+?XB8oJiEtt+0v1)tlwtZC#Rx#+=Q zJi}jTn;oV^!FG=+~Dsm(nsx&z;Hyvd^sfz(LKyNlt()-~eG$b7-ZdpO-5=+KuC6 zrtA%%jn{r(cD@hP2C<%PmSR&8(fi0BcXWZPN@ilPjpcy&(O$k0( zg&_T4T%~6&AIr)bFCfP;RZ}l`(47D4q`;*o83F7Adx{5k?kf8(1b*=p4ri!F08R_u z&%(@uYl|!aR!3{X?{bQw2iOv~(RlloRw8%+3>AY70dt;zKAc+gsCF-bqwFy>fT@U+ z4{S=?(x9m!K<69AaAY)XnID^yFBtR;MU_MCrp*iNj>MYxuj%Vn?Y1JM185-TlB=TB zT!}w?nc{<}+5262V6$q701C;T0z!|0DH+5iY-s-s~IKs76WipGIq_k3`48%79r; zk40@B_`z7Ak(+T~Jvm(qCnK=4p`f<*V=wmS_0Tk6Q|Rt~J6rqSy^wAds4DafRUTI7 ze6qW5aT!x}^-3R@H<@4h0EU$C!CMDH`36qivoNvc{(BZi8;%5|6>cZ>8&KFH< zxy!@-AAIE=v&wzHqO&{eC~TFZ%DgbnclRuMRv4~Xe*s@-rWnr$XJL@@_$J_kVNi;U zjww)yKSz~!s4B%VQ9^Jn41qZr{~^|2wuSAQR&h*+uBLdPdsR%V4hS?HrSIU#01S8v zFxrpj6uo2ha!O{i2(dJGLw3zjSSwe?l~e&v^;SrHBJY6JSC~%*NcB{;MfhaEki`{-ebBG3SpK+`7YSqt-~;yTPfR$>^W%o1 zPv?!$v(&BrYH*i8tJHxV$2+yw1^Nn?yom|UAWDG2#)ctZu@H7^uIvebPH>6 z*4-G9UYf+hKX5gTK|CAjSB^ybU2ObYw*n)NIY3Rz0l^hO6N31)3B&?^fOXe-*&OGK zhT#?a0h&#+aHDWi-5Z@QhNNuIQJW$NAK$x{tsmD7(P(1 z=ZU}i?h!NF%i%^FT4d~;)iKPO9>{SFswIt&V8`vO^dV`+gnf&1sAik)K zPjLZ^;c*OXMPCcV;Q#5^l#Bc&aLN^rm|^Ha#}b!p8!PP@X^;!}9N0zm9}#X}9j`FJ z$=(2oC5s;rKO=YU|1Wj=%>=TM`wbjLeNUK4l2uK3r}29%x?Bw3HM$@(M<6tJ9fqZ^ z{sFcM?9NYO@aUEd11Z9)f|PE&F8*PHyBLtcaznZq18+c1%mL@edSh@nF!$X91U>tB z1Qugp?_Jk+Migk#ongBukG=)SKid#0IMQ@|BY9_mr4IF_m@0^@i6A-JLyUlw<=&H2 zgEZ&0ZTJ6$Ak7`vsQ<+chZDx>+%$Gia@jEc#ny+j)hf|83NXs$n0x)^OkqL(>Z(UT zOtl+|jxc1_zo&pA1&i^ny-y^2*{cj*1RDFGMPZ;Q16pr)p%|Db4*Tm3UC$HoN-Zac zBW6nM`|AAt`Ti}0fN;Mg355HZHca~FSx@oSN(&xQGxM`o5v~G*(Ta`+R%S1t_>4U< zaF_FL^0U{4q;-#Eudk|X!CkSh(H+Mytbf}Gd2tMPg+-Q(pS}d2%=k+MOt=t-3o$xE z;bi3i?Vv=|5EnDL{j@*lD;}+RdZgopvQh++TMl~*uVyzYaWNxd*lXiXbk6_44t}uE z&oSHSDGp@Xm;K86^=_e-(fC;*l00V zUhe>ilpv32O%RAnM*p981|rq7mHlq@d|4jQoJk_`>HzPqbG-9?w>SX90R6$q*1hHp zK^aLsKnkNfDMBQHsE}tw>wXs%P}e8Q`juX(mV;6c6w(JqqcIrs;quA8M{t*oVfGV| z$Y%F5AT=FRgZw{?eRn*SfB1L92qB@2knJQRJFAd!jBt`Yv-jRBgviKoGLFqLDzf*c z$d*m^-YTL9&*whAzu)ux`TY6)>cxG3?(1`n_xpWaS1c=(9%yHRKF~+Oe&_8c*mPCG z8C0v;$_P1mu4Ry7b}bBpuQc%J9BV)g`~CGFKniIErI38$PBc*iQUIF-NwYH+14A@m zrsc84;rSu3k?K#5ufDuVu#vO*V@I_p`HX)NI+8YD1ZbScX+Ast2+E+N=5u=#MQ);R zN5_9Ttuh3%`~q5UEJVog=#TdAVTl~(+fWY05{hJMW)H1?$T-9L5yv5yIlzH4i^?)cVg5X+?{Tyx_paAKb!i!39hyjzX0>B-k6nk9EFX* z`iY*SftgInmGOmehJX?&1jxU#a8g)SPODkN9FGlr&gvuDl#D= zPOCbL2^QFG?l#p&r}qKOb3Utyy%!Oe^U|V`w3d7S3uT;L1sIeM_J@kBvH`Vg;S6Ve zkh$nLYXYoH9)Y~NaqrTj+f|u~C<64)-4$%g*bvwri2<2=$nI63t7`Ccm$;wQtj3RM zvuL|}WQ`_U2iBKrpVZ3WpiJ5Nnjm1`^KiW?| zIHuB3K8%G*cv9iM=$mlH%WF`DX!Ys-sRRrp3|0=Th9H_exK{pZub7er+iN{tUpiZc znfCW=B$34hMPK50>pyRhu|9Oe(^PA+xc)mqkOt7~@>!TvvA}fVRzm%7$ELqyVBOP_ zo#_`S%@DMULxHpuYYuK1Z>QoY8ZkdWd|5Dg25b`uxI3|TM_&JJ6WVnE--w{SSf*Aq5_`7Mxe>E%@L6 zkT+5^r&1B-I%(1uP(ZxJDEFses2z>;dw|mjeh&AhWnG~InP7vzGhOeOtLmIc>HOBm zo`o#YRGUSHh*__Fl|Q>Dd!YEuDQ+rLL5P5W;@3j4g+w&}c=i^KaG0sXe*Qs!X@Tx9 zEV2tL>2Yzu{?yt^oQ9`C!BO0FhQ=aYZhy;s-~_2%;3-(}RD!zV*=#%9k^eWs*`rWm z6`5CSVvv0K#xWKwq02e4PrpSm8UkhUf&{F%`6pZYj31~voBR&G0#ncfC%7*o(z~=1?uXH&fFESp)b!5QK%1?S%^E2$Q^8 zbtafmz~9%TLd={_i&p;(`@Lt0!vL}PRj{i)t*X*1XK!vSV3{ab+$4y83zn>; z`%s?YM)2uJIx2{eH5ZGXge9+ral(jclNAUFM6fi+LYrO(DU}9b&R(gg{r-?5b7iMm z4Z*$GMl!!RIm#>OSZ47VR~uGm`}fqd2mlu~P$~(1L|E%PozYy8};?-NlF@x{p93&9{L zMwvyx&|kqa8L5&g$m~Fz+QhavRL#q-i*pfAk^n(t@Z}W?27z@GG{L2GW(ZR9J%!=?BsQOR;5GL^o$@AmkMunz3Ons|%ud)Fg`21b5da@c4 zVaFMvI8+BAi#ZFn^rV_+kJrORN@rA@tfs6%A&j&R$MPSAS?CdlMOGPNjAW!$RuXt% zp&2tWNSCd{3pRA3bSV@W>>mv1(~I}d+F@&%_9hZs>Wja4tb>kwJ;1!SZRjK%map~G z>s?+dFB3G)Jl9@dNXVtGQs{2-$Ddfi1s7#DT2Bt1MQ!;G-hCZ1%@)u-@&=g=l3P(} zv|bSQEO1(Sm=&GNR$YH6y|ahe9tFIc1iQ>5>B!WVi7-0kF{SxAQ-F zef$0Typ}%OKwpGAy^;y$2(%GPaxwG0-zeXv#N|?7{l}jr|7>S{SX8MJvprLt0Yx!< z^g|79m?8j+qLLx76z@;;bD+E0n1pbUPC!TAR*Y=3{u%C>imj(!p}Xx%k-^jn;8RIp zy}O9ta=~WTbP~o1*l9?Jt4=`0;_s!8P^YqpsS2XMaIDeYgIFY(Up_&mKS{aoE!DdbKse3Pe?!;XH@)QEl6kYWa)XmfsNmqw0dxxUR<+T8JkNDtewR-*duYC%qq1SmD;U{@p|1bB%R47qV6_1FAgAcI4r5u;!0b3sgnvya4Jt{)7n00bW| z6SJ(EmPegWS_~=U=BFdxfim^;J-SFjkzjKC1ZlZV1@NbZ=w6^-uv$OiQT+|XL~9?N zcBZ~xxg9KdJDkQ1RLg%}wvJFi5EUv@0kKKhF9L9>?Fj-b_p|(-KXf0%(cmmpYDy1z zRjL=FS2`0>VH~i~*t`GkT2Wm|tkELwR=7}t z<)|A^q2FSHbn!b!P{kwjsQp17f&=(4`D<3-!~Ei`pGdB6arfFXqf>XVq+!!EMO9f zB+W0cC!vIO_@C12_Cr}kN@tNmH*KfZ#;o{LqN$9flZ3YQWis@)`aXsANJXMG4O-y2~*UTOX?7y*>(xsls3J@ z3m?a$&I9uX!Z={08(XpVgRjKz3kycvf=CBeX}O1;N?-Ge{$TE7NG5UCu!O;&S=>ZZB@ zJ_kqxzgniUUIdW!rYDuip#jJH5PdoxD4oY9gvsJ$j4z!I$-FHlU151cdbY7DjAH zm#ZEz+-1Zj7pIhpk$x;IDiltT>I$?3R>*=g0VHw&q-9IB0KWi??{GRSpoBjJW<>$8 zMft<~K^3n|(BFnVaX>Q1I_8Q3UZTz(zrp*A3tY{8190_0D!`E?EObMW1=Qk}b7vt~ z+$7q;ee1*dcKT&PR@P5TUeLXH^w|yPX_rFx76%qg#-B+nFhrC=IKgZ{&RtKt7>hgK z!;#SRxz^-%a5;M8DC^4QHD5A|H26Nibgm2mM5`X2=m=mpZyEaAlR}1AYPlEi8#xrj z0-?bZOfdGRY1mA=%07_bg{kic6bgi0yIji@jjzfKIn?2vJV00O(Taq`h7aA1Lu1$+ zoN@3yxq=r$!ffO`_gG$c5DrCB4QPOS5YTQRM1TT++-Do3f<;+}nQh6NEh|5tOn#Cai;9pnq5V&3IIKZ_MK3cUD^cW z6?Mm0-0=g@?=V1}$??Hmj5zIa2QdO)zU2H}=-b!$&6;leG+~q|4E2n-JW$?L+6tHO zdj@Set^arc9*GGufp3}~$%Da|ua2qy8!HC?a}JHuIf+o#`3*V-6K60>ZAK4E$=_&qtUo;Xwt>WOoNlKB1h4^Q^O{(*uiEp%%KE(izSDYcv`Za@{ZhvuTm$hn z))s{9rtR(k&FUn!TA5IcQss+Mrq80r_uztBE9d`6assAtJ!Y>Hz|OOYw;${8ok34< zMRU-pZ+$a4TNeQ&9&d;{)q$Mc^PCYp66E<_+jG_{7pNhs90F?&-70~Ow^xhT5k z3)!}}_2ugulUn?BUL7(|mVleeeO_h**C}-o-0lpMnHSxj^lkZbt&9fi{${>^m7Avk zb*5b>HZ0^|Y*@|JPD&vo@e~8RB`ZiBOoy=P9lDbCu8`(A?5iScX!^BfQ1;e&lZHS9 zyp)!N7s%iy>U$$G+fwk!9>9nAdh~`%N%+{xSq_M-Pl%}Vi&iTl7-8g-N9LTGt@L&x zAeH-Af0V39D0F~0rDTUi%yd8{>8`yQvlBoi9ICMG3RQN#a6kfwh(sGf_jr)QtqUF_ z@TvwD!9z4oB^$EcH$;FcuxzWc5o^B&zs3jRgONiYtAS3R9|;Qdjm3ADx}2v<*K$K4 zXz@-J8%*AVXP9mh(rDR!Uu}PxM2{w$vAO2f0$j#ZK!hx^_UJ&7%W(ED`e!;tE~s?e zXd##QV(Ke5Imk8LX@#)Z0Ijg&bN^aP;}fVt%G5^?$|DRXE3vXQ?IxFKkYB&}j)5rV zw8ljfk<}-h9(&r*tfAJ084y4QKlZqV8$le&N4+(f^G~H{vQZb_3dcLe)ZdE2zv zOcCb5@e$PBaBxkiF%cet8O+&gaJiO>Z}3Y?40&@&EEpI<#NnMQKTq*&IzE11g~V4* zgV~sEeS_7OPq`qC(H}h9o)*9DBkwsHbuIStjajeP;1LvoM&EUf=as#fArN1sRPUCU zu;8+W#sh7qJ#)RX6^NhImT&~<_HKt_WT9?3eck&8=L9%}t*(FTzi^-#?4jw87a?r# z7Pq0UNHXmqK_pAA3L&KI*?CB{cuX=FWuUi)eJJBZAY4E1zBv<=rqn{#P-abX5DB{6 z==2W42jxNpnaj)@?!g&t^T4bV*`Tcw=Y1h?Ckh`U7VEG;5_i)kYv?Ca?9p>-7J;Jh zbSf4CRZCmDfw#DmrR>;dhy5whE$+BJk&nuVy1#i)ScxmbYaNt46);^}g~XMT_p9#1 zPVR8PcpOu&N-$*$=E%GWm?kWz)MLptJ`^8=5$faDT}B`&a#fGSV=!)qAf#5@h5hQ0 z0AC#2Tar+uZ2;_o=jebq@DBU|_PeN6c|-Cd@BQ0dlE!MuKys_H3d#>AJ(5?g6Aad0 zI8*Mh!%hrK*{kg6)KZ$s|<3F5_zNq0MJ3)Dv0J0S%{QRru%q@jH0U|ke~avylkN+)AD z>e+KYIzk%3o8Me6dA2>%^EMyWhwewAVz(g*i-Qht?{HP8Q*MTO%mzBCQVNYpjb z-$*{wRlAE*sD2z!E1!%pgB0_S{|J^zp-7Mx5(BG!F^J%YywA^h_<`*0M za36%ZjYTogv!l1M{*3|e^WjKTqHsU9nXy<9bT61jIP56_`eUNWfy9kytAN^Mw~?`C z;ZooF{DUWz80F56P#Th;t;eeU1@BOd1|U~eldg!}=F5_XCpSAifIPF5@Z(#GkN_K- zMRG8*O&l2JEwad-xea^}+`{G-I^}EKEV7ddik46oYL^=#|7d-VOOxMliWh2n3y}~5 z*~Kp18@HMpTvnb{#c9L_(o?o_NxnRVnIOKlnw9|GHbW@hJrZ=iS-dnu1{2p0^+?Fn znL(A8RffnYlF##u3G1xD#Dx#6xt@O%F8t-e@S=9XH7V$AgaWkBC3jDFZ)|f&}37E?3!wipyN;gTFtT%$R^SH zaA1?nu#jXd>tw|+X)Ya#_w=HHB0qspeO2ke_v7Mg5v>}oI#=)^hX8d2(Ah7Duu zom)HxCiehk0O$@cc-K6*dg{O?3McomzVZWqWqj>#LM14O&IBv(nU{IghO>m0^uoO0*hV=?h!ZU)LV53VbKv%!%8+-v4dWLul;u>CmcP^f#8Cc8+}%5w}^tY zrF6+=Uu4?AvsO03#DGBv=YF7rQ-c|UKvBTtZ+657@H!eMEV-a?XH*iPWYACQfQkVO zq{50p^OjYGr{lB#xu^<2k)-P8RKx9qDBySW#(SZ>ZhqAM7K=H%V)v&aB6qAI2op^37aXn5fpzA?Oqml?J@L>tJatY{hHfPCwo_GvJ6@9dXykv=O zk2EK;442iMlY9G;P*Ex_-FG}2Ij4B4YXz}DWnjMQ06tq41Uevlq zOm?q6$Az*NEZ3za#5K4eU6DC6S>wl6arARIs-?rAm6TI~QyP8rj0^U#mRviZ!-=k- zREraKRSoIlOukhFxY@ZatISY&}Cup3M{A_KZrj(}U9 ze7K~Y&jPCcTgH{3v0yzFLMKIidK_x1?!tzm%SXtDeyy(D5=n$ZPx0X$$_&c09}XV8 z=Vb-MU-Yqtp&`7cA@-(#WK=Tv4lVjK zcrrkD>Bc~>o%!v6zI2m?wapg$cSkB{-3SQAqlkMfA+5xZAvs%Q*=1I9W?*h(TxpjX z(9Eo^H$nk_w?;2GEVb8uvmzNvVml|co$=u6XV+Zhi(4W5$$0qFAWTGqU+6vn z#STEPdpHOWr6x^Sihhc9n6V}|(c+I_RG853I$OCCU(l7s$7XteivsjD&+KLSu;dOy z9(Qn7$)mke8lF}56QVjbghPe<@A=}?`hInSehR~W1ZG&peJDD{2@2tZ${Wy9i73$Q zHKF)8p8EzJRW>y^_GRD^j60A2g67$iUxiA~yxzkj5IM-Wg$D!c5fBT9r^ z1JLC(Gm8Nh(v zSls-x;uH&<+9M4vSdLt@No*#8emDU+d-9Bk?Wv2Z5f*8=;Sd7)50#;)Bkyr20&v0^ z>6=hytMPKcZRl)W+WH8AKDTHP* zce(qH_)Jyhek)m_t_bnJX~5*^Y|z)ip-K~sr4h0tAc9Bv!~#ZnbW zA1bG9J4rlF$ZCF&RLBI~!>FiI5Rz>bu%$2|FV+byFURm8z>ov#2=)&W8iu2cc-i&++SZo2`IxZWjkGxFZNzc9&sF!1@#Q>~FD`S~J{eGN4pDeypfSQ(vzK zikDmpsDpzgS2dpu6tj#PxtKvShnyeVZ?MvfP@w+L2J?BrXSTAPd}cz(8p=(Mh2ojzqXE{svj|xL zrrGCz9stHXq+tXmCPVF(MSp~%K+m5Ly3}XE4VxS)b#HptaY4!971l5HQqTIV4219K zj&ES7&-xDdgFeKeOxoj3l;siti^l(AgUl=!IV6VdWPIh-olXeI0GcF)?$;x6&<&6W z6JUTgGS}b^l$QJu_IEP?HH-=xvQYfAf{u>E7w#AhgtWv7l$uBqi=vg?j%x;ss3FeX z&d^*IAyl0HQAYi;e2L$z#*YtkPx!^R!h+a=-tZ5I{inkKa)T?}=?~il9wCh^1uXQq zsP!8!qJx+$@&(Xvry?)f#i^Zvq~5nKpZ}t&vhD-WkMVM${GrGz2UB6Y zQbf&p`@eDPvIxR%J6%C7tbEGy@AP|)ThRhJ&(qXcbou{Hzo1ZxH0%5MGvcifp8)_x zsY}5#L6ymlxVdU5h>8nv7}gu4k$rrJdb$$^rH?UZd9k1NSs}3DztZ7}xcYN3RmInq z4A7nY7=UjzKBV+NsA!62f8~7`tvW*JTQG_7WGZa%gU3~30;z0)oFYA8AWxD*@V=D^ zXPc*h*Lt-&5Ob zzzO@}hr$K#y5Rxgs}-tknam6q3{ScTu|qh%z#z)+Vms4sX7EN~A3~|xW)B`gLJ#qG zqJNV6i$SNS7r3yuZA?cL2@RN50qmnYP86QGS|nilSO0?g7y1MuBg=PwI^>onU+Q`?K-~C3O15mI7;&B7G$qLA56eAVljAQD19Q_H)UJ<|CyC?p!t+iC2qHP2NcaQOL* z+7D0LENZ1S?2t&~Qx`2HN+&)`2MiYf=3{K@XBuJ_# zB)<}%g0}4#n&f7IZ6)-5D>4cLWr8d}dx%~r4SK;);u3m%JCj;c1-vE0`b<8980W1T zl99;*5cXuTrys-xE`bgb6%dM)Zfk?0pPHp9isGM6S9E#Y1y0&fbQ2Eq!%5~-nZ%~@ z#|Jx(C<;;M=S;95=wD0_&SXqhmDXF_hb2KH%UkQr$5_la>^k9K-uWO#U$D<`|K( zoz~zD@4*6PO6Un<^-QW3XIOMW#bz)wQbVABjp9I4CO=N8 zNZ7?y3|xzpI}-yOoHE^2Xc)q)L7}|;Esi(}LjX#L##mM&7x&13M60M~{QAo=cN&|H zw&Zx=b_}%bWT7miNUzZg^s;;ZCC_q*a6x~=MDl2=6fc4fdQwm zvyz_l8lt@B*BE`>W&r-5vAZ#ps~5*dl&YjvNDd5p9jnR*JWK=hxqn~o@I{n3stlZh;gx_=XNx{Cpj>G^>Q%~0TajiJFtHmc8P>5fO~(AGI9wE>0UrdC8Smu*_A(h$L3CZHiO1bbAfH6g%uR=p zj}NT}9ywE#F$g1?osz2JkV?F&q$ma^af5uPWf)KhEU+TID!wKj^F#}QTt4;iubkB_ zwQ3F+$)H^=l#=3YyKt}CEOlQ1zkDh3(X-NN{AAIaA`}5m_o~|skY!~)u6AMMvI?|N zO}`|V!JSJ@%<1h6Cj5b7&4mmeu`}CFCCYT~9*v7jXE}fB;f|PeXH49c+u1VV*Oro1 z=9*4bL{sKpwlEQQRMCmGHa{13phpd6(|6m?qL`p#u=X>usVTV1;+(BSK=;H!pQM`@ zWS{O&j%dD$rC5nmgBgV1>fjKJ^}~h#ogN$!%$xITdeEN)Wq$nB9NSg7uASFK?drnL z8;9DAS&trik)F);-Eehv!P!c;k=RS)V-EHHuYFL&Nobp>AT)b<28*;`0w;L|h1yhY z%A_W~R~6PV8Z5}lCHV0*X0R{u*Zki~Yod)Denv19EPF7!y?sh1sl_}~E<|!j($M))7z#Bf~7 z8R|5qGnY|tdJUf;rr|A6a2Ru(?&u3fphpQqBglzXz^Ef`3p#_7ABXpQtgSadH{{A~ z5&UlAXw0CqgpV@YpOe2SBQvj2BTThA4PJu6q_HybAM7)|S9H-2JZEvL#TkpFv>U-JU$mNCJ{6sRliq6b*-wbBACVI^mYZEL>q6%oJ}@GVbm~Y0KaNa&o811rgO#S%2Tt!9m1Lw5 zi}2rPtIz^IHq!wCF-xnuQ`EVTU`vncg>~%v+5pJ&zlrh2f3Eg_u;`=5tbi9|c zx|`ESqkJfJrQ2pelNnhY)rOWkyHrJX^+v!yK`I#0YF-2as(w&93zp*Se8 zcm9!3jpIn0=LS<`KX$0P(`X^T9zgE8jvyqijp?H5`9w^rsu)ydKZPFA+0W}U2BT|b zX`)dk55W*VM!rHvGI+9ZU|iQJ?yKtj+b3##o7ef(U#ue;XL6*^uNFVumW>mQZ`GT< z*p_+ouA;{9(ux##1@ysCLuBDdH%)V|>Yl zz1+n(yC_#!yh8 zbc8$;NN#82?)3LYEM@*`PX89=vm%jcGI~kHT9==yLp2HU1kqu!hStwv)6Fh8*quov zCVQs#{&E%xl15DHW%pv_iuaw!IZb+Be`UE_V&o1>OSWLD<-WoTSLCKL8k!%zX%nqVTdd9<=v)7mylu#cRMY)plzMn^3~tNb++k}q)Kro!VmL7wp9YEtr_-%QJ{pTGGU%}Tg6;Q>8| z?Y?}jWr^g=Cz^&@BU;MIqD2Z0LJm`SeVebKX@vqG7I7U`K3L1OE=K^ki@Uc{02vIX zfRQM6>jMcs*w}GAK8#kc_9L=V8#Qu0KD?v(1OYe|JPF?eJ_05w&$;T~_C2eOnL772 zaz@C*S#{Xrs2s>db2t@m$}}|{2>-47HU2#QZpe`*!Cx1`h|aJ?8YAZEo%M6M9$i*L z(jC|1OrE;Q2OPZDrfHH%M#*=6xQo&XISN<+9?GKSRv3vQ7+s4>0h;zmRCrkE>G$Ju zvdqg@@ygFbQYarX3H#K1FMS})Q882BDV_N!Ju``Tl-zBf-@HRyIG*j66TdMLGm;;S zoLph6NZas#@MKsny0kE;u$Sfj!MRg8Q|EJ6Q^W8EbC%x3=a0pAX~BHxuTfxbvEBC~ zz3YD}fAV|#sAbOVQv2BZrwHnB^EjJR4m*Q~AZ~Z#6@KjTncFK4rVXL8O&<`;?-d*rJVN~Ipx+ZTYw$*auu>4PZdV@72~C%&C+mO-`7p$78{V;$%d>no z50)QKjZd4iMD3l9cM(_qtl0DZE$wz~uf^p>dP<+3$IEJ83gN4~x8@CJ@Yj&FWRlABNpS>&XSZ3F;K;b1e1V@^Ek{E6;NQ zGmfd!Me1II$;!9p2NtqS{<#q96K;}Q;e@gzB&LwHyVkfD6TB18Qhy(be&D+31%U~- z29iPN5uqBw0xaJ&KK6=c&DD1;(5fvmu+m_@RK~}CD-Hz)(YFD@)p)ul;>O^Z(bvc~ zi(p8%nT1&^XT70}$8BqYu}^bXiqLNJ;4ud)JZ?lWJgR(+QK;?ey+dT*;9p~YOC+O8 zvPnCTT*tzzR;ToZguqAIHfY|mcZgb&xVId5uW5+Dl*^00QmmOi4bnl?$9j*F_{?=n zYjsMDSp_~(e+6@w3yexB1^lvtEqYTys|cirTD$^slxwW!54hGZ zZE9MZ3hN3Hg#Y`e1Ewza;2&VFrJY{C!~1roYo^SbNQeS{M0>+6y55VX+(d@PrRti) zfEfp>y4UFP`+s1p$l-;p}2(J%P7T#i=%m?}2%e%n^dPggCRKamrbQe|i9`S%$WER|vij5iOR@jYyB zx*9$|xRB#?@COdmUe|#F6|cd2_lmyP)=e-pi}I6!FYT=Nkpx%?a|<-w+@3w3mw_hl z{OHOjT>zarFF~I_4VeBT2DSqA<~jn?u$^9CMUMiziW$&Di9<^7cby^dAA#?HDud+bqw~~vOJJ1DOZixOliKFs;^s4&roV@J ze-6Lz&DZZWhwKIZp%3`8Fjx2wY_?#Ab}(Hd)<;o(-H}1dk39yLeq#k=Sq$j2S!buoHOv9#A->s~c-4_;iob9M< z#Ah%z2z=!(?f&!2ZKE>(^O>W$@>9F?l;Yajzc}OP1%IZEZ=qK35+AIt(mxW;pjcfk zAIP2d>+1eI&_{Y-_|f767&9wGSg}TMJ93 z?;u@VzrIcJpYFHV*KC~lwW+Jr7UJ7B?fs?(jLrt5MK#h5iYcpveGln*yZYV_TP|#G zIkr9Q?bAc0a3;}C-`+zwI8eLD>_q2I&o`Y(rPGR6y{Qt;1N%do?bB&{WlL+b#(A|y zgy6MVJA;Q-^%ed;3<)XW4by(+g2Im|<7to6&WyVIIy3wtJIPj84-LGI8fmwwOlu#W z-)eYT+j{Dqy0TisD16+z-MJT9J2}wT7Z&|J3Hzj*nm=Cp47>w_+Lt;(aaPaUgU0ke zfhT_f>ZHH5wQ4IHYXUi%wH9jm$k-X{nZm2e$+}>7BS*mqoc?o18wdM@c0+_oAW-z$ z-TwsbO!{(lfsOvNX9>R-11X8rKFB4w3)sPG( zExBxLZ2Fiu_>Rx1q=#-rOp~+MwTu^&lI=SIjDpuEIQ&j`gpb26le*pGA-{2dSk>#t zxpMU7g#Yh7G7p7PE5I_z`Y$x3n{KlvWzuwqw2tZF!xKRnE&hJne_%kMU-KNE#lP_N z$Jw-K6~4WAj=IxYkRY7#VU`O6n5EbY6R}=5Q+5eC7ZcnDcda$--&M_6Qpq#a%Bm7Y zy<&wYM)#-uz!sn+9{}@;Bwn7hiM#rn=th0a-y2$+2_j9H%lRh`^`wZWN>;K&#bM}W^%tP}0A5rX$7zF7p3kxVm-!@ zW_)N}iC8mLl7uIturO%7V3$Fr&Yy!lg04>eZ&Sd!tMbDzXv>j`gO$;FP^X=VLx4a} zpH`van~TLU^hwKMQ^ibRc}$12gMxTK&h$F3u(pG3ZPr}ixdHyUT*TkaEl0J0CgUNw zlh;!gHjbb8bih4PHgT}Z09!Jje-sWj+UlPc9ZUVimAPA50h-8n}n^rrsaeCE<80(q4RB4iiU@VCSBJXK3 zQ6Ft6v=XMm>JH(<$!Fl7%Ytz&yKWxa`QjeMQ9TKvI?-uPd8K@Ouu} zXa?tdY8F`KJ)eg+9IyS@xU%H3Z?aRT0v6Kf12{&z!iv%@nx>b;EFewvisLon*P#s! z$@;aF$VFYy7QpAZ%lG=)R?lXPQT|~#-}eUxXNB#9aegg*DW3EF2B>$W zyGv5P2>gz3n6D6_-W4~Q99gL?oow+mo5=j+1gn~I!a{d-7~f}wYz>EJlx}@+dpmQ! zewm!X2D7(#S^j&I{}FxtQ&oHhcNaHSIyz>qZDdda9OvMZx=vC>DB#yP>iWQiAf zuALfzHg#Gd?&k8nNB>?D7$tf-F5AuM2V%PHJ2>=8{RwKk4bxR zl0@^S@r1;ry^*xa-WPYZUk9(Ny`wBkQ}m_x?=^~&`{{k6EtzNUdA*11gzhM3yzX`h zF`tvEZ9NYa?KkaIZGX>HTN_jRO^JJSX{MfGo%Ocs{*5E*(NEzhi zHz?jU?R0D{WPMAOczKpSuJBWh`#KIsyCfGgqr(r5uNk7Z#|menkV>(&yJ1>=F0RvW zQ^u1E^`Gd}UeV$e9yhP8HBF%H4nd_b5QAk*DxKS&_l4&+T|<6lj`@Z9d$9e@A*d$`uY-myg|*p_dxg&Z%~#8#>zo0z#LrYgOfe5 zsSL+;pRsApz7Bu4QE!_nXF4^1x487vXJSRmPNCwn zJJLGhCV|JeeMyo2f{^TeAB+jmN1?ojou%*}BM~3Xs6l7ad-bf!;r9_EMVmy#Hh-i- z&;f&kubav0^feS-rcYfSoKVP27Y!QxtnfCyE^JS3xo3U+!6(NjP4?fdG#^p<={=GD z$hPpOKA`^KGkN2xCeMVn=J8CmEDrY^$&}ZVpnN^wLm%5}l5I~GanSlIo%wv-ISFO-LAdHG^(`I zJv(@-XSDUvEnPtp^WQAR!j`7Z(>H2((oiYVBHx7@ioJCrUl@8&9|STAq#FKtL{rr_ zD}R30acVvhNK7!<^zP8J(Z*h%n>Ha6fHdAMpKv^?*+7t)29Zuq9X+Sh~i zSgGTuoy`7;GT$HUnl1$-m>M3%UbQ?4I}+@>MhYXn6WJ5})BoT^!P;Sc!aaE!XC0R%z2o(@{4>b`siTCoU1;J)bU&8HImhrqbet)hNrj?KUnc58g;_T-c=W4^{tbirg_gV>ua?a~ zQkxlqL;DH5@mK~+eF+~5&0hU$(Iw7tV`SIP9PXp}66qLR`gguNiYG9I_}uzi|LRdU z0bNf+Gu_OYV%*Wqnj7Y5>EG-b!%Q44$3|fX*gvt3Wo(HR+ilN`VlTT%W(1 zSH#rIU)YLNnX-dv)ubo2nyfr*L?asmU;8b4+=#b&0vHlSNu<>tudm_8Ta-6*rATI+ z25bzP{II3&G9`& zZHg!Cebl$?+PR~K-N?Vuf z#2zzV^m0>1i!8?s&IgIVQ5MSdDSd#T!R}s7mT*TqJe35XG8 z6hxPt%pWbNDY;8`_v=UUlVqAkiLL7SIlU~7<+5>6ywB3FRc{~i!wHM(-KP9%JhrL8 zH@RNLt-nH9yWge<&+wzCl4))M970;xgR6CT(>Kt-=f4#rC= z_Vwj$$M}-#6+0?KS|uSUIo~AA{6Na>q8BR|ei_|nLqUeaa-6Q4jodf>&Aep^eM<3* zpS?XB<~jjy`I?n8Imdj(baIZ=Ve<0+FT$v($l-GXX;J$6%01g(buF^qrDPgs zpbH7eFD|~KpgH=J@jdVrf2kp8-hIrY9_^`-ddJ6w%z_>ze$@!(cq{Q5v>zn8tfy1xT6{;2DkCg`r@+33?PA3q_#SB+0QY>Pu0u7i7=nfXMl8h72Xnuum5|5T${mLL>$M`4T zjs*@>ddLo%1&Wpi3~xhslux1i*t=%}-u40bji2+36V=YNV)Ry@7x+D>fGrgQ4z_LknXJ)!2)~cWP<-T@f}fg&-h5xrg@6=3SS?t zM=maTlqt`SS+qfG&4yaNi>*lY-lc{*4|3bD>pp^9v}SK_1N%#JNM(gvtF_;5oANME zbUU=4?oQ}>+HcV_Xnq%o`miFN`AmVwV@!UJeeM$rOpwzj8*^Y8sI;DjBlzR!G^MI_ z!=SkIM0I`pEs1vB9x#G9I^Aa3c4MnOhIX?^mRz{~qr-b7PQ0e$mmT?Exw=< z$yjr(zv!aXiu6b6=~+Y1#xBzu+@$r1W(g(H zM$#SopOjS&7HH~KrK;{9+OdSQi2^tHYbC7iFTKsXZV2&Xm+uZWfkMciR2?-HRl7exnF#) ztwjiXC|+w%85mnKh5Q!&9(R4P0H={HEiKJ&<+-@RK@ToqWdp!Q4?}l`L$TS{YrM|#TUIe7_Z0zW8tp&1U`~!mK0*0?>?RHL0Uk*X@MktxInf-^OmFL zBO7Vj*qDwT1$H)rHlGwbqj|Ijw+_RHN09G?HZudTE9f~K>@wzay$N~FY>dE1gcg4i zreQ+a*mC{X)3G1-6=E4o{rYm$c_TZt*T>BZehOCCoo!c6ygu7LGW-^Dm-zv?jfR!A zepvsqRr2eW-R+~+(unPJGB(jLbJ6g_7d@~3cvv*ElPY{M?|A&KtZ$N<>6EL)9p(Ht zOwgZ^$Vh4PQQIFHvQQU6e)bFrLJ1cIQGri02@**CkI4Kkmn*Gvq3P;ZCx0?Zb?&qz zd6};230&vu@jty1>T*`^Kz9FdeHSzYfiq<&`n(=*8m(Ctw+M}M8){c)Zv zmtOy&R#_eTjLi^x7!7eev>R^Crks%UYup%l`Plp4ADCJ_`nK?%OPh=-qvbRX zl`!K#RK#1(2Zp#diNbG9Umgh)obr(?x0a>E+ec6Tyg|#KRR3sML++arU0kSr`*j(~ zJ48IihjQn$W&db@VJK0mQyI+i7BZ9+as#(^biRw(AK(9)Aw-_XXHjCFx7u?UYIh2c z-)D?X5_l)otlFD`*GGfzy7evf7sqN^4*uh_gDdU6ihJR|@B6Agv^%HjzH2#z@;f}c z=^g*uJiA#X;{k0L3Ecdgz4%V7k}L`(s`_p)>SsJ84C?O9cEWPcgDW_@wNX3)s(ugw5W88>9>KsX6rR7 zp#ps$#GnV{m8?=iJ7|S4nf)irYq@&`K&JG)Ne@%t*GF;TinACPZ$KMM?;jkh6bTZ( zau+Hv(GFPMOpQB?U9^lrIYs@F>raVwf3RcM+;1=RO=4?ssFE>#g7t1gC@*b~+Dr4K zhqffjiQPdjWEQ2(laqvT*_2bSgUyDezs%O6!XYKFxG7&p+pC7Ix2dUJT%AjZ_fI4W zjz);k55QDO?0^!$t@D|DaF}|6C6_7+XB7B9WMWYMQhIW+{h?sr)(uK(;#R5FFXZdG zIM#A+ug}ggT<0l-{LTx;0(4{$$jABdL7g&L`hK(3lz!pmAhJfSTK{6$m#k;*ck8Nn};mMH?523hXb6 zD*8D!{y2y!+6-6pZ3e`>cBf5f0w^1#5o+K*SaR#WwS&E98N0jsj_wh)Cna1%4P>+` zV}tO(y2Yo)^`3@m05OYBs|h!&VGR}$n;yDCLh;931?_e~AZG>=SdWb8>wQz^Rc$v? zq7W)?zM#f)<|ldB=)F$H2qbAYB)(0Oaya+9ByolcjTgpyCL4sx)GdO6MgN&ex>+9?;QF~r15-rt* z@0#^Zoq^ZX;9BQCuW`ZzkhU4LIRe$l#CqTDvw?Vs`B%TH0D1<}kpv;PkdN1zU! z8U9E#Wum0+x4c4Bw1;~F`jp>~8^O8ZunHVsrhc+QH8^ummdGS?ZhqdL*AR^Gtch8z zoH=*Umt9H2FWKA-5nq7Ai=)A=-v!~7)hy^QK-a|4V3X6}{|G3iM-*Lo5h5$7=8ep~ zGy1O<Q7{e#GMLPt&s-H4s1}3e$l3OlO-m?9~f#(y$Zln zgcYs0>1!9A*X9!)Nbx^?%Lq1?Ke-GI0QgSRIOC9jT)E$dQu0Zq1K}d46v^GNAX||_ zk2KWdB6l#wVm`^%G;hf1rTKJ>E(I`k`}GC)5k8$YPr9NYvJ;i<~$SAY%?Eg(lM(xlVy@TOia`i|r6on$F8VukgzArk(6O?rmM4CW&8{ip^rC^1O)DL~LTet^esoZTwi0Jfu5j1zx%j*u$& zwN^QLwT*8;CZ_q&s_4z4r?d>Rn;>C2F@am|hioKM`f{lPkN1v;!3Na8=;C)iWqKu*g9#!-K2Bf9(Dwy#S%G<=J8>C2I7->(QkT*IW`pD^z3y7+T5^F zlENU3_|w5~*&-U=3?IDYpO-5I$9ALzvLbSbz@iay=B#}5@qn6d%=Spmag0LPL-I|0 z!dQ7#D)8k)SOq@frS507w1JWASRl!i=EEx*gX02=eoTs&Ys@_UmTXNYyx_ilrl9#e^QW3D|H-ajnq*{wPdiMX%1FK z3Km&p@@)i~&nAsYGFxgIF+Yvh5qlx&k)Y(m#=xR3#`!^njF#}|(A=@PV$Vxv@I9JA znTSI^1y&_%BWoo?mURcv{|bGRC~q;8{uH1RT9fbZR?^QZ)K|D7uHkk{<~jdJ_+t7U zP{~}`=|&AGcw>$vxI7)i(W$l&^;$w`eHy(f#7dsn{KXQJjsQHXsIJ9k{5qf}fJMYO zc>UE2Cn!t+sL1K1wv>V8MWtllR}gbJxIA&^waNn~D|>=fCU{#%))FHBXwM}@TsM(>i^ldHmGEaLzn;xT%-JJ2f!nF*>O$>cHbyVL@;)n1_%Fg z)SB);mT*=FF@fV_J#|`}TrqEtzxCD7gOlQ~0hL$3665St8EBz3O~%2M5&d!z1KK4W zlsXcr14rPJ*S;Fk!wrMTM<$=Yl$XCuqM2_%9G#6$gQ5N7feJLGX1pXP2IjJQeMMgh zmQF>cPSN5i%9b!r2EGSm1=-`#(KhtcGoh~j_gA_lpW&D!IzgW#6Rcl8iPyHktiMG6mq$-Y*3%j=krBYk;qEB?`pT75B*`3 zBP-;5E3%CfJyqr>zAIiU;i&?DW_`=#=yUry(?B)EhME2PWH<3k1g^bWx`m~monWPG z-4FGVm0gA`tb}N?)qZAfO&r|HJ6_c3l2BN-@vsK0C?~USdH4H~mnMi%lv$Gz;ios_ z&fkUpT_D@+Or)y6k>N16c|;6y^qc;IBFyHwLmgWrQo}2YLWB2}Wu7O? zD|5RxsATdAA4Fpf4#R7m2*GY1HsaKno3)xo7eT1^Hk`I4lcZE>TW={&mb+ zA`+X=qN!D3G=?LsI;mBe?s=83BOL?2OJDF*emCq+C~bLriJDwS)-?3Z%qX8c5T(7tsZfROm_AY-&}5LH z!GXiba|4XZ0++s!NPOnZ0`atUr^HVH=>GYcCnX5?*HPUa4v5_45$@6Z3o#489GTBN zMSrvLUP+rHa6}1@aH=0pcDP#A7meh6?4{2Yx{EX_`z6A+ah05ob;aL4+N;iVl6rUh z!c-6_OFT8Aq}$tkZ%ynhh!i`cOwM}MMqkuCey__g+E5i4 zy2|v5&mpcx>F}HW6d9*sgQPr+3m}`J>Rw-yY#(*s!Y3RuOt6}&syBkcCo(6o&+Bib zvo#g=Mitra*|}q*o(hqU{wX<1g8u=^rnF)y$v1lBmLYGJF|rYk4bdN)qgm$=o1RIw zo@s2CTXGN8l$jfup8!AtSMrDy%!9ux|$TMJ)C0kF#>Yi8{_RUC z35x-FF5JP#<5S)XI>M1WF8)?~M?+9@Ua|{n0SxU@BmXbcrR479K=2<6&^`43Bo*W| zy(%%_uvigaqA(XzBR9AB;pejmMd~5LXt~SuWJtDN`Fb1$-;y#n}#EM51?vJ^*sr(h@=C5z#AW{Fb`3KC9vz@ zsIyF3H0jl%P}q#d96RlMGQV^stRxgv&6u+9Oj56ZGH2m%V|C91LD=(hWL5RI}=H@G09|PKA@Mhv>re^-P_?rhCQiXW==ye2p9pv-{W7%eW5kzf%15y{cRH)Xai5VIg+|08bEqVw30(L9=L9*Q{p=HuUvVaDVeXJcQtXaP z*FZ#~r^L0NSrTXE1GlCo0wd3L%`MQxgqe?ETEltUx?8!q+P%F;gRmBw=eg+ zUHJ!7MW5=`V)B$4e{rCDM|bZpWp$^w8iyoIW&vb&>zFiPiy0Ph9W^1)gm>(uat!p_ zHN+v0cH^EyImH(I0aaBSA5q?&=hY^-PT6jc1k@X|SZXFG%SH;cqV1hMdxn81+L$f# zJ;bQT|DMHgU|Q0v4D?L^wQd06%+LE)SQ_Z@+vQxqXBkN>C16I*2^Nh~OeMW4i!1biuTiFGuISu79lcV`%cK63NBf7y-#+{~Y&|;Ky!pC3 zB?9rOXID%Uqns+9!>HUCd|aEb*liCPwMBC#0wDiz(i3a;OaJrQjTJtzcKh4MEjPEe z0>6I(N*+d6MyoSk_!{V^fKwnF^{IN7zx?wnxiT{J%F>8Wb4!N7;&)&CjsKi-8+f{) zcQ;c#*2Nyz4VD||zBqVmkYN@Pi3Cundlu1q02Ef?5CLlyXY45nJR1niV$*@Yy!*8R zP=3_1F#rmhsqZj{kGHgp{y<+J6&(XPpA@c863#I4vMAQ6>t%wagRm z4hgne<)gR4^8BHNB0rckbZnQFJ$H>#y6lDAKkQnJOQ43wXqf3os&Q=$>UUaT4;dz7 zI+t3sJ#GDqY=mWLWdp^;3Vb47W%_5m5>s`{*G|7U@>}eD ze(hG{Mi$)NVy{aregwQ@X9Hu;Nu6vWc~slZnVVHx3JDsdhru9qd9i&AYx3X_Aarml zoh0t3=p?y2VdemM%T#=eRbsZC=C~gA0aIl_x8Kg{VU>XrH?%PFF;BBmetz3O zUnT7$fLDJmS>M`>B=Tcm8N;^5)bv_u699sg(a1^(nzTBPL?D3QHy)q)Ch|I>c<-3Q zM;2wRWH1nIx?*`j?yZx@%>e)N-SayR(?wRk^Y?!wjscTDBjo^Iiq}n_IfxQ{Hpj^4 z?eW4(*V{WaXZM;bzn&IqRDSBK`8`)1>^)DUl$%~t#@}?j?R(%BqJ3BrG)NiB@hCCZ zb!S59vMv&4{)OZa>TwWAHt$0_mTms*CPuUxF4^<=yZ$m1vdqcw=d&{3%(3R$)u;j% zB{gvKEh0-ncIxTYchm`Q0q$+M(r$_ZRv%`GN?bi*ECHrLO9HT1LzIE;LZV9~=tF(J z?d2Wdw_6?HS$U&+;L7*U{)i+kn=E}gXFF|bP&S9*Flk>L)?9HOJ?+q0Q_m&O2KKMN zU#b%duoiWK^*G(6|4PQ+^Th%Y4`@TEDUfXDa5H;?>QOTmal#B9$&|1Or3X_|(1TIa z%<<@HMXag9bcdCyL_P;l2I{8`wJh^BKS{{$L_|3NLTp}H3+9CMW-e{J!YS}c z7q8ER052}}=?S`ypHW#5Pg~R!f|!ISOp<#zS#hh|cZz?Co|#8QUdrzGS(5UxVh%Gs zBO^fr6ju<24XB@xtz61dY`G?zW)p>me@3dB8e>1TNzQIscFr|Nm{{gZ`vh#r7hZ@A z3F*6V@$Wpa>Q*MRA5)io>QK9QIy3h3!m3-BOvVJanGDJ)@|O;xF*OU*6Y4=FTmmS= zO8x4u{(79zJIv>7Oop<%l!g+#xTM2c$(}EDcOAMXHMK$zH_Nxy$$(?|A*IFvf3SfE z-U!In9}WkkYQtx}CP16(EZ=!%wcLA@i|w3=hWsO@y_{=l$~O@xoHb0F&r6V7neCHJ!aw2y+n>*Q4ABaR?gUA?r-XwFM7>qEtcV#^o{nl z(eCqgN78-)%rIbSl8bQ^ho6l>uol?O21LO`0Jn=c@GhO#M<-!0rX_p6v=xiVeNP~;e}m;gxj1>oS+NE04)-4+w-fv0QkI%wQXSVLr z`NyiyXr>o~pgBtXPlutAUnm-e zm2()*NX0fH-)Y)?+~$UE;j3sG1ZAobijHt1)j-!c)XvbtFu!pUARTK&DU*Ax4ha0v zMMS=*vr`SWTnqI?`>F}GJ{BE$=O3Uin@icx}mTuBitjO{-Rh= zM`R@r9G?Wg3y60D2tW~*-fk~;einYj(;_GN24DZf#sMbB!4L|^?i;7_2*J5W2?si; zbTB!|{9#Tza;Gic>$&lLh1X}ZI)H6-w+cSXJEZDa^s+K|DB}O8(p#VErO#`37#6Ex zIX+CqZPh{Q&5uB75-;W_7KDT5yORZDAMID6gXl^d2>`Oh0vw(?^k%?G>GS8SXnZQ}=s zmGP)^tyj|wDMB$3B@QuR2Z(vChCXes`T2Jq2zlUp`+o~{42 zBVT~xc|g?ChTnpsa0%nd^xF`g3V;rnbownuzN)HK3P9!rFjpq_Y4yKJ8Lu(Z9qN@I z2BR|tYT8nmZ6Le$e}ZX%5gDvS;>bD}TJRaS9G z$)1*o_(aad9KE8+Y%S4g4tlAudsHJc>Q&-pPT9$X1ERSx8rVGcx#=8EI4144`>iLsk{aQvXiOf3YvF?PCVX?C7~ z=l_Mg_etllDb-yV zr1Ueg+tVTY-F#_TR4oVj__eU@cCDb?1qN3fNZErbm`mp^3VXr?P9h+m6d|%uhXdrG z%(9UIwYcLrjNlQiQ2@dOLU5S@FPt5aSE=uL4o3NgH{UcsiZ5;e9Ke7OzNLp8XgDQnbfSYH{0)#Eq-Hu4I`h zC-bM`lf56OWH=N8Bn@u+PZ%6O$nQ@4$xB4w9r6546-rR*0d3)ch~FB}JN$Q+@i!wu ze=wYy(TB3UbA=cuOO^&#s;<%+vykt0VC^OKWoj@hu3AmaU2Y?}`nt6#gyTpVruVag zsNI)myZHL5rNFf7n{T+JXuA(7T>LtD7T}acND3vrUvU98q*w$eAl7hkx6hMfP@jCX z#=Xuf1CgishnsEx@~WJ$0d&|9taMITg&Ao`NQfVx$kK5}TKRLPaP{luiL(2z6@* zS^C*x(>{d9cFNB_obA?b?hc=#)g5TquEI2GuEJGL6@KzUtJLBq(>c*Wwb|1?&J_xq z5d|}YCr3{&LQ#cx0c7V5P!LtdB6PJ5pw?sK#Cl%8QbyZ5rrRe(1xM>`-vTj)y80aC z>ohoWwCc+F#k6_q+i}pM<9k!@`2}3D{hTO$v1`}R@85ST?fdh)qPNE~?&Hsc&g(RF zRc-t(smcL4VVux7 zh5iY~rXxvfM&dN#_knCP%M;C%n3x?ixs;wI>iKLxx3|rofhJssvds0WPu}bTfjrzF zM3HWzHQT)KG&qBTGhlB<%|XQ-Ipn;Gqlj-u7c&$ z_HzxZnv^(&FR*cFfi%PIeelTRg3MOoro&w0L>--6wz<6DkI)hk6uYsJxaf(kekI(f5*qKuA&)n3>uK4$ zy$tJp`2#?}DIle>HU?Cm)LRY&E1!~>og#G*h>~YyM3^1HksLG>!gnhSfwC}9M*!ZX!uPaBQo(%7eEV2R-k5w+RR!mZ(JY z_pf)PqIW^UCPM%=b{lDH!DJWt7DammhG!a?iCz>Fv$P`|*7IDKmr5OGqX!VHAB8nP z_1%QZ+Xup7^AVM+wQ7g!kJM;)Du@Tsg>|v6^kS5IeO(c~LaQ>)>n#K^FeAsV+Viign2s-8drvW&XVr zV3w~kX};PR_p$%IEESQxmpj>{o2@o{4Eisvb+K9zaUx2as{5BXPydmq32pzU$JJ~0RBG;!Shcg-?2*T_p z0NIe-K5DP`NbCTpv@U=8uDkAh;0F??^!IVWN)`I~0x2oz*pk2(1K5`3?eQ^>a8^OM z_{1@NaFn=^uT_0^PY?Ir)pNo8=%7p}_HNeKiTB`LSG?pGxivIPPEeZJ(s12EiR{QF zXbt)6bb978gmJQCLSD_L(uQm{45hOF1nlq2WF-phv?ykfP-6lIky^fl0J+n-Ou3P} zuXev|2s|%I0bxdvID9;mK2SXoUui)P$nGYv8DL2n7oba}e;I`MWU(}9HKG{U0xw*L zoxD^=hj$IWroHUi6Ll}&NcXhM#h5l+t|tK5pBoozE8{#riwIJ_AfSO84aoNK`S>~5 zT}!`1HI+4!a?z0+V%82SR-29*i6kNS%!Si>H2_SLiSGpgb~+)ZuBBL} zcg9eaOI4|nxqC=9%cT+)P`%m#Ag(h`Jm3tFrk6tk3e@{;`YPFZ@qkt6^;z~EPf z$)K?t&~g!Y1;9SrJ3Qon`}j!;2cH)$Yma$2Idprn{xL9@faEl*cf;c){#~S0G|=Nfa=va)zsa&34Mxc=pWBJS?IzpIJwQy%0C>K=5jTCfU@18o5=u{pddn8s z0x25{!Fs8X^OC26F8I%9dZ)8Q_pOFT@Cdh}SY9m7N^MpjdzIjuKf5*}BKJilza$F*MwbaZ*)}n` z;)$HK8K8Af2)Ar7KW+y2eG~|wn5zKJR)f7;IuSZ=B?p$7bU$%*(~%{1V9EEzfo4q) zM!(p$6hh%JB3q{*M~&o>?~zgx$;uo^aiLBSTM8OThIQlC^VNI*QY7`sc(??8oj$K!+q!^U+O z0L$-&yu91600wUO3V?FbgdAeT?Kl3^zTZ@dT)L#}u|M?GRYt+TtRL`Mx~%@%RxzI_ zfC`~_*y*!Z@zu7BU+j$+L66(PWI2J?{!A!=u<}Z$GKH`se7Gu&&l;XL;gYv6KAJb7 zoVF8eVdV3{gY)58?3v8<$*l;=C&gN@$jxMBQh$l`boo1%`JAJW zmQhqz92={Y8pYTO=XD95S{G>Trdt3Nwk&y9V1Dr~7)Ebf$8TWZNC+MPfnS_GxM@R| zk+&T1h(6XrCf%*F%E&v&5>+VY3&id)&YHh%2XAs6qMmuwDR>WWsL%R*mfzf;{otGI z1v49eOGRn7&b4PIZ8yoMXG4 zDzFBTN^ zE^U@bBN3Vz5->fgzVlBM!l8xyOnnLa=XrWFzIzYQa=+)b9@JkNIetxCVsCdq4w8*d z^S`=mbr+eZ_hOC4|1sj$H%x4|sS|ReHlMM=1YS{zC>!_tGdYn_6OPa}_M-fAIwl8n zEsOuS$@wgB$e!-C$Oa2gn0u;f7jC@VN3HUuyPHqsWQHJ5wOlsrye0#${AAElagKhN zm|gYP+IjwwKv%zMv~f?4iy)rho7QI|Up!*o$Tam|nuigVi>_!3uS_ey@#15*TmJNA znnTny#-V2)OPDAi>REhG2qd;-dGVdetToc^1skj3zk!;jJ&8^(!LoF{?QCDx>lbta~ex z?OkfC#2tRPn4inIyijud5Y}bXv}Nk)DMrj}KwxdFipvtxno+No0aJug z2q>3p_^kNYaldMNeZw%tWUt2h>CXcZaM~{}B_;bj|8lzzwYjjaoaSa?N=nI$b%e|K zT(GL8rFgkVYxp7)WnOg3(!m}+^^)*NY@LC(pBJ{CvI8cMX`D;O31=JOt{C%8(o4q= z8=HxMatV_%^D|0kEKW0fAMDoK;HCXv`-evHhheH$KZ1jy}g&-X`XE_~;EcqOx7F?Ifmh{o4puk-IgfzPND{XQa_q!q>=(}ZBzvSsB=IomFn0;=ZW7b? zLdTnjD`hXbG6G&i3@vqc!JYZ8uG*elgBFPp-95Ybf1MA=59Sbn$6@_N7&j?EO2fhZOi|W5UiAG(ye5 zy}!au^Zs%5H-%>)SyO1&xs)zi7{Uxa9x~oVcwLN zJp8ogbC9@B=`wDa{;fJW9Jk9HE-=BmW8p!lQfzp+tEb8tO1AQ68GW6lTEfrXUqg`o zh4@eN6a{qLo0>V~9GRcGW`-=VONY$nvkLrBu9wk$2kQ5`K*W|ze%AX`nBEHW8xHAyU!RsI}*=vS;jBKfBaR>B4@#Fi3nPg~(T9EJcB9wE@G zJX)1YtMd45N$!oIR6dETgR7&S@6kB_e>uO8=w zv8gW;OW&A0+c%XsOG3{I0mXR3<(#%TM_R<6=~fw=!ExZq<58F>5C(A1Z%4hl5$gN{ zVQaW|Mn)Qa9D&igdrFP+z7TW{YUR~clRtKs=0S@(dsdyeTPE%M8Z~TdMwLvyC;CW0 zLxwS%Zv#ZOqCSd10J%TbD$BL(7x@ove|4!6CrYRrg@zW9DNgggZrNr{(AO^?8;jas zbTFXY>&eNHswVy}wC0 zZeEo2Zv8@aST((};Qal{#2IbTmbL4~wd*Rg=$SZps3#b${>np(&o?$X^l9A0@e>a^ zFm4%r-ts_b;gzBRR%uUqdrx*;Il<=uSD^&*tt1g>&yTS-tFs%q><*Psi&oXiF~`h= zD9qaIbT;8)RY`?U%a{s32=5n@fl4;tg-V`AdxLa>5#r+(nJ`2s=e|Apj%E&vAolvP z^~v+tShTR$#Nda4z5BBA2zupWGsidUB#brpKMEmu^s%(Pv|S(;u?UcJfx9@2LP|!u ze<(O?sK@?M7b8q@J_PY51p=;+md}cV^vy+rut0cV>l-?TNLmJl5ejf02pkF`_KL-? zB?j{XyH%ybcr~mX+FBqq!?c0Jwc!Ys28V{U1&H<6P=t^(lKwjksajyRCo9hy#=;Ei z2g8^(+~{&gJ&;zcvDrB{u3-mn@xZ1oLXs48xfA%{&8=gra%uS-2G|Y-ZSFiic%?jE zM*az2)*Ev0_LJB*SnjZ6cSeWRr(wFk}7Sf@HV8LLdyG1UUaK)J<)T*oj_AK3w+Cvj{AB(_4Dz{f3aX=GnI~KrGH6N`6~MJ6&Kodc+%Y3gJ{V=KAZ8<8Tvm zigLeK?>trA;lf(`MBD2p-OZ_7ECAbsK9u zOx*-vIe&%gR7Wc#E_}$h&`H0;m4+Jj92=jsN1%KKQqF`4`a~B<^gK}j_HTQlg2b@2 zHcrQlZlmoAZanw_(M_6d-}~*SpO<%5Fv0>44t=Q`(<{&&N+=g53eCiz09QSz@BD96 z?oVWuck5w9`iTMS+57qC*zBeDRFkpX?a#VAYoLLg&RAB68O3U67+qI7y((%HNbjS; z%6|`2&^wkkL{&FaRW}R6aXm(+KS71g+}Cjye4C15=_J1{Yk)0Y@%Z%I9hCi68X#gghVjpe_TmZENyCzs;;K& zcn!rM2wcHCk8L2^|9dSVRuWB2BDUgd0~>E^m0zBplShca|GKL8NDO-r3pt2|m>FV5 zB%63qwq(R5zD^6ZQPGtCucu25mX!PWFa<=fkB^-b z4tP1jY;}0xIG!=$JoYypr+#T&)vi^DsoqDOloiio9U}-{M1j2EukZw5Rwz!P|JnS# z$pXeMV@}Ujn7zjup^EICdiQp;J_Mn=fVMinhIZBdnf~d&#Cg~O7yA=grwlTpjQsDzt8BnMt8vNX5*#psZInPkTm}ly#@AOUbF;XH zLuWL&v8V}lZ)%v`o=9goKgUXar1q17SrYOi2d>Ka16w5~r@&EzCg7m3svvWwP<0RZ zi4hu)9TgiQD>Ld#>&6oBNmWWDcV#uX^4om&p-J zFO&TfBuE+h8^OGmFH6HNN>)!g*4q~$;pT=@;q)dpULoAah+-UTC036ldZOzX!WJs` zM)%Z8MAJMlH_sRIKWgHopx*Dq{BFjMF?EcI;pQs++4a6#T)#!`(#H)|(M$7G{rURdY#ROULJ%LA z@spc!3aWeT?Y^M=0-@QW){hOGV~^3zgnjBLgRnU7>*SZ&Z*Al|`6bVA5du`-NBMou zU5f1#`(K@IvsUG9X45r35cTLHVP@@6wMOe^vB@kc>`|1W+Zd^N{mX!yPe{0YVLJTF z4vI)N>9@EBN0FS2&P`&=3`_q=(?RN4GN_Xc1+_$(@E5bfQ zS4QvYT9#%%Qm2-63733#zqCX1)i4gaEK)e~^}rKjW@%G#K0T^Dqws!}F*moCl3(#| zRf92IVYn@yVB*+JlB{%WvsJ3+&%M8=(U*jy62M6R=GPR|dZ_j!@iV^;%SVu%*qRjWS~_b2T3wnl!K@<8HT?nKfxSH1@Jkeuc&Q#GGLNOwMSJ~`j| zcRva{>7<*n*$3%-MU9qie{WI2-*94>&OFn(UtmTM?cX`cwvwEvz_*lfvj6TU!)97A z6tN*Fv*b}yUS|0C-%&fFWv*0U(M`sC1Z?*Al%LaUFgIhz7lbVK1o@x*cbEg^dn&Nu z5Sgj=0Lj0LRaj+(O@<9u=5!BR;QrfHxVpFXEp~j0k7#_6=XdMA65YR>C~qyN@4L&= z`Vw88MtXgD8rkvR&D8{D)v`iqsY`JE-`4ULSkwL;n8Q?CRpaWl5bvs~%aQ7-ryu_g zwYJ_4`rYJsCR^40U$mYC@lRj;;Yay5;*)28c+Gp8H^>~h$ZW6K(n}8hJ?mOt&C9#O z@}janIL)w}lvKxYcTsuz&6Po?F(<4%jd}LvI>bBu?)J0&y zKgvqbn=)I4;Xicu7dWE?cKBm%54}loWuP1|H@A#W82tGSC>Nm;aX Date: Wed, 22 Mar 2017 20:04:00 +0100 Subject: [PATCH 331/496] small fix --- src/NadekoBot/Modules/Gambling/Commands/Slots.cs | 8 ++++---- src/NadekoBot/Resources/CommandStrings.Designer.cs | 2 +- src/NadekoBot/Resources/CommandStrings.resx | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/NadekoBot/Modules/Gambling/Commands/Slots.cs b/src/NadekoBot/Modules/Gambling/Commands/Slots.cs index f4cf201a..198d4d72 100644 --- a/src/NadekoBot/Modules/Gambling/Commands/Slots.cs +++ b/src/NadekoBot/Modules/Gambling/Commands/Slots.cs @@ -144,11 +144,11 @@ namespace NadekoBot.Modules.Gambling await ReplyErrorLocalized("min_bet_limit", 1 + CurrencySign).ConfigureAwait(false); return; } - - if (amount > 9999) + const int maxAmount = 9999; + if (amount > maxAmount) { - GetText("slot_maxbet", 999 + CurrencySign); - await ReplyErrorLocalized("max_bet_limit", 999 + CurrencySign).ConfigureAwait(false); + GetText("slot_maxbet", maxAmount + CurrencySign); + await ReplyErrorLocalized("max_bet_limit", maxAmount + CurrencySign).ConfigureAwait(false); return; } diff --git a/src/NadekoBot/Resources/CommandStrings.Designer.cs b/src/NadekoBot/Resources/CommandStrings.Designer.cs index 045f5885..cc7550b6 100644 --- a/src/NadekoBot/Resources/CommandStrings.Designer.cs +++ b/src/NadekoBot/Resources/CommandStrings.Designer.cs @@ -9006,7 +9006,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Claim a waifu for yourself by spending currency. You must spend atleast 10% more than her current value unless she set `{0}affinity` towards you.. + /// Looks up a localized string similar to Claim a waifu for yourself by spending currency. You must spend at least 10% more than her current value unless she set `{0}affinity` towards you.. /// public static string waifuclaim_desc { get { diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx index 14a6e44a..790df4de 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -3001,7 +3001,7 @@ claimwaifu claim - Claim a waifu for yourself by spending currency. You must spend atleast 10% more than her current value unless she set `{0}affinity` towards you. + Claim a waifu for yourself by spending currency. You must spend at least 10% more than her current value unless she set `{0}affinity` towards you. `{0}claim 50 @Himesama` From 9f5a71ae67d48f9b01de68ab9fc3592fe73b9211 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 22 Mar 2017 20:31:44 +0100 Subject: [PATCH 332/496] Update ResponseStrings.zh-CN.resx (POEditor.com) --- .../Resources/ResponseStrings.zh-CN.resx | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.zh-CN.resx b/src/NadekoBot/Resources/ResponseStrings.zh-CN.resx index 57e2e91c..e756cf57 100644 --- a/src/NadekoBot/Resources/ResponseStrings.zh-CN.resx +++ b/src/NadekoBot/Resources/ResponseStrings.zh-CN.resx @@ -2324,64 +2324,64 @@ Fuzzy {0}投票总数。 - + 用 `{0}pick` 命令來捡起。 - + 用 `{0}pick` 命令來捡起。 - + 此用户不存在。 - + 页面 {0} - + 您必须加入此服务器的语音频道。 - + 没有可设置的语音频道身份。 - + 用户 {0} 被静音和禁言 {1} 分钟。 - + 新加入{0}语音频道的用户会得到{1}身份。 - + 新加入{0}语音频道的用户不会再得到身份。 - + 语音频道身份 - + 触发 ID{0} 定制反应的命令不会被自动删除。 - + 触发 ID{0} 定制反应的命令将会被被自动删除。 - + ID {0}定制反应的回复不会已私聊模式发送。 - + ID {0}定制反应的回复会以私聊模式发送。 - + 没有找到任何命令别名。 - + {1} 命令的新别名设置成为 {0}。 - + 别名列表 - + {0} 命令的别名已经成功删除。 - + {0} 命令没有已经设置的别名。 - + 竞争比赛游戏时间。 \ No newline at end of file From 085ac26a5e06835e87fe511adc8cf0242b8d1342 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 22 Mar 2017 20:31:48 +0100 Subject: [PATCH 333/496] Update ResponseStrings.zh-TW.resx (POEditor.com) --- src/NadekoBot/Resources/ResponseStrings.zh-TW.resx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx b/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx index d42f47bc..051bb851 100644 --- a/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx +++ b/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx @@ -2181,7 +2181,7 @@ Paypal <{1}> 上線時間 - {1} 成員的 {0} 是 {2} + {1} 的 {0} 是 {2} Id of the user kwoth#1234 is 123123123123 @@ -2267,13 +2267,13 @@ Paypal <{1}> - + 找不到別名 - + 現在輸入 {0} 會被辨識為 {1} 的別名了。 - + 別名列表 From c9985ede2ccb0dcdb55622ec9518e4e9f8c483d7 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 22 Mar 2017 20:31:51 +0100 Subject: [PATCH 334/496] Update ResponseStrings.en-US.resx (POEditor.com) From f8efb04d78240955cd75f53a7826ceec7224ca98 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 22 Mar 2017 20:31:55 +0100 Subject: [PATCH 335/496] Update ResponseStrings.fr-FR.resx (POEditor.com) --- src/NadekoBot/Resources/ResponseStrings.fr-FR.resx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.fr-FR.resx b/src/NadekoBot/Resources/ResponseStrings.fr-FR.resx index ee351ef0..783470c2 100644 --- a/src/NadekoBot/Resources/ResponseStrings.fr-FR.resx +++ b/src/NadekoBot/Resources/ResponseStrings.fr-FR.resx @@ -2383,22 +2383,22 @@ Fuzzy Le message de réponse pour la réaction personnalisée avec l'ID {0} sera envoyé en MP. - + Pas d'alias trouvé. - + {0} sera maintenant l'alias de {1}. - + Liste des alias. - + {0} n'a plus d'alias. - + {0} n'avait pas d'alias. - + Temps en jeu compétitif. \ No newline at end of file From ca49a39c5b2a6da63c9961a3450fa3bfb720acc9 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 22 Mar 2017 20:31:58 +0100 Subject: [PATCH 336/496] Update ResponseStrings.de-DE.resx (POEditor.com) --- .../Resources/ResponseStrings.de-DE.resx | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.de-DE.resx b/src/NadekoBot/Resources/ResponseStrings.de-DE.resx index db44d4ac..9c071e54 100644 --- a/src/NadekoBot/Resources/ResponseStrings.de-DE.resx +++ b/src/NadekoBot/Resources/ResponseStrings.de-DE.resx @@ -476,8 +476,7 @@ Grund: {1} Fuzzy - Liste der Sprachen -{0} + Liste der Sprachen Fuzzy @@ -1281,12 +1280,12 @@ Vergessen Sie bitte nicht, Ihren Discord-Namen oder Ihre ID in der Nachricht zu Währungsgeneration in diesem Kanal aktiviert. - {0} zufällige {1} sind erschienen! Sammlen Sie sie indem Sie `{2}pick` schreiben + {0} zufällige {1} sind erschienen! plural Fuzzy - Eine zufällige {0} ist erschienen! Sammlen Sie sie indem Sie `{1}pick` schreiben + Eine zufällige {0} ist erschienen! Fuzzy @@ -2371,22 +2370,22 @@ ID des Besitzers: {2} Reaktionsnachricht für die benutzerdefinierte Reaktion mit der ID {0} wird nicht als DN gesendet. - + Keinen Alias gefunden - + {0} ist nun ein Alias für {1} - + Liste der Aliasse - + Der Auslöser {0} hat keinen Alias mehr - + Der Auslöser {0} hatte keinen Alias - + Kompetetive Spielzeit \ No newline at end of file From f89bd49c5272050e097cfe0c2f12d7ce25f950c6 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 22 Mar 2017 20:32:02 +0100 Subject: [PATCH 337/496] Update ResponseStrings.ja-JP.resx (POEditor.com) From 9c5a1ffabc7bf8bd103dbd027a19053ba568b2fa Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 22 Mar 2017 20:32:06 +0100 Subject: [PATCH 338/496] Update ResponseStrings.pl-PL.resx (POEditor.com) --- .../Resources/ResponseStrings.pl-PL.resx | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.pl-PL.resx b/src/NadekoBot/Resources/ResponseStrings.pl-PL.resx index 6517d703..013b1cd8 100644 --- a/src/NadekoBot/Resources/ResponseStrings.pl-PL.resx +++ b/src/NadekoBot/Resources/ResponseStrings.pl-PL.resx @@ -1006,7 +1006,7 @@ Trwa {0} sekund. Nie nikomu. Ciiii. Możesz wspierać ten projekt na patreonie: <{0}> albo poprzez paypala: <{1}> - + Komendy i aliasy @@ -1194,6 +1194,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś + Jakies pomysły jak przetlumaczyć Submission by miało sens? Brak głosów. Gra zakończyła się bez zwycięzcy. @@ -1585,10 +1586,10 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + Filtrowanie zaproszeń na tym serwerze wyłączone. - + Filtrowanie zaproszeń na tym serwerze włączone. Przeniesiono uprawnienia {0} z #{1} to #{2} @@ -1732,7 +1733,8 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Zdefiniuj: - + Porzucone + Fuzzy Odcinki @@ -1783,7 +1785,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Poziom - + Lista {0}place tagów Don't translate {0}place @@ -1877,22 +1879,23 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + Streamer {0} jest niedostępny. - + Streamer {0} jest online z {1} widzami. - + Śledzisz {0} streamów na tym serwerze. - + Nie śledzisz żadnych streamów na tym serwerze. + Jak lepiej by brzmiało; streamy/strumyki - + Nie ma takiego streamu. - + Stream prawdopodobnie nie istnieje. @@ -1919,7 +1922,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Tłumaczenie: - + Typy @@ -2237,7 +2240,7 @@ ID właściciela: {2} - + Dziękuję za oddany głos, {0} From 77f80e8309543c0bfa6ad60eaa6408b66b8397a4 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 22 Mar 2017 20:32:10 +0100 Subject: [PATCH 339/496] Update ResponseStrings.pt-BR.resx (POEditor.com) --- src/NadekoBot/Resources/ResponseStrings.pt-BR.resx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx b/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx index 1fa1070b..f24177e0 100644 --- a/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx +++ b/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx @@ -2369,22 +2369,22 @@ OwnerID: {2} A resposta para a reação personalizada com o id {0} será enviada como mensagem direta. - + Atalho não encontrado - + Digitar {0} agora será um atalho de {1}. - + Lista de atalhos - + Comando {0} não possui mais um atalho. - + Comando {0} não possui um atalho. - + Tempo de jogo competitivo \ No newline at end of file From 42fbbb51d886d40f8a72acd67cf7da851da4631a Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 22 Mar 2017 20:32:13 +0100 Subject: [PATCH 340/496] Update ResponseStrings.ru-RU.resx (POEditor.com) --- .../Resources/ResponseStrings.ru-RU.resx | 41 +++++++++++-------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx b/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx index 250cb254..b1039c13 100644 --- a/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx +++ b/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx @@ -607,7 +607,6 @@ Все роли пользователя {0} были успешно убраны с него - Fuzzy Не удалось убрать роли. Отсутвуют требуемые разрешения. @@ -641,7 +640,8 @@ Удалено повторяющееся сообщение: {0} - Fuzzy + What does it mean? +Fuzzy Роль {0} добавлена в лист. @@ -1092,7 +1092,7 @@ Paypal <{1}> Второе число должно быть больше первого. - Смены чувств + Изменения в чувствах Fuzzy @@ -1355,12 +1355,12 @@ Paypal <{1}> Песня завершилась. - Отключено справедливое воспроизведение. + Отключено честное воспроизведение. "Честное воспроизведение" не подойдет? Fuzzy - Включено справедливое воспроизведение. + Включено честное воспроизведение. Fuzzy @@ -1421,7 +1421,8 @@ Fuzzy Не удалось удалить плейлист. Он либо не существует, либо Вы не его автор. - Плейлист с таким ID не существует. + Плейлист с таким номером не существует. + Fuzzy Добавление плейлиста в очередь завершено. @@ -1524,13 +1525,14 @@ Fuzzy Включено использование ВСЕХ МОДУЛЕЙ для пользователя {0}. - Добавлено {0} в чёрный список c ID {1} + {0} добавлено в чёрный список под номером {1} + Fuzzy У команды {0} теперь есть время перезарядки {1}c - У команды {0} больше нет времени перезарядки и все существующие времена перезадки были сброшены. + У команды {0} больше нет времени перезарядки и все существующие перезарядки были сброшены. Fuzzy @@ -1621,7 +1623,8 @@ Fuzzy Включено использование {0} {1} для данного сервера. - {0} с ID {1} убраны из черного списка. + {0} с номером {1} убраны из черного списка. + Fuzzy нередактируемое @@ -2024,7 +2027,7 @@ Fuzzy Имя: {0} Участники: {1} -IDВладельца: {2} +ID Владельца: {2} На этой странице не найдено серверов. @@ -2182,7 +2185,7 @@ IDВладельца: {2} Время работы - {} пользователя {1} — {2} + {0} пользователя {1} — {2} Id of the user kwoth#1234 is 123123123123 @@ -2256,24 +2259,28 @@ IDВладельца: {2} Роли голосовых каналов - Сообщение, инициирующее настраеваемую реакцию с ИД {0}, не будет автоматически удалено. - Fuzzy + Сообщение, инициирующее настраиваемую реакцию с номером {0}, не будет автоматически удалено. + Изменил "ИД" на "номером" +Fuzzy - Сообщение, инициирующее настраеваемую реакцию с ИД {0}, будет автоматически удалено. + Сообщение, инициирующее настраеваемую реакцию с номером {0}, будет автоматически удалено. + Fuzzy - Ответное сообщение для настраеваемой реакцией с ИД {0} не будет отправлено в ЛС. + Ответное сообщение для настраеваемой реакцией с номером {0} не будет отправлено в ЛС. + Fuzzy - Ответное сообщение для настраиваемой реакцией с ИД {0} будет отправлено в ЛС. + Ответное сообщение для настраиваемой реакцией с номером {0} будет отправлено в ЛС. + Fuzzy Альтернативная команда не найдена Fuzzy - {0} будет теперь альтернативной командой для {1}. + {0} теперь будет альтернативной командой для {1}. Fuzzy From b860a17f240c1244800d74189d2bca997c135686 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 22 Mar 2017 20:32:19 +0100 Subject: [PATCH 341/496] Update ResponseStrings.sr-cyrl-rs.resx (POEditor.com) From c2e0bb84de0e315eea7d081018387ef06742a28a Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 22 Mar 2017 20:32:22 +0100 Subject: [PATCH 342/496] Update ResponseStrings.es-ES.resx (POEditor.com) --- .../Resources/ResponseStrings.es-ES.resx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.es-ES.resx b/src/NadekoBot/Resources/ResponseStrings.es-ES.resx index 4e34bf78..37e12fc6 100644 --- a/src/NadekoBot/Resources/ResponseStrings.es-ES.resx +++ b/src/NadekoBot/Resources/ResponseStrings.es-ES.resx @@ -1518,7 +1518,7 @@ No olvides dejar tu usuario de Discord o ID en el mensaje. Activado el uso de todos los módulos para el usuario {0}. - Enviado a la lista negra a: {0} con el ID: {1} + Enviado a la lista negra a: {0} con la ID: {1} El comando {0} ahora tiene {1} de enfriamiento. @@ -1614,7 +1614,7 @@ No olvides dejar tu usuario de Discord o ID en el mensaje. Activado el uso de {0} {1} en este servidor. - Removido de la lista negra a: {0} con el ID: {1} + Removido de la lista negra a: {0} con la ID: {1} ineditable @@ -2260,22 +2260,22 @@ IDs de dueños: {2} Respuesta del mensaje para el comando personalizado con la ID {0} será enviada como MP. - + No encontré ningún alias. - + Escribir {0} ahora será un alias de {1}. - + Lista de alias - + El comando {0} ya no tiene un alias. - + El comando {0} no tiene un alias. - + Tiempo de juego en competitivo \ No newline at end of file From 692d6d2db32b8810123b91b65bc9792a1fb5578c Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 22 Mar 2017 20:32:25 +0100 Subject: [PATCH 343/496] Update ResponseStrings.sv-SE.resx (POEditor.com) --- .../Resources/ResponseStrings.sv-SE.resx | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.sv-SE.resx b/src/NadekoBot/Resources/ResponseStrings.sv-SE.resx index f5297053..bd3d6093 100644 --- a/src/NadekoBot/Resources/ResponseStrings.sv-SE.resx +++ b/src/NadekoBot/Resources/ResponseStrings.sv-SE.resx @@ -2336,25 +2336,26 @@ Medlemmar: {1} Röstkanalsroller - + Meddelande som triggrar den egengjorda reaktion med id {0} kommer inte bli automatiskt raderad. - + Meddelandet som triggrar den egengjorda reaktion med id {0} kommer bli - + + - + Ingen alias hittad - + Skriver {0} kommer nu vara en alias av {1}. - + Lista av aliaser @@ -2363,7 +2364,7 @@ Medlemmar: {1} - + Kompetitiv speltid \ No newline at end of file From 2d41f4aa02ee953142fa912264a6ae8c8f7d4483 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 22 Mar 2017 20:32:29 +0100 Subject: [PATCH 344/496] Update ResponseStrings.tr-TR.resx (POEditor.com) From 64c52f1cd08c717b1e57885448733b55be36c353 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Thu, 23 Mar 2017 12:09:15 +0100 Subject: [PATCH 345/496] >trivia pokemon added --- global.json | 5 +- .../Games/Commands/Trivia/TriviaGame.cs | 39 +- .../Games/Commands/Trivia/TriviaQuestion.cs | 6 +- .../Commands/Trivia/TriviaQuestionPool.cs | 28 +- .../Modules/Games/Commands/TriviaCommands.cs | 14 +- src/NadekoBot/data/pokemon/name-id_map.json | 3246 +++++++++++++++++ 6 files changed, 3319 insertions(+), 19 deletions(-) create mode 100644 src/NadekoBot/data/pokemon/name-id_map.json diff --git a/global.json b/global.json index ae345495..2c5832ca 100644 --- a/global.json +++ b/global.json @@ -1,3 +1,6 @@ { - "projects": [ "Discord.Net/src", "src" ] + "projects": [ "Discord.Net/src", "src" ], + "sdk": { + "version": "1.0.0-preview2-1-003177" + } } diff --git a/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaGame.cs b/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaGame.cs index 18e46fa5..3bfb8b1a 100644 --- a/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaGame.cs +++ b/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaGame.cs @@ -25,6 +25,7 @@ namespace NadekoBot.Modules.Games.Trivia private int questionDurationMiliseconds { get; } = 30000; private int hintTimeoutMiliseconds { get; } = 6000; public bool ShowHints { get; } + public bool IsPokemon { get; } private CancellationTokenSource triviaCancelSource { get; set; } public TriviaQuestion CurrentQuestion { get; private set; } @@ -37,7 +38,7 @@ namespace NadekoBot.Modules.Games.Trivia public int WinRequirement { get; } - public TriviaGame(IGuild guild, ITextChannel channel, bool showHints, int winReq) + public TriviaGame(IGuild guild, ITextChannel channel, bool showHints, int winReq, bool isPokemon) { _log = LogManager.GetCurrentClassLogger(); @@ -45,6 +46,7 @@ namespace NadekoBot.Modules.Games.Trivia Guild = guild; Channel = channel; WinRequirement = winReq; + IsPokemon = isPokemon; } private string GetText(string key, params object[] replacements) => @@ -61,7 +63,7 @@ namespace NadekoBot.Modules.Games.Trivia triviaCancelSource = new CancellationTokenSource(); // load question - CurrentQuestion = TriviaQuestionPool.Instance.GetRandomQuestion(OldQuestions); + CurrentQuestion = TriviaQuestionPool.Instance.GetRandomQuestion(OldQuestions, IsPokemon); if (string.IsNullOrWhiteSpace(CurrentQuestion?.Answer) || string.IsNullOrWhiteSpace(CurrentQuestion.Question)) { await Channel.SendErrorAsync(GetText("trivia_game"), GetText("failed_loading_question")).ConfigureAwait(false); @@ -76,7 +78,8 @@ namespace NadekoBot.Modules.Games.Trivia questionEmbed = new EmbedBuilder().WithOkColor() .WithTitle(GetText("trivia_game")) .AddField(eab => eab.WithName(GetText("category")).WithValue(CurrentQuestion.Category)) - .AddField(eab => eab.WithName(GetText("question")).WithValue(CurrentQuestion.Question)); + .AddField(eab => eab.WithName(GetText("question")).WithValue(CurrentQuestion.Question)) + .WithImageUrl(CurrentQuestion.ImageUrl); questionMessage = await Channel.EmbedAsync(questionEmbed).ConfigureAwait(false); } @@ -128,7 +131,19 @@ namespace NadekoBot.Modules.Games.Trivia NadekoBot.Client.MessageReceived -= PotentialGuess; } if (!triviaCancelSource.IsCancellationRequested) - try { await Channel.SendErrorAsync(GetText("trivia_game"), GetText("trivia_times_up", Format.Bold(CurrentQuestion.Answer))).ConfigureAwait(false); } catch (Exception ex) { _log.Warn(ex); } + { + try + { + await Channel.EmbedAsync(new EmbedBuilder().WithErrorColor() + .WithTitle(GetText("trivia_game")) + .WithDescription(GetText("trivia_times_up", Format.Bold(CurrentQuestion.Answer)))) + .ConfigureAwait(false); + } + catch (Exception ex) + { + _log.Warn(ex); + } + } await Task.Delay(2000).ConfigureAwait(false); } } @@ -186,10 +201,13 @@ namespace NadekoBot.Modules.Games.Trivia ShouldStopGame = true; try { - await Channel.SendConfirmAsync(GetText("trivia_game"), - GetText("trivia_win", + await Channel.EmbedAsync(new EmbedBuilder().WithOkColor() + .WithTitle(GetText("trivia_game")) + .WithDescription(GetText("trivia_win", guildUser.Mention, - Format.Bold(CurrentQuestion.Answer))).ConfigureAwait(false); + Format.Bold(CurrentQuestion.Answer))) + .WithImageUrl(CurrentQuestion.AnswerImageUrl)) + .ConfigureAwait(false); } catch { @@ -200,9 +218,12 @@ namespace NadekoBot.Modules.Games.Trivia await CurrencyHandler.AddCurrencyAsync(guildUser, "Won trivia", reward, true).ConfigureAwait(false); return; } - await Channel.SendConfirmAsync(GetText("trivia_game"), - GetText("trivia_guess", guildUser.Mention, Format.Bold(CurrentQuestion.Answer))).ConfigureAwait(false); + await Channel.EmbedAsync(new EmbedBuilder().WithOkColor() + .WithTitle(GetText("trivia_game")) + .WithDescription(GetText("trivia_guess", guildUser.Mention, Format.Bold(CurrentQuestion.Answer))) + .WithImageUrl(CurrentQuestion.AnswerImageUrl)) + .ConfigureAwait(false); } catch (Exception ex) { _log.Warn(ex); } } diff --git a/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestion.cs b/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestion.cs index d9c908a8..01e676fd 100644 --- a/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestion.cs +++ b/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestion.cs @@ -20,13 +20,17 @@ namespace NadekoBot.Modules.Games.Trivia public string Category { get; set; } public string Question { get; set; } + public string ImageUrl { get; set; } + public string AnswerImageUrl { get; set; } public string Answer { get; set; } - public TriviaQuestion(string q, string a, string c) + public TriviaQuestion(string q, string a, string c, string img = null, string answerImage = null) { this.Question = q; this.Answer = a; this.Category = c; + this.ImageUrl = img; + this.AnswerImageUrl = answerImage ?? img; } public string GetHint() => Scramble(Answer); diff --git a/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs b/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs index d85a15c1..854db99d 100644 --- a/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs +++ b/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs @@ -1,10 +1,9 @@ using NadekoBot.Extensions; using NadekoBot.Services; using Newtonsoft.Json; -using Newtonsoft.Json.Linq; using System; -using System.Collections.Concurrent; using System.Collections.Generic; +using System.Collections.Immutable; using System.IO; using System.Linq; @@ -12,27 +11,50 @@ namespace NadekoBot.Modules.Games.Trivia { public class TriviaQuestionPool { + public class PokemonNameId + { + public int Id { get; set; } + public string Name { get; set; } + } + private static TriviaQuestionPool _instance; public static TriviaQuestionPool Instance { get; } = _instance ?? (_instance = new TriviaQuestionPool()); private const string questionsFile = "data/trivia_questions.json"; + private const string pokemonMapPath = "data/pokemon/name-id_map.json"; + private readonly int maxPokemonId; private Random rng { get; } = new NadekoRandom(); private TriviaQuestion[] pool { get; } + private ImmutableDictionary map { get; } static TriviaQuestionPool() { } private TriviaQuestionPool() { pool = JsonConvert.DeserializeObject(File.ReadAllText(questionsFile)); + map = JsonConvert.DeserializeObject(File.ReadAllText(pokemonMapPath)) + .ToDictionary(x => x.Id, x => x.Name) + .ToImmutableDictionary(); + + maxPokemonId = 721; //xd } - public TriviaQuestion GetRandomQuestion(HashSet exclude) + public TriviaQuestion GetRandomQuestion(HashSet exclude, bool isPokemon) { if (pool.Length == 0) return null; + if (isPokemon) + { + var num = rng.Next(1, maxPokemonId + 1); + return new TriviaQuestion("Who's That Pokémon?", + map[num].ToTitleCase(), + "Pokemon", + $@"http://nadekobot.xyz/images/pokemon/shadows/{num}.png", + $@"http://nadekobot.xyz/images/pokemon/real/{num}.png"); + } TriviaQuestion randomQuestion; while (exclude.Contains(randomQuestion = pool[rng.Next(0, pool.Length)])) ; diff --git a/src/NadekoBot/Modules/Games/Commands/TriviaCommands.cs b/src/NadekoBot/Modules/Games/Commands/TriviaCommands.cs index 60dc4216..c8bd3e73 100644 --- a/src/NadekoBot/Modules/Games/Commands/TriviaCommands.cs +++ b/src/NadekoBot/Modules/Games/Commands/TriviaCommands.cs @@ -19,17 +19,21 @@ namespace NadekoBot.Modules.Games [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] public Task Trivia([Remainder] string additionalArgs = "") - => Trivia(10, additionalArgs); + => InternalTrivia(10, additionalArgs); [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] - public async Task Trivia(int winReq = 10, [Remainder] string additionalArgs = "") + public Task Trivia(int winReq = 10, [Remainder] string additionalArgs = "") + => InternalTrivia(winReq, additionalArgs); + + public async Task InternalTrivia(int winReq, string additionalArgs = "") { var channel = (ITextChannel)Context.Channel; var showHints = !additionalArgs.Contains("nohint"); + var isPokemon = additionalArgs.Contains("pokemon"); - var trivia = new TriviaGame(channel.Guild, channel, showHints, winReq); + var trivia = new TriviaGame(channel.Guild, channel, showHints, winReq, isPokemon); if (RunningTrivias.TryAdd(channel.Guild.Id, trivia)) { try @@ -41,9 +45,9 @@ namespace NadekoBot.Modules.Games RunningTrivias.TryRemove(channel.Guild.Id, out trivia); await trivia.EnsureStopped().ConfigureAwait(false); } - return; + return; } - + await Context.Channel.SendErrorAsync(GetText("trivia_already_running") + "\n" + trivia.CurrentQuestion) .ConfigureAwait(false); } diff --git a/src/NadekoBot/data/pokemon/name-id_map.json b/src/NadekoBot/data/pokemon/name-id_map.json new file mode 100644 index 00000000..334a2380 --- /dev/null +++ b/src/NadekoBot/data/pokemon/name-id_map.json @@ -0,0 +1,3246 @@ +[ + { + "Id": 1, + "Name": "bulbasaur" + }, + { + "Id": 2, + "Name": "ivysaur" + }, + { + "Id": 3, + "Name": "venusaur" + }, + { + "Id": 4, + "Name": "charmander" + }, + { + "Id": 5, + "Name": "charmeleon" + }, + { + "Id": 6, + "Name": "charizard" + }, + { + "Id": 7, + "Name": "squirtle" + }, + { + "Id": 8, + "Name": "wartortle" + }, + { + "Id": 9, + "Name": "blastoise" + }, + { + "Id": 10, + "Name": "caterpie" + }, + { + "Id": 11, + "Name": "metapod" + }, + { + "Id": 12, + "Name": "butterfree" + }, + { + "Id": 13, + "Name": "weedle" + }, + { + "Id": 14, + "Name": "kakuna" + }, + { + "Id": 15, + "Name": "beedrill" + }, + { + "Id": 16, + "Name": "pidgey" + }, + { + "Id": 17, + "Name": "pidgeotto" + }, + { + "Id": 18, + "Name": "pidgeot" + }, + { + "Id": 19, + "Name": "rattata" + }, + { + "Id": 20, + "Name": "raticate" + }, + { + "Id": 21, + "Name": "spearow" + }, + { + "Id": 22, + "Name": "fearow" + }, + { + "Id": 23, + "Name": "ekans" + }, + { + "Id": 24, + "Name": "arbok" + }, + { + "Id": 25, + "Name": "pikachu" + }, + { + "Id": 26, + "Name": "raichu" + }, + { + "Id": 27, + "Name": "sandshrew" + }, + { + "Id": 28, + "Name": "sandslash" + }, + { + "Id": 29, + "Name": "nidoran" + }, + { + "Id": 30, + "Name": "nidorina" + }, + { + "Id": 31, + "Name": "nidoqueen" + }, + { + "Id": 32, + "Name": "nidoran" + }, + { + "Id": 33, + "Name": "nidorino" + }, + { + "Id": 34, + "Name": "nidoking" + }, + { + "Id": 35, + "Name": "clefairy" + }, + { + "Id": 36, + "Name": "clefable" + }, + { + "Id": 37, + "Name": "vulpix" + }, + { + "Id": 38, + "Name": "ninetales" + }, + { + "Id": 39, + "Name": "jigglypuff" + }, + { + "Id": 40, + "Name": "wigglytuff" + }, + { + "Id": 41, + "Name": "zubat" + }, + { + "Id": 42, + "Name": "golbat" + }, + { + "Id": 43, + "Name": "oddish" + }, + { + "Id": 44, + "Name": "gloom" + }, + { + "Id": 45, + "Name": "vileplume" + }, + { + "Id": 46, + "Name": "paras" + }, + { + "Id": 47, + "Name": "parasect" + }, + { + "Id": 48, + "Name": "venonat" + }, + { + "Id": 49, + "Name": "venomoth" + }, + { + "Id": 50, + "Name": "diglett" + }, + { + "Id": 51, + "Name": "dugtrio" + }, + { + "Id": 52, + "Name": "meowth" + }, + { + "Id": 53, + "Name": "persian" + }, + { + "Id": 54, + "Name": "psyduck" + }, + { + "Id": 55, + "Name": "golduck" + }, + { + "Id": 56, + "Name": "mankey" + }, + { + "Id": 57, + "Name": "primeape" + }, + { + "Id": 58, + "Name": "growlithe" + }, + { + "Id": 59, + "Name": "arcanine" + }, + { + "Id": 60, + "Name": "poliwag" + }, + { + "Id": 61, + "Name": "poliwhirl" + }, + { + "Id": 62, + "Name": "poliwrath" + }, + { + "Id": 63, + "Name": "abra" + }, + { + "Id": 64, + "Name": "kadabra" + }, + { + "Id": 65, + "Name": "alakazam" + }, + { + "Id": 66, + "Name": "machop" + }, + { + "Id": 67, + "Name": "machoke" + }, + { + "Id": 68, + "Name": "machamp" + }, + { + "Id": 69, + "Name": "bellsprout" + }, + { + "Id": 70, + "Name": "weepinbell" + }, + { + "Id": 71, + "Name": "victreebel" + }, + { + "Id": 72, + "Name": "tentacool" + }, + { + "Id": 73, + "Name": "tentacruel" + }, + { + "Id": 74, + "Name": "geodude" + }, + { + "Id": 75, + "Name": "graveler" + }, + { + "Id": 76, + "Name": "golem" + }, + { + "Id": 77, + "Name": "ponyta" + }, + { + "Id": 78, + "Name": "rapidash" + }, + { + "Id": 79, + "Name": "slowpoke" + }, + { + "Id": 80, + "Name": "slowbro" + }, + { + "Id": 81, + "Name": "magnemite" + }, + { + "Id": 82, + "Name": "magneton" + }, + { + "Id": 83, + "Name": "farfetchd" + }, + { + "Id": 84, + "Name": "doduo" + }, + { + "Id": 85, + "Name": "dodrio" + }, + { + "Id": 86, + "Name": "seel" + }, + { + "Id": 87, + "Name": "dewgong" + }, + { + "Id": 88, + "Name": "grimer" + }, + { + "Id": 89, + "Name": "muk" + }, + { + "Id": 90, + "Name": "shellder" + }, + { + "Id": 91, + "Name": "cloyster" + }, + { + "Id": 92, + "Name": "gastly" + }, + { + "Id": 93, + "Name": "haunter" + }, + { + "Id": 94, + "Name": "gengar" + }, + { + "Id": 95, + "Name": "onix" + }, + { + "Id": 96, + "Name": "drowzee" + }, + { + "Id": 97, + "Name": "hypno" + }, + { + "Id": 98, + "Name": "krabby" + }, + { + "Id": 99, + "Name": "kingler" + }, + { + "Id": 100, + "Name": "voltorb" + }, + { + "Id": 101, + "Name": "electrode" + }, + { + "Id": 102, + "Name": "exeggcute" + }, + { + "Id": 103, + "Name": "exeggutor" + }, + { + "Id": 104, + "Name": "cubone" + }, + { + "Id": 105, + "Name": "marowak" + }, + { + "Id": 106, + "Name": "hitmonlee" + }, + { + "Id": 107, + "Name": "hitmonchan" + }, + { + "Id": 108, + "Name": "lickitung" + }, + { + "Id": 109, + "Name": "koffing" + }, + { + "Id": 110, + "Name": "weezing" + }, + { + "Id": 111, + "Name": "rhyhorn" + }, + { + "Id": 112, + "Name": "rhydon" + }, + { + "Id": 113, + "Name": "chansey" + }, + { + "Id": 114, + "Name": "tangela" + }, + { + "Id": 115, + "Name": "kangaskhan" + }, + { + "Id": 116, + "Name": "horsea" + }, + { + "Id": 117, + "Name": "seadra" + }, + { + "Id": 118, + "Name": "goldeen" + }, + { + "Id": 119, + "Name": "seaking" + }, + { + "Id": 120, + "Name": "staryu" + }, + { + "Id": 121, + "Name": "starmie" + }, + { + "Id": 122, + "Name": "mr" + }, + { + "Id": 123, + "Name": "scyther" + }, + { + "Id": 124, + "Name": "jynx" + }, + { + "Id": 125, + "Name": "electabuzz" + }, + { + "Id": 126, + "Name": "magmar" + }, + { + "Id": 127, + "Name": "pinsir" + }, + { + "Id": 128, + "Name": "tauros" + }, + { + "Id": 129, + "Name": "magikarp" + }, + { + "Id": 130, + "Name": "gyarados" + }, + { + "Id": 131, + "Name": "lapras" + }, + { + "Id": 132, + "Name": "ditto" + }, + { + "Id": 133, + "Name": "eevee" + }, + { + "Id": 134, + "Name": "vaporeon" + }, + { + "Id": 135, + "Name": "jolteon" + }, + { + "Id": 136, + "Name": "flareon" + }, + { + "Id": 137, + "Name": "porygon" + }, + { + "Id": 138, + "Name": "omanyte" + }, + { + "Id": 139, + "Name": "omastar" + }, + { + "Id": 140, + "Name": "kabuto" + }, + { + "Id": 141, + "Name": "kabutops" + }, + { + "Id": 142, + "Name": "aerodactyl" + }, + { + "Id": 143, + "Name": "snorlax" + }, + { + "Id": 144, + "Name": "articuno" + }, + { + "Id": 145, + "Name": "zapdos" + }, + { + "Id": 146, + "Name": "moltres" + }, + { + "Id": 147, + "Name": "dratini" + }, + { + "Id": 148, + "Name": "dragonair" + }, + { + "Id": 149, + "Name": "dragonite" + }, + { + "Id": 150, + "Name": "mewtwo" + }, + { + "Id": 151, + "Name": "mew" + }, + { + "Id": 152, + "Name": "chikorita" + }, + { + "Id": 153, + "Name": "bayleef" + }, + { + "Id": 154, + "Name": "meganium" + }, + { + "Id": 155, + "Name": "cyndaquil" + }, + { + "Id": 156, + "Name": "quilava" + }, + { + "Id": 157, + "Name": "typhlosion" + }, + { + "Id": 158, + "Name": "totodile" + }, + { + "Id": 159, + "Name": "croconaw" + }, + { + "Id": 160, + "Name": "feraligatr" + }, + { + "Id": 161, + "Name": "sentret" + }, + { + "Id": 162, + "Name": "furret" + }, + { + "Id": 163, + "Name": "hoothoot" + }, + { + "Id": 164, + "Name": "noctowl" + }, + { + "Id": 165, + "Name": "ledyba" + }, + { + "Id": 166, + "Name": "ledian" + }, + { + "Id": 167, + "Name": "spinarak" + }, + { + "Id": 168, + "Name": "ariados" + }, + { + "Id": 169, + "Name": "crobat" + }, + { + "Id": 170, + "Name": "chinchou" + }, + { + "Id": 171, + "Name": "lanturn" + }, + { + "Id": 172, + "Name": "pichu" + }, + { + "Id": 173, + "Name": "cleffa" + }, + { + "Id": 174, + "Name": "igglybuff" + }, + { + "Id": 175, + "Name": "togepi" + }, + { + "Id": 176, + "Name": "togetic" + }, + { + "Id": 177, + "Name": "natu" + }, + { + "Id": 178, + "Name": "xatu" + }, + { + "Id": 179, + "Name": "mareep" + }, + { + "Id": 180, + "Name": "flaaffy" + }, + { + "Id": 181, + "Name": "ampharos" + }, + { + "Id": 182, + "Name": "bellossom" + }, + { + "Id": 183, + "Name": "marill" + }, + { + "Id": 184, + "Name": "azumarill" + }, + { + "Id": 185, + "Name": "sudowoodo" + }, + { + "Id": 186, + "Name": "politoed" + }, + { + "Id": 187, + "Name": "hoppip" + }, + { + "Id": 188, + "Name": "skiploom" + }, + { + "Id": 189, + "Name": "jumpluff" + }, + { + "Id": 190, + "Name": "aipom" + }, + { + "Id": 191, + "Name": "sunkern" + }, + { + "Id": 192, + "Name": "sunflora" + }, + { + "Id": 193, + "Name": "yanma" + }, + { + "Id": 194, + "Name": "wooper" + }, + { + "Id": 195, + "Name": "quagsire" + }, + { + "Id": 196, + "Name": "espeon" + }, + { + "Id": 197, + "Name": "umbreon" + }, + { + "Id": 198, + "Name": "murkrow" + }, + { + "Id": 199, + "Name": "slowking" + }, + { + "Id": 200, + "Name": "misdreavus" + }, + { + "Id": 201, + "Name": "unown" + }, + { + "Id": 202, + "Name": "wobbuffet" + }, + { + "Id": 203, + "Name": "girafarig" + }, + { + "Id": 204, + "Name": "pineco" + }, + { + "Id": 205, + "Name": "forretress" + }, + { + "Id": 206, + "Name": "dunsparce" + }, + { + "Id": 207, + "Name": "gligar" + }, + { + "Id": 208, + "Name": "steelix" + }, + { + "Id": 209, + "Name": "snubbull" + }, + { + "Id": 210, + "Name": "granbull" + }, + { + "Id": 211, + "Name": "qwilfish" + }, + { + "Id": 212, + "Name": "scizor" + }, + { + "Id": 213, + "Name": "shuckle" + }, + { + "Id": 214, + "Name": "heracross" + }, + { + "Id": 215, + "Name": "sneasel" + }, + { + "Id": 216, + "Name": "teddiursa" + }, + { + "Id": 217, + "Name": "ursaring" + }, + { + "Id": 218, + "Name": "slugma" + }, + { + "Id": 219, + "Name": "magcargo" + }, + { + "Id": 220, + "Name": "swinub" + }, + { + "Id": 221, + "Name": "piloswine" + }, + { + "Id": 222, + "Name": "corsola" + }, + { + "Id": 223, + "Name": "remoraid" + }, + { + "Id": 224, + "Name": "octillery" + }, + { + "Id": 225, + "Name": "delibird" + }, + { + "Id": 226, + "Name": "mantine" + }, + { + "Id": 227, + "Name": "skarmory" + }, + { + "Id": 228, + "Name": "houndour" + }, + { + "Id": 229, + "Name": "houndoom" + }, + { + "Id": 230, + "Name": "kingdra" + }, + { + "Id": 231, + "Name": "phanpy" + }, + { + "Id": 232, + "Name": "donphan" + }, + { + "Id": 233, + "Name": "porygon2" + }, + { + "Id": 234, + "Name": "stantler" + }, + { + "Id": 235, + "Name": "smeargle" + }, + { + "Id": 236, + "Name": "tyrogue" + }, + { + "Id": 237, + "Name": "hitmontop" + }, + { + "Id": 238, + "Name": "smoochum" + }, + { + "Id": 239, + "Name": "elekid" + }, + { + "Id": 240, + "Name": "magby" + }, + { + "Id": 241, + "Name": "miltank" + }, + { + "Id": 242, + "Name": "blissey" + }, + { + "Id": 243, + "Name": "raikou" + }, + { + "Id": 244, + "Name": "entei" + }, + { + "Id": 245, + "Name": "suicune" + }, + { + "Id": 246, + "Name": "larvitar" + }, + { + "Id": 247, + "Name": "pupitar" + }, + { + "Id": 248, + "Name": "tyranitar" + }, + { + "Id": 249, + "Name": "lugia" + }, + { + "Id": 250, + "Name": "ho" + }, + { + "Id": 251, + "Name": "celebi" + }, + { + "Id": 252, + "Name": "treecko" + }, + { + "Id": 253, + "Name": "grovyle" + }, + { + "Id": 254, + "Name": "sceptile" + }, + { + "Id": 255, + "Name": "torchic" + }, + { + "Id": 256, + "Name": "combusken" + }, + { + "Id": 257, + "Name": "blaziken" + }, + { + "Id": 258, + "Name": "mudkip" + }, + { + "Id": 259, + "Name": "marshtomp" + }, + { + "Id": 260, + "Name": "swampert" + }, + { + "Id": 261, + "Name": "poochyena" + }, + { + "Id": 262, + "Name": "mightyena" + }, + { + "Id": 263, + "Name": "zigzagoon" + }, + { + "Id": 264, + "Name": "linoone" + }, + { + "Id": 265, + "Name": "wurmple" + }, + { + "Id": 266, + "Name": "silcoon" + }, + { + "Id": 267, + "Name": "beautifly" + }, + { + "Id": 268, + "Name": "cascoon" + }, + { + "Id": 269, + "Name": "dustox" + }, + { + "Id": 270, + "Name": "lotad" + }, + { + "Id": 271, + "Name": "lombre" + }, + { + "Id": 272, + "Name": "ludicolo" + }, + { + "Id": 273, + "Name": "seedot" + }, + { + "Id": 274, + "Name": "nuzleaf" + }, + { + "Id": 275, + "Name": "shiftry" + }, + { + "Id": 276, + "Name": "taillow" + }, + { + "Id": 277, + "Name": "swellow" + }, + { + "Id": 278, + "Name": "wingull" + }, + { + "Id": 279, + "Name": "pelipper" + }, + { + "Id": 280, + "Name": "ralts" + }, + { + "Id": 281, + "Name": "kirlia" + }, + { + "Id": 282, + "Name": "gardevoir" + }, + { + "Id": 283, + "Name": "surskit" + }, + { + "Id": 284, + "Name": "masquerain" + }, + { + "Id": 285, + "Name": "shroomish" + }, + { + "Id": 286, + "Name": "breloom" + }, + { + "Id": 287, + "Name": "slakoth" + }, + { + "Id": 288, + "Name": "vigoroth" + }, + { + "Id": 289, + "Name": "slaking" + }, + { + "Id": 290, + "Name": "nincada" + }, + { + "Id": 291, + "Name": "ninjask" + }, + { + "Id": 292, + "Name": "shedinja" + }, + { + "Id": 293, + "Name": "whismur" + }, + { + "Id": 294, + "Name": "loudred" + }, + { + "Id": 295, + "Name": "exploud" + }, + { + "Id": 296, + "Name": "makuhita" + }, + { + "Id": 297, + "Name": "hariyama" + }, + { + "Id": 298, + "Name": "azurill" + }, + { + "Id": 299, + "Name": "nosepass" + }, + { + "Id": 300, + "Name": "skitty" + }, + { + "Id": 301, + "Name": "delcatty" + }, + { + "Id": 302, + "Name": "sableye" + }, + { + "Id": 303, + "Name": "mawile" + }, + { + "Id": 304, + "Name": "aron" + }, + { + "Id": 305, + "Name": "lairon" + }, + { + "Id": 306, + "Name": "aggron" + }, + { + "Id": 307, + "Name": "meditite" + }, + { + "Id": 308, + "Name": "medicham" + }, + { + "Id": 309, + "Name": "electrike" + }, + { + "Id": 310, + "Name": "manectric" + }, + { + "Id": 311, + "Name": "plusle" + }, + { + "Id": 312, + "Name": "minun" + }, + { + "Id": 313, + "Name": "volbeat" + }, + { + "Id": 314, + "Name": "illumise" + }, + { + "Id": 315, + "Name": "roselia" + }, + { + "Id": 316, + "Name": "gulpin" + }, + { + "Id": 317, + "Name": "swalot" + }, + { + "Id": 318, + "Name": "carvanha" + }, + { + "Id": 319, + "Name": "sharpedo" + }, + { + "Id": 320, + "Name": "wailmer" + }, + { + "Id": 321, + "Name": "wailord" + }, + { + "Id": 322, + "Name": "numel" + }, + { + "Id": 323, + "Name": "camerupt" + }, + { + "Id": 324, + "Name": "torkoal" + }, + { + "Id": 325, + "Name": "spoink" + }, + { + "Id": 326, + "Name": "grumpig" + }, + { + "Id": 327, + "Name": "spinda" + }, + { + "Id": 328, + "Name": "trapinch" + }, + { + "Id": 329, + "Name": "vibrava" + }, + { + "Id": 330, + "Name": "flygon" + }, + { + "Id": 331, + "Name": "cacnea" + }, + { + "Id": 332, + "Name": "cacturne" + }, + { + "Id": 333, + "Name": "swablu" + }, + { + "Id": 334, + "Name": "altaria" + }, + { + "Id": 335, + "Name": "zangoose" + }, + { + "Id": 336, + "Name": "seviper" + }, + { + "Id": 337, + "Name": "lunatone" + }, + { + "Id": 338, + "Name": "solrock" + }, + { + "Id": 339, + "Name": "barboach" + }, + { + "Id": 340, + "Name": "whiscash" + }, + { + "Id": 341, + "Name": "corphish" + }, + { + "Id": 342, + "Name": "crawdaunt" + }, + { + "Id": 343, + "Name": "baltoy" + }, + { + "Id": 344, + "Name": "claydol" + }, + { + "Id": 345, + "Name": "lileep" + }, + { + "Id": 346, + "Name": "cradily" + }, + { + "Id": 347, + "Name": "anorith" + }, + { + "Id": 348, + "Name": "armaldo" + }, + { + "Id": 349, + "Name": "feebas" + }, + { + "Id": 350, + "Name": "milotic" + }, + { + "Id": 351, + "Name": "castform" + }, + { + "Id": 352, + "Name": "kecleon" + }, + { + "Id": 353, + "Name": "shuppet" + }, + { + "Id": 354, + "Name": "banette" + }, + { + "Id": 355, + "Name": "duskull" + }, + { + "Id": 356, + "Name": "dusclops" + }, + { + "Id": 357, + "Name": "tropius" + }, + { + "Id": 358, + "Name": "chimecho" + }, + { + "Id": 359, + "Name": "absol" + }, + { + "Id": 360, + "Name": "wynaut" + }, + { + "Id": 361, + "Name": "snorunt" + }, + { + "Id": 362, + "Name": "glalie" + }, + { + "Id": 363, + "Name": "spheal" + }, + { + "Id": 364, + "Name": "sealeo" + }, + { + "Id": 365, + "Name": "walrein" + }, + { + "Id": 366, + "Name": "clamperl" + }, + { + "Id": 367, + "Name": "huntail" + }, + { + "Id": 368, + "Name": "gorebyss" + }, + { + "Id": 369, + "Name": "relicanth" + }, + { + "Id": 370, + "Name": "luvdisc" + }, + { + "Id": 371, + "Name": "bagon" + }, + { + "Id": 372, + "Name": "shelgon" + }, + { + "Id": 373, + "Name": "salamence" + }, + { + "Id": 374, + "Name": "beldum" + }, + { + "Id": 375, + "Name": "metang" + }, + { + "Id": 376, + "Name": "metagross" + }, + { + "Id": 377, + "Name": "regirock" + }, + { + "Id": 378, + "Name": "regice" + }, + { + "Id": 379, + "Name": "registeel" + }, + { + "Id": 380, + "Name": "latias" + }, + { + "Id": 381, + "Name": "latios" + }, + { + "Id": 382, + "Name": "kyogre" + }, + { + "Id": 383, + "Name": "groudon" + }, + { + "Id": 384, + "Name": "rayquaza" + }, + { + "Id": 385, + "Name": "jirachi" + }, + { + "Id": 386, + "Name": "deoxys" + }, + { + "Id": 387, + "Name": "turtwig" + }, + { + "Id": 388, + "Name": "grotle" + }, + { + "Id": 389, + "Name": "torterra" + }, + { + "Id": 390, + "Name": "chimchar" + }, + { + "Id": 391, + "Name": "monferno" + }, + { + "Id": 392, + "Name": "infernape" + }, + { + "Id": 393, + "Name": "piplup" + }, + { + "Id": 394, + "Name": "prinplup" + }, + { + "Id": 395, + "Name": "empoleon" + }, + { + "Id": 396, + "Name": "starly" + }, + { + "Id": 397, + "Name": "staravia" + }, + { + "Id": 398, + "Name": "staraptor" + }, + { + "Id": 399, + "Name": "bidoof" + }, + { + "Id": 400, + "Name": "bibarel" + }, + { + "Id": 401, + "Name": "kricketot" + }, + { + "Id": 402, + "Name": "kricketune" + }, + { + "Id": 403, + "Name": "shinx" + }, + { + "Id": 404, + "Name": "luxio" + }, + { + "Id": 405, + "Name": "luxray" + }, + { + "Id": 406, + "Name": "budew" + }, + { + "Id": 407, + "Name": "roserade" + }, + { + "Id": 408, + "Name": "cranidos" + }, + { + "Id": 409, + "Name": "rampardos" + }, + { + "Id": 410, + "Name": "shieldon" + }, + { + "Id": 411, + "Name": "bastiodon" + }, + { + "Id": 412, + "Name": "burmy" + }, + { + "Id": 413, + "Name": "wormadam" + }, + { + "Id": 414, + "Name": "mothim" + }, + { + "Id": 415, + "Name": "combee" + }, + { + "Id": 416, + "Name": "vespiquen" + }, + { + "Id": 417, + "Name": "pachirisu" + }, + { + "Id": 418, + "Name": "buizel" + }, + { + "Id": 419, + "Name": "floatzel" + }, + { + "Id": 420, + "Name": "cherubi" + }, + { + "Id": 421, + "Name": "cherrim" + }, + { + "Id": 422, + "Name": "shellos" + }, + { + "Id": 423, + "Name": "gastrodon" + }, + { + "Id": 424, + "Name": "ambipom" + }, + { + "Id": 425, + "Name": "drifloon" + }, + { + "Id": 426, + "Name": "drifblim" + }, + { + "Id": 427, + "Name": "buneary" + }, + { + "Id": 428, + "Name": "lopunny" + }, + { + "Id": 429, + "Name": "mismagius" + }, + { + "Id": 430, + "Name": "honchkrow" + }, + { + "Id": 431, + "Name": "glameow" + }, + { + "Id": 432, + "Name": "purugly" + }, + { + "Id": 433, + "Name": "chingling" + }, + { + "Id": 434, + "Name": "stunky" + }, + { + "Id": 435, + "Name": "skuntank" + }, + { + "Id": 436, + "Name": "bronzor" + }, + { + "Id": 437, + "Name": "bronzong" + }, + { + "Id": 438, + "Name": "bonsly" + }, + { + "Id": 439, + "Name": "mime" + }, + { + "Id": 440, + "Name": "happiny" + }, + { + "Id": 441, + "Name": "chatot" + }, + { + "Id": 442, + "Name": "spiritomb" + }, + { + "Id": 443, + "Name": "gible" + }, + { + "Id": 444, + "Name": "gabite" + }, + { + "Id": 445, + "Name": "garchomp" + }, + { + "Id": 446, + "Name": "munchlax" + }, + { + "Id": 447, + "Name": "riolu" + }, + { + "Id": 448, + "Name": "lucario" + }, + { + "Id": 449, + "Name": "hippopotas" + }, + { + "Id": 450, + "Name": "hippowdon" + }, + { + "Id": 451, + "Name": "skorupi" + }, + { + "Id": 452, + "Name": "drapion" + }, + { + "Id": 453, + "Name": "croagunk" + }, + { + "Id": 454, + "Name": "toxicroak" + }, + { + "Id": 455, + "Name": "carnivine" + }, + { + "Id": 456, + "Name": "finneon" + }, + { + "Id": 457, + "Name": "lumineon" + }, + { + "Id": 458, + "Name": "mantyke" + }, + { + "Id": 459, + "Name": "snover" + }, + { + "Id": 460, + "Name": "abomasnow" + }, + { + "Id": 461, + "Name": "weavile" + }, + { + "Id": 462, + "Name": "magnezone" + }, + { + "Id": 463, + "Name": "lickilicky" + }, + { + "Id": 464, + "Name": "rhyperior" + }, + { + "Id": 465, + "Name": "tangrowth" + }, + { + "Id": 466, + "Name": "electivire" + }, + { + "Id": 467, + "Name": "magmortar" + }, + { + "Id": 468, + "Name": "togekiss" + }, + { + "Id": 469, + "Name": "yanmega" + }, + { + "Id": 470, + "Name": "leafeon" + }, + { + "Id": 471, + "Name": "glaceon" + }, + { + "Id": 472, + "Name": "gliscor" + }, + { + "Id": 473, + "Name": "mamoswine" + }, + { + "Id": 474, + "Name": "porygon" + }, + { + "Id": 475, + "Name": "gallade" + }, + { + "Id": 476, + "Name": "probopass" + }, + { + "Id": 477, + "Name": "dusknoir" + }, + { + "Id": 478, + "Name": "froslass" + }, + { + "Id": 479, + "Name": "rotom" + }, + { + "Id": 480, + "Name": "uxie" + }, + { + "Id": 481, + "Name": "mesprit" + }, + { + "Id": 482, + "Name": "azelf" + }, + { + "Id": 483, + "Name": "dialga" + }, + { + "Id": 484, + "Name": "palkia" + }, + { + "Id": 485, + "Name": "heatran" + }, + { + "Id": 486, + "Name": "regigigas" + }, + { + "Id": 487, + "Name": "giratina" + }, + { + "Id": 488, + "Name": "cresselia" + }, + { + "Id": 489, + "Name": "phione" + }, + { + "Id": 490, + "Name": "manaphy" + }, + { + "Id": 491, + "Name": "darkrai" + }, + { + "Id": 492, + "Name": "shaymin" + }, + { + "Id": 493, + "Name": "arceus" + }, + { + "Id": 494, + "Name": "victini" + }, + { + "Id": 495, + "Name": "snivy" + }, + { + "Id": 496, + "Name": "servine" + }, + { + "Id": 497, + "Name": "serperior" + }, + { + "Id": 498, + "Name": "tepig" + }, + { + "Id": 499, + "Name": "pignite" + }, + { + "Id": 500, + "Name": "emboar" + }, + { + "Id": 501, + "Name": "oshawott" + }, + { + "Id": 502, + "Name": "dewott" + }, + { + "Id": 503, + "Name": "samurott" + }, + { + "Id": 504, + "Name": "patrat" + }, + { + "Id": 505, + "Name": "watchog" + }, + { + "Id": 506, + "Name": "lillipup" + }, + { + "Id": 507, + "Name": "herdier" + }, + { + "Id": 508, + "Name": "stoutland" + }, + { + "Id": 509, + "Name": "purrloin" + }, + { + "Id": 510, + "Name": "liepard" + }, + { + "Id": 511, + "Name": "pansage" + }, + { + "Id": 512, + "Name": "simisage" + }, + { + "Id": 513, + "Name": "pansear" + }, + { + "Id": 514, + "Name": "simisear" + }, + { + "Id": 515, + "Name": "panpour" + }, + { + "Id": 516, + "Name": "simipour" + }, + { + "Id": 517, + "Name": "munna" + }, + { + "Id": 518, + "Name": "musharna" + }, + { + "Id": 519, + "Name": "pidove" + }, + { + "Id": 520, + "Name": "tranquill" + }, + { + "Id": 521, + "Name": "unfezant" + }, + { + "Id": 522, + "Name": "blitzle" + }, + { + "Id": 523, + "Name": "zebstrika" + }, + { + "Id": 524, + "Name": "roggenrola" + }, + { + "Id": 525, + "Name": "boldore" + }, + { + "Id": 526, + "Name": "gigalith" + }, + { + "Id": 527, + "Name": "woobat" + }, + { + "Id": 528, + "Name": "swoobat" + }, + { + "Id": 529, + "Name": "drilbur" + }, + { + "Id": 530, + "Name": "excadrill" + }, + { + "Id": 531, + "Name": "audino" + }, + { + "Id": 532, + "Name": "timburr" + }, + { + "Id": 533, + "Name": "gurdurr" + }, + { + "Id": 534, + "Name": "conkeldurr" + }, + { + "Id": 535, + "Name": "tympole" + }, + { + "Id": 536, + "Name": "palpitoad" + }, + { + "Id": 537, + "Name": "seismitoad" + }, + { + "Id": 538, + "Name": "throh" + }, + { + "Id": 539, + "Name": "sawk" + }, + { + "Id": 540, + "Name": "sewaddle" + }, + { + "Id": 541, + "Name": "swadloon" + }, + { + "Id": 542, + "Name": "leavanny" + }, + { + "Id": 543, + "Name": "venipede" + }, + { + "Id": 544, + "Name": "whirlipede" + }, + { + "Id": 545, + "Name": "scolipede" + }, + { + "Id": 546, + "Name": "cottonee" + }, + { + "Id": 547, + "Name": "whimsicott" + }, + { + "Id": 548, + "Name": "petilil" + }, + { + "Id": 549, + "Name": "lilligant" + }, + { + "Id": 550, + "Name": "basculin" + }, + { + "Id": 551, + "Name": "sandile" + }, + { + "Id": 552, + "Name": "krokorok" + }, + { + "Id": 553, + "Name": "krookodile" + }, + { + "Id": 554, + "Name": "darumaka" + }, + { + "Id": 555, + "Name": "darmanitan" + }, + { + "Id": 556, + "Name": "maractus" + }, + { + "Id": 557, + "Name": "dwebble" + }, + { + "Id": 558, + "Name": "crustle" + }, + { + "Id": 559, + "Name": "scraggy" + }, + { + "Id": 560, + "Name": "scrafty" + }, + { + "Id": 561, + "Name": "sigilyph" + }, + { + "Id": 562, + "Name": "yamask" + }, + { + "Id": 563, + "Name": "cofagrigus" + }, + { + "Id": 564, + "Name": "tirtouga" + }, + { + "Id": 565, + "Name": "carracosta" + }, + { + "Id": 566, + "Name": "archen" + }, + { + "Id": 567, + "Name": "archeops" + }, + { + "Id": 568, + "Name": "trubbish" + }, + { + "Id": 569, + "Name": "garbodor" + }, + { + "Id": 570, + "Name": "zorua" + }, + { + "Id": 571, + "Name": "zoroark" + }, + { + "Id": 572, + "Name": "minccino" + }, + { + "Id": 573, + "Name": "cinccino" + }, + { + "Id": 574, + "Name": "gothita" + }, + { + "Id": 575, + "Name": "gothorita" + }, + { + "Id": 576, + "Name": "gothitelle" + }, + { + "Id": 577, + "Name": "solosis" + }, + { + "Id": 578, + "Name": "duosion" + }, + { + "Id": 579, + "Name": "reuniclus" + }, + { + "Id": 580, + "Name": "ducklett" + }, + { + "Id": 581, + "Name": "swanna" + }, + { + "Id": 582, + "Name": "vanillite" + }, + { + "Id": 583, + "Name": "vanillish" + }, + { + "Id": 584, + "Name": "vanilluxe" + }, + { + "Id": 585, + "Name": "deerling" + }, + { + "Id": 586, + "Name": "sawsbuck" + }, + { + "Id": 587, + "Name": "emolga" + }, + { + "Id": 588, + "Name": "karrablast" + }, + { + "Id": 589, + "Name": "escavalier" + }, + { + "Id": 590, + "Name": "foongus" + }, + { + "Id": 591, + "Name": "amoonguss" + }, + { + "Id": 592, + "Name": "frillish" + }, + { + "Id": 593, + "Name": "jellicent" + }, + { + "Id": 594, + "Name": "alomomola" + }, + { + "Id": 595, + "Name": "joltik" + }, + { + "Id": 596, + "Name": "galvantula" + }, + { + "Id": 597, + "Name": "ferroseed" + }, + { + "Id": 598, + "Name": "ferrothorn" + }, + { + "Id": 599, + "Name": "klink" + }, + { + "Id": 600, + "Name": "klang" + }, + { + "Id": 601, + "Name": "klinklang" + }, + { + "Id": 602, + "Name": "tynamo" + }, + { + "Id": 603, + "Name": "eelektrik" + }, + { + "Id": 604, + "Name": "eelektross" + }, + { + "Id": 605, + "Name": "elgyem" + }, + { + "Id": 606, + "Name": "beheeyem" + }, + { + "Id": 607, + "Name": "litwick" + }, + { + "Id": 608, + "Name": "lampent" + }, + { + "Id": 609, + "Name": "chandelure" + }, + { + "Id": 610, + "Name": "axew" + }, + { + "Id": 611, + "Name": "fraxure" + }, + { + "Id": 612, + "Name": "haxorus" + }, + { + "Id": 613, + "Name": "cubchoo" + }, + { + "Id": 614, + "Name": "beartic" + }, + { + "Id": 615, + "Name": "cryogonal" + }, + { + "Id": 616, + "Name": "shelmet" + }, + { + "Id": 617, + "Name": "accelgor" + }, + { + "Id": 618, + "Name": "stunfisk" + }, + { + "Id": 619, + "Name": "mienfoo" + }, + { + "Id": 620, + "Name": "mienshao" + }, + { + "Id": 621, + "Name": "druddigon" + }, + { + "Id": 622, + "Name": "golett" + }, + { + "Id": 623, + "Name": "golurk" + }, + { + "Id": 624, + "Name": "pawniard" + }, + { + "Id": 625, + "Name": "bisharp" + }, + { + "Id": 626, + "Name": "bouffalant" + }, + { + "Id": 627, + "Name": "rufflet" + }, + { + "Id": 628, + "Name": "braviary" + }, + { + "Id": 629, + "Name": "vullaby" + }, + { + "Id": 630, + "Name": "mandibuzz" + }, + { + "Id": 631, + "Name": "heatmor" + }, + { + "Id": 632, + "Name": "durant" + }, + { + "Id": 633, + "Name": "deino" + }, + { + "Id": 634, + "Name": "zweilous" + }, + { + "Id": 635, + "Name": "hydreigon" + }, + { + "Id": 636, + "Name": "larvesta" + }, + { + "Id": 637, + "Name": "volcarona" + }, + { + "Id": 638, + "Name": "cobalion" + }, + { + "Id": 639, + "Name": "terrakion" + }, + { + "Id": 640, + "Name": "virizion" + }, + { + "Id": 641, + "Name": "tornadus" + }, + { + "Id": 642, + "Name": "thundurus" + }, + { + "Id": 643, + "Name": "reshiram" + }, + { + "Id": 644, + "Name": "zekrom" + }, + { + "Id": 645, + "Name": "landorus" + }, + { + "Id": 646, + "Name": "kyurem" + }, + { + "Id": 647, + "Name": "keldeo" + }, + { + "Id": 648, + "Name": "meloetta" + }, + { + "Id": 649, + "Name": "genesect" + }, + { + "Id": 650, + "Name": "chespin" + }, + { + "Id": 651, + "Name": "quilladin" + }, + { + "Id": 652, + "Name": "chesnaught" + }, + { + "Id": 653, + "Name": "fennekin" + }, + { + "Id": 654, + "Name": "braixen" + }, + { + "Id": 655, + "Name": "delphox" + }, + { + "Id": 656, + "Name": "froakie" + }, + { + "Id": 657, + "Name": "frogadier" + }, + { + "Id": 658, + "Name": "greninja" + }, + { + "Id": 659, + "Name": "bunnelby" + }, + { + "Id": 660, + "Name": "diggersby" + }, + { + "Id": 661, + "Name": "fletchling" + }, + { + "Id": 662, + "Name": "fletchinder" + }, + { + "Id": 663, + "Name": "talonflame" + }, + { + "Id": 664, + "Name": "scatterbug" + }, + { + "Id": 665, + "Name": "spewpa" + }, + { + "Id": 666, + "Name": "vivillon" + }, + { + "Id": 667, + "Name": "litleo" + }, + { + "Id": 668, + "Name": "pyroar" + }, + { + "Id": 669, + "Name": "flabebe" + }, + { + "Id": 670, + "Name": "floette" + }, + { + "Id": 671, + "Name": "florges" + }, + { + "Id": 672, + "Name": "skiddo" + }, + { + "Id": 673, + "Name": "gogoat" + }, + { + "Id": 674, + "Name": "pancham" + }, + { + "Id": 675, + "Name": "pangoro" + }, + { + "Id": 676, + "Name": "furfrou" + }, + { + "Id": 677, + "Name": "espurr" + }, + { + "Id": 678, + "Name": "meowstic" + }, + { + "Id": 679, + "Name": "honedge" + }, + { + "Id": 680, + "Name": "doublade" + }, + { + "Id": 681, + "Name": "aegislash" + }, + { + "Id": 682, + "Name": "spritzee" + }, + { + "Id": 683, + "Name": "aromatisse" + }, + { + "Id": 684, + "Name": "swirlix" + }, + { + "Id": 685, + "Name": "slurpuff" + }, + { + "Id": 686, + "Name": "inkay" + }, + { + "Id": 687, + "Name": "malamar" + }, + { + "Id": 688, + "Name": "binacle" + }, + { + "Id": 689, + "Name": "barbaracle" + }, + { + "Id": 690, + "Name": "skrelp" + }, + { + "Id": 691, + "Name": "dragalge" + }, + { + "Id": 692, + "Name": "clauncher" + }, + { + "Id": 693, + "Name": "clawitzer" + }, + { + "Id": 694, + "Name": "helioptile" + }, + { + "Id": 695, + "Name": "heliolisk" + }, + { + "Id": 696, + "Name": "tyrunt" + }, + { + "Id": 697, + "Name": "tyrantrum" + }, + { + "Id": 698, + "Name": "amaura" + }, + { + "Id": 699, + "Name": "aurorus" + }, + { + "Id": 700, + "Name": "sylveon" + }, + { + "Id": 701, + "Name": "hawlucha" + }, + { + "Id": 702, + "Name": "dedenne" + }, + { + "Id": 703, + "Name": "carbink" + }, + { + "Id": 704, + "Name": "goomy" + }, + { + "Id": 705, + "Name": "sliggoo" + }, + { + "Id": 706, + "Name": "goodra" + }, + { + "Id": 707, + "Name": "klefki" + }, + { + "Id": 708, + "Name": "phantump" + }, + { + "Id": 709, + "Name": "trevenant" + }, + { + "Id": 710, + "Name": "pumpkaboo" + }, + { + "Id": 711, + "Name": "gourgeist" + }, + { + "Id": 712, + "Name": "bergmite" + }, + { + "Id": 713, + "Name": "avalugg" + }, + { + "Id": 714, + "Name": "noibat" + }, + { + "Id": 715, + "Name": "noivern" + }, + { + "Id": 716, + "Name": "xerneas" + }, + { + "Id": 717, + "Name": "yveltal" + }, + { + "Id": 718, + "Name": "zygarde" + }, + { + "Id": 719, + "Name": "diancie" + }, + { + "Id": 720, + "Name": "hoopa" + }, + { + "Id": 721, + "Name": "volcanion" + }, + { + "Id": 10001, + "Name": "deoxys" + }, + { + "Id": 10002, + "Name": "deoxys" + }, + { + "Id": 10003, + "Name": "deoxys" + }, + { + "Id": 10004, + "Name": "wormadam" + }, + { + "Id": 10005, + "Name": "wormadam" + }, + { + "Id": 10006, + "Name": "shaymin" + }, + { + "Id": 10007, + "Name": "giratina" + }, + { + "Id": 10008, + "Name": "rotom" + }, + { + "Id": 10009, + "Name": "rotom" + }, + { + "Id": 10010, + "Name": "rotom" + }, + { + "Id": 10011, + "Name": "rotom" + }, + { + "Id": 10012, + "Name": "rotom" + }, + { + "Id": 10013, + "Name": "castform" + }, + { + "Id": 10014, + "Name": "castform" + }, + { + "Id": 10015, + "Name": "castform" + }, + { + "Id": 10016, + "Name": "basculin" + }, + { + "Id": 10017, + "Name": "darmanitan" + }, + { + "Id": 10018, + "Name": "meloetta" + }, + { + "Id": 10019, + "Name": "tornadus" + }, + { + "Id": 10020, + "Name": "thundurus" + }, + { + "Id": 10021, + "Name": "landorus" + }, + { + "Id": 10022, + "Name": "kyurem" + }, + { + "Id": 10023, + "Name": "kyurem" + }, + { + "Id": 10024, + "Name": "keldeo" + }, + { + "Id": 10025, + "Name": "meowstic" + }, + { + "Id": 10026, + "Name": "aegislash" + }, + { + "Id": 10027, + "Name": "pumpkaboo" + }, + { + "Id": 10028, + "Name": "pumpkaboo" + }, + { + "Id": 10029, + "Name": "pumpkaboo" + }, + { + "Id": 10030, + "Name": "gourgeist" + }, + { + "Id": 10031, + "Name": "gourgeist" + }, + { + "Id": 10032, + "Name": "gourgeist" + }, + { + "Id": 10033, + "Name": "venusaur" + }, + { + "Id": 10034, + "Name": "charizard" + }, + { + "Id": 10035, + "Name": "charizard" + }, + { + "Id": 10036, + "Name": "blastoise" + }, + { + "Id": 10037, + "Name": "alakazam" + }, + { + "Id": 10038, + "Name": "gengar" + }, + { + "Id": 10039, + "Name": "kangaskhan" + }, + { + "Id": 10040, + "Name": "pinsir" + }, + { + "Id": 10041, + "Name": "gyarados" + }, + { + "Id": 10042, + "Name": "aerodactyl" + }, + { + "Id": 10043, + "Name": "mewtwo" + }, + { + "Id": 10044, + "Name": "mewtwo" + }, + { + "Id": 10045, + "Name": "ampharos" + }, + { + "Id": 10046, + "Name": "scizor" + }, + { + "Id": 10047, + "Name": "heracross" + }, + { + "Id": 10048, + "Name": "houndoom" + }, + { + "Id": 10049, + "Name": "tyranitar" + }, + { + "Id": 10050, + "Name": "blaziken" + }, + { + "Id": 10051, + "Name": "gardevoir" + }, + { + "Id": 10052, + "Name": "mawile" + }, + { + "Id": 10053, + "Name": "aggron" + }, + { + "Id": 10054, + "Name": "medicham" + }, + { + "Id": 10055, + "Name": "manectric" + }, + { + "Id": 10056, + "Name": "banette" + }, + { + "Id": 10057, + "Name": "absol" + }, + { + "Id": 10058, + "Name": "garchomp" + }, + { + "Id": 10059, + "Name": "lucario" + }, + { + "Id": 10060, + "Name": "abomasnow" + }, + { + "Id": 10061, + "Name": "floette" + }, + { + "Id": 10062, + "Name": "latias" + }, + { + "Id": 10063, + "Name": "latios" + }, + { + "Id": 10064, + "Name": "swampert" + }, + { + "Id": 10065, + "Name": "sceptile" + }, + { + "Id": 10066, + "Name": "sableye" + }, + { + "Id": 10067, + "Name": "altaria" + }, + { + "Id": 10068, + "Name": "gallade" + }, + { + "Id": 10069, + "Name": "audino" + }, + { + "Id": 10070, + "Name": "sharpedo" + }, + { + "Id": 10071, + "Name": "slowbro" + }, + { + "Id": 10072, + "Name": "steelix" + }, + { + "Id": 10073, + "Name": "pidgeot" + }, + { + "Id": 10074, + "Name": "glalie" + }, + { + "Id": 10075, + "Name": "diancie" + }, + { + "Id": 10076, + "Name": "metagross" + }, + { + "Id": 10077, + "Name": "kyogre" + }, + { + "Id": 10078, + "Name": "groudon" + }, + { + "Id": 10079, + "Name": "rayquaza" + }, + { + "Id": 10080, + "Name": "pikachu" + }, + { + "Id": 10081, + "Name": "pikachu" + }, + { + "Id": 10082, + "Name": "pikachu" + }, + { + "Id": 10083, + "Name": "pikachu" + }, + { + "Id": 10084, + "Name": "pikachu" + }, + { + "Id": 10085, + "Name": "pikachu" + }, + { + "Id": 10086, + "Name": "hoopa" + }, + { + "Id": 10087, + "Name": "camerupt" + }, + { + "Id": 10088, + "Name": "lopunny" + }, + { + "Id": 10089, + "Name": "salamence" + }, + { + "Id": 10090, + "Name": "beedrill" + } +] \ No newline at end of file From dfbef6d16147d566708b61c4391234ddb4363e93 Mon Sep 17 00:00:00 2001 From: samvaio Date: Thu, 23 Mar 2017 23:29:22 +0530 Subject: [PATCH 346/496] Update README.md Markdown header needed some space :D --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cb00cdc9..ae4aa579 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@ [![nadeko1](https://cdn.discordapp.com/attachments/266240393639755778/281920134967328768/part2.png)](https://discordapp.com/oauth2/authorize?client_id=170254782546575360&scope=bot&permissions=66186303) [![nadeko2](https://cdn.discordapp.com/attachments/266240393639755778/281920161311883264/part3.png)](http://nadekobot.readthedocs.io/en/latest/Commands%20List/) -##For Update, Help and Guidelines +## For Updates, Help and Guidelines | [![twitter](https://cdn.discordapp.com/attachments/155726317222887425/252192520094613504/twiter_banner.JPG)](https://twitter.com/TheNadekoBot) | [![discord](https://cdn.discordapp.com/attachments/266240393639755778/281920766490968064/discord.png)](https://discord.gg/nadekobot) | [![Wiki](https://cdn.discordapp.com/attachments/266240393639755778/281920793330581506/datcord.png)](http://nadekobot.readthedocs.io/en/latest/) | --- | --- | --- | -| Follow me on Twitter for updates. | Join my Discord server if you need help. | Read the Docs for hosting guides. | \ No newline at end of file +| **Follow me on Twitter.** | **Join my Discord server for help.** | **Read the Docs for self-hosting.** | From a2ed4ac49bee66106d0cf5791014ac36655ccf52 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 24 Mar 2017 11:15:31 +0100 Subject: [PATCH 347/496] Fixed ;lp, thanks manuel --- src/NadekoBot/Modules/Permissions/Permissions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Permissions/Permissions.cs b/src/NadekoBot/Modules/Permissions/Permissions.cs index 2d21630d..ec0e1016 100644 --- a/src/NadekoBot/Modules/Permissions/Permissions.cs +++ b/src/NadekoBot/Modules/Permissions/Permissions.cs @@ -203,7 +203,7 @@ namespace NadekoBot.Modules.Permissions [RequireContext(ContextType.Guild)] public async Task ListPerms(int page = 1) { - if (page < 1 || page > 4) + if (page < 1) return; PermissionCache permCache; From 921725005c46c51e4412f2df62265ed9966da49b Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 24 Mar 2017 11:29:17 +0100 Subject: [PATCH 348/496] mr mime fix --- .../Commands/Trivia/TriviaQuestionPool.cs | 2 +- src/NadekoBot/data/pokemon/name-id_map2.json | 3246 +++++++++++++++++ 2 files changed, 3247 insertions(+), 1 deletion(-) create mode 100644 src/NadekoBot/data/pokemon/name-id_map2.json diff --git a/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs b/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs index 854db99d..cbad9815 100644 --- a/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs +++ b/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs @@ -21,7 +21,7 @@ namespace NadekoBot.Modules.Games.Trivia public static TriviaQuestionPool Instance { get; } = _instance ?? (_instance = new TriviaQuestionPool()); private const string questionsFile = "data/trivia_questions.json"; - private const string pokemonMapPath = "data/pokemon/name-id_map.json"; + private const string pokemonMapPath = "data/pokemon/name-id_map2.json"; private readonly int maxPokemonId; private Random rng { get; } = new NadekoRandom(); diff --git a/src/NadekoBot/data/pokemon/name-id_map2.json b/src/NadekoBot/data/pokemon/name-id_map2.json new file mode 100644 index 00000000..1de578a0 --- /dev/null +++ b/src/NadekoBot/data/pokemon/name-id_map2.json @@ -0,0 +1,3246 @@ +[ + { + "Id": 1, + "Name": "bulbasaur" + }, + { + "Id": 2, + "Name": "ivysaur" + }, + { + "Id": 3, + "Name": "venusaur" + }, + { + "Id": 4, + "Name": "charmander" + }, + { + "Id": 5, + "Name": "charmeleon" + }, + { + "Id": 6, + "Name": "charizard" + }, + { + "Id": 7, + "Name": "squirtle" + }, + { + "Id": 8, + "Name": "wartortle" + }, + { + "Id": 9, + "Name": "blastoise" + }, + { + "Id": 10, + "Name": "caterpie" + }, + { + "Id": 11, + "Name": "metapod" + }, + { + "Id": 12, + "Name": "butterfree" + }, + { + "Id": 13, + "Name": "weedle" + }, + { + "Id": 14, + "Name": "kakuna" + }, + { + "Id": 15, + "Name": "beedrill" + }, + { + "Id": 16, + "Name": "pidgey" + }, + { + "Id": 17, + "Name": "pidgeotto" + }, + { + "Id": 18, + "Name": "pidgeot" + }, + { + "Id": 19, + "Name": "rattata" + }, + { + "Id": 20, + "Name": "raticate" + }, + { + "Id": 21, + "Name": "spearow" + }, + { + "Id": 22, + "Name": "fearow" + }, + { + "Id": 23, + "Name": "ekans" + }, + { + "Id": 24, + "Name": "arbok" + }, + { + "Id": 25, + "Name": "pikachu" + }, + { + "Id": 26, + "Name": "raichu" + }, + { + "Id": 27, + "Name": "sandshrew" + }, + { + "Id": 28, + "Name": "sandslash" + }, + { + "Id": 29, + "Name": "nidoran" + }, + { + "Id": 30, + "Name": "nidorina" + }, + { + "Id": 31, + "Name": "nidoqueen" + }, + { + "Id": 32, + "Name": "nidoran" + }, + { + "Id": 33, + "Name": "nidorino" + }, + { + "Id": 34, + "Name": "nidoking" + }, + { + "Id": 35, + "Name": "clefairy" + }, + { + "Id": 36, + "Name": "clefable" + }, + { + "Id": 37, + "Name": "vulpix" + }, + { + "Id": 38, + "Name": "ninetales" + }, + { + "Id": 39, + "Name": "jigglypuff" + }, + { + "Id": 40, + "Name": "wigglytuff" + }, + { + "Id": 41, + "Name": "zubat" + }, + { + "Id": 42, + "Name": "golbat" + }, + { + "Id": 43, + "Name": "oddish" + }, + { + "Id": 44, + "Name": "gloom" + }, + { + "Id": 45, + "Name": "vileplume" + }, + { + "Id": 46, + "Name": "paras" + }, + { + "Id": 47, + "Name": "parasect" + }, + { + "Id": 48, + "Name": "venonat" + }, + { + "Id": 49, + "Name": "venomoth" + }, + { + "Id": 50, + "Name": "diglett" + }, + { + "Id": 51, + "Name": "dugtrio" + }, + { + "Id": 52, + "Name": "meowth" + }, + { + "Id": 53, + "Name": "persian" + }, + { + "Id": 54, + "Name": "psyduck" + }, + { + "Id": 55, + "Name": "golduck" + }, + { + "Id": 56, + "Name": "mankey" + }, + { + "Id": 57, + "Name": "primeape" + }, + { + "Id": 58, + "Name": "growlithe" + }, + { + "Id": 59, + "Name": "arcanine" + }, + { + "Id": 60, + "Name": "poliwag" + }, + { + "Id": 61, + "Name": "poliwhirl" + }, + { + "Id": 62, + "Name": "poliwrath" + }, + { + "Id": 63, + "Name": "abra" + }, + { + "Id": 64, + "Name": "kadabra" + }, + { + "Id": 65, + "Name": "alakazam" + }, + { + "Id": 66, + "Name": "machop" + }, + { + "Id": 67, + "Name": "machoke" + }, + { + "Id": 68, + "Name": "machamp" + }, + { + "Id": 69, + "Name": "bellsprout" + }, + { + "Id": 70, + "Name": "weepinbell" + }, + { + "Id": 71, + "Name": "victreebel" + }, + { + "Id": 72, + "Name": "tentacool" + }, + { + "Id": 73, + "Name": "tentacruel" + }, + { + "Id": 74, + "Name": "geodude" + }, + { + "Id": 75, + "Name": "graveler" + }, + { + "Id": 76, + "Name": "golem" + }, + { + "Id": 77, + "Name": "ponyta" + }, + { + "Id": 78, + "Name": "rapidash" + }, + { + "Id": 79, + "Name": "slowpoke" + }, + { + "Id": 80, + "Name": "slowbro" + }, + { + "Id": 81, + "Name": "magnemite" + }, + { + "Id": 82, + "Name": "magneton" + }, + { + "Id": 83, + "Name": "farfetchd" + }, + { + "Id": 84, + "Name": "doduo" + }, + { + "Id": 85, + "Name": "dodrio" + }, + { + "Id": 86, + "Name": "seel" + }, + { + "Id": 87, + "Name": "dewgong" + }, + { + "Id": 88, + "Name": "grimer" + }, + { + "Id": 89, + "Name": "muk" + }, + { + "Id": 90, + "Name": "shellder" + }, + { + "Id": 91, + "Name": "cloyster" + }, + { + "Id": 92, + "Name": "gastly" + }, + { + "Id": 93, + "Name": "haunter" + }, + { + "Id": 94, + "Name": "gengar" + }, + { + "Id": 95, + "Name": "onix" + }, + { + "Id": 96, + "Name": "drowzee" + }, + { + "Id": 97, + "Name": "hypno" + }, + { + "Id": 98, + "Name": "krabby" + }, + { + "Id": 99, + "Name": "kingler" + }, + { + "Id": 100, + "Name": "voltorb" + }, + { + "Id": 101, + "Name": "electrode" + }, + { + "Id": 102, + "Name": "exeggcute" + }, + { + "Id": 103, + "Name": "exeggutor" + }, + { + "Id": 104, + "Name": "cubone" + }, + { + "Id": 105, + "Name": "marowak" + }, + { + "Id": 106, + "Name": "hitmonlee" + }, + { + "Id": 107, + "Name": "hitmonchan" + }, + { + "Id": 108, + "Name": "lickitung" + }, + { + "Id": 109, + "Name": "koffing" + }, + { + "Id": 110, + "Name": "weezing" + }, + { + "Id": 111, + "Name": "rhyhorn" + }, + { + "Id": 112, + "Name": "rhydon" + }, + { + "Id": 113, + "Name": "chansey" + }, + { + "Id": 114, + "Name": "tangela" + }, + { + "Id": 115, + "Name": "kangaskhan" + }, + { + "Id": 116, + "Name": "horsea" + }, + { + "Id": 117, + "Name": "seadra" + }, + { + "Id": 118, + "Name": "goldeen" + }, + { + "Id": 119, + "Name": "seaking" + }, + { + "Id": 120, + "Name": "staryu" + }, + { + "Id": 121, + "Name": "starmie" + }, + { + "Id": 122, + "Name": "mr mime" + }, + { + "Id": 123, + "Name": "scyther" + }, + { + "Id": 124, + "Name": "jynx" + }, + { + "Id": 125, + "Name": "electabuzz" + }, + { + "Id": 126, + "Name": "magmar" + }, + { + "Id": 127, + "Name": "pinsir" + }, + { + "Id": 128, + "Name": "tauros" + }, + { + "Id": 129, + "Name": "magikarp" + }, + { + "Id": 130, + "Name": "gyarados" + }, + { + "Id": 131, + "Name": "lapras" + }, + { + "Id": 132, + "Name": "ditto" + }, + { + "Id": 133, + "Name": "eevee" + }, + { + "Id": 134, + "Name": "vaporeon" + }, + { + "Id": 135, + "Name": "jolteon" + }, + { + "Id": 136, + "Name": "flareon" + }, + { + "Id": 137, + "Name": "porygon" + }, + { + "Id": 138, + "Name": "omanyte" + }, + { + "Id": 139, + "Name": "omastar" + }, + { + "Id": 140, + "Name": "kabuto" + }, + { + "Id": 141, + "Name": "kabutops" + }, + { + "Id": 142, + "Name": "aerodactyl" + }, + { + "Id": 143, + "Name": "snorlax" + }, + { + "Id": 144, + "Name": "articuno" + }, + { + "Id": 145, + "Name": "zapdos" + }, + { + "Id": 146, + "Name": "moltres" + }, + { + "Id": 147, + "Name": "dratini" + }, + { + "Id": 148, + "Name": "dragonair" + }, + { + "Id": 149, + "Name": "dragonite" + }, + { + "Id": 150, + "Name": "mewtwo" + }, + { + "Id": 151, + "Name": "mew" + }, + { + "Id": 152, + "Name": "chikorita" + }, + { + "Id": 153, + "Name": "bayleef" + }, + { + "Id": 154, + "Name": "meganium" + }, + { + "Id": 155, + "Name": "cyndaquil" + }, + { + "Id": 156, + "Name": "quilava" + }, + { + "Id": 157, + "Name": "typhlosion" + }, + { + "Id": 158, + "Name": "totodile" + }, + { + "Id": 159, + "Name": "croconaw" + }, + { + "Id": 160, + "Name": "feraligatr" + }, + { + "Id": 161, + "Name": "sentret" + }, + { + "Id": 162, + "Name": "furret" + }, + { + "Id": 163, + "Name": "hoothoot" + }, + { + "Id": 164, + "Name": "noctowl" + }, + { + "Id": 165, + "Name": "ledyba" + }, + { + "Id": 166, + "Name": "ledian" + }, + { + "Id": 167, + "Name": "spinarak" + }, + { + "Id": 168, + "Name": "ariados" + }, + { + "Id": 169, + "Name": "crobat" + }, + { + "Id": 170, + "Name": "chinchou" + }, + { + "Id": 171, + "Name": "lanturn" + }, + { + "Id": 172, + "Name": "pichu" + }, + { + "Id": 173, + "Name": "cleffa" + }, + { + "Id": 174, + "Name": "igglybuff" + }, + { + "Id": 175, + "Name": "togepi" + }, + { + "Id": 176, + "Name": "togetic" + }, + { + "Id": 177, + "Name": "natu" + }, + { + "Id": 178, + "Name": "xatu" + }, + { + "Id": 179, + "Name": "mareep" + }, + { + "Id": 180, + "Name": "flaaffy" + }, + { + "Id": 181, + "Name": "ampharos" + }, + { + "Id": 182, + "Name": "bellossom" + }, + { + "Id": 183, + "Name": "marill" + }, + { + "Id": 184, + "Name": "azumarill" + }, + { + "Id": 185, + "Name": "sudowoodo" + }, + { + "Id": 186, + "Name": "politoed" + }, + { + "Id": 187, + "Name": "hoppip" + }, + { + "Id": 188, + "Name": "skiploom" + }, + { + "Id": 189, + "Name": "jumpluff" + }, + { + "Id": 190, + "Name": "aipom" + }, + { + "Id": 191, + "Name": "sunkern" + }, + { + "Id": 192, + "Name": "sunflora" + }, + { + "Id": 193, + "Name": "yanma" + }, + { + "Id": 194, + "Name": "wooper" + }, + { + "Id": 195, + "Name": "quagsire" + }, + { + "Id": 196, + "Name": "espeon" + }, + { + "Id": 197, + "Name": "umbreon" + }, + { + "Id": 198, + "Name": "murkrow" + }, + { + "Id": 199, + "Name": "slowking" + }, + { + "Id": 200, + "Name": "misdreavus" + }, + { + "Id": 201, + "Name": "unown" + }, + { + "Id": 202, + "Name": "wobbuffet" + }, + { + "Id": 203, + "Name": "girafarig" + }, + { + "Id": 204, + "Name": "pineco" + }, + { + "Id": 205, + "Name": "forretress" + }, + { + "Id": 206, + "Name": "dunsparce" + }, + { + "Id": 207, + "Name": "gligar" + }, + { + "Id": 208, + "Name": "steelix" + }, + { + "Id": 209, + "Name": "snubbull" + }, + { + "Id": 210, + "Name": "granbull" + }, + { + "Id": 211, + "Name": "qwilfish" + }, + { + "Id": 212, + "Name": "scizor" + }, + { + "Id": 213, + "Name": "shuckle" + }, + { + "Id": 214, + "Name": "heracross" + }, + { + "Id": 215, + "Name": "sneasel" + }, + { + "Id": 216, + "Name": "teddiursa" + }, + { + "Id": 217, + "Name": "ursaring" + }, + { + "Id": 218, + "Name": "slugma" + }, + { + "Id": 219, + "Name": "magcargo" + }, + { + "Id": 220, + "Name": "swinub" + }, + { + "Id": 221, + "Name": "piloswine" + }, + { + "Id": 222, + "Name": "corsola" + }, + { + "Id": 223, + "Name": "remoraid" + }, + { + "Id": 224, + "Name": "octillery" + }, + { + "Id": 225, + "Name": "delibird" + }, + { + "Id": 226, + "Name": "mantine" + }, + { + "Id": 227, + "Name": "skarmory" + }, + { + "Id": 228, + "Name": "houndour" + }, + { + "Id": 229, + "Name": "houndoom" + }, + { + "Id": 230, + "Name": "kingdra" + }, + { + "Id": 231, + "Name": "phanpy" + }, + { + "Id": 232, + "Name": "donphan" + }, + { + "Id": 233, + "Name": "porygon2" + }, + { + "Id": 234, + "Name": "stantler" + }, + { + "Id": 235, + "Name": "smeargle" + }, + { + "Id": 236, + "Name": "tyrogue" + }, + { + "Id": 237, + "Name": "hitmontop" + }, + { + "Id": 238, + "Name": "smoochum" + }, + { + "Id": 239, + "Name": "elekid" + }, + { + "Id": 240, + "Name": "magby" + }, + { + "Id": 241, + "Name": "miltank" + }, + { + "Id": 242, + "Name": "blissey" + }, + { + "Id": 243, + "Name": "raikou" + }, + { + "Id": 244, + "Name": "entei" + }, + { + "Id": 245, + "Name": "suicune" + }, + { + "Id": 246, + "Name": "larvitar" + }, + { + "Id": 247, + "Name": "pupitar" + }, + { + "Id": 248, + "Name": "tyranitar" + }, + { + "Id": 249, + "Name": "lugia" + }, + { + "Id": 250, + "Name": "ho" + }, + { + "Id": 251, + "Name": "celebi" + }, + { + "Id": 252, + "Name": "treecko" + }, + { + "Id": 253, + "Name": "grovyle" + }, + { + "Id": 254, + "Name": "sceptile" + }, + { + "Id": 255, + "Name": "torchic" + }, + { + "Id": 256, + "Name": "combusken" + }, + { + "Id": 257, + "Name": "blaziken" + }, + { + "Id": 258, + "Name": "mudkip" + }, + { + "Id": 259, + "Name": "marshtomp" + }, + { + "Id": 260, + "Name": "swampert" + }, + { + "Id": 261, + "Name": "poochyena" + }, + { + "Id": 262, + "Name": "mightyena" + }, + { + "Id": 263, + "Name": "zigzagoon" + }, + { + "Id": 264, + "Name": "linoone" + }, + { + "Id": 265, + "Name": "wurmple" + }, + { + "Id": 266, + "Name": "silcoon" + }, + { + "Id": 267, + "Name": "beautifly" + }, + { + "Id": 268, + "Name": "cascoon" + }, + { + "Id": 269, + "Name": "dustox" + }, + { + "Id": 270, + "Name": "lotad" + }, + { + "Id": 271, + "Name": "lombre" + }, + { + "Id": 272, + "Name": "ludicolo" + }, + { + "Id": 273, + "Name": "seedot" + }, + { + "Id": 274, + "Name": "nuzleaf" + }, + { + "Id": 275, + "Name": "shiftry" + }, + { + "Id": 276, + "Name": "taillow" + }, + { + "Id": 277, + "Name": "swellow" + }, + { + "Id": 278, + "Name": "wingull" + }, + { + "Id": 279, + "Name": "pelipper" + }, + { + "Id": 280, + "Name": "ralts" + }, + { + "Id": 281, + "Name": "kirlia" + }, + { + "Id": 282, + "Name": "gardevoir" + }, + { + "Id": 283, + "Name": "surskit" + }, + { + "Id": 284, + "Name": "masquerain" + }, + { + "Id": 285, + "Name": "shroomish" + }, + { + "Id": 286, + "Name": "breloom" + }, + { + "Id": 287, + "Name": "slakoth" + }, + { + "Id": 288, + "Name": "vigoroth" + }, + { + "Id": 289, + "Name": "slaking" + }, + { + "Id": 290, + "Name": "nincada" + }, + { + "Id": 291, + "Name": "ninjask" + }, + { + "Id": 292, + "Name": "shedinja" + }, + { + "Id": 293, + "Name": "whismur" + }, + { + "Id": 294, + "Name": "loudred" + }, + { + "Id": 295, + "Name": "exploud" + }, + { + "Id": 296, + "Name": "makuhita" + }, + { + "Id": 297, + "Name": "hariyama" + }, + { + "Id": 298, + "Name": "azurill" + }, + { + "Id": 299, + "Name": "nosepass" + }, + { + "Id": 300, + "Name": "skitty" + }, + { + "Id": 301, + "Name": "delcatty" + }, + { + "Id": 302, + "Name": "sableye" + }, + { + "Id": 303, + "Name": "mawile" + }, + { + "Id": 304, + "Name": "aron" + }, + { + "Id": 305, + "Name": "lairon" + }, + { + "Id": 306, + "Name": "aggron" + }, + { + "Id": 307, + "Name": "meditite" + }, + { + "Id": 308, + "Name": "medicham" + }, + { + "Id": 309, + "Name": "electrike" + }, + { + "Id": 310, + "Name": "manectric" + }, + { + "Id": 311, + "Name": "plusle" + }, + { + "Id": 312, + "Name": "minun" + }, + { + "Id": 313, + "Name": "volbeat" + }, + { + "Id": 314, + "Name": "illumise" + }, + { + "Id": 315, + "Name": "roselia" + }, + { + "Id": 316, + "Name": "gulpin" + }, + { + "Id": 317, + "Name": "swalot" + }, + { + "Id": 318, + "Name": "carvanha" + }, + { + "Id": 319, + "Name": "sharpedo" + }, + { + "Id": 320, + "Name": "wailmer" + }, + { + "Id": 321, + "Name": "wailord" + }, + { + "Id": 322, + "Name": "numel" + }, + { + "Id": 323, + "Name": "camerupt" + }, + { + "Id": 324, + "Name": "torkoal" + }, + { + "Id": 325, + "Name": "spoink" + }, + { + "Id": 326, + "Name": "grumpig" + }, + { + "Id": 327, + "Name": "spinda" + }, + { + "Id": 328, + "Name": "trapinch" + }, + { + "Id": 329, + "Name": "vibrava" + }, + { + "Id": 330, + "Name": "flygon" + }, + { + "Id": 331, + "Name": "cacnea" + }, + { + "Id": 332, + "Name": "cacturne" + }, + { + "Id": 333, + "Name": "swablu" + }, + { + "Id": 334, + "Name": "altaria" + }, + { + "Id": 335, + "Name": "zangoose" + }, + { + "Id": 336, + "Name": "seviper" + }, + { + "Id": 337, + "Name": "lunatone" + }, + { + "Id": 338, + "Name": "solrock" + }, + { + "Id": 339, + "Name": "barboach" + }, + { + "Id": 340, + "Name": "whiscash" + }, + { + "Id": 341, + "Name": "corphish" + }, + { + "Id": 342, + "Name": "crawdaunt" + }, + { + "Id": 343, + "Name": "baltoy" + }, + { + "Id": 344, + "Name": "claydol" + }, + { + "Id": 345, + "Name": "lileep" + }, + { + "Id": 346, + "Name": "cradily" + }, + { + "Id": 347, + "Name": "anorith" + }, + { + "Id": 348, + "Name": "armaldo" + }, + { + "Id": 349, + "Name": "feebas" + }, + { + "Id": 350, + "Name": "milotic" + }, + { + "Id": 351, + "Name": "castform" + }, + { + "Id": 352, + "Name": "kecleon" + }, + { + "Id": 353, + "Name": "shuppet" + }, + { + "Id": 354, + "Name": "banette" + }, + { + "Id": 355, + "Name": "duskull" + }, + { + "Id": 356, + "Name": "dusclops" + }, + { + "Id": 357, + "Name": "tropius" + }, + { + "Id": 358, + "Name": "chimecho" + }, + { + "Id": 359, + "Name": "absol" + }, + { + "Id": 360, + "Name": "wynaut" + }, + { + "Id": 361, + "Name": "snorunt" + }, + { + "Id": 362, + "Name": "glalie" + }, + { + "Id": 363, + "Name": "spheal" + }, + { + "Id": 364, + "Name": "sealeo" + }, + { + "Id": 365, + "Name": "walrein" + }, + { + "Id": 366, + "Name": "clamperl" + }, + { + "Id": 367, + "Name": "huntail" + }, + { + "Id": 368, + "Name": "gorebyss" + }, + { + "Id": 369, + "Name": "relicanth" + }, + { + "Id": 370, + "Name": "luvdisc" + }, + { + "Id": 371, + "Name": "bagon" + }, + { + "Id": 372, + "Name": "shelgon" + }, + { + "Id": 373, + "Name": "salamence" + }, + { + "Id": 374, + "Name": "beldum" + }, + { + "Id": 375, + "Name": "metang" + }, + { + "Id": 376, + "Name": "metagross" + }, + { + "Id": 377, + "Name": "regirock" + }, + { + "Id": 378, + "Name": "regice" + }, + { + "Id": 379, + "Name": "registeel" + }, + { + "Id": 380, + "Name": "latias" + }, + { + "Id": 381, + "Name": "latios" + }, + { + "Id": 382, + "Name": "kyogre" + }, + { + "Id": 383, + "Name": "groudon" + }, + { + "Id": 384, + "Name": "rayquaza" + }, + { + "Id": 385, + "Name": "jirachi" + }, + { + "Id": 386, + "Name": "deoxys" + }, + { + "Id": 387, + "Name": "turtwig" + }, + { + "Id": 388, + "Name": "grotle" + }, + { + "Id": 389, + "Name": "torterra" + }, + { + "Id": 390, + "Name": "chimchar" + }, + { + "Id": 391, + "Name": "monferno" + }, + { + "Id": 392, + "Name": "infernape" + }, + { + "Id": 393, + "Name": "piplup" + }, + { + "Id": 394, + "Name": "prinplup" + }, + { + "Id": 395, + "Name": "empoleon" + }, + { + "Id": 396, + "Name": "starly" + }, + { + "Id": 397, + "Name": "staravia" + }, + { + "Id": 398, + "Name": "staraptor" + }, + { + "Id": 399, + "Name": "bidoof" + }, + { + "Id": 400, + "Name": "bibarel" + }, + { + "Id": 401, + "Name": "kricketot" + }, + { + "Id": 402, + "Name": "kricketune" + }, + { + "Id": 403, + "Name": "shinx" + }, + { + "Id": 404, + "Name": "luxio" + }, + { + "Id": 405, + "Name": "luxray" + }, + { + "Id": 406, + "Name": "budew" + }, + { + "Id": 407, + "Name": "roserade" + }, + { + "Id": 408, + "Name": "cranidos" + }, + { + "Id": 409, + "Name": "rampardos" + }, + { + "Id": 410, + "Name": "shieldon" + }, + { + "Id": 411, + "Name": "bastiodon" + }, + { + "Id": 412, + "Name": "burmy" + }, + { + "Id": 413, + "Name": "wormadam" + }, + { + "Id": 414, + "Name": "mothim" + }, + { + "Id": 415, + "Name": "combee" + }, + { + "Id": 416, + "Name": "vespiquen" + }, + { + "Id": 417, + "Name": "pachirisu" + }, + { + "Id": 418, + "Name": "buizel" + }, + { + "Id": 419, + "Name": "floatzel" + }, + { + "Id": 420, + "Name": "cherubi" + }, + { + "Id": 421, + "Name": "cherrim" + }, + { + "Id": 422, + "Name": "shellos" + }, + { + "Id": 423, + "Name": "gastrodon" + }, + { + "Id": 424, + "Name": "ambipom" + }, + { + "Id": 425, + "Name": "drifloon" + }, + { + "Id": 426, + "Name": "drifblim" + }, + { + "Id": 427, + "Name": "buneary" + }, + { + "Id": 428, + "Name": "lopunny" + }, + { + "Id": 429, + "Name": "mismagius" + }, + { + "Id": 430, + "Name": "honchkrow" + }, + { + "Id": 431, + "Name": "glameow" + }, + { + "Id": 432, + "Name": "purugly" + }, + { + "Id": 433, + "Name": "chingling" + }, + { + "Id": 434, + "Name": "stunky" + }, + { + "Id": 435, + "Name": "skuntank" + }, + { + "Id": 436, + "Name": "bronzor" + }, + { + "Id": 437, + "Name": "bronzong" + }, + { + "Id": 438, + "Name": "bonsly" + }, + { + "Id": 439, + "Name": "mime" + }, + { + "Id": 440, + "Name": "happiny" + }, + { + "Id": 441, + "Name": "chatot" + }, + { + "Id": 442, + "Name": "spiritomb" + }, + { + "Id": 443, + "Name": "gible" + }, + { + "Id": 444, + "Name": "gabite" + }, + { + "Id": 445, + "Name": "garchomp" + }, + { + "Id": 446, + "Name": "munchlax" + }, + { + "Id": 447, + "Name": "riolu" + }, + { + "Id": 448, + "Name": "lucario" + }, + { + "Id": 449, + "Name": "hippopotas" + }, + { + "Id": 450, + "Name": "hippowdon" + }, + { + "Id": 451, + "Name": "skorupi" + }, + { + "Id": 452, + "Name": "drapion" + }, + { + "Id": 453, + "Name": "croagunk" + }, + { + "Id": 454, + "Name": "toxicroak" + }, + { + "Id": 455, + "Name": "carnivine" + }, + { + "Id": 456, + "Name": "finneon" + }, + { + "Id": 457, + "Name": "lumineon" + }, + { + "Id": 458, + "Name": "mantyke" + }, + { + "Id": 459, + "Name": "snover" + }, + { + "Id": 460, + "Name": "abomasnow" + }, + { + "Id": 461, + "Name": "weavile" + }, + { + "Id": 462, + "Name": "magnezone" + }, + { + "Id": 463, + "Name": "lickilicky" + }, + { + "Id": 464, + "Name": "rhyperior" + }, + { + "Id": 465, + "Name": "tangrowth" + }, + { + "Id": 466, + "Name": "electivire" + }, + { + "Id": 467, + "Name": "magmortar" + }, + { + "Id": 468, + "Name": "togekiss" + }, + { + "Id": 469, + "Name": "yanmega" + }, + { + "Id": 470, + "Name": "leafeon" + }, + { + "Id": 471, + "Name": "glaceon" + }, + { + "Id": 472, + "Name": "gliscor" + }, + { + "Id": 473, + "Name": "mamoswine" + }, + { + "Id": 474, + "Name": "porygon" + }, + { + "Id": 475, + "Name": "gallade" + }, + { + "Id": 476, + "Name": "probopass" + }, + { + "Id": 477, + "Name": "dusknoir" + }, + { + "Id": 478, + "Name": "froslass" + }, + { + "Id": 479, + "Name": "rotom" + }, + { + "Id": 480, + "Name": "uxie" + }, + { + "Id": 481, + "Name": "mesprit" + }, + { + "Id": 482, + "Name": "azelf" + }, + { + "Id": 483, + "Name": "dialga" + }, + { + "Id": 484, + "Name": "palkia" + }, + { + "Id": 485, + "Name": "heatran" + }, + { + "Id": 486, + "Name": "regigigas" + }, + { + "Id": 487, + "Name": "giratina" + }, + { + "Id": 488, + "Name": "cresselia" + }, + { + "Id": 489, + "Name": "phione" + }, + { + "Id": 490, + "Name": "manaphy" + }, + { + "Id": 491, + "Name": "darkrai" + }, + { + "Id": 492, + "Name": "shaymin" + }, + { + "Id": 493, + "Name": "arceus" + }, + { + "Id": 494, + "Name": "victini" + }, + { + "Id": 495, + "Name": "snivy" + }, + { + "Id": 496, + "Name": "servine" + }, + { + "Id": 497, + "Name": "serperior" + }, + { + "Id": 498, + "Name": "tepig" + }, + { + "Id": 499, + "Name": "pignite" + }, + { + "Id": 500, + "Name": "emboar" + }, + { + "Id": 501, + "Name": "oshawott" + }, + { + "Id": 502, + "Name": "dewott" + }, + { + "Id": 503, + "Name": "samurott" + }, + { + "Id": 504, + "Name": "patrat" + }, + { + "Id": 505, + "Name": "watchog" + }, + { + "Id": 506, + "Name": "lillipup" + }, + { + "Id": 507, + "Name": "herdier" + }, + { + "Id": 508, + "Name": "stoutland" + }, + { + "Id": 509, + "Name": "purrloin" + }, + { + "Id": 510, + "Name": "liepard" + }, + { + "Id": 511, + "Name": "pansage" + }, + { + "Id": 512, + "Name": "simisage" + }, + { + "Id": 513, + "Name": "pansear" + }, + { + "Id": 514, + "Name": "simisear" + }, + { + "Id": 515, + "Name": "panpour" + }, + { + "Id": 516, + "Name": "simipour" + }, + { + "Id": 517, + "Name": "munna" + }, + { + "Id": 518, + "Name": "musharna" + }, + { + "Id": 519, + "Name": "pidove" + }, + { + "Id": 520, + "Name": "tranquill" + }, + { + "Id": 521, + "Name": "unfezant" + }, + { + "Id": 522, + "Name": "blitzle" + }, + { + "Id": 523, + "Name": "zebstrika" + }, + { + "Id": 524, + "Name": "roggenrola" + }, + { + "Id": 525, + "Name": "boldore" + }, + { + "Id": 526, + "Name": "gigalith" + }, + { + "Id": 527, + "Name": "woobat" + }, + { + "Id": 528, + "Name": "swoobat" + }, + { + "Id": 529, + "Name": "drilbur" + }, + { + "Id": 530, + "Name": "excadrill" + }, + { + "Id": 531, + "Name": "audino" + }, + { + "Id": 532, + "Name": "timburr" + }, + { + "Id": 533, + "Name": "gurdurr" + }, + { + "Id": 534, + "Name": "conkeldurr" + }, + { + "Id": 535, + "Name": "tympole" + }, + { + "Id": 536, + "Name": "palpitoad" + }, + { + "Id": 537, + "Name": "seismitoad" + }, + { + "Id": 538, + "Name": "throh" + }, + { + "Id": 539, + "Name": "sawk" + }, + { + "Id": 540, + "Name": "sewaddle" + }, + { + "Id": 541, + "Name": "swadloon" + }, + { + "Id": 542, + "Name": "leavanny" + }, + { + "Id": 543, + "Name": "venipede" + }, + { + "Id": 544, + "Name": "whirlipede" + }, + { + "Id": 545, + "Name": "scolipede" + }, + { + "Id": 546, + "Name": "cottonee" + }, + { + "Id": 547, + "Name": "whimsicott" + }, + { + "Id": 548, + "Name": "petilil" + }, + { + "Id": 549, + "Name": "lilligant" + }, + { + "Id": 550, + "Name": "basculin" + }, + { + "Id": 551, + "Name": "sandile" + }, + { + "Id": 552, + "Name": "krokorok" + }, + { + "Id": 553, + "Name": "krookodile" + }, + { + "Id": 554, + "Name": "darumaka" + }, + { + "Id": 555, + "Name": "darmanitan" + }, + { + "Id": 556, + "Name": "maractus" + }, + { + "Id": 557, + "Name": "dwebble" + }, + { + "Id": 558, + "Name": "crustle" + }, + { + "Id": 559, + "Name": "scraggy" + }, + { + "Id": 560, + "Name": "scrafty" + }, + { + "Id": 561, + "Name": "sigilyph" + }, + { + "Id": 562, + "Name": "yamask" + }, + { + "Id": 563, + "Name": "cofagrigus" + }, + { + "Id": 564, + "Name": "tirtouga" + }, + { + "Id": 565, + "Name": "carracosta" + }, + { + "Id": 566, + "Name": "archen" + }, + { + "Id": 567, + "Name": "archeops" + }, + { + "Id": 568, + "Name": "trubbish" + }, + { + "Id": 569, + "Name": "garbodor" + }, + { + "Id": 570, + "Name": "zorua" + }, + { + "Id": 571, + "Name": "zoroark" + }, + { + "Id": 572, + "Name": "minccino" + }, + { + "Id": 573, + "Name": "cinccino" + }, + { + "Id": 574, + "Name": "gothita" + }, + { + "Id": 575, + "Name": "gothorita" + }, + { + "Id": 576, + "Name": "gothitelle" + }, + { + "Id": 577, + "Name": "solosis" + }, + { + "Id": 578, + "Name": "duosion" + }, + { + "Id": 579, + "Name": "reuniclus" + }, + { + "Id": 580, + "Name": "ducklett" + }, + { + "Id": 581, + "Name": "swanna" + }, + { + "Id": 582, + "Name": "vanillite" + }, + { + "Id": 583, + "Name": "vanillish" + }, + { + "Id": 584, + "Name": "vanilluxe" + }, + { + "Id": 585, + "Name": "deerling" + }, + { + "Id": 586, + "Name": "sawsbuck" + }, + { + "Id": 587, + "Name": "emolga" + }, + { + "Id": 588, + "Name": "karrablast" + }, + { + "Id": 589, + "Name": "escavalier" + }, + { + "Id": 590, + "Name": "foongus" + }, + { + "Id": 591, + "Name": "amoonguss" + }, + { + "Id": 592, + "Name": "frillish" + }, + { + "Id": 593, + "Name": "jellicent" + }, + { + "Id": 594, + "Name": "alomomola" + }, + { + "Id": 595, + "Name": "joltik" + }, + { + "Id": 596, + "Name": "galvantula" + }, + { + "Id": 597, + "Name": "ferroseed" + }, + { + "Id": 598, + "Name": "ferrothorn" + }, + { + "Id": 599, + "Name": "klink" + }, + { + "Id": 600, + "Name": "klang" + }, + { + "Id": 601, + "Name": "klinklang" + }, + { + "Id": 602, + "Name": "tynamo" + }, + { + "Id": 603, + "Name": "eelektrik" + }, + { + "Id": 604, + "Name": "eelektross" + }, + { + "Id": 605, + "Name": "elgyem" + }, + { + "Id": 606, + "Name": "beheeyem" + }, + { + "Id": 607, + "Name": "litwick" + }, + { + "Id": 608, + "Name": "lampent" + }, + { + "Id": 609, + "Name": "chandelure" + }, + { + "Id": 610, + "Name": "axew" + }, + { + "Id": 611, + "Name": "fraxure" + }, + { + "Id": 612, + "Name": "haxorus" + }, + { + "Id": 613, + "Name": "cubchoo" + }, + { + "Id": 614, + "Name": "beartic" + }, + { + "Id": 615, + "Name": "cryogonal" + }, + { + "Id": 616, + "Name": "shelmet" + }, + { + "Id": 617, + "Name": "accelgor" + }, + { + "Id": 618, + "Name": "stunfisk" + }, + { + "Id": 619, + "Name": "mienfoo" + }, + { + "Id": 620, + "Name": "mienshao" + }, + { + "Id": 621, + "Name": "druddigon" + }, + { + "Id": 622, + "Name": "golett" + }, + { + "Id": 623, + "Name": "golurk" + }, + { + "Id": 624, + "Name": "pawniard" + }, + { + "Id": 625, + "Name": "bisharp" + }, + { + "Id": 626, + "Name": "bouffalant" + }, + { + "Id": 627, + "Name": "rufflet" + }, + { + "Id": 628, + "Name": "braviary" + }, + { + "Id": 629, + "Name": "vullaby" + }, + { + "Id": 630, + "Name": "mandibuzz" + }, + { + "Id": 631, + "Name": "heatmor" + }, + { + "Id": 632, + "Name": "durant" + }, + { + "Id": 633, + "Name": "deino" + }, + { + "Id": 634, + "Name": "zweilous" + }, + { + "Id": 635, + "Name": "hydreigon" + }, + { + "Id": 636, + "Name": "larvesta" + }, + { + "Id": 637, + "Name": "volcarona" + }, + { + "Id": 638, + "Name": "cobalion" + }, + { + "Id": 639, + "Name": "terrakion" + }, + { + "Id": 640, + "Name": "virizion" + }, + { + "Id": 641, + "Name": "tornadus" + }, + { + "Id": 642, + "Name": "thundurus" + }, + { + "Id": 643, + "Name": "reshiram" + }, + { + "Id": 644, + "Name": "zekrom" + }, + { + "Id": 645, + "Name": "landorus" + }, + { + "Id": 646, + "Name": "kyurem" + }, + { + "Id": 647, + "Name": "keldeo" + }, + { + "Id": 648, + "Name": "meloetta" + }, + { + "Id": 649, + "Name": "genesect" + }, + { + "Id": 650, + "Name": "chespin" + }, + { + "Id": 651, + "Name": "quilladin" + }, + { + "Id": 652, + "Name": "chesnaught" + }, + { + "Id": 653, + "Name": "fennekin" + }, + { + "Id": 654, + "Name": "braixen" + }, + { + "Id": 655, + "Name": "delphox" + }, + { + "Id": 656, + "Name": "froakie" + }, + { + "Id": 657, + "Name": "frogadier" + }, + { + "Id": 658, + "Name": "greninja" + }, + { + "Id": 659, + "Name": "bunnelby" + }, + { + "Id": 660, + "Name": "diggersby" + }, + { + "Id": 661, + "Name": "fletchling" + }, + { + "Id": 662, + "Name": "fletchinder" + }, + { + "Id": 663, + "Name": "talonflame" + }, + { + "Id": 664, + "Name": "scatterbug" + }, + { + "Id": 665, + "Name": "spewpa" + }, + { + "Id": 666, + "Name": "vivillon" + }, + { + "Id": 667, + "Name": "litleo" + }, + { + "Id": 668, + "Name": "pyroar" + }, + { + "Id": 669, + "Name": "flabebe" + }, + { + "Id": 670, + "Name": "floette" + }, + { + "Id": 671, + "Name": "florges" + }, + { + "Id": 672, + "Name": "skiddo" + }, + { + "Id": 673, + "Name": "gogoat" + }, + { + "Id": 674, + "Name": "pancham" + }, + { + "Id": 675, + "Name": "pangoro" + }, + { + "Id": 676, + "Name": "furfrou" + }, + { + "Id": 677, + "Name": "espurr" + }, + { + "Id": 678, + "Name": "meowstic" + }, + { + "Id": 679, + "Name": "honedge" + }, + { + "Id": 680, + "Name": "doublade" + }, + { + "Id": 681, + "Name": "aegislash" + }, + { + "Id": 682, + "Name": "spritzee" + }, + { + "Id": 683, + "Name": "aromatisse" + }, + { + "Id": 684, + "Name": "swirlix" + }, + { + "Id": 685, + "Name": "slurpuff" + }, + { + "Id": 686, + "Name": "inkay" + }, + { + "Id": 687, + "Name": "malamar" + }, + { + "Id": 688, + "Name": "binacle" + }, + { + "Id": 689, + "Name": "barbaracle" + }, + { + "Id": 690, + "Name": "skrelp" + }, + { + "Id": 691, + "Name": "dragalge" + }, + { + "Id": 692, + "Name": "clauncher" + }, + { + "Id": 693, + "Name": "clawitzer" + }, + { + "Id": 694, + "Name": "helioptile" + }, + { + "Id": 695, + "Name": "heliolisk" + }, + { + "Id": 696, + "Name": "tyrunt" + }, + { + "Id": 697, + "Name": "tyrantrum" + }, + { + "Id": 698, + "Name": "amaura" + }, + { + "Id": 699, + "Name": "aurorus" + }, + { + "Id": 700, + "Name": "sylveon" + }, + { + "Id": 701, + "Name": "hawlucha" + }, + { + "Id": 702, + "Name": "dedenne" + }, + { + "Id": 703, + "Name": "carbink" + }, + { + "Id": 704, + "Name": "goomy" + }, + { + "Id": 705, + "Name": "sliggoo" + }, + { + "Id": 706, + "Name": "goodra" + }, + { + "Id": 707, + "Name": "klefki" + }, + { + "Id": 708, + "Name": "phantump" + }, + { + "Id": 709, + "Name": "trevenant" + }, + { + "Id": 710, + "Name": "pumpkaboo" + }, + { + "Id": 711, + "Name": "gourgeist" + }, + { + "Id": 712, + "Name": "bergmite" + }, + { + "Id": 713, + "Name": "avalugg" + }, + { + "Id": 714, + "Name": "noibat" + }, + { + "Id": 715, + "Name": "noivern" + }, + { + "Id": 716, + "Name": "xerneas" + }, + { + "Id": 717, + "Name": "yveltal" + }, + { + "Id": 718, + "Name": "zygarde" + }, + { + "Id": 719, + "Name": "diancie" + }, + { + "Id": 720, + "Name": "hoopa" + }, + { + "Id": 721, + "Name": "volcanion" + }, + { + "Id": 10001, + "Name": "deoxys" + }, + { + "Id": 10002, + "Name": "deoxys" + }, + { + "Id": 10003, + "Name": "deoxys" + }, + { + "Id": 10004, + "Name": "wormadam" + }, + { + "Id": 10005, + "Name": "wormadam" + }, + { + "Id": 10006, + "Name": "shaymin" + }, + { + "Id": 10007, + "Name": "giratina" + }, + { + "Id": 10008, + "Name": "rotom" + }, + { + "Id": 10009, + "Name": "rotom" + }, + { + "Id": 10010, + "Name": "rotom" + }, + { + "Id": 10011, + "Name": "rotom" + }, + { + "Id": 10012, + "Name": "rotom" + }, + { + "Id": 10013, + "Name": "castform" + }, + { + "Id": 10014, + "Name": "castform" + }, + { + "Id": 10015, + "Name": "castform" + }, + { + "Id": 10016, + "Name": "basculin" + }, + { + "Id": 10017, + "Name": "darmanitan" + }, + { + "Id": 10018, + "Name": "meloetta" + }, + { + "Id": 10019, + "Name": "tornadus" + }, + { + "Id": 10020, + "Name": "thundurus" + }, + { + "Id": 10021, + "Name": "landorus" + }, + { + "Id": 10022, + "Name": "kyurem" + }, + { + "Id": 10023, + "Name": "kyurem" + }, + { + "Id": 10024, + "Name": "keldeo" + }, + { + "Id": 10025, + "Name": "meowstic" + }, + { + "Id": 10026, + "Name": "aegislash" + }, + { + "Id": 10027, + "Name": "pumpkaboo" + }, + { + "Id": 10028, + "Name": "pumpkaboo" + }, + { + "Id": 10029, + "Name": "pumpkaboo" + }, + { + "Id": 10030, + "Name": "gourgeist" + }, + { + "Id": 10031, + "Name": "gourgeist" + }, + { + "Id": 10032, + "Name": "gourgeist" + }, + { + "Id": 10033, + "Name": "venusaur" + }, + { + "Id": 10034, + "Name": "charizard" + }, + { + "Id": 10035, + "Name": "charizard" + }, + { + "Id": 10036, + "Name": "blastoise" + }, + { + "Id": 10037, + "Name": "alakazam" + }, + { + "Id": 10038, + "Name": "gengar" + }, + { + "Id": 10039, + "Name": "kangaskhan" + }, + { + "Id": 10040, + "Name": "pinsir" + }, + { + "Id": 10041, + "Name": "gyarados" + }, + { + "Id": 10042, + "Name": "aerodactyl" + }, + { + "Id": 10043, + "Name": "mewtwo" + }, + { + "Id": 10044, + "Name": "mewtwo" + }, + { + "Id": 10045, + "Name": "ampharos" + }, + { + "Id": 10046, + "Name": "scizor" + }, + { + "Id": 10047, + "Name": "heracross" + }, + { + "Id": 10048, + "Name": "houndoom" + }, + { + "Id": 10049, + "Name": "tyranitar" + }, + { + "Id": 10050, + "Name": "blaziken" + }, + { + "Id": 10051, + "Name": "gardevoir" + }, + { + "Id": 10052, + "Name": "mawile" + }, + { + "Id": 10053, + "Name": "aggron" + }, + { + "Id": 10054, + "Name": "medicham" + }, + { + "Id": 10055, + "Name": "manectric" + }, + { + "Id": 10056, + "Name": "banette" + }, + { + "Id": 10057, + "Name": "absol" + }, + { + "Id": 10058, + "Name": "garchomp" + }, + { + "Id": 10059, + "Name": "lucario" + }, + { + "Id": 10060, + "Name": "abomasnow" + }, + { + "Id": 10061, + "Name": "floette" + }, + { + "Id": 10062, + "Name": "latias" + }, + { + "Id": 10063, + "Name": "latios" + }, + { + "Id": 10064, + "Name": "swampert" + }, + { + "Id": 10065, + "Name": "sceptile" + }, + { + "Id": 10066, + "Name": "sableye" + }, + { + "Id": 10067, + "Name": "altaria" + }, + { + "Id": 10068, + "Name": "gallade" + }, + { + "Id": 10069, + "Name": "audino" + }, + { + "Id": 10070, + "Name": "sharpedo" + }, + { + "Id": 10071, + "Name": "slowbro" + }, + { + "Id": 10072, + "Name": "steelix" + }, + { + "Id": 10073, + "Name": "pidgeot" + }, + { + "Id": 10074, + "Name": "glalie" + }, + { + "Id": 10075, + "Name": "diancie" + }, + { + "Id": 10076, + "Name": "metagross" + }, + { + "Id": 10077, + "Name": "kyogre" + }, + { + "Id": 10078, + "Name": "groudon" + }, + { + "Id": 10079, + "Name": "rayquaza" + }, + { + "Id": 10080, + "Name": "pikachu" + }, + { + "Id": 10081, + "Name": "pikachu" + }, + { + "Id": 10082, + "Name": "pikachu" + }, + { + "Id": 10083, + "Name": "pikachu" + }, + { + "Id": 10084, + "Name": "pikachu" + }, + { + "Id": 10085, + "Name": "pikachu" + }, + { + "Id": 10086, + "Name": "hoopa" + }, + { + "Id": 10087, + "Name": "camerupt" + }, + { + "Id": 10088, + "Name": "lopunny" + }, + { + "Id": 10089, + "Name": "salamence" + }, + { + "Id": 10090, + "Name": "beedrill" + } +] \ No newline at end of file From 0cc3102f2b0d286f05f2675ff3c414c90d864649 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 24 Mar 2017 11:56:42 +0100 Subject: [PATCH 349/496] mime jr fix --- src/NadekoBot/data/pokemon/name-id_map.json | 3246 ------------------ src/NadekoBot/data/pokemon/name-id_map2.json | 2 +- 2 files changed, 1 insertion(+), 3247 deletions(-) delete mode 100644 src/NadekoBot/data/pokemon/name-id_map.json diff --git a/src/NadekoBot/data/pokemon/name-id_map.json b/src/NadekoBot/data/pokemon/name-id_map.json deleted file mode 100644 index 334a2380..00000000 --- a/src/NadekoBot/data/pokemon/name-id_map.json +++ /dev/null @@ -1,3246 +0,0 @@ -[ - { - "Id": 1, - "Name": "bulbasaur" - }, - { - "Id": 2, - "Name": "ivysaur" - }, - { - "Id": 3, - "Name": "venusaur" - }, - { - "Id": 4, - "Name": "charmander" - }, - { - "Id": 5, - "Name": "charmeleon" - }, - { - "Id": 6, - "Name": "charizard" - }, - { - "Id": 7, - "Name": "squirtle" - }, - { - "Id": 8, - "Name": "wartortle" - }, - { - "Id": 9, - "Name": "blastoise" - }, - { - "Id": 10, - "Name": "caterpie" - }, - { - "Id": 11, - "Name": "metapod" - }, - { - "Id": 12, - "Name": "butterfree" - }, - { - "Id": 13, - "Name": "weedle" - }, - { - "Id": 14, - "Name": "kakuna" - }, - { - "Id": 15, - "Name": "beedrill" - }, - { - "Id": 16, - "Name": "pidgey" - }, - { - "Id": 17, - "Name": "pidgeotto" - }, - { - "Id": 18, - "Name": "pidgeot" - }, - { - "Id": 19, - "Name": "rattata" - }, - { - "Id": 20, - "Name": "raticate" - }, - { - "Id": 21, - "Name": "spearow" - }, - { - "Id": 22, - "Name": "fearow" - }, - { - "Id": 23, - "Name": "ekans" - }, - { - "Id": 24, - "Name": "arbok" - }, - { - "Id": 25, - "Name": "pikachu" - }, - { - "Id": 26, - "Name": "raichu" - }, - { - "Id": 27, - "Name": "sandshrew" - }, - { - "Id": 28, - "Name": "sandslash" - }, - { - "Id": 29, - "Name": "nidoran" - }, - { - "Id": 30, - "Name": "nidorina" - }, - { - "Id": 31, - "Name": "nidoqueen" - }, - { - "Id": 32, - "Name": "nidoran" - }, - { - "Id": 33, - "Name": "nidorino" - }, - { - "Id": 34, - "Name": "nidoking" - }, - { - "Id": 35, - "Name": "clefairy" - }, - { - "Id": 36, - "Name": "clefable" - }, - { - "Id": 37, - "Name": "vulpix" - }, - { - "Id": 38, - "Name": "ninetales" - }, - { - "Id": 39, - "Name": "jigglypuff" - }, - { - "Id": 40, - "Name": "wigglytuff" - }, - { - "Id": 41, - "Name": "zubat" - }, - { - "Id": 42, - "Name": "golbat" - }, - { - "Id": 43, - "Name": "oddish" - }, - { - "Id": 44, - "Name": "gloom" - }, - { - "Id": 45, - "Name": "vileplume" - }, - { - "Id": 46, - "Name": "paras" - }, - { - "Id": 47, - "Name": "parasect" - }, - { - "Id": 48, - "Name": "venonat" - }, - { - "Id": 49, - "Name": "venomoth" - }, - { - "Id": 50, - "Name": "diglett" - }, - { - "Id": 51, - "Name": "dugtrio" - }, - { - "Id": 52, - "Name": "meowth" - }, - { - "Id": 53, - "Name": "persian" - }, - { - "Id": 54, - "Name": "psyduck" - }, - { - "Id": 55, - "Name": "golduck" - }, - { - "Id": 56, - "Name": "mankey" - }, - { - "Id": 57, - "Name": "primeape" - }, - { - "Id": 58, - "Name": "growlithe" - }, - { - "Id": 59, - "Name": "arcanine" - }, - { - "Id": 60, - "Name": "poliwag" - }, - { - "Id": 61, - "Name": "poliwhirl" - }, - { - "Id": 62, - "Name": "poliwrath" - }, - { - "Id": 63, - "Name": "abra" - }, - { - "Id": 64, - "Name": "kadabra" - }, - { - "Id": 65, - "Name": "alakazam" - }, - { - "Id": 66, - "Name": "machop" - }, - { - "Id": 67, - "Name": "machoke" - }, - { - "Id": 68, - "Name": "machamp" - }, - { - "Id": 69, - "Name": "bellsprout" - }, - { - "Id": 70, - "Name": "weepinbell" - }, - { - "Id": 71, - "Name": "victreebel" - }, - { - "Id": 72, - "Name": "tentacool" - }, - { - "Id": 73, - "Name": "tentacruel" - }, - { - "Id": 74, - "Name": "geodude" - }, - { - "Id": 75, - "Name": "graveler" - }, - { - "Id": 76, - "Name": "golem" - }, - { - "Id": 77, - "Name": "ponyta" - }, - { - "Id": 78, - "Name": "rapidash" - }, - { - "Id": 79, - "Name": "slowpoke" - }, - { - "Id": 80, - "Name": "slowbro" - }, - { - "Id": 81, - "Name": "magnemite" - }, - { - "Id": 82, - "Name": "magneton" - }, - { - "Id": 83, - "Name": "farfetchd" - }, - { - "Id": 84, - "Name": "doduo" - }, - { - "Id": 85, - "Name": "dodrio" - }, - { - "Id": 86, - "Name": "seel" - }, - { - "Id": 87, - "Name": "dewgong" - }, - { - "Id": 88, - "Name": "grimer" - }, - { - "Id": 89, - "Name": "muk" - }, - { - "Id": 90, - "Name": "shellder" - }, - { - "Id": 91, - "Name": "cloyster" - }, - { - "Id": 92, - "Name": "gastly" - }, - { - "Id": 93, - "Name": "haunter" - }, - { - "Id": 94, - "Name": "gengar" - }, - { - "Id": 95, - "Name": "onix" - }, - { - "Id": 96, - "Name": "drowzee" - }, - { - "Id": 97, - "Name": "hypno" - }, - { - "Id": 98, - "Name": "krabby" - }, - { - "Id": 99, - "Name": "kingler" - }, - { - "Id": 100, - "Name": "voltorb" - }, - { - "Id": 101, - "Name": "electrode" - }, - { - "Id": 102, - "Name": "exeggcute" - }, - { - "Id": 103, - "Name": "exeggutor" - }, - { - "Id": 104, - "Name": "cubone" - }, - { - "Id": 105, - "Name": "marowak" - }, - { - "Id": 106, - "Name": "hitmonlee" - }, - { - "Id": 107, - "Name": "hitmonchan" - }, - { - "Id": 108, - "Name": "lickitung" - }, - { - "Id": 109, - "Name": "koffing" - }, - { - "Id": 110, - "Name": "weezing" - }, - { - "Id": 111, - "Name": "rhyhorn" - }, - { - "Id": 112, - "Name": "rhydon" - }, - { - "Id": 113, - "Name": "chansey" - }, - { - "Id": 114, - "Name": "tangela" - }, - { - "Id": 115, - "Name": "kangaskhan" - }, - { - "Id": 116, - "Name": "horsea" - }, - { - "Id": 117, - "Name": "seadra" - }, - { - "Id": 118, - "Name": "goldeen" - }, - { - "Id": 119, - "Name": "seaking" - }, - { - "Id": 120, - "Name": "staryu" - }, - { - "Id": 121, - "Name": "starmie" - }, - { - "Id": 122, - "Name": "mr" - }, - { - "Id": 123, - "Name": "scyther" - }, - { - "Id": 124, - "Name": "jynx" - }, - { - "Id": 125, - "Name": "electabuzz" - }, - { - "Id": 126, - "Name": "magmar" - }, - { - "Id": 127, - "Name": "pinsir" - }, - { - "Id": 128, - "Name": "tauros" - }, - { - "Id": 129, - "Name": "magikarp" - }, - { - "Id": 130, - "Name": "gyarados" - }, - { - "Id": 131, - "Name": "lapras" - }, - { - "Id": 132, - "Name": "ditto" - }, - { - "Id": 133, - "Name": "eevee" - }, - { - "Id": 134, - "Name": "vaporeon" - }, - { - "Id": 135, - "Name": "jolteon" - }, - { - "Id": 136, - "Name": "flareon" - }, - { - "Id": 137, - "Name": "porygon" - }, - { - "Id": 138, - "Name": "omanyte" - }, - { - "Id": 139, - "Name": "omastar" - }, - { - "Id": 140, - "Name": "kabuto" - }, - { - "Id": 141, - "Name": "kabutops" - }, - { - "Id": 142, - "Name": "aerodactyl" - }, - { - "Id": 143, - "Name": "snorlax" - }, - { - "Id": 144, - "Name": "articuno" - }, - { - "Id": 145, - "Name": "zapdos" - }, - { - "Id": 146, - "Name": "moltres" - }, - { - "Id": 147, - "Name": "dratini" - }, - { - "Id": 148, - "Name": "dragonair" - }, - { - "Id": 149, - "Name": "dragonite" - }, - { - "Id": 150, - "Name": "mewtwo" - }, - { - "Id": 151, - "Name": "mew" - }, - { - "Id": 152, - "Name": "chikorita" - }, - { - "Id": 153, - "Name": "bayleef" - }, - { - "Id": 154, - "Name": "meganium" - }, - { - "Id": 155, - "Name": "cyndaquil" - }, - { - "Id": 156, - "Name": "quilava" - }, - { - "Id": 157, - "Name": "typhlosion" - }, - { - "Id": 158, - "Name": "totodile" - }, - { - "Id": 159, - "Name": "croconaw" - }, - { - "Id": 160, - "Name": "feraligatr" - }, - { - "Id": 161, - "Name": "sentret" - }, - { - "Id": 162, - "Name": "furret" - }, - { - "Id": 163, - "Name": "hoothoot" - }, - { - "Id": 164, - "Name": "noctowl" - }, - { - "Id": 165, - "Name": "ledyba" - }, - { - "Id": 166, - "Name": "ledian" - }, - { - "Id": 167, - "Name": "spinarak" - }, - { - "Id": 168, - "Name": "ariados" - }, - { - "Id": 169, - "Name": "crobat" - }, - { - "Id": 170, - "Name": "chinchou" - }, - { - "Id": 171, - "Name": "lanturn" - }, - { - "Id": 172, - "Name": "pichu" - }, - { - "Id": 173, - "Name": "cleffa" - }, - { - "Id": 174, - "Name": "igglybuff" - }, - { - "Id": 175, - "Name": "togepi" - }, - { - "Id": 176, - "Name": "togetic" - }, - { - "Id": 177, - "Name": "natu" - }, - { - "Id": 178, - "Name": "xatu" - }, - { - "Id": 179, - "Name": "mareep" - }, - { - "Id": 180, - "Name": "flaaffy" - }, - { - "Id": 181, - "Name": "ampharos" - }, - { - "Id": 182, - "Name": "bellossom" - }, - { - "Id": 183, - "Name": "marill" - }, - { - "Id": 184, - "Name": "azumarill" - }, - { - "Id": 185, - "Name": "sudowoodo" - }, - { - "Id": 186, - "Name": "politoed" - }, - { - "Id": 187, - "Name": "hoppip" - }, - { - "Id": 188, - "Name": "skiploom" - }, - { - "Id": 189, - "Name": "jumpluff" - }, - { - "Id": 190, - "Name": "aipom" - }, - { - "Id": 191, - "Name": "sunkern" - }, - { - "Id": 192, - "Name": "sunflora" - }, - { - "Id": 193, - "Name": "yanma" - }, - { - "Id": 194, - "Name": "wooper" - }, - { - "Id": 195, - "Name": "quagsire" - }, - { - "Id": 196, - "Name": "espeon" - }, - { - "Id": 197, - "Name": "umbreon" - }, - { - "Id": 198, - "Name": "murkrow" - }, - { - "Id": 199, - "Name": "slowking" - }, - { - "Id": 200, - "Name": "misdreavus" - }, - { - "Id": 201, - "Name": "unown" - }, - { - "Id": 202, - "Name": "wobbuffet" - }, - { - "Id": 203, - "Name": "girafarig" - }, - { - "Id": 204, - "Name": "pineco" - }, - { - "Id": 205, - "Name": "forretress" - }, - { - "Id": 206, - "Name": "dunsparce" - }, - { - "Id": 207, - "Name": "gligar" - }, - { - "Id": 208, - "Name": "steelix" - }, - { - "Id": 209, - "Name": "snubbull" - }, - { - "Id": 210, - "Name": "granbull" - }, - { - "Id": 211, - "Name": "qwilfish" - }, - { - "Id": 212, - "Name": "scizor" - }, - { - "Id": 213, - "Name": "shuckle" - }, - { - "Id": 214, - "Name": "heracross" - }, - { - "Id": 215, - "Name": "sneasel" - }, - { - "Id": 216, - "Name": "teddiursa" - }, - { - "Id": 217, - "Name": "ursaring" - }, - { - "Id": 218, - "Name": "slugma" - }, - { - "Id": 219, - "Name": "magcargo" - }, - { - "Id": 220, - "Name": "swinub" - }, - { - "Id": 221, - "Name": "piloswine" - }, - { - "Id": 222, - "Name": "corsola" - }, - { - "Id": 223, - "Name": "remoraid" - }, - { - "Id": 224, - "Name": "octillery" - }, - { - "Id": 225, - "Name": "delibird" - }, - { - "Id": 226, - "Name": "mantine" - }, - { - "Id": 227, - "Name": "skarmory" - }, - { - "Id": 228, - "Name": "houndour" - }, - { - "Id": 229, - "Name": "houndoom" - }, - { - "Id": 230, - "Name": "kingdra" - }, - { - "Id": 231, - "Name": "phanpy" - }, - { - "Id": 232, - "Name": "donphan" - }, - { - "Id": 233, - "Name": "porygon2" - }, - { - "Id": 234, - "Name": "stantler" - }, - { - "Id": 235, - "Name": "smeargle" - }, - { - "Id": 236, - "Name": "tyrogue" - }, - { - "Id": 237, - "Name": "hitmontop" - }, - { - "Id": 238, - "Name": "smoochum" - }, - { - "Id": 239, - "Name": "elekid" - }, - { - "Id": 240, - "Name": "magby" - }, - { - "Id": 241, - "Name": "miltank" - }, - { - "Id": 242, - "Name": "blissey" - }, - { - "Id": 243, - "Name": "raikou" - }, - { - "Id": 244, - "Name": "entei" - }, - { - "Id": 245, - "Name": "suicune" - }, - { - "Id": 246, - "Name": "larvitar" - }, - { - "Id": 247, - "Name": "pupitar" - }, - { - "Id": 248, - "Name": "tyranitar" - }, - { - "Id": 249, - "Name": "lugia" - }, - { - "Id": 250, - "Name": "ho" - }, - { - "Id": 251, - "Name": "celebi" - }, - { - "Id": 252, - "Name": "treecko" - }, - { - "Id": 253, - "Name": "grovyle" - }, - { - "Id": 254, - "Name": "sceptile" - }, - { - "Id": 255, - "Name": "torchic" - }, - { - "Id": 256, - "Name": "combusken" - }, - { - "Id": 257, - "Name": "blaziken" - }, - { - "Id": 258, - "Name": "mudkip" - }, - { - "Id": 259, - "Name": "marshtomp" - }, - { - "Id": 260, - "Name": "swampert" - }, - { - "Id": 261, - "Name": "poochyena" - }, - { - "Id": 262, - "Name": "mightyena" - }, - { - "Id": 263, - "Name": "zigzagoon" - }, - { - "Id": 264, - "Name": "linoone" - }, - { - "Id": 265, - "Name": "wurmple" - }, - { - "Id": 266, - "Name": "silcoon" - }, - { - "Id": 267, - "Name": "beautifly" - }, - { - "Id": 268, - "Name": "cascoon" - }, - { - "Id": 269, - "Name": "dustox" - }, - { - "Id": 270, - "Name": "lotad" - }, - { - "Id": 271, - "Name": "lombre" - }, - { - "Id": 272, - "Name": "ludicolo" - }, - { - "Id": 273, - "Name": "seedot" - }, - { - "Id": 274, - "Name": "nuzleaf" - }, - { - "Id": 275, - "Name": "shiftry" - }, - { - "Id": 276, - "Name": "taillow" - }, - { - "Id": 277, - "Name": "swellow" - }, - { - "Id": 278, - "Name": "wingull" - }, - { - "Id": 279, - "Name": "pelipper" - }, - { - "Id": 280, - "Name": "ralts" - }, - { - "Id": 281, - "Name": "kirlia" - }, - { - "Id": 282, - "Name": "gardevoir" - }, - { - "Id": 283, - "Name": "surskit" - }, - { - "Id": 284, - "Name": "masquerain" - }, - { - "Id": 285, - "Name": "shroomish" - }, - { - "Id": 286, - "Name": "breloom" - }, - { - "Id": 287, - "Name": "slakoth" - }, - { - "Id": 288, - "Name": "vigoroth" - }, - { - "Id": 289, - "Name": "slaking" - }, - { - "Id": 290, - "Name": "nincada" - }, - { - "Id": 291, - "Name": "ninjask" - }, - { - "Id": 292, - "Name": "shedinja" - }, - { - "Id": 293, - "Name": "whismur" - }, - { - "Id": 294, - "Name": "loudred" - }, - { - "Id": 295, - "Name": "exploud" - }, - { - "Id": 296, - "Name": "makuhita" - }, - { - "Id": 297, - "Name": "hariyama" - }, - { - "Id": 298, - "Name": "azurill" - }, - { - "Id": 299, - "Name": "nosepass" - }, - { - "Id": 300, - "Name": "skitty" - }, - { - "Id": 301, - "Name": "delcatty" - }, - { - "Id": 302, - "Name": "sableye" - }, - { - "Id": 303, - "Name": "mawile" - }, - { - "Id": 304, - "Name": "aron" - }, - { - "Id": 305, - "Name": "lairon" - }, - { - "Id": 306, - "Name": "aggron" - }, - { - "Id": 307, - "Name": "meditite" - }, - { - "Id": 308, - "Name": "medicham" - }, - { - "Id": 309, - "Name": "electrike" - }, - { - "Id": 310, - "Name": "manectric" - }, - { - "Id": 311, - "Name": "plusle" - }, - { - "Id": 312, - "Name": "minun" - }, - { - "Id": 313, - "Name": "volbeat" - }, - { - "Id": 314, - "Name": "illumise" - }, - { - "Id": 315, - "Name": "roselia" - }, - { - "Id": 316, - "Name": "gulpin" - }, - { - "Id": 317, - "Name": "swalot" - }, - { - "Id": 318, - "Name": "carvanha" - }, - { - "Id": 319, - "Name": "sharpedo" - }, - { - "Id": 320, - "Name": "wailmer" - }, - { - "Id": 321, - "Name": "wailord" - }, - { - "Id": 322, - "Name": "numel" - }, - { - "Id": 323, - "Name": "camerupt" - }, - { - "Id": 324, - "Name": "torkoal" - }, - { - "Id": 325, - "Name": "spoink" - }, - { - "Id": 326, - "Name": "grumpig" - }, - { - "Id": 327, - "Name": "spinda" - }, - { - "Id": 328, - "Name": "trapinch" - }, - { - "Id": 329, - "Name": "vibrava" - }, - { - "Id": 330, - "Name": "flygon" - }, - { - "Id": 331, - "Name": "cacnea" - }, - { - "Id": 332, - "Name": "cacturne" - }, - { - "Id": 333, - "Name": "swablu" - }, - { - "Id": 334, - "Name": "altaria" - }, - { - "Id": 335, - "Name": "zangoose" - }, - { - "Id": 336, - "Name": "seviper" - }, - { - "Id": 337, - "Name": "lunatone" - }, - { - "Id": 338, - "Name": "solrock" - }, - { - "Id": 339, - "Name": "barboach" - }, - { - "Id": 340, - "Name": "whiscash" - }, - { - "Id": 341, - "Name": "corphish" - }, - { - "Id": 342, - "Name": "crawdaunt" - }, - { - "Id": 343, - "Name": "baltoy" - }, - { - "Id": 344, - "Name": "claydol" - }, - { - "Id": 345, - "Name": "lileep" - }, - { - "Id": 346, - "Name": "cradily" - }, - { - "Id": 347, - "Name": "anorith" - }, - { - "Id": 348, - "Name": "armaldo" - }, - { - "Id": 349, - "Name": "feebas" - }, - { - "Id": 350, - "Name": "milotic" - }, - { - "Id": 351, - "Name": "castform" - }, - { - "Id": 352, - "Name": "kecleon" - }, - { - "Id": 353, - "Name": "shuppet" - }, - { - "Id": 354, - "Name": "banette" - }, - { - "Id": 355, - "Name": "duskull" - }, - { - "Id": 356, - "Name": "dusclops" - }, - { - "Id": 357, - "Name": "tropius" - }, - { - "Id": 358, - "Name": "chimecho" - }, - { - "Id": 359, - "Name": "absol" - }, - { - "Id": 360, - "Name": "wynaut" - }, - { - "Id": 361, - "Name": "snorunt" - }, - { - "Id": 362, - "Name": "glalie" - }, - { - "Id": 363, - "Name": "spheal" - }, - { - "Id": 364, - "Name": "sealeo" - }, - { - "Id": 365, - "Name": "walrein" - }, - { - "Id": 366, - "Name": "clamperl" - }, - { - "Id": 367, - "Name": "huntail" - }, - { - "Id": 368, - "Name": "gorebyss" - }, - { - "Id": 369, - "Name": "relicanth" - }, - { - "Id": 370, - "Name": "luvdisc" - }, - { - "Id": 371, - "Name": "bagon" - }, - { - "Id": 372, - "Name": "shelgon" - }, - { - "Id": 373, - "Name": "salamence" - }, - { - "Id": 374, - "Name": "beldum" - }, - { - "Id": 375, - "Name": "metang" - }, - { - "Id": 376, - "Name": "metagross" - }, - { - "Id": 377, - "Name": "regirock" - }, - { - "Id": 378, - "Name": "regice" - }, - { - "Id": 379, - "Name": "registeel" - }, - { - "Id": 380, - "Name": "latias" - }, - { - "Id": 381, - "Name": "latios" - }, - { - "Id": 382, - "Name": "kyogre" - }, - { - "Id": 383, - "Name": "groudon" - }, - { - "Id": 384, - "Name": "rayquaza" - }, - { - "Id": 385, - "Name": "jirachi" - }, - { - "Id": 386, - "Name": "deoxys" - }, - { - "Id": 387, - "Name": "turtwig" - }, - { - "Id": 388, - "Name": "grotle" - }, - { - "Id": 389, - "Name": "torterra" - }, - { - "Id": 390, - "Name": "chimchar" - }, - { - "Id": 391, - "Name": "monferno" - }, - { - "Id": 392, - "Name": "infernape" - }, - { - "Id": 393, - "Name": "piplup" - }, - { - "Id": 394, - "Name": "prinplup" - }, - { - "Id": 395, - "Name": "empoleon" - }, - { - "Id": 396, - "Name": "starly" - }, - { - "Id": 397, - "Name": "staravia" - }, - { - "Id": 398, - "Name": "staraptor" - }, - { - "Id": 399, - "Name": "bidoof" - }, - { - "Id": 400, - "Name": "bibarel" - }, - { - "Id": 401, - "Name": "kricketot" - }, - { - "Id": 402, - "Name": "kricketune" - }, - { - "Id": 403, - "Name": "shinx" - }, - { - "Id": 404, - "Name": "luxio" - }, - { - "Id": 405, - "Name": "luxray" - }, - { - "Id": 406, - "Name": "budew" - }, - { - "Id": 407, - "Name": "roserade" - }, - { - "Id": 408, - "Name": "cranidos" - }, - { - "Id": 409, - "Name": "rampardos" - }, - { - "Id": 410, - "Name": "shieldon" - }, - { - "Id": 411, - "Name": "bastiodon" - }, - { - "Id": 412, - "Name": "burmy" - }, - { - "Id": 413, - "Name": "wormadam" - }, - { - "Id": 414, - "Name": "mothim" - }, - { - "Id": 415, - "Name": "combee" - }, - { - "Id": 416, - "Name": "vespiquen" - }, - { - "Id": 417, - "Name": "pachirisu" - }, - { - "Id": 418, - "Name": "buizel" - }, - { - "Id": 419, - "Name": "floatzel" - }, - { - "Id": 420, - "Name": "cherubi" - }, - { - "Id": 421, - "Name": "cherrim" - }, - { - "Id": 422, - "Name": "shellos" - }, - { - "Id": 423, - "Name": "gastrodon" - }, - { - "Id": 424, - "Name": "ambipom" - }, - { - "Id": 425, - "Name": "drifloon" - }, - { - "Id": 426, - "Name": "drifblim" - }, - { - "Id": 427, - "Name": "buneary" - }, - { - "Id": 428, - "Name": "lopunny" - }, - { - "Id": 429, - "Name": "mismagius" - }, - { - "Id": 430, - "Name": "honchkrow" - }, - { - "Id": 431, - "Name": "glameow" - }, - { - "Id": 432, - "Name": "purugly" - }, - { - "Id": 433, - "Name": "chingling" - }, - { - "Id": 434, - "Name": "stunky" - }, - { - "Id": 435, - "Name": "skuntank" - }, - { - "Id": 436, - "Name": "bronzor" - }, - { - "Id": 437, - "Name": "bronzong" - }, - { - "Id": 438, - "Name": "bonsly" - }, - { - "Id": 439, - "Name": "mime" - }, - { - "Id": 440, - "Name": "happiny" - }, - { - "Id": 441, - "Name": "chatot" - }, - { - "Id": 442, - "Name": "spiritomb" - }, - { - "Id": 443, - "Name": "gible" - }, - { - "Id": 444, - "Name": "gabite" - }, - { - "Id": 445, - "Name": "garchomp" - }, - { - "Id": 446, - "Name": "munchlax" - }, - { - "Id": 447, - "Name": "riolu" - }, - { - "Id": 448, - "Name": "lucario" - }, - { - "Id": 449, - "Name": "hippopotas" - }, - { - "Id": 450, - "Name": "hippowdon" - }, - { - "Id": 451, - "Name": "skorupi" - }, - { - "Id": 452, - "Name": "drapion" - }, - { - "Id": 453, - "Name": "croagunk" - }, - { - "Id": 454, - "Name": "toxicroak" - }, - { - "Id": 455, - "Name": "carnivine" - }, - { - "Id": 456, - "Name": "finneon" - }, - { - "Id": 457, - "Name": "lumineon" - }, - { - "Id": 458, - "Name": "mantyke" - }, - { - "Id": 459, - "Name": "snover" - }, - { - "Id": 460, - "Name": "abomasnow" - }, - { - "Id": 461, - "Name": "weavile" - }, - { - "Id": 462, - "Name": "magnezone" - }, - { - "Id": 463, - "Name": "lickilicky" - }, - { - "Id": 464, - "Name": "rhyperior" - }, - { - "Id": 465, - "Name": "tangrowth" - }, - { - "Id": 466, - "Name": "electivire" - }, - { - "Id": 467, - "Name": "magmortar" - }, - { - "Id": 468, - "Name": "togekiss" - }, - { - "Id": 469, - "Name": "yanmega" - }, - { - "Id": 470, - "Name": "leafeon" - }, - { - "Id": 471, - "Name": "glaceon" - }, - { - "Id": 472, - "Name": "gliscor" - }, - { - "Id": 473, - "Name": "mamoswine" - }, - { - "Id": 474, - "Name": "porygon" - }, - { - "Id": 475, - "Name": "gallade" - }, - { - "Id": 476, - "Name": "probopass" - }, - { - "Id": 477, - "Name": "dusknoir" - }, - { - "Id": 478, - "Name": "froslass" - }, - { - "Id": 479, - "Name": "rotom" - }, - { - "Id": 480, - "Name": "uxie" - }, - { - "Id": 481, - "Name": "mesprit" - }, - { - "Id": 482, - "Name": "azelf" - }, - { - "Id": 483, - "Name": "dialga" - }, - { - "Id": 484, - "Name": "palkia" - }, - { - "Id": 485, - "Name": "heatran" - }, - { - "Id": 486, - "Name": "regigigas" - }, - { - "Id": 487, - "Name": "giratina" - }, - { - "Id": 488, - "Name": "cresselia" - }, - { - "Id": 489, - "Name": "phione" - }, - { - "Id": 490, - "Name": "manaphy" - }, - { - "Id": 491, - "Name": "darkrai" - }, - { - "Id": 492, - "Name": "shaymin" - }, - { - "Id": 493, - "Name": "arceus" - }, - { - "Id": 494, - "Name": "victini" - }, - { - "Id": 495, - "Name": "snivy" - }, - { - "Id": 496, - "Name": "servine" - }, - { - "Id": 497, - "Name": "serperior" - }, - { - "Id": 498, - "Name": "tepig" - }, - { - "Id": 499, - "Name": "pignite" - }, - { - "Id": 500, - "Name": "emboar" - }, - { - "Id": 501, - "Name": "oshawott" - }, - { - "Id": 502, - "Name": "dewott" - }, - { - "Id": 503, - "Name": "samurott" - }, - { - "Id": 504, - "Name": "patrat" - }, - { - "Id": 505, - "Name": "watchog" - }, - { - "Id": 506, - "Name": "lillipup" - }, - { - "Id": 507, - "Name": "herdier" - }, - { - "Id": 508, - "Name": "stoutland" - }, - { - "Id": 509, - "Name": "purrloin" - }, - { - "Id": 510, - "Name": "liepard" - }, - { - "Id": 511, - "Name": "pansage" - }, - { - "Id": 512, - "Name": "simisage" - }, - { - "Id": 513, - "Name": "pansear" - }, - { - "Id": 514, - "Name": "simisear" - }, - { - "Id": 515, - "Name": "panpour" - }, - { - "Id": 516, - "Name": "simipour" - }, - { - "Id": 517, - "Name": "munna" - }, - { - "Id": 518, - "Name": "musharna" - }, - { - "Id": 519, - "Name": "pidove" - }, - { - "Id": 520, - "Name": "tranquill" - }, - { - "Id": 521, - "Name": "unfezant" - }, - { - "Id": 522, - "Name": "blitzle" - }, - { - "Id": 523, - "Name": "zebstrika" - }, - { - "Id": 524, - "Name": "roggenrola" - }, - { - "Id": 525, - "Name": "boldore" - }, - { - "Id": 526, - "Name": "gigalith" - }, - { - "Id": 527, - "Name": "woobat" - }, - { - "Id": 528, - "Name": "swoobat" - }, - { - "Id": 529, - "Name": "drilbur" - }, - { - "Id": 530, - "Name": "excadrill" - }, - { - "Id": 531, - "Name": "audino" - }, - { - "Id": 532, - "Name": "timburr" - }, - { - "Id": 533, - "Name": "gurdurr" - }, - { - "Id": 534, - "Name": "conkeldurr" - }, - { - "Id": 535, - "Name": "tympole" - }, - { - "Id": 536, - "Name": "palpitoad" - }, - { - "Id": 537, - "Name": "seismitoad" - }, - { - "Id": 538, - "Name": "throh" - }, - { - "Id": 539, - "Name": "sawk" - }, - { - "Id": 540, - "Name": "sewaddle" - }, - { - "Id": 541, - "Name": "swadloon" - }, - { - "Id": 542, - "Name": "leavanny" - }, - { - "Id": 543, - "Name": "venipede" - }, - { - "Id": 544, - "Name": "whirlipede" - }, - { - "Id": 545, - "Name": "scolipede" - }, - { - "Id": 546, - "Name": "cottonee" - }, - { - "Id": 547, - "Name": "whimsicott" - }, - { - "Id": 548, - "Name": "petilil" - }, - { - "Id": 549, - "Name": "lilligant" - }, - { - "Id": 550, - "Name": "basculin" - }, - { - "Id": 551, - "Name": "sandile" - }, - { - "Id": 552, - "Name": "krokorok" - }, - { - "Id": 553, - "Name": "krookodile" - }, - { - "Id": 554, - "Name": "darumaka" - }, - { - "Id": 555, - "Name": "darmanitan" - }, - { - "Id": 556, - "Name": "maractus" - }, - { - "Id": 557, - "Name": "dwebble" - }, - { - "Id": 558, - "Name": "crustle" - }, - { - "Id": 559, - "Name": "scraggy" - }, - { - "Id": 560, - "Name": "scrafty" - }, - { - "Id": 561, - "Name": "sigilyph" - }, - { - "Id": 562, - "Name": "yamask" - }, - { - "Id": 563, - "Name": "cofagrigus" - }, - { - "Id": 564, - "Name": "tirtouga" - }, - { - "Id": 565, - "Name": "carracosta" - }, - { - "Id": 566, - "Name": "archen" - }, - { - "Id": 567, - "Name": "archeops" - }, - { - "Id": 568, - "Name": "trubbish" - }, - { - "Id": 569, - "Name": "garbodor" - }, - { - "Id": 570, - "Name": "zorua" - }, - { - "Id": 571, - "Name": "zoroark" - }, - { - "Id": 572, - "Name": "minccino" - }, - { - "Id": 573, - "Name": "cinccino" - }, - { - "Id": 574, - "Name": "gothita" - }, - { - "Id": 575, - "Name": "gothorita" - }, - { - "Id": 576, - "Name": "gothitelle" - }, - { - "Id": 577, - "Name": "solosis" - }, - { - "Id": 578, - "Name": "duosion" - }, - { - "Id": 579, - "Name": "reuniclus" - }, - { - "Id": 580, - "Name": "ducklett" - }, - { - "Id": 581, - "Name": "swanna" - }, - { - "Id": 582, - "Name": "vanillite" - }, - { - "Id": 583, - "Name": "vanillish" - }, - { - "Id": 584, - "Name": "vanilluxe" - }, - { - "Id": 585, - "Name": "deerling" - }, - { - "Id": 586, - "Name": "sawsbuck" - }, - { - "Id": 587, - "Name": "emolga" - }, - { - "Id": 588, - "Name": "karrablast" - }, - { - "Id": 589, - "Name": "escavalier" - }, - { - "Id": 590, - "Name": "foongus" - }, - { - "Id": 591, - "Name": "amoonguss" - }, - { - "Id": 592, - "Name": "frillish" - }, - { - "Id": 593, - "Name": "jellicent" - }, - { - "Id": 594, - "Name": "alomomola" - }, - { - "Id": 595, - "Name": "joltik" - }, - { - "Id": 596, - "Name": "galvantula" - }, - { - "Id": 597, - "Name": "ferroseed" - }, - { - "Id": 598, - "Name": "ferrothorn" - }, - { - "Id": 599, - "Name": "klink" - }, - { - "Id": 600, - "Name": "klang" - }, - { - "Id": 601, - "Name": "klinklang" - }, - { - "Id": 602, - "Name": "tynamo" - }, - { - "Id": 603, - "Name": "eelektrik" - }, - { - "Id": 604, - "Name": "eelektross" - }, - { - "Id": 605, - "Name": "elgyem" - }, - { - "Id": 606, - "Name": "beheeyem" - }, - { - "Id": 607, - "Name": "litwick" - }, - { - "Id": 608, - "Name": "lampent" - }, - { - "Id": 609, - "Name": "chandelure" - }, - { - "Id": 610, - "Name": "axew" - }, - { - "Id": 611, - "Name": "fraxure" - }, - { - "Id": 612, - "Name": "haxorus" - }, - { - "Id": 613, - "Name": "cubchoo" - }, - { - "Id": 614, - "Name": "beartic" - }, - { - "Id": 615, - "Name": "cryogonal" - }, - { - "Id": 616, - "Name": "shelmet" - }, - { - "Id": 617, - "Name": "accelgor" - }, - { - "Id": 618, - "Name": "stunfisk" - }, - { - "Id": 619, - "Name": "mienfoo" - }, - { - "Id": 620, - "Name": "mienshao" - }, - { - "Id": 621, - "Name": "druddigon" - }, - { - "Id": 622, - "Name": "golett" - }, - { - "Id": 623, - "Name": "golurk" - }, - { - "Id": 624, - "Name": "pawniard" - }, - { - "Id": 625, - "Name": "bisharp" - }, - { - "Id": 626, - "Name": "bouffalant" - }, - { - "Id": 627, - "Name": "rufflet" - }, - { - "Id": 628, - "Name": "braviary" - }, - { - "Id": 629, - "Name": "vullaby" - }, - { - "Id": 630, - "Name": "mandibuzz" - }, - { - "Id": 631, - "Name": "heatmor" - }, - { - "Id": 632, - "Name": "durant" - }, - { - "Id": 633, - "Name": "deino" - }, - { - "Id": 634, - "Name": "zweilous" - }, - { - "Id": 635, - "Name": "hydreigon" - }, - { - "Id": 636, - "Name": "larvesta" - }, - { - "Id": 637, - "Name": "volcarona" - }, - { - "Id": 638, - "Name": "cobalion" - }, - { - "Id": 639, - "Name": "terrakion" - }, - { - "Id": 640, - "Name": "virizion" - }, - { - "Id": 641, - "Name": "tornadus" - }, - { - "Id": 642, - "Name": "thundurus" - }, - { - "Id": 643, - "Name": "reshiram" - }, - { - "Id": 644, - "Name": "zekrom" - }, - { - "Id": 645, - "Name": "landorus" - }, - { - "Id": 646, - "Name": "kyurem" - }, - { - "Id": 647, - "Name": "keldeo" - }, - { - "Id": 648, - "Name": "meloetta" - }, - { - "Id": 649, - "Name": "genesect" - }, - { - "Id": 650, - "Name": "chespin" - }, - { - "Id": 651, - "Name": "quilladin" - }, - { - "Id": 652, - "Name": "chesnaught" - }, - { - "Id": 653, - "Name": "fennekin" - }, - { - "Id": 654, - "Name": "braixen" - }, - { - "Id": 655, - "Name": "delphox" - }, - { - "Id": 656, - "Name": "froakie" - }, - { - "Id": 657, - "Name": "frogadier" - }, - { - "Id": 658, - "Name": "greninja" - }, - { - "Id": 659, - "Name": "bunnelby" - }, - { - "Id": 660, - "Name": "diggersby" - }, - { - "Id": 661, - "Name": "fletchling" - }, - { - "Id": 662, - "Name": "fletchinder" - }, - { - "Id": 663, - "Name": "talonflame" - }, - { - "Id": 664, - "Name": "scatterbug" - }, - { - "Id": 665, - "Name": "spewpa" - }, - { - "Id": 666, - "Name": "vivillon" - }, - { - "Id": 667, - "Name": "litleo" - }, - { - "Id": 668, - "Name": "pyroar" - }, - { - "Id": 669, - "Name": "flabebe" - }, - { - "Id": 670, - "Name": "floette" - }, - { - "Id": 671, - "Name": "florges" - }, - { - "Id": 672, - "Name": "skiddo" - }, - { - "Id": 673, - "Name": "gogoat" - }, - { - "Id": 674, - "Name": "pancham" - }, - { - "Id": 675, - "Name": "pangoro" - }, - { - "Id": 676, - "Name": "furfrou" - }, - { - "Id": 677, - "Name": "espurr" - }, - { - "Id": 678, - "Name": "meowstic" - }, - { - "Id": 679, - "Name": "honedge" - }, - { - "Id": 680, - "Name": "doublade" - }, - { - "Id": 681, - "Name": "aegislash" - }, - { - "Id": 682, - "Name": "spritzee" - }, - { - "Id": 683, - "Name": "aromatisse" - }, - { - "Id": 684, - "Name": "swirlix" - }, - { - "Id": 685, - "Name": "slurpuff" - }, - { - "Id": 686, - "Name": "inkay" - }, - { - "Id": 687, - "Name": "malamar" - }, - { - "Id": 688, - "Name": "binacle" - }, - { - "Id": 689, - "Name": "barbaracle" - }, - { - "Id": 690, - "Name": "skrelp" - }, - { - "Id": 691, - "Name": "dragalge" - }, - { - "Id": 692, - "Name": "clauncher" - }, - { - "Id": 693, - "Name": "clawitzer" - }, - { - "Id": 694, - "Name": "helioptile" - }, - { - "Id": 695, - "Name": "heliolisk" - }, - { - "Id": 696, - "Name": "tyrunt" - }, - { - "Id": 697, - "Name": "tyrantrum" - }, - { - "Id": 698, - "Name": "amaura" - }, - { - "Id": 699, - "Name": "aurorus" - }, - { - "Id": 700, - "Name": "sylveon" - }, - { - "Id": 701, - "Name": "hawlucha" - }, - { - "Id": 702, - "Name": "dedenne" - }, - { - "Id": 703, - "Name": "carbink" - }, - { - "Id": 704, - "Name": "goomy" - }, - { - "Id": 705, - "Name": "sliggoo" - }, - { - "Id": 706, - "Name": "goodra" - }, - { - "Id": 707, - "Name": "klefki" - }, - { - "Id": 708, - "Name": "phantump" - }, - { - "Id": 709, - "Name": "trevenant" - }, - { - "Id": 710, - "Name": "pumpkaboo" - }, - { - "Id": 711, - "Name": "gourgeist" - }, - { - "Id": 712, - "Name": "bergmite" - }, - { - "Id": 713, - "Name": "avalugg" - }, - { - "Id": 714, - "Name": "noibat" - }, - { - "Id": 715, - "Name": "noivern" - }, - { - "Id": 716, - "Name": "xerneas" - }, - { - "Id": 717, - "Name": "yveltal" - }, - { - "Id": 718, - "Name": "zygarde" - }, - { - "Id": 719, - "Name": "diancie" - }, - { - "Id": 720, - "Name": "hoopa" - }, - { - "Id": 721, - "Name": "volcanion" - }, - { - "Id": 10001, - "Name": "deoxys" - }, - { - "Id": 10002, - "Name": "deoxys" - }, - { - "Id": 10003, - "Name": "deoxys" - }, - { - "Id": 10004, - "Name": "wormadam" - }, - { - "Id": 10005, - "Name": "wormadam" - }, - { - "Id": 10006, - "Name": "shaymin" - }, - { - "Id": 10007, - "Name": "giratina" - }, - { - "Id": 10008, - "Name": "rotom" - }, - { - "Id": 10009, - "Name": "rotom" - }, - { - "Id": 10010, - "Name": "rotom" - }, - { - "Id": 10011, - "Name": "rotom" - }, - { - "Id": 10012, - "Name": "rotom" - }, - { - "Id": 10013, - "Name": "castform" - }, - { - "Id": 10014, - "Name": "castform" - }, - { - "Id": 10015, - "Name": "castform" - }, - { - "Id": 10016, - "Name": "basculin" - }, - { - "Id": 10017, - "Name": "darmanitan" - }, - { - "Id": 10018, - "Name": "meloetta" - }, - { - "Id": 10019, - "Name": "tornadus" - }, - { - "Id": 10020, - "Name": "thundurus" - }, - { - "Id": 10021, - "Name": "landorus" - }, - { - "Id": 10022, - "Name": "kyurem" - }, - { - "Id": 10023, - "Name": "kyurem" - }, - { - "Id": 10024, - "Name": "keldeo" - }, - { - "Id": 10025, - "Name": "meowstic" - }, - { - "Id": 10026, - "Name": "aegislash" - }, - { - "Id": 10027, - "Name": "pumpkaboo" - }, - { - "Id": 10028, - "Name": "pumpkaboo" - }, - { - "Id": 10029, - "Name": "pumpkaboo" - }, - { - "Id": 10030, - "Name": "gourgeist" - }, - { - "Id": 10031, - "Name": "gourgeist" - }, - { - "Id": 10032, - "Name": "gourgeist" - }, - { - "Id": 10033, - "Name": "venusaur" - }, - { - "Id": 10034, - "Name": "charizard" - }, - { - "Id": 10035, - "Name": "charizard" - }, - { - "Id": 10036, - "Name": "blastoise" - }, - { - "Id": 10037, - "Name": "alakazam" - }, - { - "Id": 10038, - "Name": "gengar" - }, - { - "Id": 10039, - "Name": "kangaskhan" - }, - { - "Id": 10040, - "Name": "pinsir" - }, - { - "Id": 10041, - "Name": "gyarados" - }, - { - "Id": 10042, - "Name": "aerodactyl" - }, - { - "Id": 10043, - "Name": "mewtwo" - }, - { - "Id": 10044, - "Name": "mewtwo" - }, - { - "Id": 10045, - "Name": "ampharos" - }, - { - "Id": 10046, - "Name": "scizor" - }, - { - "Id": 10047, - "Name": "heracross" - }, - { - "Id": 10048, - "Name": "houndoom" - }, - { - "Id": 10049, - "Name": "tyranitar" - }, - { - "Id": 10050, - "Name": "blaziken" - }, - { - "Id": 10051, - "Name": "gardevoir" - }, - { - "Id": 10052, - "Name": "mawile" - }, - { - "Id": 10053, - "Name": "aggron" - }, - { - "Id": 10054, - "Name": "medicham" - }, - { - "Id": 10055, - "Name": "manectric" - }, - { - "Id": 10056, - "Name": "banette" - }, - { - "Id": 10057, - "Name": "absol" - }, - { - "Id": 10058, - "Name": "garchomp" - }, - { - "Id": 10059, - "Name": "lucario" - }, - { - "Id": 10060, - "Name": "abomasnow" - }, - { - "Id": 10061, - "Name": "floette" - }, - { - "Id": 10062, - "Name": "latias" - }, - { - "Id": 10063, - "Name": "latios" - }, - { - "Id": 10064, - "Name": "swampert" - }, - { - "Id": 10065, - "Name": "sceptile" - }, - { - "Id": 10066, - "Name": "sableye" - }, - { - "Id": 10067, - "Name": "altaria" - }, - { - "Id": 10068, - "Name": "gallade" - }, - { - "Id": 10069, - "Name": "audino" - }, - { - "Id": 10070, - "Name": "sharpedo" - }, - { - "Id": 10071, - "Name": "slowbro" - }, - { - "Id": 10072, - "Name": "steelix" - }, - { - "Id": 10073, - "Name": "pidgeot" - }, - { - "Id": 10074, - "Name": "glalie" - }, - { - "Id": 10075, - "Name": "diancie" - }, - { - "Id": 10076, - "Name": "metagross" - }, - { - "Id": 10077, - "Name": "kyogre" - }, - { - "Id": 10078, - "Name": "groudon" - }, - { - "Id": 10079, - "Name": "rayquaza" - }, - { - "Id": 10080, - "Name": "pikachu" - }, - { - "Id": 10081, - "Name": "pikachu" - }, - { - "Id": 10082, - "Name": "pikachu" - }, - { - "Id": 10083, - "Name": "pikachu" - }, - { - "Id": 10084, - "Name": "pikachu" - }, - { - "Id": 10085, - "Name": "pikachu" - }, - { - "Id": 10086, - "Name": "hoopa" - }, - { - "Id": 10087, - "Name": "camerupt" - }, - { - "Id": 10088, - "Name": "lopunny" - }, - { - "Id": 10089, - "Name": "salamence" - }, - { - "Id": 10090, - "Name": "beedrill" - } -] \ No newline at end of file diff --git a/src/NadekoBot/data/pokemon/name-id_map2.json b/src/NadekoBot/data/pokemon/name-id_map2.json index 1de578a0..eb6cf559 100644 --- a/src/NadekoBot/data/pokemon/name-id_map2.json +++ b/src/NadekoBot/data/pokemon/name-id_map2.json @@ -1753,7 +1753,7 @@ }, { "Id": 439, - "Name": "mime" + "Name": "mime jr" }, { "Id": 440, From c8179cdf2a170cb10393102216bbe0032ef5724f Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 24 Mar 2017 12:15:50 +0100 Subject: [PATCH 350/496] .lcr will now indicate autodeleting and dming custom reactions with emojis before the id --- .../Modules/CustomReactions/CustomReactions.cs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs b/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs index 024e79b5..f28a7bc9 100644 --- a/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs +++ b/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs @@ -188,7 +188,19 @@ namespace NadekoBot.Modules.CustomReactions .WithDescription(string.Join("\n", customReactions.OrderBy(cr => cr.Trigger) .Skip((curPage - 1) * 20) .Take(20) - .Select(cr => $"`#{cr.Id}` `{GetText("trigger")}:` {cr.Trigger}"))), lastPage) + .Select(cr => + { + var str = $"`#{cr.Id}` {cr.Trigger}"; + if (cr.AutoDeleteTrigger) + { + str = "🗑" + str; + } + if (cr.DmResponse) + { + str = "📪" + str; + } + return str; + }))), lastPage) .ConfigureAwait(false); } From 86105df59acce318dbdb0737770d8c704a71de88 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 25 Mar 2017 07:39:50 +0100 Subject: [PATCH 351/496] pokemon and nohint trivia args are now case-insensitive --- src/NadekoBot/Modules/Games/Commands/TriviaCommands.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/NadekoBot/Modules/Games/Commands/TriviaCommands.cs b/src/NadekoBot/Modules/Games/Commands/TriviaCommands.cs index c8bd3e73..a18763c1 100644 --- a/src/NadekoBot/Modules/Games/Commands/TriviaCommands.cs +++ b/src/NadekoBot/Modules/Games/Commands/TriviaCommands.cs @@ -30,6 +30,8 @@ namespace NadekoBot.Modules.Games { var channel = (ITextChannel)Context.Channel; + additionalArgs = additionalArgs?.Trim()?.ToLowerInvariant(); + var showHints = !additionalArgs.Contains("nohint"); var isPokemon = additionalArgs.Contains("pokemon"); From 77b6d42d9358d01d702b381cc5f000e9b2f7eaec Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 25 Mar 2017 09:32:04 +0100 Subject: [PATCH 352/496] Fixes to some pokemans, higher delay between questions --- .../Games/Commands/Trivia/TriviaGame.cs | 5 +- .../Commands/Trivia/TriviaQuestionPool.cs | 2 +- src/NadekoBot/data/pokemon/name-id_map2.json | 3246 ----------------- src/NadekoBot/data/pokemon/name-id_map3.json | 1 + 4 files changed, 5 insertions(+), 3249 deletions(-) delete mode 100644 src/NadekoBot/data/pokemon/name-id_map2.json create mode 100644 src/NadekoBot/data/pokemon/name-id_map3.json diff --git a/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaGame.cs b/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaGame.cs index 3bfb8b1a..0fba8200 100644 --- a/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaGame.cs +++ b/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaGame.cs @@ -136,7 +136,8 @@ namespace NadekoBot.Modules.Games.Trivia { await Channel.EmbedAsync(new EmbedBuilder().WithErrorColor() .WithTitle(GetText("trivia_game")) - .WithDescription(GetText("trivia_times_up", Format.Bold(CurrentQuestion.Answer)))) + .WithDescription(GetText("trivia_times_up", Format.Bold(CurrentQuestion.Answer))) + .WithImageUrl(CurrentQuestion.AnswerImageUrl)) .ConfigureAwait(false); } catch (Exception ex) @@ -144,7 +145,7 @@ namespace NadekoBot.Modules.Games.Trivia _log.Warn(ex); } } - await Task.Delay(2000).ConfigureAwait(false); + await Task.Delay(5000).ConfigureAwait(false); } } diff --git a/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs b/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs index cbad9815..e98830f5 100644 --- a/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs +++ b/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs @@ -21,7 +21,7 @@ namespace NadekoBot.Modules.Games.Trivia public static TriviaQuestionPool Instance { get; } = _instance ?? (_instance = new TriviaQuestionPool()); private const string questionsFile = "data/trivia_questions.json"; - private const string pokemonMapPath = "data/pokemon/name-id_map2.json"; + private const string pokemonMapPath = "data/pokemon/name-id_map3.json"; private readonly int maxPokemonId; private Random rng { get; } = new NadekoRandom(); diff --git a/src/NadekoBot/data/pokemon/name-id_map2.json b/src/NadekoBot/data/pokemon/name-id_map2.json deleted file mode 100644 index eb6cf559..00000000 --- a/src/NadekoBot/data/pokemon/name-id_map2.json +++ /dev/null @@ -1,3246 +0,0 @@ -[ - { - "Id": 1, - "Name": "bulbasaur" - }, - { - "Id": 2, - "Name": "ivysaur" - }, - { - "Id": 3, - "Name": "venusaur" - }, - { - "Id": 4, - "Name": "charmander" - }, - { - "Id": 5, - "Name": "charmeleon" - }, - { - "Id": 6, - "Name": "charizard" - }, - { - "Id": 7, - "Name": "squirtle" - }, - { - "Id": 8, - "Name": "wartortle" - }, - { - "Id": 9, - "Name": "blastoise" - }, - { - "Id": 10, - "Name": "caterpie" - }, - { - "Id": 11, - "Name": "metapod" - }, - { - "Id": 12, - "Name": "butterfree" - }, - { - "Id": 13, - "Name": "weedle" - }, - { - "Id": 14, - "Name": "kakuna" - }, - { - "Id": 15, - "Name": "beedrill" - }, - { - "Id": 16, - "Name": "pidgey" - }, - { - "Id": 17, - "Name": "pidgeotto" - }, - { - "Id": 18, - "Name": "pidgeot" - }, - { - "Id": 19, - "Name": "rattata" - }, - { - "Id": 20, - "Name": "raticate" - }, - { - "Id": 21, - "Name": "spearow" - }, - { - "Id": 22, - "Name": "fearow" - }, - { - "Id": 23, - "Name": "ekans" - }, - { - "Id": 24, - "Name": "arbok" - }, - { - "Id": 25, - "Name": "pikachu" - }, - { - "Id": 26, - "Name": "raichu" - }, - { - "Id": 27, - "Name": "sandshrew" - }, - { - "Id": 28, - "Name": "sandslash" - }, - { - "Id": 29, - "Name": "nidoran" - }, - { - "Id": 30, - "Name": "nidorina" - }, - { - "Id": 31, - "Name": "nidoqueen" - }, - { - "Id": 32, - "Name": "nidoran" - }, - { - "Id": 33, - "Name": "nidorino" - }, - { - "Id": 34, - "Name": "nidoking" - }, - { - "Id": 35, - "Name": "clefairy" - }, - { - "Id": 36, - "Name": "clefable" - }, - { - "Id": 37, - "Name": "vulpix" - }, - { - "Id": 38, - "Name": "ninetales" - }, - { - "Id": 39, - "Name": "jigglypuff" - }, - { - "Id": 40, - "Name": "wigglytuff" - }, - { - "Id": 41, - "Name": "zubat" - }, - { - "Id": 42, - "Name": "golbat" - }, - { - "Id": 43, - "Name": "oddish" - }, - { - "Id": 44, - "Name": "gloom" - }, - { - "Id": 45, - "Name": "vileplume" - }, - { - "Id": 46, - "Name": "paras" - }, - { - "Id": 47, - "Name": "parasect" - }, - { - "Id": 48, - "Name": "venonat" - }, - { - "Id": 49, - "Name": "venomoth" - }, - { - "Id": 50, - "Name": "diglett" - }, - { - "Id": 51, - "Name": "dugtrio" - }, - { - "Id": 52, - "Name": "meowth" - }, - { - "Id": 53, - "Name": "persian" - }, - { - "Id": 54, - "Name": "psyduck" - }, - { - "Id": 55, - "Name": "golduck" - }, - { - "Id": 56, - "Name": "mankey" - }, - { - "Id": 57, - "Name": "primeape" - }, - { - "Id": 58, - "Name": "growlithe" - }, - { - "Id": 59, - "Name": "arcanine" - }, - { - "Id": 60, - "Name": "poliwag" - }, - { - "Id": 61, - "Name": "poliwhirl" - }, - { - "Id": 62, - "Name": "poliwrath" - }, - { - "Id": 63, - "Name": "abra" - }, - { - "Id": 64, - "Name": "kadabra" - }, - { - "Id": 65, - "Name": "alakazam" - }, - { - "Id": 66, - "Name": "machop" - }, - { - "Id": 67, - "Name": "machoke" - }, - { - "Id": 68, - "Name": "machamp" - }, - { - "Id": 69, - "Name": "bellsprout" - }, - { - "Id": 70, - "Name": "weepinbell" - }, - { - "Id": 71, - "Name": "victreebel" - }, - { - "Id": 72, - "Name": "tentacool" - }, - { - "Id": 73, - "Name": "tentacruel" - }, - { - "Id": 74, - "Name": "geodude" - }, - { - "Id": 75, - "Name": "graveler" - }, - { - "Id": 76, - "Name": "golem" - }, - { - "Id": 77, - "Name": "ponyta" - }, - { - "Id": 78, - "Name": "rapidash" - }, - { - "Id": 79, - "Name": "slowpoke" - }, - { - "Id": 80, - "Name": "slowbro" - }, - { - "Id": 81, - "Name": "magnemite" - }, - { - "Id": 82, - "Name": "magneton" - }, - { - "Id": 83, - "Name": "farfetchd" - }, - { - "Id": 84, - "Name": "doduo" - }, - { - "Id": 85, - "Name": "dodrio" - }, - { - "Id": 86, - "Name": "seel" - }, - { - "Id": 87, - "Name": "dewgong" - }, - { - "Id": 88, - "Name": "grimer" - }, - { - "Id": 89, - "Name": "muk" - }, - { - "Id": 90, - "Name": "shellder" - }, - { - "Id": 91, - "Name": "cloyster" - }, - { - "Id": 92, - "Name": "gastly" - }, - { - "Id": 93, - "Name": "haunter" - }, - { - "Id": 94, - "Name": "gengar" - }, - { - "Id": 95, - "Name": "onix" - }, - { - "Id": 96, - "Name": "drowzee" - }, - { - "Id": 97, - "Name": "hypno" - }, - { - "Id": 98, - "Name": "krabby" - }, - { - "Id": 99, - "Name": "kingler" - }, - { - "Id": 100, - "Name": "voltorb" - }, - { - "Id": 101, - "Name": "electrode" - }, - { - "Id": 102, - "Name": "exeggcute" - }, - { - "Id": 103, - "Name": "exeggutor" - }, - { - "Id": 104, - "Name": "cubone" - }, - { - "Id": 105, - "Name": "marowak" - }, - { - "Id": 106, - "Name": "hitmonlee" - }, - { - "Id": 107, - "Name": "hitmonchan" - }, - { - "Id": 108, - "Name": "lickitung" - }, - { - "Id": 109, - "Name": "koffing" - }, - { - "Id": 110, - "Name": "weezing" - }, - { - "Id": 111, - "Name": "rhyhorn" - }, - { - "Id": 112, - "Name": "rhydon" - }, - { - "Id": 113, - "Name": "chansey" - }, - { - "Id": 114, - "Name": "tangela" - }, - { - "Id": 115, - "Name": "kangaskhan" - }, - { - "Id": 116, - "Name": "horsea" - }, - { - "Id": 117, - "Name": "seadra" - }, - { - "Id": 118, - "Name": "goldeen" - }, - { - "Id": 119, - "Name": "seaking" - }, - { - "Id": 120, - "Name": "staryu" - }, - { - "Id": 121, - "Name": "starmie" - }, - { - "Id": 122, - "Name": "mr mime" - }, - { - "Id": 123, - "Name": "scyther" - }, - { - "Id": 124, - "Name": "jynx" - }, - { - "Id": 125, - "Name": "electabuzz" - }, - { - "Id": 126, - "Name": "magmar" - }, - { - "Id": 127, - "Name": "pinsir" - }, - { - "Id": 128, - "Name": "tauros" - }, - { - "Id": 129, - "Name": "magikarp" - }, - { - "Id": 130, - "Name": "gyarados" - }, - { - "Id": 131, - "Name": "lapras" - }, - { - "Id": 132, - "Name": "ditto" - }, - { - "Id": 133, - "Name": "eevee" - }, - { - "Id": 134, - "Name": "vaporeon" - }, - { - "Id": 135, - "Name": "jolteon" - }, - { - "Id": 136, - "Name": "flareon" - }, - { - "Id": 137, - "Name": "porygon" - }, - { - "Id": 138, - "Name": "omanyte" - }, - { - "Id": 139, - "Name": "omastar" - }, - { - "Id": 140, - "Name": "kabuto" - }, - { - "Id": 141, - "Name": "kabutops" - }, - { - "Id": 142, - "Name": "aerodactyl" - }, - { - "Id": 143, - "Name": "snorlax" - }, - { - "Id": 144, - "Name": "articuno" - }, - { - "Id": 145, - "Name": "zapdos" - }, - { - "Id": 146, - "Name": "moltres" - }, - { - "Id": 147, - "Name": "dratini" - }, - { - "Id": 148, - "Name": "dragonair" - }, - { - "Id": 149, - "Name": "dragonite" - }, - { - "Id": 150, - "Name": "mewtwo" - }, - { - "Id": 151, - "Name": "mew" - }, - { - "Id": 152, - "Name": "chikorita" - }, - { - "Id": 153, - "Name": "bayleef" - }, - { - "Id": 154, - "Name": "meganium" - }, - { - "Id": 155, - "Name": "cyndaquil" - }, - { - "Id": 156, - "Name": "quilava" - }, - { - "Id": 157, - "Name": "typhlosion" - }, - { - "Id": 158, - "Name": "totodile" - }, - { - "Id": 159, - "Name": "croconaw" - }, - { - "Id": 160, - "Name": "feraligatr" - }, - { - "Id": 161, - "Name": "sentret" - }, - { - "Id": 162, - "Name": "furret" - }, - { - "Id": 163, - "Name": "hoothoot" - }, - { - "Id": 164, - "Name": "noctowl" - }, - { - "Id": 165, - "Name": "ledyba" - }, - { - "Id": 166, - "Name": "ledian" - }, - { - "Id": 167, - "Name": "spinarak" - }, - { - "Id": 168, - "Name": "ariados" - }, - { - "Id": 169, - "Name": "crobat" - }, - { - "Id": 170, - "Name": "chinchou" - }, - { - "Id": 171, - "Name": "lanturn" - }, - { - "Id": 172, - "Name": "pichu" - }, - { - "Id": 173, - "Name": "cleffa" - }, - { - "Id": 174, - "Name": "igglybuff" - }, - { - "Id": 175, - "Name": "togepi" - }, - { - "Id": 176, - "Name": "togetic" - }, - { - "Id": 177, - "Name": "natu" - }, - { - "Id": 178, - "Name": "xatu" - }, - { - "Id": 179, - "Name": "mareep" - }, - { - "Id": 180, - "Name": "flaaffy" - }, - { - "Id": 181, - "Name": "ampharos" - }, - { - "Id": 182, - "Name": "bellossom" - }, - { - "Id": 183, - "Name": "marill" - }, - { - "Id": 184, - "Name": "azumarill" - }, - { - "Id": 185, - "Name": "sudowoodo" - }, - { - "Id": 186, - "Name": "politoed" - }, - { - "Id": 187, - "Name": "hoppip" - }, - { - "Id": 188, - "Name": "skiploom" - }, - { - "Id": 189, - "Name": "jumpluff" - }, - { - "Id": 190, - "Name": "aipom" - }, - { - "Id": 191, - "Name": "sunkern" - }, - { - "Id": 192, - "Name": "sunflora" - }, - { - "Id": 193, - "Name": "yanma" - }, - { - "Id": 194, - "Name": "wooper" - }, - { - "Id": 195, - "Name": "quagsire" - }, - { - "Id": 196, - "Name": "espeon" - }, - { - "Id": 197, - "Name": "umbreon" - }, - { - "Id": 198, - "Name": "murkrow" - }, - { - "Id": 199, - "Name": "slowking" - }, - { - "Id": 200, - "Name": "misdreavus" - }, - { - "Id": 201, - "Name": "unown" - }, - { - "Id": 202, - "Name": "wobbuffet" - }, - { - "Id": 203, - "Name": "girafarig" - }, - { - "Id": 204, - "Name": "pineco" - }, - { - "Id": 205, - "Name": "forretress" - }, - { - "Id": 206, - "Name": "dunsparce" - }, - { - "Id": 207, - "Name": "gligar" - }, - { - "Id": 208, - "Name": "steelix" - }, - { - "Id": 209, - "Name": "snubbull" - }, - { - "Id": 210, - "Name": "granbull" - }, - { - "Id": 211, - "Name": "qwilfish" - }, - { - "Id": 212, - "Name": "scizor" - }, - { - "Id": 213, - "Name": "shuckle" - }, - { - "Id": 214, - "Name": "heracross" - }, - { - "Id": 215, - "Name": "sneasel" - }, - { - "Id": 216, - "Name": "teddiursa" - }, - { - "Id": 217, - "Name": "ursaring" - }, - { - "Id": 218, - "Name": "slugma" - }, - { - "Id": 219, - "Name": "magcargo" - }, - { - "Id": 220, - "Name": "swinub" - }, - { - "Id": 221, - "Name": "piloswine" - }, - { - "Id": 222, - "Name": "corsola" - }, - { - "Id": 223, - "Name": "remoraid" - }, - { - "Id": 224, - "Name": "octillery" - }, - { - "Id": 225, - "Name": "delibird" - }, - { - "Id": 226, - "Name": "mantine" - }, - { - "Id": 227, - "Name": "skarmory" - }, - { - "Id": 228, - "Name": "houndour" - }, - { - "Id": 229, - "Name": "houndoom" - }, - { - "Id": 230, - "Name": "kingdra" - }, - { - "Id": 231, - "Name": "phanpy" - }, - { - "Id": 232, - "Name": "donphan" - }, - { - "Id": 233, - "Name": "porygon2" - }, - { - "Id": 234, - "Name": "stantler" - }, - { - "Id": 235, - "Name": "smeargle" - }, - { - "Id": 236, - "Name": "tyrogue" - }, - { - "Id": 237, - "Name": "hitmontop" - }, - { - "Id": 238, - "Name": "smoochum" - }, - { - "Id": 239, - "Name": "elekid" - }, - { - "Id": 240, - "Name": "magby" - }, - { - "Id": 241, - "Name": "miltank" - }, - { - "Id": 242, - "Name": "blissey" - }, - { - "Id": 243, - "Name": "raikou" - }, - { - "Id": 244, - "Name": "entei" - }, - { - "Id": 245, - "Name": "suicune" - }, - { - "Id": 246, - "Name": "larvitar" - }, - { - "Id": 247, - "Name": "pupitar" - }, - { - "Id": 248, - "Name": "tyranitar" - }, - { - "Id": 249, - "Name": "lugia" - }, - { - "Id": 250, - "Name": "ho" - }, - { - "Id": 251, - "Name": "celebi" - }, - { - "Id": 252, - "Name": "treecko" - }, - { - "Id": 253, - "Name": "grovyle" - }, - { - "Id": 254, - "Name": "sceptile" - }, - { - "Id": 255, - "Name": "torchic" - }, - { - "Id": 256, - "Name": "combusken" - }, - { - "Id": 257, - "Name": "blaziken" - }, - { - "Id": 258, - "Name": "mudkip" - }, - { - "Id": 259, - "Name": "marshtomp" - }, - { - "Id": 260, - "Name": "swampert" - }, - { - "Id": 261, - "Name": "poochyena" - }, - { - "Id": 262, - "Name": "mightyena" - }, - { - "Id": 263, - "Name": "zigzagoon" - }, - { - "Id": 264, - "Name": "linoone" - }, - { - "Id": 265, - "Name": "wurmple" - }, - { - "Id": 266, - "Name": "silcoon" - }, - { - "Id": 267, - "Name": "beautifly" - }, - { - "Id": 268, - "Name": "cascoon" - }, - { - "Id": 269, - "Name": "dustox" - }, - { - "Id": 270, - "Name": "lotad" - }, - { - "Id": 271, - "Name": "lombre" - }, - { - "Id": 272, - "Name": "ludicolo" - }, - { - "Id": 273, - "Name": "seedot" - }, - { - "Id": 274, - "Name": "nuzleaf" - }, - { - "Id": 275, - "Name": "shiftry" - }, - { - "Id": 276, - "Name": "taillow" - }, - { - "Id": 277, - "Name": "swellow" - }, - { - "Id": 278, - "Name": "wingull" - }, - { - "Id": 279, - "Name": "pelipper" - }, - { - "Id": 280, - "Name": "ralts" - }, - { - "Id": 281, - "Name": "kirlia" - }, - { - "Id": 282, - "Name": "gardevoir" - }, - { - "Id": 283, - "Name": "surskit" - }, - { - "Id": 284, - "Name": "masquerain" - }, - { - "Id": 285, - "Name": "shroomish" - }, - { - "Id": 286, - "Name": "breloom" - }, - { - "Id": 287, - "Name": "slakoth" - }, - { - "Id": 288, - "Name": "vigoroth" - }, - { - "Id": 289, - "Name": "slaking" - }, - { - "Id": 290, - "Name": "nincada" - }, - { - "Id": 291, - "Name": "ninjask" - }, - { - "Id": 292, - "Name": "shedinja" - }, - { - "Id": 293, - "Name": "whismur" - }, - { - "Id": 294, - "Name": "loudred" - }, - { - "Id": 295, - "Name": "exploud" - }, - { - "Id": 296, - "Name": "makuhita" - }, - { - "Id": 297, - "Name": "hariyama" - }, - { - "Id": 298, - "Name": "azurill" - }, - { - "Id": 299, - "Name": "nosepass" - }, - { - "Id": 300, - "Name": "skitty" - }, - { - "Id": 301, - "Name": "delcatty" - }, - { - "Id": 302, - "Name": "sableye" - }, - { - "Id": 303, - "Name": "mawile" - }, - { - "Id": 304, - "Name": "aron" - }, - { - "Id": 305, - "Name": "lairon" - }, - { - "Id": 306, - "Name": "aggron" - }, - { - "Id": 307, - "Name": "meditite" - }, - { - "Id": 308, - "Name": "medicham" - }, - { - "Id": 309, - "Name": "electrike" - }, - { - "Id": 310, - "Name": "manectric" - }, - { - "Id": 311, - "Name": "plusle" - }, - { - "Id": 312, - "Name": "minun" - }, - { - "Id": 313, - "Name": "volbeat" - }, - { - "Id": 314, - "Name": "illumise" - }, - { - "Id": 315, - "Name": "roselia" - }, - { - "Id": 316, - "Name": "gulpin" - }, - { - "Id": 317, - "Name": "swalot" - }, - { - "Id": 318, - "Name": "carvanha" - }, - { - "Id": 319, - "Name": "sharpedo" - }, - { - "Id": 320, - "Name": "wailmer" - }, - { - "Id": 321, - "Name": "wailord" - }, - { - "Id": 322, - "Name": "numel" - }, - { - "Id": 323, - "Name": "camerupt" - }, - { - "Id": 324, - "Name": "torkoal" - }, - { - "Id": 325, - "Name": "spoink" - }, - { - "Id": 326, - "Name": "grumpig" - }, - { - "Id": 327, - "Name": "spinda" - }, - { - "Id": 328, - "Name": "trapinch" - }, - { - "Id": 329, - "Name": "vibrava" - }, - { - "Id": 330, - "Name": "flygon" - }, - { - "Id": 331, - "Name": "cacnea" - }, - { - "Id": 332, - "Name": "cacturne" - }, - { - "Id": 333, - "Name": "swablu" - }, - { - "Id": 334, - "Name": "altaria" - }, - { - "Id": 335, - "Name": "zangoose" - }, - { - "Id": 336, - "Name": "seviper" - }, - { - "Id": 337, - "Name": "lunatone" - }, - { - "Id": 338, - "Name": "solrock" - }, - { - "Id": 339, - "Name": "barboach" - }, - { - "Id": 340, - "Name": "whiscash" - }, - { - "Id": 341, - "Name": "corphish" - }, - { - "Id": 342, - "Name": "crawdaunt" - }, - { - "Id": 343, - "Name": "baltoy" - }, - { - "Id": 344, - "Name": "claydol" - }, - { - "Id": 345, - "Name": "lileep" - }, - { - "Id": 346, - "Name": "cradily" - }, - { - "Id": 347, - "Name": "anorith" - }, - { - "Id": 348, - "Name": "armaldo" - }, - { - "Id": 349, - "Name": "feebas" - }, - { - "Id": 350, - "Name": "milotic" - }, - { - "Id": 351, - "Name": "castform" - }, - { - "Id": 352, - "Name": "kecleon" - }, - { - "Id": 353, - "Name": "shuppet" - }, - { - "Id": 354, - "Name": "banette" - }, - { - "Id": 355, - "Name": "duskull" - }, - { - "Id": 356, - "Name": "dusclops" - }, - { - "Id": 357, - "Name": "tropius" - }, - { - "Id": 358, - "Name": "chimecho" - }, - { - "Id": 359, - "Name": "absol" - }, - { - "Id": 360, - "Name": "wynaut" - }, - { - "Id": 361, - "Name": "snorunt" - }, - { - "Id": 362, - "Name": "glalie" - }, - { - "Id": 363, - "Name": "spheal" - }, - { - "Id": 364, - "Name": "sealeo" - }, - { - "Id": 365, - "Name": "walrein" - }, - { - "Id": 366, - "Name": "clamperl" - }, - { - "Id": 367, - "Name": "huntail" - }, - { - "Id": 368, - "Name": "gorebyss" - }, - { - "Id": 369, - "Name": "relicanth" - }, - { - "Id": 370, - "Name": "luvdisc" - }, - { - "Id": 371, - "Name": "bagon" - }, - { - "Id": 372, - "Name": "shelgon" - }, - { - "Id": 373, - "Name": "salamence" - }, - { - "Id": 374, - "Name": "beldum" - }, - { - "Id": 375, - "Name": "metang" - }, - { - "Id": 376, - "Name": "metagross" - }, - { - "Id": 377, - "Name": "regirock" - }, - { - "Id": 378, - "Name": "regice" - }, - { - "Id": 379, - "Name": "registeel" - }, - { - "Id": 380, - "Name": "latias" - }, - { - "Id": 381, - "Name": "latios" - }, - { - "Id": 382, - "Name": "kyogre" - }, - { - "Id": 383, - "Name": "groudon" - }, - { - "Id": 384, - "Name": "rayquaza" - }, - { - "Id": 385, - "Name": "jirachi" - }, - { - "Id": 386, - "Name": "deoxys" - }, - { - "Id": 387, - "Name": "turtwig" - }, - { - "Id": 388, - "Name": "grotle" - }, - { - "Id": 389, - "Name": "torterra" - }, - { - "Id": 390, - "Name": "chimchar" - }, - { - "Id": 391, - "Name": "monferno" - }, - { - "Id": 392, - "Name": "infernape" - }, - { - "Id": 393, - "Name": "piplup" - }, - { - "Id": 394, - "Name": "prinplup" - }, - { - "Id": 395, - "Name": "empoleon" - }, - { - "Id": 396, - "Name": "starly" - }, - { - "Id": 397, - "Name": "staravia" - }, - { - "Id": 398, - "Name": "staraptor" - }, - { - "Id": 399, - "Name": "bidoof" - }, - { - "Id": 400, - "Name": "bibarel" - }, - { - "Id": 401, - "Name": "kricketot" - }, - { - "Id": 402, - "Name": "kricketune" - }, - { - "Id": 403, - "Name": "shinx" - }, - { - "Id": 404, - "Name": "luxio" - }, - { - "Id": 405, - "Name": "luxray" - }, - { - "Id": 406, - "Name": "budew" - }, - { - "Id": 407, - "Name": "roserade" - }, - { - "Id": 408, - "Name": "cranidos" - }, - { - "Id": 409, - "Name": "rampardos" - }, - { - "Id": 410, - "Name": "shieldon" - }, - { - "Id": 411, - "Name": "bastiodon" - }, - { - "Id": 412, - "Name": "burmy" - }, - { - "Id": 413, - "Name": "wormadam" - }, - { - "Id": 414, - "Name": "mothim" - }, - { - "Id": 415, - "Name": "combee" - }, - { - "Id": 416, - "Name": "vespiquen" - }, - { - "Id": 417, - "Name": "pachirisu" - }, - { - "Id": 418, - "Name": "buizel" - }, - { - "Id": 419, - "Name": "floatzel" - }, - { - "Id": 420, - "Name": "cherubi" - }, - { - "Id": 421, - "Name": "cherrim" - }, - { - "Id": 422, - "Name": "shellos" - }, - { - "Id": 423, - "Name": "gastrodon" - }, - { - "Id": 424, - "Name": "ambipom" - }, - { - "Id": 425, - "Name": "drifloon" - }, - { - "Id": 426, - "Name": "drifblim" - }, - { - "Id": 427, - "Name": "buneary" - }, - { - "Id": 428, - "Name": "lopunny" - }, - { - "Id": 429, - "Name": "mismagius" - }, - { - "Id": 430, - "Name": "honchkrow" - }, - { - "Id": 431, - "Name": "glameow" - }, - { - "Id": 432, - "Name": "purugly" - }, - { - "Id": 433, - "Name": "chingling" - }, - { - "Id": 434, - "Name": "stunky" - }, - { - "Id": 435, - "Name": "skuntank" - }, - { - "Id": 436, - "Name": "bronzor" - }, - { - "Id": 437, - "Name": "bronzong" - }, - { - "Id": 438, - "Name": "bonsly" - }, - { - "Id": 439, - "Name": "mime jr" - }, - { - "Id": 440, - "Name": "happiny" - }, - { - "Id": 441, - "Name": "chatot" - }, - { - "Id": 442, - "Name": "spiritomb" - }, - { - "Id": 443, - "Name": "gible" - }, - { - "Id": 444, - "Name": "gabite" - }, - { - "Id": 445, - "Name": "garchomp" - }, - { - "Id": 446, - "Name": "munchlax" - }, - { - "Id": 447, - "Name": "riolu" - }, - { - "Id": 448, - "Name": "lucario" - }, - { - "Id": 449, - "Name": "hippopotas" - }, - { - "Id": 450, - "Name": "hippowdon" - }, - { - "Id": 451, - "Name": "skorupi" - }, - { - "Id": 452, - "Name": "drapion" - }, - { - "Id": 453, - "Name": "croagunk" - }, - { - "Id": 454, - "Name": "toxicroak" - }, - { - "Id": 455, - "Name": "carnivine" - }, - { - "Id": 456, - "Name": "finneon" - }, - { - "Id": 457, - "Name": "lumineon" - }, - { - "Id": 458, - "Name": "mantyke" - }, - { - "Id": 459, - "Name": "snover" - }, - { - "Id": 460, - "Name": "abomasnow" - }, - { - "Id": 461, - "Name": "weavile" - }, - { - "Id": 462, - "Name": "magnezone" - }, - { - "Id": 463, - "Name": "lickilicky" - }, - { - "Id": 464, - "Name": "rhyperior" - }, - { - "Id": 465, - "Name": "tangrowth" - }, - { - "Id": 466, - "Name": "electivire" - }, - { - "Id": 467, - "Name": "magmortar" - }, - { - "Id": 468, - "Name": "togekiss" - }, - { - "Id": 469, - "Name": "yanmega" - }, - { - "Id": 470, - "Name": "leafeon" - }, - { - "Id": 471, - "Name": "glaceon" - }, - { - "Id": 472, - "Name": "gliscor" - }, - { - "Id": 473, - "Name": "mamoswine" - }, - { - "Id": 474, - "Name": "porygon" - }, - { - "Id": 475, - "Name": "gallade" - }, - { - "Id": 476, - "Name": "probopass" - }, - { - "Id": 477, - "Name": "dusknoir" - }, - { - "Id": 478, - "Name": "froslass" - }, - { - "Id": 479, - "Name": "rotom" - }, - { - "Id": 480, - "Name": "uxie" - }, - { - "Id": 481, - "Name": "mesprit" - }, - { - "Id": 482, - "Name": "azelf" - }, - { - "Id": 483, - "Name": "dialga" - }, - { - "Id": 484, - "Name": "palkia" - }, - { - "Id": 485, - "Name": "heatran" - }, - { - "Id": 486, - "Name": "regigigas" - }, - { - "Id": 487, - "Name": "giratina" - }, - { - "Id": 488, - "Name": "cresselia" - }, - { - "Id": 489, - "Name": "phione" - }, - { - "Id": 490, - "Name": "manaphy" - }, - { - "Id": 491, - "Name": "darkrai" - }, - { - "Id": 492, - "Name": "shaymin" - }, - { - "Id": 493, - "Name": "arceus" - }, - { - "Id": 494, - "Name": "victini" - }, - { - "Id": 495, - "Name": "snivy" - }, - { - "Id": 496, - "Name": "servine" - }, - { - "Id": 497, - "Name": "serperior" - }, - { - "Id": 498, - "Name": "tepig" - }, - { - "Id": 499, - "Name": "pignite" - }, - { - "Id": 500, - "Name": "emboar" - }, - { - "Id": 501, - "Name": "oshawott" - }, - { - "Id": 502, - "Name": "dewott" - }, - { - "Id": 503, - "Name": "samurott" - }, - { - "Id": 504, - "Name": "patrat" - }, - { - "Id": 505, - "Name": "watchog" - }, - { - "Id": 506, - "Name": "lillipup" - }, - { - "Id": 507, - "Name": "herdier" - }, - { - "Id": 508, - "Name": "stoutland" - }, - { - "Id": 509, - "Name": "purrloin" - }, - { - "Id": 510, - "Name": "liepard" - }, - { - "Id": 511, - "Name": "pansage" - }, - { - "Id": 512, - "Name": "simisage" - }, - { - "Id": 513, - "Name": "pansear" - }, - { - "Id": 514, - "Name": "simisear" - }, - { - "Id": 515, - "Name": "panpour" - }, - { - "Id": 516, - "Name": "simipour" - }, - { - "Id": 517, - "Name": "munna" - }, - { - "Id": 518, - "Name": "musharna" - }, - { - "Id": 519, - "Name": "pidove" - }, - { - "Id": 520, - "Name": "tranquill" - }, - { - "Id": 521, - "Name": "unfezant" - }, - { - "Id": 522, - "Name": "blitzle" - }, - { - "Id": 523, - "Name": "zebstrika" - }, - { - "Id": 524, - "Name": "roggenrola" - }, - { - "Id": 525, - "Name": "boldore" - }, - { - "Id": 526, - "Name": "gigalith" - }, - { - "Id": 527, - "Name": "woobat" - }, - { - "Id": 528, - "Name": "swoobat" - }, - { - "Id": 529, - "Name": "drilbur" - }, - { - "Id": 530, - "Name": "excadrill" - }, - { - "Id": 531, - "Name": "audino" - }, - { - "Id": 532, - "Name": "timburr" - }, - { - "Id": 533, - "Name": "gurdurr" - }, - { - "Id": 534, - "Name": "conkeldurr" - }, - { - "Id": 535, - "Name": "tympole" - }, - { - "Id": 536, - "Name": "palpitoad" - }, - { - "Id": 537, - "Name": "seismitoad" - }, - { - "Id": 538, - "Name": "throh" - }, - { - "Id": 539, - "Name": "sawk" - }, - { - "Id": 540, - "Name": "sewaddle" - }, - { - "Id": 541, - "Name": "swadloon" - }, - { - "Id": 542, - "Name": "leavanny" - }, - { - "Id": 543, - "Name": "venipede" - }, - { - "Id": 544, - "Name": "whirlipede" - }, - { - "Id": 545, - "Name": "scolipede" - }, - { - "Id": 546, - "Name": "cottonee" - }, - { - "Id": 547, - "Name": "whimsicott" - }, - { - "Id": 548, - "Name": "petilil" - }, - { - "Id": 549, - "Name": "lilligant" - }, - { - "Id": 550, - "Name": "basculin" - }, - { - "Id": 551, - "Name": "sandile" - }, - { - "Id": 552, - "Name": "krokorok" - }, - { - "Id": 553, - "Name": "krookodile" - }, - { - "Id": 554, - "Name": "darumaka" - }, - { - "Id": 555, - "Name": "darmanitan" - }, - { - "Id": 556, - "Name": "maractus" - }, - { - "Id": 557, - "Name": "dwebble" - }, - { - "Id": 558, - "Name": "crustle" - }, - { - "Id": 559, - "Name": "scraggy" - }, - { - "Id": 560, - "Name": "scrafty" - }, - { - "Id": 561, - "Name": "sigilyph" - }, - { - "Id": 562, - "Name": "yamask" - }, - { - "Id": 563, - "Name": "cofagrigus" - }, - { - "Id": 564, - "Name": "tirtouga" - }, - { - "Id": 565, - "Name": "carracosta" - }, - { - "Id": 566, - "Name": "archen" - }, - { - "Id": 567, - "Name": "archeops" - }, - { - "Id": 568, - "Name": "trubbish" - }, - { - "Id": 569, - "Name": "garbodor" - }, - { - "Id": 570, - "Name": "zorua" - }, - { - "Id": 571, - "Name": "zoroark" - }, - { - "Id": 572, - "Name": "minccino" - }, - { - "Id": 573, - "Name": "cinccino" - }, - { - "Id": 574, - "Name": "gothita" - }, - { - "Id": 575, - "Name": "gothorita" - }, - { - "Id": 576, - "Name": "gothitelle" - }, - { - "Id": 577, - "Name": "solosis" - }, - { - "Id": 578, - "Name": "duosion" - }, - { - "Id": 579, - "Name": "reuniclus" - }, - { - "Id": 580, - "Name": "ducklett" - }, - { - "Id": 581, - "Name": "swanna" - }, - { - "Id": 582, - "Name": "vanillite" - }, - { - "Id": 583, - "Name": "vanillish" - }, - { - "Id": 584, - "Name": "vanilluxe" - }, - { - "Id": 585, - "Name": "deerling" - }, - { - "Id": 586, - "Name": "sawsbuck" - }, - { - "Id": 587, - "Name": "emolga" - }, - { - "Id": 588, - "Name": "karrablast" - }, - { - "Id": 589, - "Name": "escavalier" - }, - { - "Id": 590, - "Name": "foongus" - }, - { - "Id": 591, - "Name": "amoonguss" - }, - { - "Id": 592, - "Name": "frillish" - }, - { - "Id": 593, - "Name": "jellicent" - }, - { - "Id": 594, - "Name": "alomomola" - }, - { - "Id": 595, - "Name": "joltik" - }, - { - "Id": 596, - "Name": "galvantula" - }, - { - "Id": 597, - "Name": "ferroseed" - }, - { - "Id": 598, - "Name": "ferrothorn" - }, - { - "Id": 599, - "Name": "klink" - }, - { - "Id": 600, - "Name": "klang" - }, - { - "Id": 601, - "Name": "klinklang" - }, - { - "Id": 602, - "Name": "tynamo" - }, - { - "Id": 603, - "Name": "eelektrik" - }, - { - "Id": 604, - "Name": "eelektross" - }, - { - "Id": 605, - "Name": "elgyem" - }, - { - "Id": 606, - "Name": "beheeyem" - }, - { - "Id": 607, - "Name": "litwick" - }, - { - "Id": 608, - "Name": "lampent" - }, - { - "Id": 609, - "Name": "chandelure" - }, - { - "Id": 610, - "Name": "axew" - }, - { - "Id": 611, - "Name": "fraxure" - }, - { - "Id": 612, - "Name": "haxorus" - }, - { - "Id": 613, - "Name": "cubchoo" - }, - { - "Id": 614, - "Name": "beartic" - }, - { - "Id": 615, - "Name": "cryogonal" - }, - { - "Id": 616, - "Name": "shelmet" - }, - { - "Id": 617, - "Name": "accelgor" - }, - { - "Id": 618, - "Name": "stunfisk" - }, - { - "Id": 619, - "Name": "mienfoo" - }, - { - "Id": 620, - "Name": "mienshao" - }, - { - "Id": 621, - "Name": "druddigon" - }, - { - "Id": 622, - "Name": "golett" - }, - { - "Id": 623, - "Name": "golurk" - }, - { - "Id": 624, - "Name": "pawniard" - }, - { - "Id": 625, - "Name": "bisharp" - }, - { - "Id": 626, - "Name": "bouffalant" - }, - { - "Id": 627, - "Name": "rufflet" - }, - { - "Id": 628, - "Name": "braviary" - }, - { - "Id": 629, - "Name": "vullaby" - }, - { - "Id": 630, - "Name": "mandibuzz" - }, - { - "Id": 631, - "Name": "heatmor" - }, - { - "Id": 632, - "Name": "durant" - }, - { - "Id": 633, - "Name": "deino" - }, - { - "Id": 634, - "Name": "zweilous" - }, - { - "Id": 635, - "Name": "hydreigon" - }, - { - "Id": 636, - "Name": "larvesta" - }, - { - "Id": 637, - "Name": "volcarona" - }, - { - "Id": 638, - "Name": "cobalion" - }, - { - "Id": 639, - "Name": "terrakion" - }, - { - "Id": 640, - "Name": "virizion" - }, - { - "Id": 641, - "Name": "tornadus" - }, - { - "Id": 642, - "Name": "thundurus" - }, - { - "Id": 643, - "Name": "reshiram" - }, - { - "Id": 644, - "Name": "zekrom" - }, - { - "Id": 645, - "Name": "landorus" - }, - { - "Id": 646, - "Name": "kyurem" - }, - { - "Id": 647, - "Name": "keldeo" - }, - { - "Id": 648, - "Name": "meloetta" - }, - { - "Id": 649, - "Name": "genesect" - }, - { - "Id": 650, - "Name": "chespin" - }, - { - "Id": 651, - "Name": "quilladin" - }, - { - "Id": 652, - "Name": "chesnaught" - }, - { - "Id": 653, - "Name": "fennekin" - }, - { - "Id": 654, - "Name": "braixen" - }, - { - "Id": 655, - "Name": "delphox" - }, - { - "Id": 656, - "Name": "froakie" - }, - { - "Id": 657, - "Name": "frogadier" - }, - { - "Id": 658, - "Name": "greninja" - }, - { - "Id": 659, - "Name": "bunnelby" - }, - { - "Id": 660, - "Name": "diggersby" - }, - { - "Id": 661, - "Name": "fletchling" - }, - { - "Id": 662, - "Name": "fletchinder" - }, - { - "Id": 663, - "Name": "talonflame" - }, - { - "Id": 664, - "Name": "scatterbug" - }, - { - "Id": 665, - "Name": "spewpa" - }, - { - "Id": 666, - "Name": "vivillon" - }, - { - "Id": 667, - "Name": "litleo" - }, - { - "Id": 668, - "Name": "pyroar" - }, - { - "Id": 669, - "Name": "flabebe" - }, - { - "Id": 670, - "Name": "floette" - }, - { - "Id": 671, - "Name": "florges" - }, - { - "Id": 672, - "Name": "skiddo" - }, - { - "Id": 673, - "Name": "gogoat" - }, - { - "Id": 674, - "Name": "pancham" - }, - { - "Id": 675, - "Name": "pangoro" - }, - { - "Id": 676, - "Name": "furfrou" - }, - { - "Id": 677, - "Name": "espurr" - }, - { - "Id": 678, - "Name": "meowstic" - }, - { - "Id": 679, - "Name": "honedge" - }, - { - "Id": 680, - "Name": "doublade" - }, - { - "Id": 681, - "Name": "aegislash" - }, - { - "Id": 682, - "Name": "spritzee" - }, - { - "Id": 683, - "Name": "aromatisse" - }, - { - "Id": 684, - "Name": "swirlix" - }, - { - "Id": 685, - "Name": "slurpuff" - }, - { - "Id": 686, - "Name": "inkay" - }, - { - "Id": 687, - "Name": "malamar" - }, - { - "Id": 688, - "Name": "binacle" - }, - { - "Id": 689, - "Name": "barbaracle" - }, - { - "Id": 690, - "Name": "skrelp" - }, - { - "Id": 691, - "Name": "dragalge" - }, - { - "Id": 692, - "Name": "clauncher" - }, - { - "Id": 693, - "Name": "clawitzer" - }, - { - "Id": 694, - "Name": "helioptile" - }, - { - "Id": 695, - "Name": "heliolisk" - }, - { - "Id": 696, - "Name": "tyrunt" - }, - { - "Id": 697, - "Name": "tyrantrum" - }, - { - "Id": 698, - "Name": "amaura" - }, - { - "Id": 699, - "Name": "aurorus" - }, - { - "Id": 700, - "Name": "sylveon" - }, - { - "Id": 701, - "Name": "hawlucha" - }, - { - "Id": 702, - "Name": "dedenne" - }, - { - "Id": 703, - "Name": "carbink" - }, - { - "Id": 704, - "Name": "goomy" - }, - { - "Id": 705, - "Name": "sliggoo" - }, - { - "Id": 706, - "Name": "goodra" - }, - { - "Id": 707, - "Name": "klefki" - }, - { - "Id": 708, - "Name": "phantump" - }, - { - "Id": 709, - "Name": "trevenant" - }, - { - "Id": 710, - "Name": "pumpkaboo" - }, - { - "Id": 711, - "Name": "gourgeist" - }, - { - "Id": 712, - "Name": "bergmite" - }, - { - "Id": 713, - "Name": "avalugg" - }, - { - "Id": 714, - "Name": "noibat" - }, - { - "Id": 715, - "Name": "noivern" - }, - { - "Id": 716, - "Name": "xerneas" - }, - { - "Id": 717, - "Name": "yveltal" - }, - { - "Id": 718, - "Name": "zygarde" - }, - { - "Id": 719, - "Name": "diancie" - }, - { - "Id": 720, - "Name": "hoopa" - }, - { - "Id": 721, - "Name": "volcanion" - }, - { - "Id": 10001, - "Name": "deoxys" - }, - { - "Id": 10002, - "Name": "deoxys" - }, - { - "Id": 10003, - "Name": "deoxys" - }, - { - "Id": 10004, - "Name": "wormadam" - }, - { - "Id": 10005, - "Name": "wormadam" - }, - { - "Id": 10006, - "Name": "shaymin" - }, - { - "Id": 10007, - "Name": "giratina" - }, - { - "Id": 10008, - "Name": "rotom" - }, - { - "Id": 10009, - "Name": "rotom" - }, - { - "Id": 10010, - "Name": "rotom" - }, - { - "Id": 10011, - "Name": "rotom" - }, - { - "Id": 10012, - "Name": "rotom" - }, - { - "Id": 10013, - "Name": "castform" - }, - { - "Id": 10014, - "Name": "castform" - }, - { - "Id": 10015, - "Name": "castform" - }, - { - "Id": 10016, - "Name": "basculin" - }, - { - "Id": 10017, - "Name": "darmanitan" - }, - { - "Id": 10018, - "Name": "meloetta" - }, - { - "Id": 10019, - "Name": "tornadus" - }, - { - "Id": 10020, - "Name": "thundurus" - }, - { - "Id": 10021, - "Name": "landorus" - }, - { - "Id": 10022, - "Name": "kyurem" - }, - { - "Id": 10023, - "Name": "kyurem" - }, - { - "Id": 10024, - "Name": "keldeo" - }, - { - "Id": 10025, - "Name": "meowstic" - }, - { - "Id": 10026, - "Name": "aegislash" - }, - { - "Id": 10027, - "Name": "pumpkaboo" - }, - { - "Id": 10028, - "Name": "pumpkaboo" - }, - { - "Id": 10029, - "Name": "pumpkaboo" - }, - { - "Id": 10030, - "Name": "gourgeist" - }, - { - "Id": 10031, - "Name": "gourgeist" - }, - { - "Id": 10032, - "Name": "gourgeist" - }, - { - "Id": 10033, - "Name": "venusaur" - }, - { - "Id": 10034, - "Name": "charizard" - }, - { - "Id": 10035, - "Name": "charizard" - }, - { - "Id": 10036, - "Name": "blastoise" - }, - { - "Id": 10037, - "Name": "alakazam" - }, - { - "Id": 10038, - "Name": "gengar" - }, - { - "Id": 10039, - "Name": "kangaskhan" - }, - { - "Id": 10040, - "Name": "pinsir" - }, - { - "Id": 10041, - "Name": "gyarados" - }, - { - "Id": 10042, - "Name": "aerodactyl" - }, - { - "Id": 10043, - "Name": "mewtwo" - }, - { - "Id": 10044, - "Name": "mewtwo" - }, - { - "Id": 10045, - "Name": "ampharos" - }, - { - "Id": 10046, - "Name": "scizor" - }, - { - "Id": 10047, - "Name": "heracross" - }, - { - "Id": 10048, - "Name": "houndoom" - }, - { - "Id": 10049, - "Name": "tyranitar" - }, - { - "Id": 10050, - "Name": "blaziken" - }, - { - "Id": 10051, - "Name": "gardevoir" - }, - { - "Id": 10052, - "Name": "mawile" - }, - { - "Id": 10053, - "Name": "aggron" - }, - { - "Id": 10054, - "Name": "medicham" - }, - { - "Id": 10055, - "Name": "manectric" - }, - { - "Id": 10056, - "Name": "banette" - }, - { - "Id": 10057, - "Name": "absol" - }, - { - "Id": 10058, - "Name": "garchomp" - }, - { - "Id": 10059, - "Name": "lucario" - }, - { - "Id": 10060, - "Name": "abomasnow" - }, - { - "Id": 10061, - "Name": "floette" - }, - { - "Id": 10062, - "Name": "latias" - }, - { - "Id": 10063, - "Name": "latios" - }, - { - "Id": 10064, - "Name": "swampert" - }, - { - "Id": 10065, - "Name": "sceptile" - }, - { - "Id": 10066, - "Name": "sableye" - }, - { - "Id": 10067, - "Name": "altaria" - }, - { - "Id": 10068, - "Name": "gallade" - }, - { - "Id": 10069, - "Name": "audino" - }, - { - "Id": 10070, - "Name": "sharpedo" - }, - { - "Id": 10071, - "Name": "slowbro" - }, - { - "Id": 10072, - "Name": "steelix" - }, - { - "Id": 10073, - "Name": "pidgeot" - }, - { - "Id": 10074, - "Name": "glalie" - }, - { - "Id": 10075, - "Name": "diancie" - }, - { - "Id": 10076, - "Name": "metagross" - }, - { - "Id": 10077, - "Name": "kyogre" - }, - { - "Id": 10078, - "Name": "groudon" - }, - { - "Id": 10079, - "Name": "rayquaza" - }, - { - "Id": 10080, - "Name": "pikachu" - }, - { - "Id": 10081, - "Name": "pikachu" - }, - { - "Id": 10082, - "Name": "pikachu" - }, - { - "Id": 10083, - "Name": "pikachu" - }, - { - "Id": 10084, - "Name": "pikachu" - }, - { - "Id": 10085, - "Name": "pikachu" - }, - { - "Id": 10086, - "Name": "hoopa" - }, - { - "Id": 10087, - "Name": "camerupt" - }, - { - "Id": 10088, - "Name": "lopunny" - }, - { - "Id": 10089, - "Name": "salamence" - }, - { - "Id": 10090, - "Name": "beedrill" - } -] \ No newline at end of file diff --git a/src/NadekoBot/data/pokemon/name-id_map3.json b/src/NadekoBot/data/pokemon/name-id_map3.json new file mode 100644 index 00000000..06422033 --- /dev/null +++ b/src/NadekoBot/data/pokemon/name-id_map3.json @@ -0,0 +1 @@ +[{"Id":1,"Name":"bulbasaur"},{"Id":2,"Name":"ivysaur"},{"Id":3,"Name":"venusaur"},{"Id":4,"Name":"charmander"},{"Id":5,"Name":"charmeleon"},{"Id":6,"Name":"charizard"},{"Id":7,"Name":"squirtle"},{"Id":8,"Name":"wartortle"},{"Id":9,"Name":"blastoise"},{"Id":10,"Name":"caterpie"},{"Id":11,"Name":"metapod"},{"Id":12,"Name":"butterfree"},{"Id":13,"Name":"weedle"},{"Id":14,"Name":"kakuna"},{"Id":15,"Name":"beedrill"},{"Id":16,"Name":"pidgey"},{"Id":17,"Name":"pidgeotto"},{"Id":18,"Name":"pidgeot"},{"Id":19,"Name":"rattata"},{"Id":20,"Name":"raticate"},{"Id":21,"Name":"spearow"},{"Id":22,"Name":"fearow"},{"Id":23,"Name":"ekans"},{"Id":24,"Name":"arbok"},{"Id":25,"Name":"pikachu"},{"Id":26,"Name":"raichu"},{"Id":27,"Name":"sandshrew"},{"Id":28,"Name":"sandslash"},{"Id":29,"Name":"nidoran"},{"Id":30,"Name":"nidorina"},{"Id":31,"Name":"nidoqueen"},{"Id":32,"Name":"nidoran"},{"Id":33,"Name":"nidorino"},{"Id":34,"Name":"nidoking"},{"Id":35,"Name":"clefairy"},{"Id":36,"Name":"clefable"},{"Id":37,"Name":"vulpix"},{"Id":38,"Name":"ninetales"},{"Id":39,"Name":"jigglypuff"},{"Id":40,"Name":"wigglytuff"},{"Id":41,"Name":"zubat"},{"Id":42,"Name":"golbat"},{"Id":43,"Name":"oddish"},{"Id":44,"Name":"gloom"},{"Id":45,"Name":"vileplume"},{"Id":46,"Name":"paras"},{"Id":47,"Name":"parasect"},{"Id":48,"Name":"venonat"},{"Id":49,"Name":"venomoth"},{"Id":50,"Name":"diglett"},{"Id":51,"Name":"dugtrio"},{"Id":52,"Name":"meowth"},{"Id":53,"Name":"persian"},{"Id":54,"Name":"psyduck"},{"Id":55,"Name":"golduck"},{"Id":56,"Name":"mankey"},{"Id":57,"Name":"primeape"},{"Id":58,"Name":"growlithe"},{"Id":59,"Name":"arcanine"},{"Id":60,"Name":"poliwag"},{"Id":61,"Name":"poliwhirl"},{"Id":62,"Name":"poliwrath"},{"Id":63,"Name":"abra"},{"Id":64,"Name":"kadabra"},{"Id":65,"Name":"alakazam"},{"Id":66,"Name":"machop"},{"Id":67,"Name":"machoke"},{"Id":68,"Name":"machamp"},{"Id":69,"Name":"bellsprout"},{"Id":70,"Name":"weepinbell"},{"Id":71,"Name":"victreebel"},{"Id":72,"Name":"tentacool"},{"Id":73,"Name":"tentacruel"},{"Id":74,"Name":"geodude"},{"Id":75,"Name":"graveler"},{"Id":76,"Name":"golem"},{"Id":77,"Name":"ponyta"},{"Id":78,"Name":"rapidash"},{"Id":79,"Name":"slowpoke"},{"Id":80,"Name":"slowbro"},{"Id":81,"Name":"magnemite"},{"Id":82,"Name":"magneton"},{"Id":83,"Name":"farfetchd"},{"Id":84,"Name":"doduo"},{"Id":85,"Name":"dodrio"},{"Id":86,"Name":"seel"},{"Id":87,"Name":"dewgong"},{"Id":88,"Name":"grimer"},{"Id":89,"Name":"muk"},{"Id":90,"Name":"shellder"},{"Id":91,"Name":"cloyster"},{"Id":92,"Name":"gastly"},{"Id":93,"Name":"haunter"},{"Id":94,"Name":"gengar"},{"Id":95,"Name":"onix"},{"Id":96,"Name":"drowzee"},{"Id":97,"Name":"hypno"},{"Id":98,"Name":"krabby"},{"Id":99,"Name":"kingler"},{"Id":100,"Name":"voltorb"},{"Id":101,"Name":"electrode"},{"Id":102,"Name":"exeggcute"},{"Id":103,"Name":"exeggutor"},{"Id":104,"Name":"cubone"},{"Id":105,"Name":"marowak"},{"Id":106,"Name":"hitmonlee"},{"Id":107,"Name":"hitmonchan"},{"Id":108,"Name":"lickitung"},{"Id":109,"Name":"koffing"},{"Id":110,"Name":"weezing"},{"Id":111,"Name":"rhyhorn"},{"Id":112,"Name":"rhydon"},{"Id":113,"Name":"chansey"},{"Id":114,"Name":"tangela"},{"Id":115,"Name":"kangaskhan"},{"Id":116,"Name":"horsea"},{"Id":117,"Name":"seadra"},{"Id":118,"Name":"goldeen"},{"Id":119,"Name":"seaking"},{"Id":120,"Name":"staryu"},{"Id":121,"Name":"starmie"},{"Id":122,"Name":"mr mime"},{"Id":123,"Name":"scyther"},{"Id":124,"Name":"jynx"},{"Id":125,"Name":"electabuzz"},{"Id":126,"Name":"magmar"},{"Id":127,"Name":"pinsir"},{"Id":128,"Name":"tauros"},{"Id":129,"Name":"magikarp"},{"Id":130,"Name":"gyarados"},{"Id":131,"Name":"lapras"},{"Id":132,"Name":"ditto"},{"Id":133,"Name":"eevee"},{"Id":134,"Name":"vaporeon"},{"Id":135,"Name":"jolteon"},{"Id":136,"Name":"flareon"},{"Id":137,"Name":"porygon"},{"Id":138,"Name":"omanyte"},{"Id":139,"Name":"omastar"},{"Id":140,"Name":"kabuto"},{"Id":141,"Name":"kabutops"},{"Id":142,"Name":"aerodactyl"},{"Id":143,"Name":"snorlax"},{"Id":144,"Name":"articuno"},{"Id":145,"Name":"zapdos"},{"Id":146,"Name":"moltres"},{"Id":147,"Name":"dratini"},{"Id":148,"Name":"dragonair"},{"Id":149,"Name":"dragonite"},{"Id":150,"Name":"mewtwo"},{"Id":151,"Name":"mew"},{"Id":152,"Name":"chikorita"},{"Id":153,"Name":"bayleef"},{"Id":154,"Name":"meganium"},{"Id":155,"Name":"cyndaquil"},{"Id":156,"Name":"quilava"},{"Id":157,"Name":"typhlosion"},{"Id":158,"Name":"totodile"},{"Id":159,"Name":"croconaw"},{"Id":160,"Name":"feraligatr"},{"Id":161,"Name":"sentret"},{"Id":162,"Name":"furret"},{"Id":163,"Name":"hoothoot"},{"Id":164,"Name":"noctowl"},{"Id":165,"Name":"ledyba"},{"Id":166,"Name":"ledian"},{"Id":167,"Name":"spinarak"},{"Id":168,"Name":"ariados"},{"Id":169,"Name":"crobat"},{"Id":170,"Name":"chinchou"},{"Id":171,"Name":"lanturn"},{"Id":172,"Name":"pichu"},{"Id":173,"Name":"cleffa"},{"Id":174,"Name":"igglybuff"},{"Id":175,"Name":"togepi"},{"Id":176,"Name":"togetic"},{"Id":177,"Name":"natu"},{"Id":178,"Name":"xatu"},{"Id":179,"Name":"mareep"},{"Id":180,"Name":"flaaffy"},{"Id":181,"Name":"ampharos"},{"Id":182,"Name":"bellossom"},{"Id":183,"Name":"marill"},{"Id":184,"Name":"azumarill"},{"Id":185,"Name":"sudowoodo"},{"Id":186,"Name":"politoed"},{"Id":187,"Name":"hoppip"},{"Id":188,"Name":"skiploom"},{"Id":189,"Name":"jumpluff"},{"Id":190,"Name":"aipom"},{"Id":191,"Name":"sunkern"},{"Id":192,"Name":"sunflora"},{"Id":193,"Name":"yanma"},{"Id":194,"Name":"wooper"},{"Id":195,"Name":"quagsire"},{"Id":196,"Name":"espeon"},{"Id":197,"Name":"umbreon"},{"Id":198,"Name":"murkrow"},{"Id":199,"Name":"slowking"},{"Id":200,"Name":"misdreavus"},{"Id":201,"Name":"unown"},{"Id":202,"Name":"wobbuffet"},{"Id":203,"Name":"girafarig"},{"Id":204,"Name":"pineco"},{"Id":205,"Name":"forretress"},{"Id":206,"Name":"dunsparce"},{"Id":207,"Name":"gligar"},{"Id":208,"Name":"steelix"},{"Id":209,"Name":"snubbull"},{"Id":210,"Name":"granbull"},{"Id":211,"Name":"qwilfish"},{"Id":212,"Name":"scizor"},{"Id":213,"Name":"shuckle"},{"Id":214,"Name":"heracross"},{"Id":215,"Name":"sneasel"},{"Id":216,"Name":"teddiursa"},{"Id":217,"Name":"ursaring"},{"Id":218,"Name":"slugma"},{"Id":219,"Name":"magcargo"},{"Id":220,"Name":"swinub"},{"Id":221,"Name":"piloswine"},{"Id":222,"Name":"corsola"},{"Id":223,"Name":"remoraid"},{"Id":224,"Name":"octillery"},{"Id":225,"Name":"delibird"},{"Id":226,"Name":"mantine"},{"Id":227,"Name":"skarmory"},{"Id":228,"Name":"houndour"},{"Id":229,"Name":"houndoom"},{"Id":230,"Name":"kingdra"},{"Id":231,"Name":"phanpy"},{"Id":232,"Name":"donphan"},{"Id":233,"Name":"porygon2"},{"Id":234,"Name":"stantler"},{"Id":235,"Name":"smeargle"},{"Id":236,"Name":"tyrogue"},{"Id":237,"Name":"hitmontop"},{"Id":238,"Name":"smoochum"},{"Id":239,"Name":"elekid"},{"Id":240,"Name":"magby"},{"Id":241,"Name":"miltank"},{"Id":242,"Name":"blissey"},{"Id":243,"Name":"raikou"},{"Id":244,"Name":"entei"},{"Id":245,"Name":"suicune"},{"Id":246,"Name":"larvitar"},{"Id":247,"Name":"pupitar"},{"Id":248,"Name":"tyranitar"},{"Id":249,"Name":"lugia"},{"Id":250,"Name":"ho-oh"},{"Id":251,"Name":"celebi"},{"Id":252,"Name":"treecko"},{"Id":253,"Name":"grovyle"},{"Id":254,"Name":"sceptile"},{"Id":255,"Name":"torchic"},{"Id":256,"Name":"combusken"},{"Id":257,"Name":"blaziken"},{"Id":258,"Name":"mudkip"},{"Id":259,"Name":"marshtomp"},{"Id":260,"Name":"swampert"},{"Id":261,"Name":"poochyena"},{"Id":262,"Name":"mightyena"},{"Id":263,"Name":"zigzagoon"},{"Id":264,"Name":"linoone"},{"Id":265,"Name":"wurmple"},{"Id":266,"Name":"silcoon"},{"Id":267,"Name":"beautifly"},{"Id":268,"Name":"cascoon"},{"Id":269,"Name":"dustox"},{"Id":270,"Name":"lotad"},{"Id":271,"Name":"lombre"},{"Id":272,"Name":"ludicolo"},{"Id":273,"Name":"seedot"},{"Id":274,"Name":"nuzleaf"},{"Id":275,"Name":"shiftry"},{"Id":276,"Name":"taillow"},{"Id":277,"Name":"swellow"},{"Id":278,"Name":"wingull"},{"Id":279,"Name":"pelipper"},{"Id":280,"Name":"ralts"},{"Id":281,"Name":"kirlia"},{"Id":282,"Name":"gardevoir"},{"Id":283,"Name":"surskit"},{"Id":284,"Name":"masquerain"},{"Id":285,"Name":"shroomish"},{"Id":286,"Name":"breloom"},{"Id":287,"Name":"slakoth"},{"Id":288,"Name":"vigoroth"},{"Id":289,"Name":"slaking"},{"Id":290,"Name":"nincada"},{"Id":291,"Name":"ninjask"},{"Id":292,"Name":"shedinja"},{"Id":293,"Name":"whismur"},{"Id":294,"Name":"loudred"},{"Id":295,"Name":"exploud"},{"Id":296,"Name":"makuhita"},{"Id":297,"Name":"hariyama"},{"Id":298,"Name":"azurill"},{"Id":299,"Name":"nosepass"},{"Id":300,"Name":"skitty"},{"Id":301,"Name":"delcatty"},{"Id":302,"Name":"sableye"},{"Id":303,"Name":"mawile"},{"Id":304,"Name":"aron"},{"Id":305,"Name":"lairon"},{"Id":306,"Name":"aggron"},{"Id":307,"Name":"meditite"},{"Id":308,"Name":"medicham"},{"Id":309,"Name":"electrike"},{"Id":310,"Name":"manectric"},{"Id":311,"Name":"plusle"},{"Id":312,"Name":"minun"},{"Id":313,"Name":"volbeat"},{"Id":314,"Name":"illumise"},{"Id":315,"Name":"roselia"},{"Id":316,"Name":"gulpin"},{"Id":317,"Name":"swalot"},{"Id":318,"Name":"carvanha"},{"Id":319,"Name":"sharpedo"},{"Id":320,"Name":"wailmer"},{"Id":321,"Name":"wailord"},{"Id":322,"Name":"numel"},{"Id":323,"Name":"camerupt"},{"Id":324,"Name":"torkoal"},{"Id":325,"Name":"spoink"},{"Id":326,"Name":"grumpig"},{"Id":327,"Name":"spinda"},{"Id":328,"Name":"trapinch"},{"Id":329,"Name":"vibrava"},{"Id":330,"Name":"flygon"},{"Id":331,"Name":"cacnea"},{"Id":332,"Name":"cacturne"},{"Id":333,"Name":"swablu"},{"Id":334,"Name":"altaria"},{"Id":335,"Name":"zangoose"},{"Id":336,"Name":"seviper"},{"Id":337,"Name":"lunatone"},{"Id":338,"Name":"solrock"},{"Id":339,"Name":"barboach"},{"Id":340,"Name":"whiscash"},{"Id":341,"Name":"corphish"},{"Id":342,"Name":"crawdaunt"},{"Id":343,"Name":"baltoy"},{"Id":344,"Name":"claydol"},{"Id":345,"Name":"lileep"},{"Id":346,"Name":"cradily"},{"Id":347,"Name":"anorith"},{"Id":348,"Name":"armaldo"},{"Id":349,"Name":"feebas"},{"Id":350,"Name":"milotic"},{"Id":351,"Name":"castform"},{"Id":352,"Name":"kecleon"},{"Id":353,"Name":"shuppet"},{"Id":354,"Name":"banette"},{"Id":355,"Name":"duskull"},{"Id":356,"Name":"dusclops"},{"Id":357,"Name":"tropius"},{"Id":358,"Name":"chimecho"},{"Id":359,"Name":"absol"},{"Id":360,"Name":"wynaut"},{"Id":361,"Name":"snorunt"},{"Id":362,"Name":"glalie"},{"Id":363,"Name":"spheal"},{"Id":364,"Name":"sealeo"},{"Id":365,"Name":"walrein"},{"Id":366,"Name":"clamperl"},{"Id":367,"Name":"huntail"},{"Id":368,"Name":"gorebyss"},{"Id":369,"Name":"relicanth"},{"Id":370,"Name":"luvdisc"},{"Id":371,"Name":"bagon"},{"Id":372,"Name":"shelgon"},{"Id":373,"Name":"salamence"},{"Id":374,"Name":"beldum"},{"Id":375,"Name":"metang"},{"Id":376,"Name":"metagross"},{"Id":377,"Name":"regirock"},{"Id":378,"Name":"regice"},{"Id":379,"Name":"registeel"},{"Id":380,"Name":"latias"},{"Id":381,"Name":"latios"},{"Id":382,"Name":"kyogre"},{"Id":383,"Name":"groudon"},{"Id":384,"Name":"rayquaza"},{"Id":385,"Name":"jirachi"},{"Id":386,"Name":"deoxys"},{"Id":387,"Name":"turtwig"},{"Id":388,"Name":"grotle"},{"Id":389,"Name":"torterra"},{"Id":390,"Name":"chimchar"},{"Id":391,"Name":"monferno"},{"Id":392,"Name":"infernape"},{"Id":393,"Name":"piplup"},{"Id":394,"Name":"prinplup"},{"Id":395,"Name":"empoleon"},{"Id":396,"Name":"starly"},{"Id":397,"Name":"staravia"},{"Id":398,"Name":"staraptor"},{"Id":399,"Name":"bidoof"},{"Id":400,"Name":"bibarel"},{"Id":401,"Name":"kricketot"},{"Id":402,"Name":"kricketune"},{"Id":403,"Name":"shinx"},{"Id":404,"Name":"luxio"},{"Id":405,"Name":"luxray"},{"Id":406,"Name":"budew"},{"Id":407,"Name":"roserade"},{"Id":408,"Name":"cranidos"},{"Id":409,"Name":"rampardos"},{"Id":410,"Name":"shieldon"},{"Id":411,"Name":"bastiodon"},{"Id":412,"Name":"burmy"},{"Id":413,"Name":"wormadam"},{"Id":414,"Name":"mothim"},{"Id":415,"Name":"combee"},{"Id":416,"Name":"vespiquen"},{"Id":417,"Name":"pachirisu"},{"Id":418,"Name":"buizel"},{"Id":419,"Name":"floatzel"},{"Id":420,"Name":"cherubi"},{"Id":421,"Name":"cherrim"},{"Id":422,"Name":"shellos"},{"Id":423,"Name":"gastrodon"},{"Id":424,"Name":"ambipom"},{"Id":425,"Name":"drifloon"},{"Id":426,"Name":"drifblim"},{"Id":427,"Name":"buneary"},{"Id":428,"Name":"lopunny"},{"Id":429,"Name":"mismagius"},{"Id":430,"Name":"honchkrow"},{"Id":431,"Name":"glameow"},{"Id":432,"Name":"purugly"},{"Id":433,"Name":"chingling"},{"Id":434,"Name":"stunky"},{"Id":435,"Name":"skuntank"},{"Id":436,"Name":"bronzor"},{"Id":437,"Name":"bronzong"},{"Id":438,"Name":"bonsly"},{"Id":439,"Name":"mime jr"},{"Id":440,"Name":"happiny"},{"Id":441,"Name":"chatot"},{"Id":442,"Name":"spiritomb"},{"Id":443,"Name":"gible"},{"Id":444,"Name":"gabite"},{"Id":445,"Name":"garchomp"},{"Id":446,"Name":"munchlax"},{"Id":447,"Name":"riolu"},{"Id":448,"Name":"lucario"},{"Id":449,"Name":"hippopotas"},{"Id":450,"Name":"hippowdon"},{"Id":451,"Name":"skorupi"},{"Id":452,"Name":"drapion"},{"Id":453,"Name":"croagunk"},{"Id":454,"Name":"toxicroak"},{"Id":455,"Name":"carnivine"},{"Id":456,"Name":"finneon"},{"Id":457,"Name":"lumineon"},{"Id":458,"Name":"mantyke"},{"Id":459,"Name":"snover"},{"Id":460,"Name":"abomasnow"},{"Id":461,"Name":"weavile"},{"Id":462,"Name":"magnezone"},{"Id":463,"Name":"lickilicky"},{"Id":464,"Name":"rhyperior"},{"Id":465,"Name":"tangrowth"},{"Id":466,"Name":"electivire"},{"Id":467,"Name":"magmortar"},{"Id":468,"Name":"togekiss"},{"Id":469,"Name":"yanmega"},{"Id":470,"Name":"leafeon"},{"Id":471,"Name":"glaceon"},{"Id":472,"Name":"gliscor"},{"Id":473,"Name":"mamoswine"},{"Id":474,"Name":"porygon"},{"Id":475,"Name":"gallade"},{"Id":476,"Name":"probopass"},{"Id":477,"Name":"dusknoir"},{"Id":478,"Name":"froslass"},{"Id":479,"Name":"rotom"},{"Id":480,"Name":"uxie"},{"Id":481,"Name":"mesprit"},{"Id":482,"Name":"azelf"},{"Id":483,"Name":"dialga"},{"Id":484,"Name":"palkia"},{"Id":485,"Name":"heatran"},{"Id":486,"Name":"regigigas"},{"Id":487,"Name":"giratina"},{"Id":488,"Name":"cresselia"},{"Id":489,"Name":"phione"},{"Id":490,"Name":"manaphy"},{"Id":491,"Name":"darkrai"},{"Id":492,"Name":"shaymin"},{"Id":493,"Name":"arceus"},{"Id":494,"Name":"victini"},{"Id":495,"Name":"snivy"},{"Id":496,"Name":"servine"},{"Id":497,"Name":"serperior"},{"Id":498,"Name":"tepig"},{"Id":499,"Name":"pignite"},{"Id":500,"Name":"emboar"},{"Id":501,"Name":"oshawott"},{"Id":502,"Name":"dewott"},{"Id":503,"Name":"samurott"},{"Id":504,"Name":"patrat"},{"Id":505,"Name":"watchog"},{"Id":506,"Name":"lillipup"},{"Id":507,"Name":"herdier"},{"Id":508,"Name":"stoutland"},{"Id":509,"Name":"purrloin"},{"Id":510,"Name":"liepard"},{"Id":511,"Name":"pansage"},{"Id":512,"Name":"simisage"},{"Id":513,"Name":"pansear"},{"Id":514,"Name":"simisear"},{"Id":515,"Name":"panpour"},{"Id":516,"Name":"simipour"},{"Id":517,"Name":"munna"},{"Id":518,"Name":"musharna"},{"Id":519,"Name":"pidove"},{"Id":520,"Name":"tranquill"},{"Id":521,"Name":"unfezant"},{"Id":522,"Name":"blitzle"},{"Id":523,"Name":"zebstrika"},{"Id":524,"Name":"roggenrola"},{"Id":525,"Name":"boldore"},{"Id":526,"Name":"gigalith"},{"Id":527,"Name":"woobat"},{"Id":528,"Name":"swoobat"},{"Id":529,"Name":"drilbur"},{"Id":530,"Name":"excadrill"},{"Id":531,"Name":"audino"},{"Id":532,"Name":"timburr"},{"Id":533,"Name":"gurdurr"},{"Id":534,"Name":"conkeldurr"},{"Id":535,"Name":"tympole"},{"Id":536,"Name":"palpitoad"},{"Id":537,"Name":"seismitoad"},{"Id":538,"Name":"throh"},{"Id":539,"Name":"sawk"},{"Id":540,"Name":"sewaddle"},{"Id":541,"Name":"swadloon"},{"Id":542,"Name":"leavanny"},{"Id":543,"Name":"venipede"},{"Id":544,"Name":"whirlipede"},{"Id":545,"Name":"scolipede"},{"Id":546,"Name":"cottonee"},{"Id":547,"Name":"whimsicott"},{"Id":548,"Name":"petilil"},{"Id":549,"Name":"lilligant"},{"Id":550,"Name":"basculin"},{"Id":551,"Name":"sandile"},{"Id":552,"Name":"krokorok"},{"Id":553,"Name":"krookodile"},{"Id":554,"Name":"darumaka"},{"Id":555,"Name":"darmanitan"},{"Id":556,"Name":"maractus"},{"Id":557,"Name":"dwebble"},{"Id":558,"Name":"crustle"},{"Id":559,"Name":"scraggy"},{"Id":560,"Name":"scrafty"},{"Id":561,"Name":"sigilyph"},{"Id":562,"Name":"yamask"},{"Id":563,"Name":"cofagrigus"},{"Id":564,"Name":"tirtouga"},{"Id":565,"Name":"carracosta"},{"Id":566,"Name":"archen"},{"Id":567,"Name":"archeops"},{"Id":568,"Name":"trubbish"},{"Id":569,"Name":"garbodor"},{"Id":570,"Name":"zorua"},{"Id":571,"Name":"zoroark"},{"Id":572,"Name":"minccino"},{"Id":573,"Name":"cinccino"},{"Id":574,"Name":"gothita"},{"Id":575,"Name":"gothorita"},{"Id":576,"Name":"gothitelle"},{"Id":577,"Name":"solosis"},{"Id":578,"Name":"duosion"},{"Id":579,"Name":"reuniclus"},{"Id":580,"Name":"ducklett"},{"Id":581,"Name":"swanna"},{"Id":582,"Name":"vanillite"},{"Id":583,"Name":"vanillish"},{"Id":584,"Name":"vanilluxe"},{"Id":585,"Name":"deerling"},{"Id":586,"Name":"sawsbuck"},{"Id":587,"Name":"emolga"},{"Id":588,"Name":"karrablast"},{"Id":589,"Name":"escavalier"},{"Id":590,"Name":"foongus"},{"Id":591,"Name":"amoonguss"},{"Id":592,"Name":"frillish"},{"Id":593,"Name":"jellicent"},{"Id":594,"Name":"alomomola"},{"Id":595,"Name":"joltik"},{"Id":596,"Name":"galvantula"},{"Id":597,"Name":"ferroseed"},{"Id":598,"Name":"ferrothorn"},{"Id":599,"Name":"klink"},{"Id":600,"Name":"klang"},{"Id":601,"Name":"klinklang"},{"Id":602,"Name":"tynamo"},{"Id":603,"Name":"eelektrik"},{"Id":604,"Name":"eelektross"},{"Id":605,"Name":"elgyem"},{"Id":606,"Name":"beheeyem"},{"Id":607,"Name":"litwick"},{"Id":608,"Name":"lampent"},{"Id":609,"Name":"chandelure"},{"Id":610,"Name":"axew"},{"Id":611,"Name":"fraxure"},{"Id":612,"Name":"haxorus"},{"Id":613,"Name":"cubchoo"},{"Id":614,"Name":"beartic"},{"Id":615,"Name":"cryogonal"},{"Id":616,"Name":"shelmet"},{"Id":617,"Name":"accelgor"},{"Id":618,"Name":"stunfisk"},{"Id":619,"Name":"mienfoo"},{"Id":620,"Name":"mienshao"},{"Id":621,"Name":"druddigon"},{"Id":622,"Name":"golett"},{"Id":623,"Name":"golurk"},{"Id":624,"Name":"pawniard"},{"Id":625,"Name":"bisharp"},{"Id":626,"Name":"bouffalant"},{"Id":627,"Name":"rufflet"},{"Id":628,"Name":"braviary"},{"Id":629,"Name":"vullaby"},{"Id":630,"Name":"mandibuzz"},{"Id":631,"Name":"heatmor"},{"Id":632,"Name":"durant"},{"Id":633,"Name":"deino"},{"Id":634,"Name":"zweilous"},{"Id":635,"Name":"hydreigon"},{"Id":636,"Name":"larvesta"},{"Id":637,"Name":"volcarona"},{"Id":638,"Name":"cobalion"},{"Id":639,"Name":"terrakion"},{"Id":640,"Name":"virizion"},{"Id":641,"Name":"tornadus"},{"Id":642,"Name":"thundurus"},{"Id":643,"Name":"reshiram"},{"Id":644,"Name":"zekrom"},{"Id":645,"Name":"landorus"},{"Id":646,"Name":"kyurem"},{"Id":647,"Name":"keldeo"},{"Id":648,"Name":"meloetta"},{"Id":649,"Name":"genesect"},{"Id":650,"Name":"chespin"},{"Id":651,"Name":"quilladin"},{"Id":652,"Name":"chesnaught"},{"Id":653,"Name":"fennekin"},{"Id":654,"Name":"braixen"},{"Id":655,"Name":"delphox"},{"Id":656,"Name":"froakie"},{"Id":657,"Name":"frogadier"},{"Id":658,"Name":"greninja"},{"Id":659,"Name":"bunnelby"},{"Id":660,"Name":"diggersby"},{"Id":661,"Name":"fletchling"},{"Id":662,"Name":"fletchinder"},{"Id":663,"Name":"talonflame"},{"Id":664,"Name":"scatterbug"},{"Id":665,"Name":"spewpa"},{"Id":666,"Name":"vivillon"},{"Id":667,"Name":"litleo"},{"Id":668,"Name":"pyroar"},{"Id":669,"Name":"flabebe"},{"Id":670,"Name":"floette"},{"Id":671,"Name":"florges"},{"Id":672,"Name":"skiddo"},{"Id":673,"Name":"gogoat"},{"Id":674,"Name":"pancham"},{"Id":675,"Name":"pangoro"},{"Id":676,"Name":"furfrou"},{"Id":677,"Name":"espurr"},{"Id":678,"Name":"meowstic"},{"Id":679,"Name":"honedge"},{"Id":680,"Name":"doublade"},{"Id":681,"Name":"aegislash"},{"Id":682,"Name":"spritzee"},{"Id":683,"Name":"aromatisse"},{"Id":684,"Name":"swirlix"},{"Id":685,"Name":"slurpuff"},{"Id":686,"Name":"inkay"},{"Id":687,"Name":"malamar"},{"Id":688,"Name":"binacle"},{"Id":689,"Name":"barbaracle"},{"Id":690,"Name":"skrelp"},{"Id":691,"Name":"dragalge"},{"Id":692,"Name":"clauncher"},{"Id":693,"Name":"clawitzer"},{"Id":694,"Name":"helioptile"},{"Id":695,"Name":"heliolisk"},{"Id":696,"Name":"tyrunt"},{"Id":697,"Name":"tyrantrum"},{"Id":698,"Name":"amaura"},{"Id":699,"Name":"aurorus"},{"Id":700,"Name":"sylveon"},{"Id":701,"Name":"hawlucha"},{"Id":702,"Name":"dedenne"},{"Id":703,"Name":"carbink"},{"Id":704,"Name":"goomy"},{"Id":705,"Name":"sliggoo"},{"Id":706,"Name":"goodra"},{"Id":707,"Name":"klefki"},{"Id":708,"Name":"phantump"},{"Id":709,"Name":"trevenant"},{"Id":710,"Name":"pumpkaboo"},{"Id":711,"Name":"gourgeist"},{"Id":712,"Name":"bergmite"},{"Id":713,"Name":"avalugg"},{"Id":714,"Name":"noibat"},{"Id":715,"Name":"noivern"},{"Id":716,"Name":"xerneas"},{"Id":717,"Name":"yveltal"},{"Id":718,"Name":"zygarde"},{"Id":719,"Name":"diancie"},{"Id":720,"Name":"hoopa"},{"Id":721,"Name":"volcanion"}] \ No newline at end of file From 58996b7286bfe5a152a36e7248bd420cf8808dfe Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 25 Mar 2017 09:44:17 +0100 Subject: [PATCH 353/496] another pokeman fix --- src/NadekoBot/data/pokemon/name-id_map3.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/data/pokemon/name-id_map3.json b/src/NadekoBot/data/pokemon/name-id_map3.json index 06422033..fa0b9d9c 100644 --- a/src/NadekoBot/data/pokemon/name-id_map3.json +++ b/src/NadekoBot/data/pokemon/name-id_map3.json @@ -1 +1 @@ -[{"Id":1,"Name":"bulbasaur"},{"Id":2,"Name":"ivysaur"},{"Id":3,"Name":"venusaur"},{"Id":4,"Name":"charmander"},{"Id":5,"Name":"charmeleon"},{"Id":6,"Name":"charizard"},{"Id":7,"Name":"squirtle"},{"Id":8,"Name":"wartortle"},{"Id":9,"Name":"blastoise"},{"Id":10,"Name":"caterpie"},{"Id":11,"Name":"metapod"},{"Id":12,"Name":"butterfree"},{"Id":13,"Name":"weedle"},{"Id":14,"Name":"kakuna"},{"Id":15,"Name":"beedrill"},{"Id":16,"Name":"pidgey"},{"Id":17,"Name":"pidgeotto"},{"Id":18,"Name":"pidgeot"},{"Id":19,"Name":"rattata"},{"Id":20,"Name":"raticate"},{"Id":21,"Name":"spearow"},{"Id":22,"Name":"fearow"},{"Id":23,"Name":"ekans"},{"Id":24,"Name":"arbok"},{"Id":25,"Name":"pikachu"},{"Id":26,"Name":"raichu"},{"Id":27,"Name":"sandshrew"},{"Id":28,"Name":"sandslash"},{"Id":29,"Name":"nidoran"},{"Id":30,"Name":"nidorina"},{"Id":31,"Name":"nidoqueen"},{"Id":32,"Name":"nidoran"},{"Id":33,"Name":"nidorino"},{"Id":34,"Name":"nidoking"},{"Id":35,"Name":"clefairy"},{"Id":36,"Name":"clefable"},{"Id":37,"Name":"vulpix"},{"Id":38,"Name":"ninetales"},{"Id":39,"Name":"jigglypuff"},{"Id":40,"Name":"wigglytuff"},{"Id":41,"Name":"zubat"},{"Id":42,"Name":"golbat"},{"Id":43,"Name":"oddish"},{"Id":44,"Name":"gloom"},{"Id":45,"Name":"vileplume"},{"Id":46,"Name":"paras"},{"Id":47,"Name":"parasect"},{"Id":48,"Name":"venonat"},{"Id":49,"Name":"venomoth"},{"Id":50,"Name":"diglett"},{"Id":51,"Name":"dugtrio"},{"Id":52,"Name":"meowth"},{"Id":53,"Name":"persian"},{"Id":54,"Name":"psyduck"},{"Id":55,"Name":"golduck"},{"Id":56,"Name":"mankey"},{"Id":57,"Name":"primeape"},{"Id":58,"Name":"growlithe"},{"Id":59,"Name":"arcanine"},{"Id":60,"Name":"poliwag"},{"Id":61,"Name":"poliwhirl"},{"Id":62,"Name":"poliwrath"},{"Id":63,"Name":"abra"},{"Id":64,"Name":"kadabra"},{"Id":65,"Name":"alakazam"},{"Id":66,"Name":"machop"},{"Id":67,"Name":"machoke"},{"Id":68,"Name":"machamp"},{"Id":69,"Name":"bellsprout"},{"Id":70,"Name":"weepinbell"},{"Id":71,"Name":"victreebel"},{"Id":72,"Name":"tentacool"},{"Id":73,"Name":"tentacruel"},{"Id":74,"Name":"geodude"},{"Id":75,"Name":"graveler"},{"Id":76,"Name":"golem"},{"Id":77,"Name":"ponyta"},{"Id":78,"Name":"rapidash"},{"Id":79,"Name":"slowpoke"},{"Id":80,"Name":"slowbro"},{"Id":81,"Name":"magnemite"},{"Id":82,"Name":"magneton"},{"Id":83,"Name":"farfetchd"},{"Id":84,"Name":"doduo"},{"Id":85,"Name":"dodrio"},{"Id":86,"Name":"seel"},{"Id":87,"Name":"dewgong"},{"Id":88,"Name":"grimer"},{"Id":89,"Name":"muk"},{"Id":90,"Name":"shellder"},{"Id":91,"Name":"cloyster"},{"Id":92,"Name":"gastly"},{"Id":93,"Name":"haunter"},{"Id":94,"Name":"gengar"},{"Id":95,"Name":"onix"},{"Id":96,"Name":"drowzee"},{"Id":97,"Name":"hypno"},{"Id":98,"Name":"krabby"},{"Id":99,"Name":"kingler"},{"Id":100,"Name":"voltorb"},{"Id":101,"Name":"electrode"},{"Id":102,"Name":"exeggcute"},{"Id":103,"Name":"exeggutor"},{"Id":104,"Name":"cubone"},{"Id":105,"Name":"marowak"},{"Id":106,"Name":"hitmonlee"},{"Id":107,"Name":"hitmonchan"},{"Id":108,"Name":"lickitung"},{"Id":109,"Name":"koffing"},{"Id":110,"Name":"weezing"},{"Id":111,"Name":"rhyhorn"},{"Id":112,"Name":"rhydon"},{"Id":113,"Name":"chansey"},{"Id":114,"Name":"tangela"},{"Id":115,"Name":"kangaskhan"},{"Id":116,"Name":"horsea"},{"Id":117,"Name":"seadra"},{"Id":118,"Name":"goldeen"},{"Id":119,"Name":"seaking"},{"Id":120,"Name":"staryu"},{"Id":121,"Name":"starmie"},{"Id":122,"Name":"mr mime"},{"Id":123,"Name":"scyther"},{"Id":124,"Name":"jynx"},{"Id":125,"Name":"electabuzz"},{"Id":126,"Name":"magmar"},{"Id":127,"Name":"pinsir"},{"Id":128,"Name":"tauros"},{"Id":129,"Name":"magikarp"},{"Id":130,"Name":"gyarados"},{"Id":131,"Name":"lapras"},{"Id":132,"Name":"ditto"},{"Id":133,"Name":"eevee"},{"Id":134,"Name":"vaporeon"},{"Id":135,"Name":"jolteon"},{"Id":136,"Name":"flareon"},{"Id":137,"Name":"porygon"},{"Id":138,"Name":"omanyte"},{"Id":139,"Name":"omastar"},{"Id":140,"Name":"kabuto"},{"Id":141,"Name":"kabutops"},{"Id":142,"Name":"aerodactyl"},{"Id":143,"Name":"snorlax"},{"Id":144,"Name":"articuno"},{"Id":145,"Name":"zapdos"},{"Id":146,"Name":"moltres"},{"Id":147,"Name":"dratini"},{"Id":148,"Name":"dragonair"},{"Id":149,"Name":"dragonite"},{"Id":150,"Name":"mewtwo"},{"Id":151,"Name":"mew"},{"Id":152,"Name":"chikorita"},{"Id":153,"Name":"bayleef"},{"Id":154,"Name":"meganium"},{"Id":155,"Name":"cyndaquil"},{"Id":156,"Name":"quilava"},{"Id":157,"Name":"typhlosion"},{"Id":158,"Name":"totodile"},{"Id":159,"Name":"croconaw"},{"Id":160,"Name":"feraligatr"},{"Id":161,"Name":"sentret"},{"Id":162,"Name":"furret"},{"Id":163,"Name":"hoothoot"},{"Id":164,"Name":"noctowl"},{"Id":165,"Name":"ledyba"},{"Id":166,"Name":"ledian"},{"Id":167,"Name":"spinarak"},{"Id":168,"Name":"ariados"},{"Id":169,"Name":"crobat"},{"Id":170,"Name":"chinchou"},{"Id":171,"Name":"lanturn"},{"Id":172,"Name":"pichu"},{"Id":173,"Name":"cleffa"},{"Id":174,"Name":"igglybuff"},{"Id":175,"Name":"togepi"},{"Id":176,"Name":"togetic"},{"Id":177,"Name":"natu"},{"Id":178,"Name":"xatu"},{"Id":179,"Name":"mareep"},{"Id":180,"Name":"flaaffy"},{"Id":181,"Name":"ampharos"},{"Id":182,"Name":"bellossom"},{"Id":183,"Name":"marill"},{"Id":184,"Name":"azumarill"},{"Id":185,"Name":"sudowoodo"},{"Id":186,"Name":"politoed"},{"Id":187,"Name":"hoppip"},{"Id":188,"Name":"skiploom"},{"Id":189,"Name":"jumpluff"},{"Id":190,"Name":"aipom"},{"Id":191,"Name":"sunkern"},{"Id":192,"Name":"sunflora"},{"Id":193,"Name":"yanma"},{"Id":194,"Name":"wooper"},{"Id":195,"Name":"quagsire"},{"Id":196,"Name":"espeon"},{"Id":197,"Name":"umbreon"},{"Id":198,"Name":"murkrow"},{"Id":199,"Name":"slowking"},{"Id":200,"Name":"misdreavus"},{"Id":201,"Name":"unown"},{"Id":202,"Name":"wobbuffet"},{"Id":203,"Name":"girafarig"},{"Id":204,"Name":"pineco"},{"Id":205,"Name":"forretress"},{"Id":206,"Name":"dunsparce"},{"Id":207,"Name":"gligar"},{"Id":208,"Name":"steelix"},{"Id":209,"Name":"snubbull"},{"Id":210,"Name":"granbull"},{"Id":211,"Name":"qwilfish"},{"Id":212,"Name":"scizor"},{"Id":213,"Name":"shuckle"},{"Id":214,"Name":"heracross"},{"Id":215,"Name":"sneasel"},{"Id":216,"Name":"teddiursa"},{"Id":217,"Name":"ursaring"},{"Id":218,"Name":"slugma"},{"Id":219,"Name":"magcargo"},{"Id":220,"Name":"swinub"},{"Id":221,"Name":"piloswine"},{"Id":222,"Name":"corsola"},{"Id":223,"Name":"remoraid"},{"Id":224,"Name":"octillery"},{"Id":225,"Name":"delibird"},{"Id":226,"Name":"mantine"},{"Id":227,"Name":"skarmory"},{"Id":228,"Name":"houndour"},{"Id":229,"Name":"houndoom"},{"Id":230,"Name":"kingdra"},{"Id":231,"Name":"phanpy"},{"Id":232,"Name":"donphan"},{"Id":233,"Name":"porygon2"},{"Id":234,"Name":"stantler"},{"Id":235,"Name":"smeargle"},{"Id":236,"Name":"tyrogue"},{"Id":237,"Name":"hitmontop"},{"Id":238,"Name":"smoochum"},{"Id":239,"Name":"elekid"},{"Id":240,"Name":"magby"},{"Id":241,"Name":"miltank"},{"Id":242,"Name":"blissey"},{"Id":243,"Name":"raikou"},{"Id":244,"Name":"entei"},{"Id":245,"Name":"suicune"},{"Id":246,"Name":"larvitar"},{"Id":247,"Name":"pupitar"},{"Id":248,"Name":"tyranitar"},{"Id":249,"Name":"lugia"},{"Id":250,"Name":"ho-oh"},{"Id":251,"Name":"celebi"},{"Id":252,"Name":"treecko"},{"Id":253,"Name":"grovyle"},{"Id":254,"Name":"sceptile"},{"Id":255,"Name":"torchic"},{"Id":256,"Name":"combusken"},{"Id":257,"Name":"blaziken"},{"Id":258,"Name":"mudkip"},{"Id":259,"Name":"marshtomp"},{"Id":260,"Name":"swampert"},{"Id":261,"Name":"poochyena"},{"Id":262,"Name":"mightyena"},{"Id":263,"Name":"zigzagoon"},{"Id":264,"Name":"linoone"},{"Id":265,"Name":"wurmple"},{"Id":266,"Name":"silcoon"},{"Id":267,"Name":"beautifly"},{"Id":268,"Name":"cascoon"},{"Id":269,"Name":"dustox"},{"Id":270,"Name":"lotad"},{"Id":271,"Name":"lombre"},{"Id":272,"Name":"ludicolo"},{"Id":273,"Name":"seedot"},{"Id":274,"Name":"nuzleaf"},{"Id":275,"Name":"shiftry"},{"Id":276,"Name":"taillow"},{"Id":277,"Name":"swellow"},{"Id":278,"Name":"wingull"},{"Id":279,"Name":"pelipper"},{"Id":280,"Name":"ralts"},{"Id":281,"Name":"kirlia"},{"Id":282,"Name":"gardevoir"},{"Id":283,"Name":"surskit"},{"Id":284,"Name":"masquerain"},{"Id":285,"Name":"shroomish"},{"Id":286,"Name":"breloom"},{"Id":287,"Name":"slakoth"},{"Id":288,"Name":"vigoroth"},{"Id":289,"Name":"slaking"},{"Id":290,"Name":"nincada"},{"Id":291,"Name":"ninjask"},{"Id":292,"Name":"shedinja"},{"Id":293,"Name":"whismur"},{"Id":294,"Name":"loudred"},{"Id":295,"Name":"exploud"},{"Id":296,"Name":"makuhita"},{"Id":297,"Name":"hariyama"},{"Id":298,"Name":"azurill"},{"Id":299,"Name":"nosepass"},{"Id":300,"Name":"skitty"},{"Id":301,"Name":"delcatty"},{"Id":302,"Name":"sableye"},{"Id":303,"Name":"mawile"},{"Id":304,"Name":"aron"},{"Id":305,"Name":"lairon"},{"Id":306,"Name":"aggron"},{"Id":307,"Name":"meditite"},{"Id":308,"Name":"medicham"},{"Id":309,"Name":"electrike"},{"Id":310,"Name":"manectric"},{"Id":311,"Name":"plusle"},{"Id":312,"Name":"minun"},{"Id":313,"Name":"volbeat"},{"Id":314,"Name":"illumise"},{"Id":315,"Name":"roselia"},{"Id":316,"Name":"gulpin"},{"Id":317,"Name":"swalot"},{"Id":318,"Name":"carvanha"},{"Id":319,"Name":"sharpedo"},{"Id":320,"Name":"wailmer"},{"Id":321,"Name":"wailord"},{"Id":322,"Name":"numel"},{"Id":323,"Name":"camerupt"},{"Id":324,"Name":"torkoal"},{"Id":325,"Name":"spoink"},{"Id":326,"Name":"grumpig"},{"Id":327,"Name":"spinda"},{"Id":328,"Name":"trapinch"},{"Id":329,"Name":"vibrava"},{"Id":330,"Name":"flygon"},{"Id":331,"Name":"cacnea"},{"Id":332,"Name":"cacturne"},{"Id":333,"Name":"swablu"},{"Id":334,"Name":"altaria"},{"Id":335,"Name":"zangoose"},{"Id":336,"Name":"seviper"},{"Id":337,"Name":"lunatone"},{"Id":338,"Name":"solrock"},{"Id":339,"Name":"barboach"},{"Id":340,"Name":"whiscash"},{"Id":341,"Name":"corphish"},{"Id":342,"Name":"crawdaunt"},{"Id":343,"Name":"baltoy"},{"Id":344,"Name":"claydol"},{"Id":345,"Name":"lileep"},{"Id":346,"Name":"cradily"},{"Id":347,"Name":"anorith"},{"Id":348,"Name":"armaldo"},{"Id":349,"Name":"feebas"},{"Id":350,"Name":"milotic"},{"Id":351,"Name":"castform"},{"Id":352,"Name":"kecleon"},{"Id":353,"Name":"shuppet"},{"Id":354,"Name":"banette"},{"Id":355,"Name":"duskull"},{"Id":356,"Name":"dusclops"},{"Id":357,"Name":"tropius"},{"Id":358,"Name":"chimecho"},{"Id":359,"Name":"absol"},{"Id":360,"Name":"wynaut"},{"Id":361,"Name":"snorunt"},{"Id":362,"Name":"glalie"},{"Id":363,"Name":"spheal"},{"Id":364,"Name":"sealeo"},{"Id":365,"Name":"walrein"},{"Id":366,"Name":"clamperl"},{"Id":367,"Name":"huntail"},{"Id":368,"Name":"gorebyss"},{"Id":369,"Name":"relicanth"},{"Id":370,"Name":"luvdisc"},{"Id":371,"Name":"bagon"},{"Id":372,"Name":"shelgon"},{"Id":373,"Name":"salamence"},{"Id":374,"Name":"beldum"},{"Id":375,"Name":"metang"},{"Id":376,"Name":"metagross"},{"Id":377,"Name":"regirock"},{"Id":378,"Name":"regice"},{"Id":379,"Name":"registeel"},{"Id":380,"Name":"latias"},{"Id":381,"Name":"latios"},{"Id":382,"Name":"kyogre"},{"Id":383,"Name":"groudon"},{"Id":384,"Name":"rayquaza"},{"Id":385,"Name":"jirachi"},{"Id":386,"Name":"deoxys"},{"Id":387,"Name":"turtwig"},{"Id":388,"Name":"grotle"},{"Id":389,"Name":"torterra"},{"Id":390,"Name":"chimchar"},{"Id":391,"Name":"monferno"},{"Id":392,"Name":"infernape"},{"Id":393,"Name":"piplup"},{"Id":394,"Name":"prinplup"},{"Id":395,"Name":"empoleon"},{"Id":396,"Name":"starly"},{"Id":397,"Name":"staravia"},{"Id":398,"Name":"staraptor"},{"Id":399,"Name":"bidoof"},{"Id":400,"Name":"bibarel"},{"Id":401,"Name":"kricketot"},{"Id":402,"Name":"kricketune"},{"Id":403,"Name":"shinx"},{"Id":404,"Name":"luxio"},{"Id":405,"Name":"luxray"},{"Id":406,"Name":"budew"},{"Id":407,"Name":"roserade"},{"Id":408,"Name":"cranidos"},{"Id":409,"Name":"rampardos"},{"Id":410,"Name":"shieldon"},{"Id":411,"Name":"bastiodon"},{"Id":412,"Name":"burmy"},{"Id":413,"Name":"wormadam"},{"Id":414,"Name":"mothim"},{"Id":415,"Name":"combee"},{"Id":416,"Name":"vespiquen"},{"Id":417,"Name":"pachirisu"},{"Id":418,"Name":"buizel"},{"Id":419,"Name":"floatzel"},{"Id":420,"Name":"cherubi"},{"Id":421,"Name":"cherrim"},{"Id":422,"Name":"shellos"},{"Id":423,"Name":"gastrodon"},{"Id":424,"Name":"ambipom"},{"Id":425,"Name":"drifloon"},{"Id":426,"Name":"drifblim"},{"Id":427,"Name":"buneary"},{"Id":428,"Name":"lopunny"},{"Id":429,"Name":"mismagius"},{"Id":430,"Name":"honchkrow"},{"Id":431,"Name":"glameow"},{"Id":432,"Name":"purugly"},{"Id":433,"Name":"chingling"},{"Id":434,"Name":"stunky"},{"Id":435,"Name":"skuntank"},{"Id":436,"Name":"bronzor"},{"Id":437,"Name":"bronzong"},{"Id":438,"Name":"bonsly"},{"Id":439,"Name":"mime jr"},{"Id":440,"Name":"happiny"},{"Id":441,"Name":"chatot"},{"Id":442,"Name":"spiritomb"},{"Id":443,"Name":"gible"},{"Id":444,"Name":"gabite"},{"Id":445,"Name":"garchomp"},{"Id":446,"Name":"munchlax"},{"Id":447,"Name":"riolu"},{"Id":448,"Name":"lucario"},{"Id":449,"Name":"hippopotas"},{"Id":450,"Name":"hippowdon"},{"Id":451,"Name":"skorupi"},{"Id":452,"Name":"drapion"},{"Id":453,"Name":"croagunk"},{"Id":454,"Name":"toxicroak"},{"Id":455,"Name":"carnivine"},{"Id":456,"Name":"finneon"},{"Id":457,"Name":"lumineon"},{"Id":458,"Name":"mantyke"},{"Id":459,"Name":"snover"},{"Id":460,"Name":"abomasnow"},{"Id":461,"Name":"weavile"},{"Id":462,"Name":"magnezone"},{"Id":463,"Name":"lickilicky"},{"Id":464,"Name":"rhyperior"},{"Id":465,"Name":"tangrowth"},{"Id":466,"Name":"electivire"},{"Id":467,"Name":"magmortar"},{"Id":468,"Name":"togekiss"},{"Id":469,"Name":"yanmega"},{"Id":470,"Name":"leafeon"},{"Id":471,"Name":"glaceon"},{"Id":472,"Name":"gliscor"},{"Id":473,"Name":"mamoswine"},{"Id":474,"Name":"porygon"},{"Id":475,"Name":"gallade"},{"Id":476,"Name":"probopass"},{"Id":477,"Name":"dusknoir"},{"Id":478,"Name":"froslass"},{"Id":479,"Name":"rotom"},{"Id":480,"Name":"uxie"},{"Id":481,"Name":"mesprit"},{"Id":482,"Name":"azelf"},{"Id":483,"Name":"dialga"},{"Id":484,"Name":"palkia"},{"Id":485,"Name":"heatran"},{"Id":486,"Name":"regigigas"},{"Id":487,"Name":"giratina"},{"Id":488,"Name":"cresselia"},{"Id":489,"Name":"phione"},{"Id":490,"Name":"manaphy"},{"Id":491,"Name":"darkrai"},{"Id":492,"Name":"shaymin"},{"Id":493,"Name":"arceus"},{"Id":494,"Name":"victini"},{"Id":495,"Name":"snivy"},{"Id":496,"Name":"servine"},{"Id":497,"Name":"serperior"},{"Id":498,"Name":"tepig"},{"Id":499,"Name":"pignite"},{"Id":500,"Name":"emboar"},{"Id":501,"Name":"oshawott"},{"Id":502,"Name":"dewott"},{"Id":503,"Name":"samurott"},{"Id":504,"Name":"patrat"},{"Id":505,"Name":"watchog"},{"Id":506,"Name":"lillipup"},{"Id":507,"Name":"herdier"},{"Id":508,"Name":"stoutland"},{"Id":509,"Name":"purrloin"},{"Id":510,"Name":"liepard"},{"Id":511,"Name":"pansage"},{"Id":512,"Name":"simisage"},{"Id":513,"Name":"pansear"},{"Id":514,"Name":"simisear"},{"Id":515,"Name":"panpour"},{"Id":516,"Name":"simipour"},{"Id":517,"Name":"munna"},{"Id":518,"Name":"musharna"},{"Id":519,"Name":"pidove"},{"Id":520,"Name":"tranquill"},{"Id":521,"Name":"unfezant"},{"Id":522,"Name":"blitzle"},{"Id":523,"Name":"zebstrika"},{"Id":524,"Name":"roggenrola"},{"Id":525,"Name":"boldore"},{"Id":526,"Name":"gigalith"},{"Id":527,"Name":"woobat"},{"Id":528,"Name":"swoobat"},{"Id":529,"Name":"drilbur"},{"Id":530,"Name":"excadrill"},{"Id":531,"Name":"audino"},{"Id":532,"Name":"timburr"},{"Id":533,"Name":"gurdurr"},{"Id":534,"Name":"conkeldurr"},{"Id":535,"Name":"tympole"},{"Id":536,"Name":"palpitoad"},{"Id":537,"Name":"seismitoad"},{"Id":538,"Name":"throh"},{"Id":539,"Name":"sawk"},{"Id":540,"Name":"sewaddle"},{"Id":541,"Name":"swadloon"},{"Id":542,"Name":"leavanny"},{"Id":543,"Name":"venipede"},{"Id":544,"Name":"whirlipede"},{"Id":545,"Name":"scolipede"},{"Id":546,"Name":"cottonee"},{"Id":547,"Name":"whimsicott"},{"Id":548,"Name":"petilil"},{"Id":549,"Name":"lilligant"},{"Id":550,"Name":"basculin"},{"Id":551,"Name":"sandile"},{"Id":552,"Name":"krokorok"},{"Id":553,"Name":"krookodile"},{"Id":554,"Name":"darumaka"},{"Id":555,"Name":"darmanitan"},{"Id":556,"Name":"maractus"},{"Id":557,"Name":"dwebble"},{"Id":558,"Name":"crustle"},{"Id":559,"Name":"scraggy"},{"Id":560,"Name":"scrafty"},{"Id":561,"Name":"sigilyph"},{"Id":562,"Name":"yamask"},{"Id":563,"Name":"cofagrigus"},{"Id":564,"Name":"tirtouga"},{"Id":565,"Name":"carracosta"},{"Id":566,"Name":"archen"},{"Id":567,"Name":"archeops"},{"Id":568,"Name":"trubbish"},{"Id":569,"Name":"garbodor"},{"Id":570,"Name":"zorua"},{"Id":571,"Name":"zoroark"},{"Id":572,"Name":"minccino"},{"Id":573,"Name":"cinccino"},{"Id":574,"Name":"gothita"},{"Id":575,"Name":"gothorita"},{"Id":576,"Name":"gothitelle"},{"Id":577,"Name":"solosis"},{"Id":578,"Name":"duosion"},{"Id":579,"Name":"reuniclus"},{"Id":580,"Name":"ducklett"},{"Id":581,"Name":"swanna"},{"Id":582,"Name":"vanillite"},{"Id":583,"Name":"vanillish"},{"Id":584,"Name":"vanilluxe"},{"Id":585,"Name":"deerling"},{"Id":586,"Name":"sawsbuck"},{"Id":587,"Name":"emolga"},{"Id":588,"Name":"karrablast"},{"Id":589,"Name":"escavalier"},{"Id":590,"Name":"foongus"},{"Id":591,"Name":"amoonguss"},{"Id":592,"Name":"frillish"},{"Id":593,"Name":"jellicent"},{"Id":594,"Name":"alomomola"},{"Id":595,"Name":"joltik"},{"Id":596,"Name":"galvantula"},{"Id":597,"Name":"ferroseed"},{"Id":598,"Name":"ferrothorn"},{"Id":599,"Name":"klink"},{"Id":600,"Name":"klang"},{"Id":601,"Name":"klinklang"},{"Id":602,"Name":"tynamo"},{"Id":603,"Name":"eelektrik"},{"Id":604,"Name":"eelektross"},{"Id":605,"Name":"elgyem"},{"Id":606,"Name":"beheeyem"},{"Id":607,"Name":"litwick"},{"Id":608,"Name":"lampent"},{"Id":609,"Name":"chandelure"},{"Id":610,"Name":"axew"},{"Id":611,"Name":"fraxure"},{"Id":612,"Name":"haxorus"},{"Id":613,"Name":"cubchoo"},{"Id":614,"Name":"beartic"},{"Id":615,"Name":"cryogonal"},{"Id":616,"Name":"shelmet"},{"Id":617,"Name":"accelgor"},{"Id":618,"Name":"stunfisk"},{"Id":619,"Name":"mienfoo"},{"Id":620,"Name":"mienshao"},{"Id":621,"Name":"druddigon"},{"Id":622,"Name":"golett"},{"Id":623,"Name":"golurk"},{"Id":624,"Name":"pawniard"},{"Id":625,"Name":"bisharp"},{"Id":626,"Name":"bouffalant"},{"Id":627,"Name":"rufflet"},{"Id":628,"Name":"braviary"},{"Id":629,"Name":"vullaby"},{"Id":630,"Name":"mandibuzz"},{"Id":631,"Name":"heatmor"},{"Id":632,"Name":"durant"},{"Id":633,"Name":"deino"},{"Id":634,"Name":"zweilous"},{"Id":635,"Name":"hydreigon"},{"Id":636,"Name":"larvesta"},{"Id":637,"Name":"volcarona"},{"Id":638,"Name":"cobalion"},{"Id":639,"Name":"terrakion"},{"Id":640,"Name":"virizion"},{"Id":641,"Name":"tornadus"},{"Id":642,"Name":"thundurus"},{"Id":643,"Name":"reshiram"},{"Id":644,"Name":"zekrom"},{"Id":645,"Name":"landorus"},{"Id":646,"Name":"kyurem"},{"Id":647,"Name":"keldeo"},{"Id":648,"Name":"meloetta"},{"Id":649,"Name":"genesect"},{"Id":650,"Name":"chespin"},{"Id":651,"Name":"quilladin"},{"Id":652,"Name":"chesnaught"},{"Id":653,"Name":"fennekin"},{"Id":654,"Name":"braixen"},{"Id":655,"Name":"delphox"},{"Id":656,"Name":"froakie"},{"Id":657,"Name":"frogadier"},{"Id":658,"Name":"greninja"},{"Id":659,"Name":"bunnelby"},{"Id":660,"Name":"diggersby"},{"Id":661,"Name":"fletchling"},{"Id":662,"Name":"fletchinder"},{"Id":663,"Name":"talonflame"},{"Id":664,"Name":"scatterbug"},{"Id":665,"Name":"spewpa"},{"Id":666,"Name":"vivillon"},{"Id":667,"Name":"litleo"},{"Id":668,"Name":"pyroar"},{"Id":669,"Name":"flabebe"},{"Id":670,"Name":"floette"},{"Id":671,"Name":"florges"},{"Id":672,"Name":"skiddo"},{"Id":673,"Name":"gogoat"},{"Id":674,"Name":"pancham"},{"Id":675,"Name":"pangoro"},{"Id":676,"Name":"furfrou"},{"Id":677,"Name":"espurr"},{"Id":678,"Name":"meowstic"},{"Id":679,"Name":"honedge"},{"Id":680,"Name":"doublade"},{"Id":681,"Name":"aegislash"},{"Id":682,"Name":"spritzee"},{"Id":683,"Name":"aromatisse"},{"Id":684,"Name":"swirlix"},{"Id":685,"Name":"slurpuff"},{"Id":686,"Name":"inkay"},{"Id":687,"Name":"malamar"},{"Id":688,"Name":"binacle"},{"Id":689,"Name":"barbaracle"},{"Id":690,"Name":"skrelp"},{"Id":691,"Name":"dragalge"},{"Id":692,"Name":"clauncher"},{"Id":693,"Name":"clawitzer"},{"Id":694,"Name":"helioptile"},{"Id":695,"Name":"heliolisk"},{"Id":696,"Name":"tyrunt"},{"Id":697,"Name":"tyrantrum"},{"Id":698,"Name":"amaura"},{"Id":699,"Name":"aurorus"},{"Id":700,"Name":"sylveon"},{"Id":701,"Name":"hawlucha"},{"Id":702,"Name":"dedenne"},{"Id":703,"Name":"carbink"},{"Id":704,"Name":"goomy"},{"Id":705,"Name":"sliggoo"},{"Id":706,"Name":"goodra"},{"Id":707,"Name":"klefki"},{"Id":708,"Name":"phantump"},{"Id":709,"Name":"trevenant"},{"Id":710,"Name":"pumpkaboo"},{"Id":711,"Name":"gourgeist"},{"Id":712,"Name":"bergmite"},{"Id":713,"Name":"avalugg"},{"Id":714,"Name":"noibat"},{"Id":715,"Name":"noivern"},{"Id":716,"Name":"xerneas"},{"Id":717,"Name":"yveltal"},{"Id":718,"Name":"zygarde"},{"Id":719,"Name":"diancie"},{"Id":720,"Name":"hoopa"},{"Id":721,"Name":"volcanion"}] \ No newline at end of file +[{"Id":1,"Name":"bulbasaur"},{"Id":2,"Name":"ivysaur"},{"Id":3,"Name":"venusaur"},{"Id":4,"Name":"charmander"},{"Id":5,"Name":"charmeleon"},{"Id":6,"Name":"charizard"},{"Id":7,"Name":"squirtle"},{"Id":8,"Name":"wartortle"},{"Id":9,"Name":"blastoise"},{"Id":10,"Name":"caterpie"},{"Id":11,"Name":"metapod"},{"Id":12,"Name":"butterfree"},{"Id":13,"Name":"weedle"},{"Id":14,"Name":"kakuna"},{"Id":15,"Name":"beedrill"},{"Id":16,"Name":"pidgey"},{"Id":17,"Name":"pidgeotto"},{"Id":18,"Name":"pidgeot"},{"Id":19,"Name":"rattata"},{"Id":20,"Name":"raticate"},{"Id":21,"Name":"spearow"},{"Id":22,"Name":"fearow"},{"Id":23,"Name":"ekans"},{"Id":24,"Name":"arbok"},{"Id":25,"Name":"pikachu"},{"Id":26,"Name":"raichu"},{"Id":27,"Name":"sandshrew"},{"Id":28,"Name":"sandslash"},{"Id":29,"Name":"nidoran"},{"Id":30,"Name":"nidorina"},{"Id":31,"Name":"nidoqueen"},{"Id":32,"Name":"nidoran"},{"Id":33,"Name":"nidorino"},{"Id":34,"Name":"nidoking"},{"Id":35,"Name":"clefairy"},{"Id":36,"Name":"clefable"},{"Id":37,"Name":"vulpix"},{"Id":38,"Name":"ninetales"},{"Id":39,"Name":"jigglypuff"},{"Id":40,"Name":"wigglytuff"},{"Id":41,"Name":"zubat"},{"Id":42,"Name":"golbat"},{"Id":43,"Name":"oddish"},{"Id":44,"Name":"gloom"},{"Id":45,"Name":"vileplume"},{"Id":46,"Name":"paras"},{"Id":47,"Name":"parasect"},{"Id":48,"Name":"venonat"},{"Id":49,"Name":"venomoth"},{"Id":50,"Name":"diglett"},{"Id":51,"Name":"dugtrio"},{"Id":52,"Name":"meowth"},{"Id":53,"Name":"persian"},{"Id":54,"Name":"psyduck"},{"Id":55,"Name":"golduck"},{"Id":56,"Name":"mankey"},{"Id":57,"Name":"primeape"},{"Id":58,"Name":"growlithe"},{"Id":59,"Name":"arcanine"},{"Id":60,"Name":"poliwag"},{"Id":61,"Name":"poliwhirl"},{"Id":62,"Name":"poliwrath"},{"Id":63,"Name":"abra"},{"Id":64,"Name":"kadabra"},{"Id":65,"Name":"alakazam"},{"Id":66,"Name":"machop"},{"Id":67,"Name":"machoke"},{"Id":68,"Name":"machamp"},{"Id":69,"Name":"bellsprout"},{"Id":70,"Name":"weepinbell"},{"Id":71,"Name":"victreebel"},{"Id":72,"Name":"tentacool"},{"Id":73,"Name":"tentacruel"},{"Id":74,"Name":"geodude"},{"Id":75,"Name":"graveler"},{"Id":76,"Name":"golem"},{"Id":77,"Name":"ponyta"},{"Id":78,"Name":"rapidash"},{"Id":79,"Name":"slowpoke"},{"Id":80,"Name":"slowbro"},{"Id":81,"Name":"magnemite"},{"Id":82,"Name":"magneton"},{"Id":83,"Name":"farfetchd"},{"Id":84,"Name":"doduo"},{"Id":85,"Name":"dodrio"},{"Id":86,"Name":"seel"},{"Id":87,"Name":"dewgong"},{"Id":88,"Name":"grimer"},{"Id":89,"Name":"muk"},{"Id":90,"Name":"shellder"},{"Id":91,"Name":"cloyster"},{"Id":92,"Name":"gastly"},{"Id":93,"Name":"haunter"},{"Id":94,"Name":"gengar"},{"Id":95,"Name":"onix"},{"Id":96,"Name":"drowzee"},{"Id":97,"Name":"hypno"},{"Id":98,"Name":"krabby"},{"Id":99,"Name":"kingler"},{"Id":100,"Name":"voltorb"},{"Id":101,"Name":"electrode"},{"Id":102,"Name":"exeggcute"},{"Id":103,"Name":"exeggutor"},{"Id":104,"Name":"cubone"},{"Id":105,"Name":"marowak"},{"Id":106,"Name":"hitmonlee"},{"Id":107,"Name":"hitmonchan"},{"Id":108,"Name":"lickitung"},{"Id":109,"Name":"koffing"},{"Id":110,"Name":"weezing"},{"Id":111,"Name":"rhyhorn"},{"Id":112,"Name":"rhydon"},{"Id":113,"Name":"chansey"},{"Id":114,"Name":"tangela"},{"Id":115,"Name":"kangaskhan"},{"Id":116,"Name":"horsea"},{"Id":117,"Name":"seadra"},{"Id":118,"Name":"goldeen"},{"Id":119,"Name":"seaking"},{"Id":120,"Name":"staryu"},{"Id":121,"Name":"starmie"},{"Id":122,"Name":"mr mime"},{"Id":123,"Name":"scyther"},{"Id":124,"Name":"jynx"},{"Id":125,"Name":"electabuzz"},{"Id":126,"Name":"magmar"},{"Id":127,"Name":"pinsir"},{"Id":128,"Name":"tauros"},{"Id":129,"Name":"magikarp"},{"Id":130,"Name":"gyarados"},{"Id":131,"Name":"lapras"},{"Id":132,"Name":"ditto"},{"Id":133,"Name":"eevee"},{"Id":134,"Name":"vaporeon"},{"Id":135,"Name":"jolteon"},{"Id":136,"Name":"flareon"},{"Id":137,"Name":"porygon z"},{"Id":138,"Name":"omanyte"},{"Id":139,"Name":"omastar"},{"Id":140,"Name":"kabuto"},{"Id":141,"Name":"kabutops"},{"Id":142,"Name":"aerodactyl"},{"Id":143,"Name":"snorlax"},{"Id":144,"Name":"articuno"},{"Id":145,"Name":"zapdos"},{"Id":146,"Name":"moltres"},{"Id":147,"Name":"dratini"},{"Id":148,"Name":"dragonair"},{"Id":149,"Name":"dragonite"},{"Id":150,"Name":"mewtwo"},{"Id":151,"Name":"mew"},{"Id":152,"Name":"chikorita"},{"Id":153,"Name":"bayleef"},{"Id":154,"Name":"meganium"},{"Id":155,"Name":"cyndaquil"},{"Id":156,"Name":"quilava"},{"Id":157,"Name":"typhlosion"},{"Id":158,"Name":"totodile"},{"Id":159,"Name":"croconaw"},{"Id":160,"Name":"feraligatr"},{"Id":161,"Name":"sentret"},{"Id":162,"Name":"furret"},{"Id":163,"Name":"hoothoot"},{"Id":164,"Name":"noctowl"},{"Id":165,"Name":"ledyba"},{"Id":166,"Name":"ledian"},{"Id":167,"Name":"spinarak"},{"Id":168,"Name":"ariados"},{"Id":169,"Name":"crobat"},{"Id":170,"Name":"chinchou"},{"Id":171,"Name":"lanturn"},{"Id":172,"Name":"pichu"},{"Id":173,"Name":"cleffa"},{"Id":174,"Name":"igglybuff"},{"Id":175,"Name":"togepi"},{"Id":176,"Name":"togetic"},{"Id":177,"Name":"natu"},{"Id":178,"Name":"xatu"},{"Id":179,"Name":"mareep"},{"Id":180,"Name":"flaaffy"},{"Id":181,"Name":"ampharos"},{"Id":182,"Name":"bellossom"},{"Id":183,"Name":"marill"},{"Id":184,"Name":"azumarill"},{"Id":185,"Name":"sudowoodo"},{"Id":186,"Name":"politoed"},{"Id":187,"Name":"hoppip"},{"Id":188,"Name":"skiploom"},{"Id":189,"Name":"jumpluff"},{"Id":190,"Name":"aipom"},{"Id":191,"Name":"sunkern"},{"Id":192,"Name":"sunflora"},{"Id":193,"Name":"yanma"},{"Id":194,"Name":"wooper"},{"Id":195,"Name":"quagsire"},{"Id":196,"Name":"espeon"},{"Id":197,"Name":"umbreon"},{"Id":198,"Name":"murkrow"},{"Id":199,"Name":"slowking"},{"Id":200,"Name":"misdreavus"},{"Id":201,"Name":"unown"},{"Id":202,"Name":"wobbuffet"},{"Id":203,"Name":"girafarig"},{"Id":204,"Name":"pineco"},{"Id":205,"Name":"forretress"},{"Id":206,"Name":"dunsparce"},{"Id":207,"Name":"gligar"},{"Id":208,"Name":"steelix"},{"Id":209,"Name":"snubbull"},{"Id":210,"Name":"granbull"},{"Id":211,"Name":"qwilfish"},{"Id":212,"Name":"scizor"},{"Id":213,"Name":"shuckle"},{"Id":214,"Name":"heracross"},{"Id":215,"Name":"sneasel"},{"Id":216,"Name":"teddiursa"},{"Id":217,"Name":"ursaring"},{"Id":218,"Name":"slugma"},{"Id":219,"Name":"magcargo"},{"Id":220,"Name":"swinub"},{"Id":221,"Name":"piloswine"},{"Id":222,"Name":"corsola"},{"Id":223,"Name":"remoraid"},{"Id":224,"Name":"octillery"},{"Id":225,"Name":"delibird"},{"Id":226,"Name":"mantine"},{"Id":227,"Name":"skarmory"},{"Id":228,"Name":"houndour"},{"Id":229,"Name":"houndoom"},{"Id":230,"Name":"kingdra"},{"Id":231,"Name":"phanpy"},{"Id":232,"Name":"donphan"},{"Id":233,"Name":"porygon2"},{"Id":234,"Name":"stantler"},{"Id":235,"Name":"smeargle"},{"Id":236,"Name":"tyrogue"},{"Id":237,"Name":"hitmontop"},{"Id":238,"Name":"smoochum"},{"Id":239,"Name":"elekid"},{"Id":240,"Name":"magby"},{"Id":241,"Name":"miltank"},{"Id":242,"Name":"blissey"},{"Id":243,"Name":"raikou"},{"Id":244,"Name":"entei"},{"Id":245,"Name":"suicune"},{"Id":246,"Name":"larvitar"},{"Id":247,"Name":"pupitar"},{"Id":248,"Name":"tyranitar"},{"Id":249,"Name":"lugia"},{"Id":250,"Name":"ho-oh"},{"Id":251,"Name":"celebi"},{"Id":252,"Name":"treecko"},{"Id":253,"Name":"grovyle"},{"Id":254,"Name":"sceptile"},{"Id":255,"Name":"torchic"},{"Id":256,"Name":"combusken"},{"Id":257,"Name":"blaziken"},{"Id":258,"Name":"mudkip"},{"Id":259,"Name":"marshtomp"},{"Id":260,"Name":"swampert"},{"Id":261,"Name":"poochyena"},{"Id":262,"Name":"mightyena"},{"Id":263,"Name":"zigzagoon"},{"Id":264,"Name":"linoone"},{"Id":265,"Name":"wurmple"},{"Id":266,"Name":"silcoon"},{"Id":267,"Name":"beautifly"},{"Id":268,"Name":"cascoon"},{"Id":269,"Name":"dustox"},{"Id":270,"Name":"lotad"},{"Id":271,"Name":"lombre"},{"Id":272,"Name":"ludicolo"},{"Id":273,"Name":"seedot"},{"Id":274,"Name":"nuzleaf"},{"Id":275,"Name":"shiftry"},{"Id":276,"Name":"taillow"},{"Id":277,"Name":"swellow"},{"Id":278,"Name":"wingull"},{"Id":279,"Name":"pelipper"},{"Id":280,"Name":"ralts"},{"Id":281,"Name":"kirlia"},{"Id":282,"Name":"gardevoir"},{"Id":283,"Name":"surskit"},{"Id":284,"Name":"masquerain"},{"Id":285,"Name":"shroomish"},{"Id":286,"Name":"breloom"},{"Id":287,"Name":"slakoth"},{"Id":288,"Name":"vigoroth"},{"Id":289,"Name":"slaking"},{"Id":290,"Name":"nincada"},{"Id":291,"Name":"ninjask"},{"Id":292,"Name":"shedinja"},{"Id":293,"Name":"whismur"},{"Id":294,"Name":"loudred"},{"Id":295,"Name":"exploud"},{"Id":296,"Name":"makuhita"},{"Id":297,"Name":"hariyama"},{"Id":298,"Name":"azurill"},{"Id":299,"Name":"nosepass"},{"Id":300,"Name":"skitty"},{"Id":301,"Name":"delcatty"},{"Id":302,"Name":"sableye"},{"Id":303,"Name":"mawile"},{"Id":304,"Name":"aron"},{"Id":305,"Name":"lairon"},{"Id":306,"Name":"aggron"},{"Id":307,"Name":"meditite"},{"Id":308,"Name":"medicham"},{"Id":309,"Name":"electrike"},{"Id":310,"Name":"manectric"},{"Id":311,"Name":"plusle"},{"Id":312,"Name":"minun"},{"Id":313,"Name":"volbeat"},{"Id":314,"Name":"illumise"},{"Id":315,"Name":"roselia"},{"Id":316,"Name":"gulpin"},{"Id":317,"Name":"swalot"},{"Id":318,"Name":"carvanha"},{"Id":319,"Name":"sharpedo"},{"Id":320,"Name":"wailmer"},{"Id":321,"Name":"wailord"},{"Id":322,"Name":"numel"},{"Id":323,"Name":"camerupt"},{"Id":324,"Name":"torkoal"},{"Id":325,"Name":"spoink"},{"Id":326,"Name":"grumpig"},{"Id":327,"Name":"spinda"},{"Id":328,"Name":"trapinch"},{"Id":329,"Name":"vibrava"},{"Id":330,"Name":"flygon"},{"Id":331,"Name":"cacnea"},{"Id":332,"Name":"cacturne"},{"Id":333,"Name":"swablu"},{"Id":334,"Name":"altaria"},{"Id":335,"Name":"zangoose"},{"Id":336,"Name":"seviper"},{"Id":337,"Name":"lunatone"},{"Id":338,"Name":"solrock"},{"Id":339,"Name":"barboach"},{"Id":340,"Name":"whiscash"},{"Id":341,"Name":"corphish"},{"Id":342,"Name":"crawdaunt"},{"Id":343,"Name":"baltoy"},{"Id":344,"Name":"claydol"},{"Id":345,"Name":"lileep"},{"Id":346,"Name":"cradily"},{"Id":347,"Name":"anorith"},{"Id":348,"Name":"armaldo"},{"Id":349,"Name":"feebas"},{"Id":350,"Name":"milotic"},{"Id":351,"Name":"castform"},{"Id":352,"Name":"kecleon"},{"Id":353,"Name":"shuppet"},{"Id":354,"Name":"banette"},{"Id":355,"Name":"duskull"},{"Id":356,"Name":"dusclops"},{"Id":357,"Name":"tropius"},{"Id":358,"Name":"chimecho"},{"Id":359,"Name":"absol"},{"Id":360,"Name":"wynaut"},{"Id":361,"Name":"snorunt"},{"Id":362,"Name":"glalie"},{"Id":363,"Name":"spheal"},{"Id":364,"Name":"sealeo"},{"Id":365,"Name":"walrein"},{"Id":366,"Name":"clamperl"},{"Id":367,"Name":"huntail"},{"Id":368,"Name":"gorebyss"},{"Id":369,"Name":"relicanth"},{"Id":370,"Name":"luvdisc"},{"Id":371,"Name":"bagon"},{"Id":372,"Name":"shelgon"},{"Id":373,"Name":"salamence"},{"Id":374,"Name":"beldum"},{"Id":375,"Name":"metang"},{"Id":376,"Name":"metagross"},{"Id":377,"Name":"regirock"},{"Id":378,"Name":"regice"},{"Id":379,"Name":"registeel"},{"Id":380,"Name":"latias"},{"Id":381,"Name":"latios"},{"Id":382,"Name":"kyogre"},{"Id":383,"Name":"groudon"},{"Id":384,"Name":"rayquaza"},{"Id":385,"Name":"jirachi"},{"Id":386,"Name":"deoxys"},{"Id":387,"Name":"turtwig"},{"Id":388,"Name":"grotle"},{"Id":389,"Name":"torterra"},{"Id":390,"Name":"chimchar"},{"Id":391,"Name":"monferno"},{"Id":392,"Name":"infernape"},{"Id":393,"Name":"piplup"},{"Id":394,"Name":"prinplup"},{"Id":395,"Name":"empoleon"},{"Id":396,"Name":"starly"},{"Id":397,"Name":"staravia"},{"Id":398,"Name":"staraptor"},{"Id":399,"Name":"bidoof"},{"Id":400,"Name":"bibarel"},{"Id":401,"Name":"kricketot"},{"Id":402,"Name":"kricketune"},{"Id":403,"Name":"shinx"},{"Id":404,"Name":"luxio"},{"Id":405,"Name":"luxray"},{"Id":406,"Name":"budew"},{"Id":407,"Name":"roserade"},{"Id":408,"Name":"cranidos"},{"Id":409,"Name":"rampardos"},{"Id":410,"Name":"shieldon"},{"Id":411,"Name":"bastiodon"},{"Id":412,"Name":"burmy"},{"Id":413,"Name":"wormadam"},{"Id":414,"Name":"mothim"},{"Id":415,"Name":"combee"},{"Id":416,"Name":"vespiquen"},{"Id":417,"Name":"pachirisu"},{"Id":418,"Name":"buizel"},{"Id":419,"Name":"floatzel"},{"Id":420,"Name":"cherubi"},{"Id":421,"Name":"cherrim"},{"Id":422,"Name":"shellos"},{"Id":423,"Name":"gastrodon"},{"Id":424,"Name":"ambipom"},{"Id":425,"Name":"drifloon"},{"Id":426,"Name":"drifblim"},{"Id":427,"Name":"buneary"},{"Id":428,"Name":"lopunny"},{"Id":429,"Name":"mismagius"},{"Id":430,"Name":"honchkrow"},{"Id":431,"Name":"glameow"},{"Id":432,"Name":"purugly"},{"Id":433,"Name":"chingling"},{"Id":434,"Name":"stunky"},{"Id":435,"Name":"skuntank"},{"Id":436,"Name":"bronzor"},{"Id":437,"Name":"bronzong"},{"Id":438,"Name":"bonsly"},{"Id":439,"Name":"mime jr"},{"Id":440,"Name":"happiny"},{"Id":441,"Name":"chatot"},{"Id":442,"Name":"spiritomb"},{"Id":443,"Name":"gible"},{"Id":444,"Name":"gabite"},{"Id":445,"Name":"garchomp"},{"Id":446,"Name":"munchlax"},{"Id":447,"Name":"riolu"},{"Id":448,"Name":"lucario"},{"Id":449,"Name":"hippopotas"},{"Id":450,"Name":"hippowdon"},{"Id":451,"Name":"skorupi"},{"Id":452,"Name":"drapion"},{"Id":453,"Name":"croagunk"},{"Id":454,"Name":"toxicroak"},{"Id":455,"Name":"carnivine"},{"Id":456,"Name":"finneon"},{"Id":457,"Name":"lumineon"},{"Id":458,"Name":"mantyke"},{"Id":459,"Name":"snover"},{"Id":460,"Name":"abomasnow"},{"Id":461,"Name":"weavile"},{"Id":462,"Name":"magnezone"},{"Id":463,"Name":"lickilicky"},{"Id":464,"Name":"rhyperior"},{"Id":465,"Name":"tangrowth"},{"Id":466,"Name":"electivire"},{"Id":467,"Name":"magmortar"},{"Id":468,"Name":"togekiss"},{"Id":469,"Name":"yanmega"},{"Id":470,"Name":"leafeon"},{"Id":471,"Name":"glaceon"},{"Id":472,"Name":"gliscor"},{"Id":473,"Name":"mamoswine"},{"Id":474,"Name":"porygon"},{"Id":475,"Name":"gallade"},{"Id":476,"Name":"probopass"},{"Id":477,"Name":"dusknoir"},{"Id":478,"Name":"froslass"},{"Id":479,"Name":"rotom"},{"Id":480,"Name":"uxie"},{"Id":481,"Name":"mesprit"},{"Id":482,"Name":"azelf"},{"Id":483,"Name":"dialga"},{"Id":484,"Name":"palkia"},{"Id":485,"Name":"heatran"},{"Id":486,"Name":"regigigas"},{"Id":487,"Name":"giratina"},{"Id":488,"Name":"cresselia"},{"Id":489,"Name":"phione"},{"Id":490,"Name":"manaphy"},{"Id":491,"Name":"darkrai"},{"Id":492,"Name":"shaymin"},{"Id":493,"Name":"arceus"},{"Id":494,"Name":"victini"},{"Id":495,"Name":"snivy"},{"Id":496,"Name":"servine"},{"Id":497,"Name":"serperior"},{"Id":498,"Name":"tepig"},{"Id":499,"Name":"pignite"},{"Id":500,"Name":"emboar"},{"Id":501,"Name":"oshawott"},{"Id":502,"Name":"dewott"},{"Id":503,"Name":"samurott"},{"Id":504,"Name":"patrat"},{"Id":505,"Name":"watchog"},{"Id":506,"Name":"lillipup"},{"Id":507,"Name":"herdier"},{"Id":508,"Name":"stoutland"},{"Id":509,"Name":"purrloin"},{"Id":510,"Name":"liepard"},{"Id":511,"Name":"pansage"},{"Id":512,"Name":"simisage"},{"Id":513,"Name":"pansear"},{"Id":514,"Name":"simisear"},{"Id":515,"Name":"panpour"},{"Id":516,"Name":"simipour"},{"Id":517,"Name":"munna"},{"Id":518,"Name":"musharna"},{"Id":519,"Name":"pidove"},{"Id":520,"Name":"tranquill"},{"Id":521,"Name":"unfezant"},{"Id":522,"Name":"blitzle"},{"Id":523,"Name":"zebstrika"},{"Id":524,"Name":"roggenrola"},{"Id":525,"Name":"boldore"},{"Id":526,"Name":"gigalith"},{"Id":527,"Name":"woobat"},{"Id":528,"Name":"swoobat"},{"Id":529,"Name":"drilbur"},{"Id":530,"Name":"excadrill"},{"Id":531,"Name":"audino"},{"Id":532,"Name":"timburr"},{"Id":533,"Name":"gurdurr"},{"Id":534,"Name":"conkeldurr"},{"Id":535,"Name":"tympole"},{"Id":536,"Name":"palpitoad"},{"Id":537,"Name":"seismitoad"},{"Id":538,"Name":"throh"},{"Id":539,"Name":"sawk"},{"Id":540,"Name":"sewaddle"},{"Id":541,"Name":"swadloon"},{"Id":542,"Name":"leavanny"},{"Id":543,"Name":"venipede"},{"Id":544,"Name":"whirlipede"},{"Id":545,"Name":"scolipede"},{"Id":546,"Name":"cottonee"},{"Id":547,"Name":"whimsicott"},{"Id":548,"Name":"petilil"},{"Id":549,"Name":"lilligant"},{"Id":550,"Name":"basculin"},{"Id":551,"Name":"sandile"},{"Id":552,"Name":"krokorok"},{"Id":553,"Name":"krookodile"},{"Id":554,"Name":"darumaka"},{"Id":555,"Name":"darmanitan"},{"Id":556,"Name":"maractus"},{"Id":557,"Name":"dwebble"},{"Id":558,"Name":"crustle"},{"Id":559,"Name":"scraggy"},{"Id":560,"Name":"scrafty"},{"Id":561,"Name":"sigilyph"},{"Id":562,"Name":"yamask"},{"Id":563,"Name":"cofagrigus"},{"Id":564,"Name":"tirtouga"},{"Id":565,"Name":"carracosta"},{"Id":566,"Name":"archen"},{"Id":567,"Name":"archeops"},{"Id":568,"Name":"trubbish"},{"Id":569,"Name":"garbodor"},{"Id":570,"Name":"zorua"},{"Id":571,"Name":"zoroark"},{"Id":572,"Name":"minccino"},{"Id":573,"Name":"cinccino"},{"Id":574,"Name":"gothita"},{"Id":575,"Name":"gothorita"},{"Id":576,"Name":"gothitelle"},{"Id":577,"Name":"solosis"},{"Id":578,"Name":"duosion"},{"Id":579,"Name":"reuniclus"},{"Id":580,"Name":"ducklett"},{"Id":581,"Name":"swanna"},{"Id":582,"Name":"vanillite"},{"Id":583,"Name":"vanillish"},{"Id":584,"Name":"vanilluxe"},{"Id":585,"Name":"deerling"},{"Id":586,"Name":"sawsbuck"},{"Id":587,"Name":"emolga"},{"Id":588,"Name":"karrablast"},{"Id":589,"Name":"escavalier"},{"Id":590,"Name":"foongus"},{"Id":591,"Name":"amoonguss"},{"Id":592,"Name":"frillish"},{"Id":593,"Name":"jellicent"},{"Id":594,"Name":"alomomola"},{"Id":595,"Name":"joltik"},{"Id":596,"Name":"galvantula"},{"Id":597,"Name":"ferroseed"},{"Id":598,"Name":"ferrothorn"},{"Id":599,"Name":"klink"},{"Id":600,"Name":"klang"},{"Id":601,"Name":"klinklang"},{"Id":602,"Name":"tynamo"},{"Id":603,"Name":"eelektrik"},{"Id":604,"Name":"eelektross"},{"Id":605,"Name":"elgyem"},{"Id":606,"Name":"beheeyem"},{"Id":607,"Name":"litwick"},{"Id":608,"Name":"lampent"},{"Id":609,"Name":"chandelure"},{"Id":610,"Name":"axew"},{"Id":611,"Name":"fraxure"},{"Id":612,"Name":"haxorus"},{"Id":613,"Name":"cubchoo"},{"Id":614,"Name":"beartic"},{"Id":615,"Name":"cryogonal"},{"Id":616,"Name":"shelmet"},{"Id":617,"Name":"accelgor"},{"Id":618,"Name":"stunfisk"},{"Id":619,"Name":"mienfoo"},{"Id":620,"Name":"mienshao"},{"Id":621,"Name":"druddigon"},{"Id":622,"Name":"golett"},{"Id":623,"Name":"golurk"},{"Id":624,"Name":"pawniard"},{"Id":625,"Name":"bisharp"},{"Id":626,"Name":"bouffalant"},{"Id":627,"Name":"rufflet"},{"Id":628,"Name":"braviary"},{"Id":629,"Name":"vullaby"},{"Id":630,"Name":"mandibuzz"},{"Id":631,"Name":"heatmor"},{"Id":632,"Name":"durant"},{"Id":633,"Name":"deino"},{"Id":634,"Name":"zweilous"},{"Id":635,"Name":"hydreigon"},{"Id":636,"Name":"larvesta"},{"Id":637,"Name":"volcarona"},{"Id":638,"Name":"cobalion"},{"Id":639,"Name":"terrakion"},{"Id":640,"Name":"virizion"},{"Id":641,"Name":"tornadus"},{"Id":642,"Name":"thundurus"},{"Id":643,"Name":"reshiram"},{"Id":644,"Name":"zekrom"},{"Id":645,"Name":"landorus"},{"Id":646,"Name":"kyurem"},{"Id":647,"Name":"keldeo"},{"Id":648,"Name":"meloetta"},{"Id":649,"Name":"genesect"},{"Id":650,"Name":"chespin"},{"Id":651,"Name":"quilladin"},{"Id":652,"Name":"chesnaught"},{"Id":653,"Name":"fennekin"},{"Id":654,"Name":"braixen"},{"Id":655,"Name":"delphox"},{"Id":656,"Name":"froakie"},{"Id":657,"Name":"frogadier"},{"Id":658,"Name":"greninja"},{"Id":659,"Name":"bunnelby"},{"Id":660,"Name":"diggersby"},{"Id":661,"Name":"fletchling"},{"Id":662,"Name":"fletchinder"},{"Id":663,"Name":"talonflame"},{"Id":664,"Name":"scatterbug"},{"Id":665,"Name":"spewpa"},{"Id":666,"Name":"vivillon"},{"Id":667,"Name":"litleo"},{"Id":668,"Name":"pyroar"},{"Id":669,"Name":"flabebe"},{"Id":670,"Name":"floette"},{"Id":671,"Name":"florges"},{"Id":672,"Name":"skiddo"},{"Id":673,"Name":"gogoat"},{"Id":674,"Name":"pancham"},{"Id":675,"Name":"pangoro"},{"Id":676,"Name":"furfrou"},{"Id":677,"Name":"espurr"},{"Id":678,"Name":"meowstic"},{"Id":679,"Name":"honedge"},{"Id":680,"Name":"doublade"},{"Id":681,"Name":"aegislash"},{"Id":682,"Name":"spritzee"},{"Id":683,"Name":"aromatisse"},{"Id":684,"Name":"swirlix"},{"Id":685,"Name":"slurpuff"},{"Id":686,"Name":"inkay"},{"Id":687,"Name":"malamar"},{"Id":688,"Name":"binacle"},{"Id":689,"Name":"barbaracle"},{"Id":690,"Name":"skrelp"},{"Id":691,"Name":"dragalge"},{"Id":692,"Name":"clauncher"},{"Id":693,"Name":"clawitzer"},{"Id":694,"Name":"helioptile"},{"Id":695,"Name":"heliolisk"},{"Id":696,"Name":"tyrunt"},{"Id":697,"Name":"tyrantrum"},{"Id":698,"Name":"amaura"},{"Id":699,"Name":"aurorus"},{"Id":700,"Name":"sylveon"},{"Id":701,"Name":"hawlucha"},{"Id":702,"Name":"dedenne"},{"Id":703,"Name":"carbink"},{"Id":704,"Name":"goomy"},{"Id":705,"Name":"sliggoo"},{"Id":706,"Name":"goodra"},{"Id":707,"Name":"klefki"},{"Id":708,"Name":"phantump"},{"Id":709,"Name":"trevenant"},{"Id":710,"Name":"pumpkaboo"},{"Id":711,"Name":"gourgeist"},{"Id":712,"Name":"bergmite"},{"Id":713,"Name":"avalugg"},{"Id":714,"Name":"noibat"},{"Id":715,"Name":"noivern"},{"Id":716,"Name":"xerneas"},{"Id":717,"Name":"yveltal"},{"Id":718,"Name":"zygarde"},{"Id":719,"Name":"diancie"},{"Id":720,"Name":"hoopa"},{"Id":721,"Name":"volcanion"}] \ No newline at end of file From 3604f6a2474aa29483587982398c9dbc6486a930 Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Wed, 22 Mar 2017 02:08:08 -0400 Subject: [PATCH 354/496] Add quote ID to output of .qsearch --- src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs b/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs index 41c29a44..ea4bc674 100644 --- a/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs +++ b/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs @@ -97,7 +97,7 @@ namespace NadekoBot.Modules.Utility if (keywordquote == null) return; - await Context.Channel.SendMessageAsync("💬 " + keyword.ToLowerInvariant() + ": " + + await Context.Channel.SendMessageAsync($"`#{keywordquote.Id}` 💬 " + keyword.ToLowerInvariant() + ": " + keywordquote.Text.SanitizeMentions()); } @@ -176,4 +176,4 @@ namespace NadekoBot.Modules.Utility } } } -} \ No newline at end of file +} From 529343ceb6469ebc25a9fdc3aab1796f2785126e Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Sun, 26 Mar 2017 12:16:17 -0400 Subject: [PATCH 355/496] Fix RepeatSong/RepeatPlaylist bug bug where song would be added to the queue at the last index when repeatplaylist was enabled + repeatsong, as the actionqueue events are not mutually independent --- src/NadekoBot/Modules/Music/Classes/MusicControls.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Music/Classes/MusicControls.cs b/src/NadekoBot/Modules/Music/Classes/MusicControls.cs index bf07a508..d5581884 100644 --- a/src/NadekoBot/Modules/Music/Classes/MusicControls.cs +++ b/src/NadekoBot/Modules/Music/Classes/MusicControls.cs @@ -163,7 +163,7 @@ namespace NadekoBot.Modules.Music.Classes } - if (RepeatPlaylist) + if (RepeatPlaylist & !RepeatSong) AddSong(CurrentSong, CurrentSong.QueuerName); if (RepeatSong) From 683107bb9134217e708d3cd96d37f8cd99852d68 Mon Sep 17 00:00:00 2001 From: Hubcapp Date: Sun, 26 Mar 2017 21:04:09 -0500 Subject: [PATCH 356/496] Fix trailing sentences, grammar, untypable characters, and remove poor quality articles. --- src/NadekoBot/data/typing_articles.json | 164 +++++------------------- 1 file changed, 34 insertions(+), 130 deletions(-) diff --git a/src/NadekoBot/data/typing_articles.json b/src/NadekoBot/data/typing_articles.json index ab34341c..9850103f 100644 --- a/src/NadekoBot/data/typing_articles.json +++ b/src/NadekoBot/data/typing_articles.json @@ -9,7 +9,7 @@ }, { "Title":"Forensic and Legal Psychology", - "Text":"Using research in clinical, cognitive, developmental, and social psychology, Forensic and Legal Psychology shows how psychological science can enhance the gathering and presentation of evidence, improve legal decision-making, prevent crime," + "Text":"Using research in clinical, cognitive, developmental, and social psychology, Forensic and Legal Psychology shows how psychological science can enhance the gathering and presentation of evidence, improve legal decision-making, prevent crime, and other things." }, { "Title":"International Handbook of Psychology in Education", @@ -17,7 +17,7 @@ }, { "Title":"Handbook of Personality Psychology", - "Text":"This comprehensive reference work on personality psychology discusses the development and measurement of personality, biological and social determinants, dynamic personality processes, the personality's relation to the self, and personality" + "Text":"This comprehensive reference work on personality psychology discusses the development and measurement of personality, biological and social determinants, dynamic personality processes, the personality's relation to the self, and personality." }, { "Title":"Dictionary of Theories, Laws, and Concepts in Psychology", @@ -25,19 +25,7 @@ }, { "Title":"Essays on Plato's Psychology", - "Text":"With a comprehensive introduction to the major issues of Plato's psychology and an up-to-date bibliography of work on the relevant issues, this much-needed text makes the study of Plato's psychology accessible to scholars in ancient Greek" - }, - { - "Title":"Psychology Statistics For Dummies", - "Text":"As an alternative to typical, lead-heavy statistics texts or supplements to assigned course reading, this is one book psychology students won't want to be without." - }, - { - "Title":"Doing Psychology Experiments", - "Text":"David W. Martin’s unique blend of informality, humor, clear instruction, and solid scholarship make this concise text a popular choice for research methods courses in psychology." - }, - { - "Title":"A Handbook of Research Methods for Clinical and Health", - "Text":"For both undergraduate and postgraduate students, the book will be essential in making them aware of the full range of techniques available to them, helping them to design scientifically rigorous experiments." + "Text":"With a comprehensive introduction to the major issues of Plato's psychology and an up-to-date bibliography of work on the relevant issues, this much-needed text makes the study of Plato's psychology accessible to scholars in ancient Greece." }, { "Title":"A History of Psychology", @@ -57,19 +45,19 @@ }, { "Title":"Psychology and Deterrence", - "Text":"Now available in paperback, Psychology and Deterrence reveals deterrence strategy's hidden and generally simplistic assumptions about the nature of power and aggression, threat and response, and calculation and behavior in the international" + "Text":"Now available in paperback, Psychology and Deterrence reveals deterrence strategy's hidden and generally simplistic assumptions about the nature of power and aggression, threat and response, and calculation and behavior internationally." }, { "Title":"Psychology: An International Perspective", - "Text":"Unlike typical American texts, this book provides an international approach to introductory psychology, providing comprehensive and lively coverage of current research from a global perspective, including the UK, Germany, Scandinavia," + "Text":"Unlike typical American texts, this book provides an international approach to introductory psychology, providing comprehensive and lively coverage of current research from a global perspective, including the UK, Germany, Scandinavia, and probably others." }, { "Title":"Psychology, Briefer Course", - "Text":"Despite its title, 'Psychology: Briefer Course' is more than a simple condensation of the great 'Principles of Psychology." + "Text":"Despite its title, \"Psychology: Briefer Course\" is more than a simple condensation of the great Principles of Psychology." }, { "Title":"Psychology, Seventh Edition (High School)", - "Text":"This new edition continues the story of psychology with added research and enhanced content from the most dynamic areas of the field—cognition, gender and diversity studies, neuroscience and more, while at the same time using the most" + "Text":"This new edition continues the story of psychology with added research and enhanced content from the most dynamic areas of the field cognition, gender and diversity studies, neuroscience and more." }, { "Title":"Psychology of Russia: Past, Present, Future", @@ -79,25 +67,17 @@ "Title":"Barron's AP Psychology", "Text":"Provides information on scoring and structure of the test, offers tips on test-taking strategies, and includes practice examinations and subject review." }, - { - "Title":"Psychology for Inclusive Education: New Directions in", - "Text":"International in focus and at the very cutting edge of the field, this is essential reading for all those interested in the development of inclusive education." - }, { "Title":"Applied Psychology: Putting Theory Into Practice", "Text":"Applied Psychology: Putting theory into practice demonstrates how psychology theory is applied in the real world." }, - { - "Title":"The Psychology of Science: A Reconnaissance", - "Text":"' This eBook edition contains the complete 168 page text of the original 1966 hardcover edition. Contents: Preface by Abraham H. Maslow Acknowledgments 1. Mechanistic and Humanistic Science 2." - }, { "Title":"Filipino American Psychology: A Handbook of Theory,", "Text":"This book is the first of its kind and aims to promote visibility of this invisible group, so that 2.4 million Filipino Americans will have their voices heard." }, { "Title":"The Psychology of Visual Illusion", - "Text":"Well-rounded perspective on the ambiguities of visual display emphasizes geometrical optical illusions: framing and contrast effects, distortion of angles and direction, and apparent 'movement' of images. 240 drawings. 1972 edition." + "Text":"Well-rounded perspective on the ambiguities of visual display emphasizes geometrical optical illusions: framing and contrast effects, distortion of angles and direction, and apparent \"movement\" of images. 240 drawings. 1972 edition." }, { "Title":"The Psychology of Women", @@ -105,15 +85,11 @@ }, { "Title":"Psychology and Race", - "Text":"' Psychology and Race is divided into two major parts. The first half of the book looks at the interracial situation itself." - }, - { - "Title":"Psychology for A-Level", - "Text":"'Precisely targeted at AQA A Level Psychology, specification A. It will also be of interest to those who are new to psychology, and who want to get a flavour of the kinds of topics in which psychologists are interested'--Preface, p. vii." + "Text":"Psychology and Race is divided into two major parts. The first half of the book looks at the interracial situation itself. The second half is a mystery." }, { "Title":"Biological Psychology", - "Text":"Updated with new topics, examples, and recent research findings--and supported by new online bio-labs, part of the strongest media package yet--this text speaks to today’s students and instructors." + "Text":"Updated with new topics, examples, and recent research findings -- and supported by new online bio-labs, part of the strongest media package yet. This text speaks to today's students and instructors." }, { "Title":"Psychology: Concepts & Connections", @@ -121,15 +97,15 @@ }, { "Title":"The Psychology of Adoption", - "Text":"In this volume David Brodzinsky, who has conducted one of the nation's largest studies of adopted children, and Marshall Schechter, a noted child psychiatrist who has been involved with adoption related issues for over forty years, have" + "Text":"In this volume David Brodzinsky, who has conducted one of the nation's largest studies of adopted children, and Marshall Schechter, a noted child psychiatrist who has been involved with adoption related issues for over forty years, have done what was previously thought impossible." }, { "Title":"Psychology and Adult Learning", - "Text":"This new edition is thoroughly revised and updated in light of the impact of globalising processes and the application of new information technologies, and the influence of postmodernism on psychology." + "Text":"This new edition is thoroughly revised and updated in light of the impact of new processes and the application of new information technologies, and the influence of postmodernism on psychology." }, { "Title":"Gestalt Psychology: An Introduction to New Concepts in", - "Text":"The general reader, if he looks to psychology for something more than entertainment or practical advice, will discover in this book a storehouse of searching criticism and brilliant suggestions from the pen of a rare thinker, and one who" + "Text":"The general reader, if he looks to psychology for something more than entertainment or practical advice, will discover in this book a storehouse of searching criticism and brilliant suggestions from the pen of a rare thinker, and one who enjoys the smell of his own farts." }, { "Title":"The Psychology of Goals", @@ -139,29 +115,17 @@ "Title":"Metaphors in the History of Psychology", "Text":"Through the identification of these metaphors, the contributors to this volume have provided a remarkably useful guide to the history, current orientations, and future prospects of modern psychology." }, - { - "Title":"Abnormal Psychology: An Integrative Approach", - "Text":"ABNORMAL PSYCHOLOGY: AN INTEGRATIVE APPROACH, Seventh Edition, is the perfect book to help you succeed in your abnormal psychology course!" - }, - { - "Title":"Art and Visual Perception: A Psychology of the Creative Eye", - "Text":"Gestalt theory and the psychology of visual perception form the basis for an analysis of art and its basic elements" - }, { "Title":"Psychology & Christianity: Five Views", "Text":"This revised edition of a widely appreciated text now presents five models for understanding the relationship between psychology and Christianity." }, { "Title":"The Psychology of Hope: You Can Get There from Here", - "Text":"Why do some people lead positive, hope-filled lives, while others wallow in pessimism? In The Psychology of Hope, a professor of psychology reveals the specific character traits that produce highly hopeful individuals." + "Text":"Why do some people lead positive, hope-filled lives, while others wallow in pessimism? In \"The Psychology of Hope\", a professor of psychology reveals the specific character traits that produce highly hopeful individuals." }, { "Title":"Perspectives on Psychology", - "Text":"This is a title in the modular 'Principles in Psychology Series', designed for A-level and other introductory courses, aiming to provide students embarking on psychology courses with the necessary background and context." - }, - { - "Title":"Psychology the Easy Way", - "Text":"Material is presented in a way that makes these books ideal as self-teaching guides, but Easy Way titles are also preferred by many teachers as supplements to classroom textbooks." + "Text":"This is a title in the modular \"Principles in Psychology Series\", designed for A-level and other introductory courses, aiming to provide students embarking on psychology courses with the necessary background and context." }, { "Title":"Ethics in Psychology: Professional Standards and Cases", @@ -169,35 +133,23 @@ }, { "Title":"Psychology Gets in the Game: Sport, Mind, and Behavior,", - "Text":"The essays collected in this volume tell the stories not only of these psychologists and their subjects but of the social and academic context that surrounded them, shaping and being shaped by their ideas'--Provided by publisher." - }, - { - "Title":"Psychology for Physical Educators: Student in Focus", - "Text":"This updated edition focuses on attitude and motivation as important aspects of the physical education curriculum, illustrating practical ideas and pedagogical solutions for any PE setting." + "Text":"The essays collected in this volume tell the stories not only of these psychologists and their subjects but of the social and academic context that surrounded them, shaping and being shaped by their ideas." }, { "Title":"The Psychology of Leadership: New Perspectives and Research", - "Text":"In this book, some of the world's leading scholars come together to describe their thinking and research on the topic of the psychology of leadership." + "Text":"Some of the world's leading scholars came together to describe their thinking and research on the topic of the psychology of leadership." }, { "Title":"The Psychology of Interpersonal Relations", - "Text":"As the title suggests, this book examines the psychology of interpersonal relations. In the context of this book, the term 'interpersonal relations' denotes relations between a few, usually between two, people." - }, - { - "Title":"Applied Psychology", - "Text":"The chapters on Counselling Psychology and Teaching Psychology are available online via the Student Companion Site at: http://tinyurl.com/c3ztvtj The text is written to be accessible to Level 1 Introductory Psychology students, and also to" + "Text":"As the title suggests, this book examines the psychology of interpersonal relations. In the context of this book, the term \"interpersonal relations\" denotes relations between a few, usually between two, people." }, { "Title":"Psychology", "Text":"An exciting read for anyone interested in psychology and research; because of its comprehensive appendix, glossary, and reference section, this book is a must-have desk reference for psychologists and others in the field." }, - { - "Title":"The Psychology of Music", - "Text":"On interpreting musical phenomena in terms of mental function" - }, { "Title":"Abnormal Psychology", - "Text":"Ron Comer's Abnormal Psychology continues to captivate students with its integrated coverage of theory, diagnosis, and treatment, its inclusive wide-ranging cross-cultural perspective, and its compassionate emphasis on the real impact of" + "Text":"Ron Comer's Abnormal Psychology continues to captivate students with its integrated coverage of theory, diagnosis, and treatment, its inclusive wide-ranging cross-cultural perspective, and its compassionate emphasis on the real impact of hugs." }, { "Title":"The Psychology of Food Choice", @@ -205,19 +157,15 @@ }, { "Title":"Psychology: brain, behavior, & culture", - "Text":"Rather than present psychological science as a series of facts for memorization, this book takes readers on a psychological journey that uncovers things they didn't know or new ways of thinking about things they did know." + "Text":"Rather than present psychological science as a series of facts for memorization, this book takes readers on a psychological journey that uncovers things they didn't know and new ways of thinking about things they did know." }, { "Title":"A Brief History of Psychology", - "Text":"Due to its brevity and engaging style, the book is often used in introductory courses to introduce students to the field. The enormous index and substantial glossary make this volume a useful desk reference for the entire field." - }, - { - "Title":"Psychology AS: The Complete Companion", - "Text":"Presented in double-page spreads this book written to the average AS ability level, provides information on psychology in bite-sized chunks with learning and revision features." + "Text":"Due to its brevity and engaging style, this book is often used in introductory courses to introduce students to the field. The enormous index and substantial glossary make this volume a useful desk reference for the entire field." }, { "Title":"The Psychology Book: From Shamanism to Cutting-Edge", - "Text":"Lavishly illustrated, this new addition in the Sterling's Milestones series chronicles the history of psychology through 250 groundbreaking events, theories, publications, experiments and discoveries." + "Text":"Lavishly illustrated, this new addition in Sterling's Milestones series chronicles the history of psychology through 250 groundbreaking events, theories, publications, experiments and discoveries." }, { "Title":"The Psychology Book", @@ -225,15 +173,15 @@ }, { "Title":"Handbook of Positive Psychology", - "Text":"' The Handbook of Positive Psychology provides a forum for a more positive view of the human condition. In its pages, readers are treated to an analysis of what the foremost experts believe to be the fundamental strengths of humankind." + "Text":"The Handbook of Positive Psychology provides a forum for a more positive view of the human condition. In its pages, readers are treated to an analysis of what the foremost experts believe to be the fundamental strengths of humankind." }, { "Title":"Psychology of Sustainable Development", - "Text":"With contributions from an international team of policy shapers and makers, the book will be an important reference for environmental, developmental, social, and organizational psychologists, in addition to other social scientists concerned" + "Text":"With contributions from an international team of policy shapers and makers, the book will be an important reference for environmental, developmental, social, and organizational psychologists, in addition to other social scientists concerned about the environment." }, { "Title":"An Introduction to the History of Psychology", - "Text":"In this Fifth Edition, B.R. Hergenhahn demonstrates that most of the concerns of contemporary psychologists are manifestations of themes that have been part of psychology for hundreds-or even thousands-of years." + "Text":"In this Fifth Edition, B.R. Hergenhahn demonstrates that most of the concerns of contemporary psychologists are manifestations of themes that have been part of psychology for thousands of years." }, { "Title":"Careers in Psychology: Opportunities in a Changing World", @@ -241,39 +189,23 @@ }, { "Title":"Philosophy of Psychology", - "Text":"This is the story of the clattering of elevated subways and the cacophony of crowded neighborhoods, the heady optimism of industrial progress and the despair of economic recession, and the vibrancy of ethnic cultures and the resilience of" + "Text":"This is the story of the clattering of elevated subways and the cacophony of crowded neighborhoods, the heady optimism of industrial progress and the despair of economic recession, and the vibrancy of ethnic cultures and the resilience of the lower class." }, { "Title":"The Psychology of Risk Taking Behavior", "Text":"This book aims to help the reader to understand what motivates people to engage in risk taking behavior, such as participating in traffic, sports, financial investments, or courtship." }, { - "Title":"The Nazi Doctors: Medical Killing and the Psychology of", - "Text":"This book explores the psychological conditions that promote the human potential for evil, relating medical killing to broader principles of doubling and genocide" - }, - { - "Title":"The Body and Psychology", - "Text":"The material in this volume was previously published as a Special Issue of th" - }, - { - "Title":"Introduction to Psychology: Gateways to Mind and Behavior", + "Title":"Legal Notices", "Text":"Important Notice: Media content referenced within the product description or the product text may not be available in the ebook version." }, - { - "Title":"Psychology of Time", - "Text":"Basic Structure The book would contain 14 or 15 chapters of roughly 12 000 words. The exact final number of chapters would depend on further discussions with you about the book's basic structure." - }, { "Title":"Handbook of Psychology, Experimental Psychology", "Text":"Includes established theories and cutting-edge developments. Presents the work of an international group of experts. Presents the nature, origin, implications, and future course of major unresolved issues in the area." }, - { - "Title":"Study Guide for Psychology, Seventh Edition", - "Text":"This new edition continues the story of psychology with added research and enhanced content from the most dynamic areas of the field--cognition, gender and diversity studies, neuroscience and more, while at the same time using the most" - }, { "Title":"Culture and Psychology", - "Text":"In addition, the text encourages students to question traditionally held beliefs and theories as and their relevance to different cultural groups today." + "Text":"In addition, the text encourages students to question traditionally held beliefs and theories and their relevance to different cultural groups today." }, { "Title":"Exploring the Psychology of Interest", @@ -289,43 +221,23 @@ }, { "Title":"The Psychology of Social Class", - "Text":"By addressing differences in social class, the book broadens the perspective of social psychological research to examine such topics as the effect of achievement motivation and other personality variables on social mobility and the effect" - }, - { - "Title":"Applied Psychology: Current Issues and New Directions", - "Text":"Key features of this book: - Consistently pedagogical throughout - chapter summaries, questions for reflection and discussion and annotated further reading in every chapter - Comprehensive coverage - all areas of applied psychology included" + "Text":"By addressing differences in social class, the book broadens the perspective of social psychological research to examine such topics as the effect of achievement motivation, personality variables on social mobility, and the effect of winning the lottery." }, { "Title":"Popular Psychology: An Encyclopedia", "Text":"Entries cover a variety of topics in the field of popular psychology, including acupuncture, emotional intelligence, brainwashing, chemical inbalance, and seasonal affective disorder." }, - { - "Title":"Advanced Psychology: Applications, Issues and Perspectives", - "Text":"The second of two books, Advanced Psychology covers units 4 to 6 for the second year at Advanced Level." - }, - { - "Title":"Mindset: The New Psychology of Success", - "Text":"This is a book that can change your life, as its ideas have changed mine.”—Robert J. Sternberg, IBM Professor of Education and Psychology at Yale University, director of the PACE Center of Yale University, and author of Successful" - }, { "Title":"E-Z Psychology", - "Text":"This book covers material as it is taught on a college-101 level." - }, - { - "Title":"Myers' Psychology for AP*", - "Text":"Already The Bestselling AP* Psychology Author, Myers Writes His First Exclusive AP* Psych Text Watch Dave G. Myers introduce this new text here." + "Text":"This book covers material as it is taught on a college-101 level. There is no substance in this book that the casual observer of humans would not already know." }, { "Title":"Psychology and Health", "Text":"Part of a series of textbooks which have been written to support A levels in psychology. The books use real life applications to make theories come alive for students and teach them what they need to know." }, - { - "Title":"Applying Psychology in Business: The Handbook for Managers", - "Text":"To learn more about Rowman & Littlefield titles please visit us at www.rowmanlittlefield.com." - }, { "Title":"Influence", - "Text":"Influence, the classic book on persuasion, explains the psychology of why people say 'yes'—and how to apply these understandings. Dr. Robert Cialdini is the seminal expert in the rapidly expanding field of influence and persuasion." + "Text":"Influence is the classic book on persuasion. It explains the psychology of why people say 'yes' and how to apply these understandings. Dr. Robert Cialdini is the seminal expert in the rapidly expanding field of influence and persuasion." }, { "Title":"Psychology and Policing", @@ -333,11 +245,7 @@ }, { "Title":"Applied Psychology: New Frontiers and Rewarding Careers", - "Text":"This book examines how psychological science is, and can be, used to prevent and ameliorate pressing human problems to promote positive social change." - }, - { - "Title":"Psychology: Concepts and Applications", - "Text":"Nevid developed the effective teaching devices in this text based on a comprehensive system derived from research on learning and memory as well as his own research on textbook pedagogy." + "Text":"This book examines how psychological science is, and can be, used to prevent and improve pressing human problems to promote positive social change." }, { "Title":"Foundations of Sport and Exercise Psychology, 6E: ", @@ -345,7 +253,7 @@ }, { "Title":"Biographical Dictionary of Psychology", - "Text":"This Dictionary provides biographical and bibliographical information on over 500 psychologists from all over the world from 1850 to the present day. All branches of psychology and its related disciplines are featured." + "Text":"This dictionary provides biographical and bibliographical information on over 500 psychologists from all over the world from 1850 to the present day. All branches of psychology and its related disciplines are featured." }, { "Title":"Psychology: A Self-Teaching Guide", @@ -354,8 +262,4 @@ { "Title":"A Dictionary of Psychology", "Text":"Entries are extensively cross-referenced for ease of use, and cover word origins and derivations as well as definitions. Over 80 illustrations complement the text." - }, - { - "Title":"An Intellectual History of Psychology", - "Text":"Invaluable as a text for students and as a stimulating and insightful overview for scholars and practicing psychologists, this volume can be read either as a history of psychology in both its philosophical and aspiring scientific periods or" - }] \ No newline at end of file + }] From 0a32e0251e1550885a466e348a2c80b452e8eebb Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 27 Mar 2017 11:30:21 +0200 Subject: [PATCH 357/496] Fixes to pokemon names: porygon, porygon z and ho-oh --- .../Modules/Games/Commands/Trivia/TriviaQuestionPool.cs | 2 +- .../data/pokemon/{name-id_map3.json => name-id_map4.json} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename src/NadekoBot/data/pokemon/{name-id_map3.json => name-id_map4.json} (52%) diff --git a/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs b/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs index e98830f5..ad752e95 100644 --- a/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs +++ b/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs @@ -21,7 +21,7 @@ namespace NadekoBot.Modules.Games.Trivia public static TriviaQuestionPool Instance { get; } = _instance ?? (_instance = new TriviaQuestionPool()); private const string questionsFile = "data/trivia_questions.json"; - private const string pokemonMapPath = "data/pokemon/name-id_map3.json"; + private const string pokemonMapPath = "data/pokemon/name-id_map4.json"; private readonly int maxPokemonId; private Random rng { get; } = new NadekoRandom(); diff --git a/src/NadekoBot/data/pokemon/name-id_map3.json b/src/NadekoBot/data/pokemon/name-id_map4.json similarity index 52% rename from src/NadekoBot/data/pokemon/name-id_map3.json rename to src/NadekoBot/data/pokemon/name-id_map4.json index fa0b9d9c..ed6411fa 100644 --- a/src/NadekoBot/data/pokemon/name-id_map3.json +++ b/src/NadekoBot/data/pokemon/name-id_map4.json @@ -1 +1 @@ -[{"Id":1,"Name":"bulbasaur"},{"Id":2,"Name":"ivysaur"},{"Id":3,"Name":"venusaur"},{"Id":4,"Name":"charmander"},{"Id":5,"Name":"charmeleon"},{"Id":6,"Name":"charizard"},{"Id":7,"Name":"squirtle"},{"Id":8,"Name":"wartortle"},{"Id":9,"Name":"blastoise"},{"Id":10,"Name":"caterpie"},{"Id":11,"Name":"metapod"},{"Id":12,"Name":"butterfree"},{"Id":13,"Name":"weedle"},{"Id":14,"Name":"kakuna"},{"Id":15,"Name":"beedrill"},{"Id":16,"Name":"pidgey"},{"Id":17,"Name":"pidgeotto"},{"Id":18,"Name":"pidgeot"},{"Id":19,"Name":"rattata"},{"Id":20,"Name":"raticate"},{"Id":21,"Name":"spearow"},{"Id":22,"Name":"fearow"},{"Id":23,"Name":"ekans"},{"Id":24,"Name":"arbok"},{"Id":25,"Name":"pikachu"},{"Id":26,"Name":"raichu"},{"Id":27,"Name":"sandshrew"},{"Id":28,"Name":"sandslash"},{"Id":29,"Name":"nidoran"},{"Id":30,"Name":"nidorina"},{"Id":31,"Name":"nidoqueen"},{"Id":32,"Name":"nidoran"},{"Id":33,"Name":"nidorino"},{"Id":34,"Name":"nidoking"},{"Id":35,"Name":"clefairy"},{"Id":36,"Name":"clefable"},{"Id":37,"Name":"vulpix"},{"Id":38,"Name":"ninetales"},{"Id":39,"Name":"jigglypuff"},{"Id":40,"Name":"wigglytuff"},{"Id":41,"Name":"zubat"},{"Id":42,"Name":"golbat"},{"Id":43,"Name":"oddish"},{"Id":44,"Name":"gloom"},{"Id":45,"Name":"vileplume"},{"Id":46,"Name":"paras"},{"Id":47,"Name":"parasect"},{"Id":48,"Name":"venonat"},{"Id":49,"Name":"venomoth"},{"Id":50,"Name":"diglett"},{"Id":51,"Name":"dugtrio"},{"Id":52,"Name":"meowth"},{"Id":53,"Name":"persian"},{"Id":54,"Name":"psyduck"},{"Id":55,"Name":"golduck"},{"Id":56,"Name":"mankey"},{"Id":57,"Name":"primeape"},{"Id":58,"Name":"growlithe"},{"Id":59,"Name":"arcanine"},{"Id":60,"Name":"poliwag"},{"Id":61,"Name":"poliwhirl"},{"Id":62,"Name":"poliwrath"},{"Id":63,"Name":"abra"},{"Id":64,"Name":"kadabra"},{"Id":65,"Name":"alakazam"},{"Id":66,"Name":"machop"},{"Id":67,"Name":"machoke"},{"Id":68,"Name":"machamp"},{"Id":69,"Name":"bellsprout"},{"Id":70,"Name":"weepinbell"},{"Id":71,"Name":"victreebel"},{"Id":72,"Name":"tentacool"},{"Id":73,"Name":"tentacruel"},{"Id":74,"Name":"geodude"},{"Id":75,"Name":"graveler"},{"Id":76,"Name":"golem"},{"Id":77,"Name":"ponyta"},{"Id":78,"Name":"rapidash"},{"Id":79,"Name":"slowpoke"},{"Id":80,"Name":"slowbro"},{"Id":81,"Name":"magnemite"},{"Id":82,"Name":"magneton"},{"Id":83,"Name":"farfetchd"},{"Id":84,"Name":"doduo"},{"Id":85,"Name":"dodrio"},{"Id":86,"Name":"seel"},{"Id":87,"Name":"dewgong"},{"Id":88,"Name":"grimer"},{"Id":89,"Name":"muk"},{"Id":90,"Name":"shellder"},{"Id":91,"Name":"cloyster"},{"Id":92,"Name":"gastly"},{"Id":93,"Name":"haunter"},{"Id":94,"Name":"gengar"},{"Id":95,"Name":"onix"},{"Id":96,"Name":"drowzee"},{"Id":97,"Name":"hypno"},{"Id":98,"Name":"krabby"},{"Id":99,"Name":"kingler"},{"Id":100,"Name":"voltorb"},{"Id":101,"Name":"electrode"},{"Id":102,"Name":"exeggcute"},{"Id":103,"Name":"exeggutor"},{"Id":104,"Name":"cubone"},{"Id":105,"Name":"marowak"},{"Id":106,"Name":"hitmonlee"},{"Id":107,"Name":"hitmonchan"},{"Id":108,"Name":"lickitung"},{"Id":109,"Name":"koffing"},{"Id":110,"Name":"weezing"},{"Id":111,"Name":"rhyhorn"},{"Id":112,"Name":"rhydon"},{"Id":113,"Name":"chansey"},{"Id":114,"Name":"tangela"},{"Id":115,"Name":"kangaskhan"},{"Id":116,"Name":"horsea"},{"Id":117,"Name":"seadra"},{"Id":118,"Name":"goldeen"},{"Id":119,"Name":"seaking"},{"Id":120,"Name":"staryu"},{"Id":121,"Name":"starmie"},{"Id":122,"Name":"mr mime"},{"Id":123,"Name":"scyther"},{"Id":124,"Name":"jynx"},{"Id":125,"Name":"electabuzz"},{"Id":126,"Name":"magmar"},{"Id":127,"Name":"pinsir"},{"Id":128,"Name":"tauros"},{"Id":129,"Name":"magikarp"},{"Id":130,"Name":"gyarados"},{"Id":131,"Name":"lapras"},{"Id":132,"Name":"ditto"},{"Id":133,"Name":"eevee"},{"Id":134,"Name":"vaporeon"},{"Id":135,"Name":"jolteon"},{"Id":136,"Name":"flareon"},{"Id":137,"Name":"porygon z"},{"Id":138,"Name":"omanyte"},{"Id":139,"Name":"omastar"},{"Id":140,"Name":"kabuto"},{"Id":141,"Name":"kabutops"},{"Id":142,"Name":"aerodactyl"},{"Id":143,"Name":"snorlax"},{"Id":144,"Name":"articuno"},{"Id":145,"Name":"zapdos"},{"Id":146,"Name":"moltres"},{"Id":147,"Name":"dratini"},{"Id":148,"Name":"dragonair"},{"Id":149,"Name":"dragonite"},{"Id":150,"Name":"mewtwo"},{"Id":151,"Name":"mew"},{"Id":152,"Name":"chikorita"},{"Id":153,"Name":"bayleef"},{"Id":154,"Name":"meganium"},{"Id":155,"Name":"cyndaquil"},{"Id":156,"Name":"quilava"},{"Id":157,"Name":"typhlosion"},{"Id":158,"Name":"totodile"},{"Id":159,"Name":"croconaw"},{"Id":160,"Name":"feraligatr"},{"Id":161,"Name":"sentret"},{"Id":162,"Name":"furret"},{"Id":163,"Name":"hoothoot"},{"Id":164,"Name":"noctowl"},{"Id":165,"Name":"ledyba"},{"Id":166,"Name":"ledian"},{"Id":167,"Name":"spinarak"},{"Id":168,"Name":"ariados"},{"Id":169,"Name":"crobat"},{"Id":170,"Name":"chinchou"},{"Id":171,"Name":"lanturn"},{"Id":172,"Name":"pichu"},{"Id":173,"Name":"cleffa"},{"Id":174,"Name":"igglybuff"},{"Id":175,"Name":"togepi"},{"Id":176,"Name":"togetic"},{"Id":177,"Name":"natu"},{"Id":178,"Name":"xatu"},{"Id":179,"Name":"mareep"},{"Id":180,"Name":"flaaffy"},{"Id":181,"Name":"ampharos"},{"Id":182,"Name":"bellossom"},{"Id":183,"Name":"marill"},{"Id":184,"Name":"azumarill"},{"Id":185,"Name":"sudowoodo"},{"Id":186,"Name":"politoed"},{"Id":187,"Name":"hoppip"},{"Id":188,"Name":"skiploom"},{"Id":189,"Name":"jumpluff"},{"Id":190,"Name":"aipom"},{"Id":191,"Name":"sunkern"},{"Id":192,"Name":"sunflora"},{"Id":193,"Name":"yanma"},{"Id":194,"Name":"wooper"},{"Id":195,"Name":"quagsire"},{"Id":196,"Name":"espeon"},{"Id":197,"Name":"umbreon"},{"Id":198,"Name":"murkrow"},{"Id":199,"Name":"slowking"},{"Id":200,"Name":"misdreavus"},{"Id":201,"Name":"unown"},{"Id":202,"Name":"wobbuffet"},{"Id":203,"Name":"girafarig"},{"Id":204,"Name":"pineco"},{"Id":205,"Name":"forretress"},{"Id":206,"Name":"dunsparce"},{"Id":207,"Name":"gligar"},{"Id":208,"Name":"steelix"},{"Id":209,"Name":"snubbull"},{"Id":210,"Name":"granbull"},{"Id":211,"Name":"qwilfish"},{"Id":212,"Name":"scizor"},{"Id":213,"Name":"shuckle"},{"Id":214,"Name":"heracross"},{"Id":215,"Name":"sneasel"},{"Id":216,"Name":"teddiursa"},{"Id":217,"Name":"ursaring"},{"Id":218,"Name":"slugma"},{"Id":219,"Name":"magcargo"},{"Id":220,"Name":"swinub"},{"Id":221,"Name":"piloswine"},{"Id":222,"Name":"corsola"},{"Id":223,"Name":"remoraid"},{"Id":224,"Name":"octillery"},{"Id":225,"Name":"delibird"},{"Id":226,"Name":"mantine"},{"Id":227,"Name":"skarmory"},{"Id":228,"Name":"houndour"},{"Id":229,"Name":"houndoom"},{"Id":230,"Name":"kingdra"},{"Id":231,"Name":"phanpy"},{"Id":232,"Name":"donphan"},{"Id":233,"Name":"porygon2"},{"Id":234,"Name":"stantler"},{"Id":235,"Name":"smeargle"},{"Id":236,"Name":"tyrogue"},{"Id":237,"Name":"hitmontop"},{"Id":238,"Name":"smoochum"},{"Id":239,"Name":"elekid"},{"Id":240,"Name":"magby"},{"Id":241,"Name":"miltank"},{"Id":242,"Name":"blissey"},{"Id":243,"Name":"raikou"},{"Id":244,"Name":"entei"},{"Id":245,"Name":"suicune"},{"Id":246,"Name":"larvitar"},{"Id":247,"Name":"pupitar"},{"Id":248,"Name":"tyranitar"},{"Id":249,"Name":"lugia"},{"Id":250,"Name":"ho-oh"},{"Id":251,"Name":"celebi"},{"Id":252,"Name":"treecko"},{"Id":253,"Name":"grovyle"},{"Id":254,"Name":"sceptile"},{"Id":255,"Name":"torchic"},{"Id":256,"Name":"combusken"},{"Id":257,"Name":"blaziken"},{"Id":258,"Name":"mudkip"},{"Id":259,"Name":"marshtomp"},{"Id":260,"Name":"swampert"},{"Id":261,"Name":"poochyena"},{"Id":262,"Name":"mightyena"},{"Id":263,"Name":"zigzagoon"},{"Id":264,"Name":"linoone"},{"Id":265,"Name":"wurmple"},{"Id":266,"Name":"silcoon"},{"Id":267,"Name":"beautifly"},{"Id":268,"Name":"cascoon"},{"Id":269,"Name":"dustox"},{"Id":270,"Name":"lotad"},{"Id":271,"Name":"lombre"},{"Id":272,"Name":"ludicolo"},{"Id":273,"Name":"seedot"},{"Id":274,"Name":"nuzleaf"},{"Id":275,"Name":"shiftry"},{"Id":276,"Name":"taillow"},{"Id":277,"Name":"swellow"},{"Id":278,"Name":"wingull"},{"Id":279,"Name":"pelipper"},{"Id":280,"Name":"ralts"},{"Id":281,"Name":"kirlia"},{"Id":282,"Name":"gardevoir"},{"Id":283,"Name":"surskit"},{"Id":284,"Name":"masquerain"},{"Id":285,"Name":"shroomish"},{"Id":286,"Name":"breloom"},{"Id":287,"Name":"slakoth"},{"Id":288,"Name":"vigoroth"},{"Id":289,"Name":"slaking"},{"Id":290,"Name":"nincada"},{"Id":291,"Name":"ninjask"},{"Id":292,"Name":"shedinja"},{"Id":293,"Name":"whismur"},{"Id":294,"Name":"loudred"},{"Id":295,"Name":"exploud"},{"Id":296,"Name":"makuhita"},{"Id":297,"Name":"hariyama"},{"Id":298,"Name":"azurill"},{"Id":299,"Name":"nosepass"},{"Id":300,"Name":"skitty"},{"Id":301,"Name":"delcatty"},{"Id":302,"Name":"sableye"},{"Id":303,"Name":"mawile"},{"Id":304,"Name":"aron"},{"Id":305,"Name":"lairon"},{"Id":306,"Name":"aggron"},{"Id":307,"Name":"meditite"},{"Id":308,"Name":"medicham"},{"Id":309,"Name":"electrike"},{"Id":310,"Name":"manectric"},{"Id":311,"Name":"plusle"},{"Id":312,"Name":"minun"},{"Id":313,"Name":"volbeat"},{"Id":314,"Name":"illumise"},{"Id":315,"Name":"roselia"},{"Id":316,"Name":"gulpin"},{"Id":317,"Name":"swalot"},{"Id":318,"Name":"carvanha"},{"Id":319,"Name":"sharpedo"},{"Id":320,"Name":"wailmer"},{"Id":321,"Name":"wailord"},{"Id":322,"Name":"numel"},{"Id":323,"Name":"camerupt"},{"Id":324,"Name":"torkoal"},{"Id":325,"Name":"spoink"},{"Id":326,"Name":"grumpig"},{"Id":327,"Name":"spinda"},{"Id":328,"Name":"trapinch"},{"Id":329,"Name":"vibrava"},{"Id":330,"Name":"flygon"},{"Id":331,"Name":"cacnea"},{"Id":332,"Name":"cacturne"},{"Id":333,"Name":"swablu"},{"Id":334,"Name":"altaria"},{"Id":335,"Name":"zangoose"},{"Id":336,"Name":"seviper"},{"Id":337,"Name":"lunatone"},{"Id":338,"Name":"solrock"},{"Id":339,"Name":"barboach"},{"Id":340,"Name":"whiscash"},{"Id":341,"Name":"corphish"},{"Id":342,"Name":"crawdaunt"},{"Id":343,"Name":"baltoy"},{"Id":344,"Name":"claydol"},{"Id":345,"Name":"lileep"},{"Id":346,"Name":"cradily"},{"Id":347,"Name":"anorith"},{"Id":348,"Name":"armaldo"},{"Id":349,"Name":"feebas"},{"Id":350,"Name":"milotic"},{"Id":351,"Name":"castform"},{"Id":352,"Name":"kecleon"},{"Id":353,"Name":"shuppet"},{"Id":354,"Name":"banette"},{"Id":355,"Name":"duskull"},{"Id":356,"Name":"dusclops"},{"Id":357,"Name":"tropius"},{"Id":358,"Name":"chimecho"},{"Id":359,"Name":"absol"},{"Id":360,"Name":"wynaut"},{"Id":361,"Name":"snorunt"},{"Id":362,"Name":"glalie"},{"Id":363,"Name":"spheal"},{"Id":364,"Name":"sealeo"},{"Id":365,"Name":"walrein"},{"Id":366,"Name":"clamperl"},{"Id":367,"Name":"huntail"},{"Id":368,"Name":"gorebyss"},{"Id":369,"Name":"relicanth"},{"Id":370,"Name":"luvdisc"},{"Id":371,"Name":"bagon"},{"Id":372,"Name":"shelgon"},{"Id":373,"Name":"salamence"},{"Id":374,"Name":"beldum"},{"Id":375,"Name":"metang"},{"Id":376,"Name":"metagross"},{"Id":377,"Name":"regirock"},{"Id":378,"Name":"regice"},{"Id":379,"Name":"registeel"},{"Id":380,"Name":"latias"},{"Id":381,"Name":"latios"},{"Id":382,"Name":"kyogre"},{"Id":383,"Name":"groudon"},{"Id":384,"Name":"rayquaza"},{"Id":385,"Name":"jirachi"},{"Id":386,"Name":"deoxys"},{"Id":387,"Name":"turtwig"},{"Id":388,"Name":"grotle"},{"Id":389,"Name":"torterra"},{"Id":390,"Name":"chimchar"},{"Id":391,"Name":"monferno"},{"Id":392,"Name":"infernape"},{"Id":393,"Name":"piplup"},{"Id":394,"Name":"prinplup"},{"Id":395,"Name":"empoleon"},{"Id":396,"Name":"starly"},{"Id":397,"Name":"staravia"},{"Id":398,"Name":"staraptor"},{"Id":399,"Name":"bidoof"},{"Id":400,"Name":"bibarel"},{"Id":401,"Name":"kricketot"},{"Id":402,"Name":"kricketune"},{"Id":403,"Name":"shinx"},{"Id":404,"Name":"luxio"},{"Id":405,"Name":"luxray"},{"Id":406,"Name":"budew"},{"Id":407,"Name":"roserade"},{"Id":408,"Name":"cranidos"},{"Id":409,"Name":"rampardos"},{"Id":410,"Name":"shieldon"},{"Id":411,"Name":"bastiodon"},{"Id":412,"Name":"burmy"},{"Id":413,"Name":"wormadam"},{"Id":414,"Name":"mothim"},{"Id":415,"Name":"combee"},{"Id":416,"Name":"vespiquen"},{"Id":417,"Name":"pachirisu"},{"Id":418,"Name":"buizel"},{"Id":419,"Name":"floatzel"},{"Id":420,"Name":"cherubi"},{"Id":421,"Name":"cherrim"},{"Id":422,"Name":"shellos"},{"Id":423,"Name":"gastrodon"},{"Id":424,"Name":"ambipom"},{"Id":425,"Name":"drifloon"},{"Id":426,"Name":"drifblim"},{"Id":427,"Name":"buneary"},{"Id":428,"Name":"lopunny"},{"Id":429,"Name":"mismagius"},{"Id":430,"Name":"honchkrow"},{"Id":431,"Name":"glameow"},{"Id":432,"Name":"purugly"},{"Id":433,"Name":"chingling"},{"Id":434,"Name":"stunky"},{"Id":435,"Name":"skuntank"},{"Id":436,"Name":"bronzor"},{"Id":437,"Name":"bronzong"},{"Id":438,"Name":"bonsly"},{"Id":439,"Name":"mime jr"},{"Id":440,"Name":"happiny"},{"Id":441,"Name":"chatot"},{"Id":442,"Name":"spiritomb"},{"Id":443,"Name":"gible"},{"Id":444,"Name":"gabite"},{"Id":445,"Name":"garchomp"},{"Id":446,"Name":"munchlax"},{"Id":447,"Name":"riolu"},{"Id":448,"Name":"lucario"},{"Id":449,"Name":"hippopotas"},{"Id":450,"Name":"hippowdon"},{"Id":451,"Name":"skorupi"},{"Id":452,"Name":"drapion"},{"Id":453,"Name":"croagunk"},{"Id":454,"Name":"toxicroak"},{"Id":455,"Name":"carnivine"},{"Id":456,"Name":"finneon"},{"Id":457,"Name":"lumineon"},{"Id":458,"Name":"mantyke"},{"Id":459,"Name":"snover"},{"Id":460,"Name":"abomasnow"},{"Id":461,"Name":"weavile"},{"Id":462,"Name":"magnezone"},{"Id":463,"Name":"lickilicky"},{"Id":464,"Name":"rhyperior"},{"Id":465,"Name":"tangrowth"},{"Id":466,"Name":"electivire"},{"Id":467,"Name":"magmortar"},{"Id":468,"Name":"togekiss"},{"Id":469,"Name":"yanmega"},{"Id":470,"Name":"leafeon"},{"Id":471,"Name":"glaceon"},{"Id":472,"Name":"gliscor"},{"Id":473,"Name":"mamoswine"},{"Id":474,"Name":"porygon"},{"Id":475,"Name":"gallade"},{"Id":476,"Name":"probopass"},{"Id":477,"Name":"dusknoir"},{"Id":478,"Name":"froslass"},{"Id":479,"Name":"rotom"},{"Id":480,"Name":"uxie"},{"Id":481,"Name":"mesprit"},{"Id":482,"Name":"azelf"},{"Id":483,"Name":"dialga"},{"Id":484,"Name":"palkia"},{"Id":485,"Name":"heatran"},{"Id":486,"Name":"regigigas"},{"Id":487,"Name":"giratina"},{"Id":488,"Name":"cresselia"},{"Id":489,"Name":"phione"},{"Id":490,"Name":"manaphy"},{"Id":491,"Name":"darkrai"},{"Id":492,"Name":"shaymin"},{"Id":493,"Name":"arceus"},{"Id":494,"Name":"victini"},{"Id":495,"Name":"snivy"},{"Id":496,"Name":"servine"},{"Id":497,"Name":"serperior"},{"Id":498,"Name":"tepig"},{"Id":499,"Name":"pignite"},{"Id":500,"Name":"emboar"},{"Id":501,"Name":"oshawott"},{"Id":502,"Name":"dewott"},{"Id":503,"Name":"samurott"},{"Id":504,"Name":"patrat"},{"Id":505,"Name":"watchog"},{"Id":506,"Name":"lillipup"},{"Id":507,"Name":"herdier"},{"Id":508,"Name":"stoutland"},{"Id":509,"Name":"purrloin"},{"Id":510,"Name":"liepard"},{"Id":511,"Name":"pansage"},{"Id":512,"Name":"simisage"},{"Id":513,"Name":"pansear"},{"Id":514,"Name":"simisear"},{"Id":515,"Name":"panpour"},{"Id":516,"Name":"simipour"},{"Id":517,"Name":"munna"},{"Id":518,"Name":"musharna"},{"Id":519,"Name":"pidove"},{"Id":520,"Name":"tranquill"},{"Id":521,"Name":"unfezant"},{"Id":522,"Name":"blitzle"},{"Id":523,"Name":"zebstrika"},{"Id":524,"Name":"roggenrola"},{"Id":525,"Name":"boldore"},{"Id":526,"Name":"gigalith"},{"Id":527,"Name":"woobat"},{"Id":528,"Name":"swoobat"},{"Id":529,"Name":"drilbur"},{"Id":530,"Name":"excadrill"},{"Id":531,"Name":"audino"},{"Id":532,"Name":"timburr"},{"Id":533,"Name":"gurdurr"},{"Id":534,"Name":"conkeldurr"},{"Id":535,"Name":"tympole"},{"Id":536,"Name":"palpitoad"},{"Id":537,"Name":"seismitoad"},{"Id":538,"Name":"throh"},{"Id":539,"Name":"sawk"},{"Id":540,"Name":"sewaddle"},{"Id":541,"Name":"swadloon"},{"Id":542,"Name":"leavanny"},{"Id":543,"Name":"venipede"},{"Id":544,"Name":"whirlipede"},{"Id":545,"Name":"scolipede"},{"Id":546,"Name":"cottonee"},{"Id":547,"Name":"whimsicott"},{"Id":548,"Name":"petilil"},{"Id":549,"Name":"lilligant"},{"Id":550,"Name":"basculin"},{"Id":551,"Name":"sandile"},{"Id":552,"Name":"krokorok"},{"Id":553,"Name":"krookodile"},{"Id":554,"Name":"darumaka"},{"Id":555,"Name":"darmanitan"},{"Id":556,"Name":"maractus"},{"Id":557,"Name":"dwebble"},{"Id":558,"Name":"crustle"},{"Id":559,"Name":"scraggy"},{"Id":560,"Name":"scrafty"},{"Id":561,"Name":"sigilyph"},{"Id":562,"Name":"yamask"},{"Id":563,"Name":"cofagrigus"},{"Id":564,"Name":"tirtouga"},{"Id":565,"Name":"carracosta"},{"Id":566,"Name":"archen"},{"Id":567,"Name":"archeops"},{"Id":568,"Name":"trubbish"},{"Id":569,"Name":"garbodor"},{"Id":570,"Name":"zorua"},{"Id":571,"Name":"zoroark"},{"Id":572,"Name":"minccino"},{"Id":573,"Name":"cinccino"},{"Id":574,"Name":"gothita"},{"Id":575,"Name":"gothorita"},{"Id":576,"Name":"gothitelle"},{"Id":577,"Name":"solosis"},{"Id":578,"Name":"duosion"},{"Id":579,"Name":"reuniclus"},{"Id":580,"Name":"ducklett"},{"Id":581,"Name":"swanna"},{"Id":582,"Name":"vanillite"},{"Id":583,"Name":"vanillish"},{"Id":584,"Name":"vanilluxe"},{"Id":585,"Name":"deerling"},{"Id":586,"Name":"sawsbuck"},{"Id":587,"Name":"emolga"},{"Id":588,"Name":"karrablast"},{"Id":589,"Name":"escavalier"},{"Id":590,"Name":"foongus"},{"Id":591,"Name":"amoonguss"},{"Id":592,"Name":"frillish"},{"Id":593,"Name":"jellicent"},{"Id":594,"Name":"alomomola"},{"Id":595,"Name":"joltik"},{"Id":596,"Name":"galvantula"},{"Id":597,"Name":"ferroseed"},{"Id":598,"Name":"ferrothorn"},{"Id":599,"Name":"klink"},{"Id":600,"Name":"klang"},{"Id":601,"Name":"klinklang"},{"Id":602,"Name":"tynamo"},{"Id":603,"Name":"eelektrik"},{"Id":604,"Name":"eelektross"},{"Id":605,"Name":"elgyem"},{"Id":606,"Name":"beheeyem"},{"Id":607,"Name":"litwick"},{"Id":608,"Name":"lampent"},{"Id":609,"Name":"chandelure"},{"Id":610,"Name":"axew"},{"Id":611,"Name":"fraxure"},{"Id":612,"Name":"haxorus"},{"Id":613,"Name":"cubchoo"},{"Id":614,"Name":"beartic"},{"Id":615,"Name":"cryogonal"},{"Id":616,"Name":"shelmet"},{"Id":617,"Name":"accelgor"},{"Id":618,"Name":"stunfisk"},{"Id":619,"Name":"mienfoo"},{"Id":620,"Name":"mienshao"},{"Id":621,"Name":"druddigon"},{"Id":622,"Name":"golett"},{"Id":623,"Name":"golurk"},{"Id":624,"Name":"pawniard"},{"Id":625,"Name":"bisharp"},{"Id":626,"Name":"bouffalant"},{"Id":627,"Name":"rufflet"},{"Id":628,"Name":"braviary"},{"Id":629,"Name":"vullaby"},{"Id":630,"Name":"mandibuzz"},{"Id":631,"Name":"heatmor"},{"Id":632,"Name":"durant"},{"Id":633,"Name":"deino"},{"Id":634,"Name":"zweilous"},{"Id":635,"Name":"hydreigon"},{"Id":636,"Name":"larvesta"},{"Id":637,"Name":"volcarona"},{"Id":638,"Name":"cobalion"},{"Id":639,"Name":"terrakion"},{"Id":640,"Name":"virizion"},{"Id":641,"Name":"tornadus"},{"Id":642,"Name":"thundurus"},{"Id":643,"Name":"reshiram"},{"Id":644,"Name":"zekrom"},{"Id":645,"Name":"landorus"},{"Id":646,"Name":"kyurem"},{"Id":647,"Name":"keldeo"},{"Id":648,"Name":"meloetta"},{"Id":649,"Name":"genesect"},{"Id":650,"Name":"chespin"},{"Id":651,"Name":"quilladin"},{"Id":652,"Name":"chesnaught"},{"Id":653,"Name":"fennekin"},{"Id":654,"Name":"braixen"},{"Id":655,"Name":"delphox"},{"Id":656,"Name":"froakie"},{"Id":657,"Name":"frogadier"},{"Id":658,"Name":"greninja"},{"Id":659,"Name":"bunnelby"},{"Id":660,"Name":"diggersby"},{"Id":661,"Name":"fletchling"},{"Id":662,"Name":"fletchinder"},{"Id":663,"Name":"talonflame"},{"Id":664,"Name":"scatterbug"},{"Id":665,"Name":"spewpa"},{"Id":666,"Name":"vivillon"},{"Id":667,"Name":"litleo"},{"Id":668,"Name":"pyroar"},{"Id":669,"Name":"flabebe"},{"Id":670,"Name":"floette"},{"Id":671,"Name":"florges"},{"Id":672,"Name":"skiddo"},{"Id":673,"Name":"gogoat"},{"Id":674,"Name":"pancham"},{"Id":675,"Name":"pangoro"},{"Id":676,"Name":"furfrou"},{"Id":677,"Name":"espurr"},{"Id":678,"Name":"meowstic"},{"Id":679,"Name":"honedge"},{"Id":680,"Name":"doublade"},{"Id":681,"Name":"aegislash"},{"Id":682,"Name":"spritzee"},{"Id":683,"Name":"aromatisse"},{"Id":684,"Name":"swirlix"},{"Id":685,"Name":"slurpuff"},{"Id":686,"Name":"inkay"},{"Id":687,"Name":"malamar"},{"Id":688,"Name":"binacle"},{"Id":689,"Name":"barbaracle"},{"Id":690,"Name":"skrelp"},{"Id":691,"Name":"dragalge"},{"Id":692,"Name":"clauncher"},{"Id":693,"Name":"clawitzer"},{"Id":694,"Name":"helioptile"},{"Id":695,"Name":"heliolisk"},{"Id":696,"Name":"tyrunt"},{"Id":697,"Name":"tyrantrum"},{"Id":698,"Name":"amaura"},{"Id":699,"Name":"aurorus"},{"Id":700,"Name":"sylveon"},{"Id":701,"Name":"hawlucha"},{"Id":702,"Name":"dedenne"},{"Id":703,"Name":"carbink"},{"Id":704,"Name":"goomy"},{"Id":705,"Name":"sliggoo"},{"Id":706,"Name":"goodra"},{"Id":707,"Name":"klefki"},{"Id":708,"Name":"phantump"},{"Id":709,"Name":"trevenant"},{"Id":710,"Name":"pumpkaboo"},{"Id":711,"Name":"gourgeist"},{"Id":712,"Name":"bergmite"},{"Id":713,"Name":"avalugg"},{"Id":714,"Name":"noibat"},{"Id":715,"Name":"noivern"},{"Id":716,"Name":"xerneas"},{"Id":717,"Name":"yveltal"},{"Id":718,"Name":"zygarde"},{"Id":719,"Name":"diancie"},{"Id":720,"Name":"hoopa"},{"Id":721,"Name":"volcanion"}] \ No newline at end of file +[{"Id":1,"Name":"bulbasaur"},{"Id":2,"Name":"ivysaur"},{"Id":3,"Name":"venusaur"},{"Id":4,"Name":"charmander"},{"Id":5,"Name":"charmeleon"},{"Id":6,"Name":"charizard"},{"Id":7,"Name":"squirtle"},{"Id":8,"Name":"wartortle"},{"Id":9,"Name":"blastoise"},{"Id":10,"Name":"caterpie"},{"Id":11,"Name":"metapod"},{"Id":12,"Name":"butterfree"},{"Id":13,"Name":"weedle"},{"Id":14,"Name":"kakuna"},{"Id":15,"Name":"beedrill"},{"Id":16,"Name":"pidgey"},{"Id":17,"Name":"pidgeotto"},{"Id":18,"Name":"pidgeot"},{"Id":19,"Name":"rattata"},{"Id":20,"Name":"raticate"},{"Id":21,"Name":"spearow"},{"Id":22,"Name":"fearow"},{"Id":23,"Name":"ekans"},{"Id":24,"Name":"arbok"},{"Id":25,"Name":"pikachu"},{"Id":26,"Name":"raichu"},{"Id":27,"Name":"sandshrew"},{"Id":28,"Name":"sandslash"},{"Id":29,"Name":"nidoran"},{"Id":30,"Name":"nidorina"},{"Id":31,"Name":"nidoqueen"},{"Id":32,"Name":"nidoran"},{"Id":33,"Name":"nidorino"},{"Id":34,"Name":"nidoking"},{"Id":35,"Name":"clefairy"},{"Id":36,"Name":"clefable"},{"Id":37,"Name":"vulpix"},{"Id":38,"Name":"ninetales"},{"Id":39,"Name":"jigglypuff"},{"Id":40,"Name":"wigglytuff"},{"Id":41,"Name":"zubat"},{"Id":42,"Name":"golbat"},{"Id":43,"Name":"oddish"},{"Id":44,"Name":"gloom"},{"Id":45,"Name":"vileplume"},{"Id":46,"Name":"paras"},{"Id":47,"Name":"parasect"},{"Id":48,"Name":"venonat"},{"Id":49,"Name":"venomoth"},{"Id":50,"Name":"diglett"},{"Id":51,"Name":"dugtrio"},{"Id":52,"Name":"meowth"},{"Id":53,"Name":"persian"},{"Id":54,"Name":"psyduck"},{"Id":55,"Name":"golduck"},{"Id":56,"Name":"mankey"},{"Id":57,"Name":"primeape"},{"Id":58,"Name":"growlithe"},{"Id":59,"Name":"arcanine"},{"Id":60,"Name":"poliwag"},{"Id":61,"Name":"poliwhirl"},{"Id":62,"Name":"poliwrath"},{"Id":63,"Name":"abra"},{"Id":64,"Name":"kadabra"},{"Id":65,"Name":"alakazam"},{"Id":66,"Name":"machop"},{"Id":67,"Name":"machoke"},{"Id":68,"Name":"machamp"},{"Id":69,"Name":"bellsprout"},{"Id":70,"Name":"weepinbell"},{"Id":71,"Name":"victreebel"},{"Id":72,"Name":"tentacool"},{"Id":73,"Name":"tentacruel"},{"Id":74,"Name":"geodude"},{"Id":75,"Name":"graveler"},{"Id":76,"Name":"golem"},{"Id":77,"Name":"ponyta"},{"Id":78,"Name":"rapidash"},{"Id":79,"Name":"slowpoke"},{"Id":80,"Name":"slowbro"},{"Id":81,"Name":"magnemite"},{"Id":82,"Name":"magneton"},{"Id":83,"Name":"farfetchd"},{"Id":84,"Name":"doduo"},{"Id":85,"Name":"dodrio"},{"Id":86,"Name":"seel"},{"Id":87,"Name":"dewgong"},{"Id":88,"Name":"grimer"},{"Id":89,"Name":"muk"},{"Id":90,"Name":"shellder"},{"Id":91,"Name":"cloyster"},{"Id":92,"Name":"gastly"},{"Id":93,"Name":"haunter"},{"Id":94,"Name":"gengar"},{"Id":95,"Name":"onix"},{"Id":96,"Name":"drowzee"},{"Id":97,"Name":"hypno"},{"Id":98,"Name":"krabby"},{"Id":99,"Name":"kingler"},{"Id":100,"Name":"voltorb"},{"Id":101,"Name":"electrode"},{"Id":102,"Name":"exeggcute"},{"Id":103,"Name":"exeggutor"},{"Id":104,"Name":"cubone"},{"Id":105,"Name":"marowak"},{"Id":106,"Name":"hitmonlee"},{"Id":107,"Name":"hitmonchan"},{"Id":108,"Name":"lickitung"},{"Id":109,"Name":"koffing"},{"Id":110,"Name":"weezing"},{"Id":111,"Name":"rhyhorn"},{"Id":112,"Name":"rhydon"},{"Id":113,"Name":"chansey"},{"Id":114,"Name":"tangela"},{"Id":115,"Name":"kangaskhan"},{"Id":116,"Name":"horsea"},{"Id":117,"Name":"seadra"},{"Id":118,"Name":"goldeen"},{"Id":119,"Name":"seaking"},{"Id":120,"Name":"staryu"},{"Id":121,"Name":"starmie"},{"Id":122,"Name":"mr mime"},{"Id":123,"Name":"scyther"},{"Id":124,"Name":"jynx"},{"Id":125,"Name":"electabuzz"},{"Id":126,"Name":"magmar"},{"Id":127,"Name":"pinsir"},{"Id":128,"Name":"tauros"},{"Id":129,"Name":"magikarp"},{"Id":130,"Name":"gyarados"},{"Id":131,"Name":"lapras"},{"Id":132,"Name":"ditto"},{"Id":133,"Name":"eevee"},{"Id":134,"Name":"vaporeon"},{"Id":135,"Name":"jolteon"},{"Id":136,"Name":"flareon"},{"Id":137,"Name":"porygon"},{"Id":138,"Name":"omanyte"},{"Id":139,"Name":"omastar"},{"Id":140,"Name":"kabuto"},{"Id":141,"Name":"kabutops"},{"Id":142,"Name":"aerodactyl"},{"Id":143,"Name":"snorlax"},{"Id":144,"Name":"articuno"},{"Id":145,"Name":"zapdos"},{"Id":146,"Name":"moltres"},{"Id":147,"Name":"dratini"},{"Id":148,"Name":"dragonair"},{"Id":149,"Name":"dragonite"},{"Id":150,"Name":"mewtwo"},{"Id":151,"Name":"mew"},{"Id":152,"Name":"chikorita"},{"Id":153,"Name":"bayleef"},{"Id":154,"Name":"meganium"},{"Id":155,"Name":"cyndaquil"},{"Id":156,"Name":"quilava"},{"Id":157,"Name":"typhlosion"},{"Id":158,"Name":"totodile"},{"Id":159,"Name":"croconaw"},{"Id":160,"Name":"feraligatr"},{"Id":161,"Name":"sentret"},{"Id":162,"Name":"furret"},{"Id":163,"Name":"hoothoot"},{"Id":164,"Name":"noctowl"},{"Id":165,"Name":"ledyba"},{"Id":166,"Name":"ledian"},{"Id":167,"Name":"spinarak"},{"Id":168,"Name":"ariados"},{"Id":169,"Name":"crobat"},{"Id":170,"Name":"chinchou"},{"Id":171,"Name":"lanturn"},{"Id":172,"Name":"pichu"},{"Id":173,"Name":"cleffa"},{"Id":174,"Name":"igglybuff"},{"Id":175,"Name":"togepi"},{"Id":176,"Name":"togetic"},{"Id":177,"Name":"natu"},{"Id":178,"Name":"xatu"},{"Id":179,"Name":"mareep"},{"Id":180,"Name":"flaaffy"},{"Id":181,"Name":"ampharos"},{"Id":182,"Name":"bellossom"},{"Id":183,"Name":"marill"},{"Id":184,"Name":"azumarill"},{"Id":185,"Name":"sudowoodo"},{"Id":186,"Name":"politoed"},{"Id":187,"Name":"hoppip"},{"Id":188,"Name":"skiploom"},{"Id":189,"Name":"jumpluff"},{"Id":190,"Name":"aipom"},{"Id":191,"Name":"sunkern"},{"Id":192,"Name":"sunflora"},{"Id":193,"Name":"yanma"},{"Id":194,"Name":"wooper"},{"Id":195,"Name":"quagsire"},{"Id":196,"Name":"espeon"},{"Id":197,"Name":"umbreon"},{"Id":198,"Name":"murkrow"},{"Id":199,"Name":"slowking"},{"Id":200,"Name":"misdreavus"},{"Id":201,"Name":"unown"},{"Id":202,"Name":"wobbuffet"},{"Id":203,"Name":"girafarig"},{"Id":204,"Name":"pineco"},{"Id":205,"Name":"forretress"},{"Id":206,"Name":"dunsparce"},{"Id":207,"Name":"gligar"},{"Id":208,"Name":"steelix"},{"Id":209,"Name":"snubbull"},{"Id":210,"Name":"granbull"},{"Id":211,"Name":"qwilfish"},{"Id":212,"Name":"scizor"},{"Id":213,"Name":"shuckle"},{"Id":214,"Name":"heracross"},{"Id":215,"Name":"sneasel"},{"Id":216,"Name":"teddiursa"},{"Id":217,"Name":"ursaring"},{"Id":218,"Name":"slugma"},{"Id":219,"Name":"magcargo"},{"Id":220,"Name":"swinub"},{"Id":221,"Name":"piloswine"},{"Id":222,"Name":"corsola"},{"Id":223,"Name":"remoraid"},{"Id":224,"Name":"octillery"},{"Id":225,"Name":"delibird"},{"Id":226,"Name":"mantine"},{"Id":227,"Name":"skarmory"},{"Id":228,"Name":"houndour"},{"Id":229,"Name":"houndoom"},{"Id":230,"Name":"kingdra"},{"Id":231,"Name":"phanpy"},{"Id":232,"Name":"donphan"},{"Id":233,"Name":"porygon2"},{"Id":234,"Name":"stantler"},{"Id":235,"Name":"smeargle"},{"Id":236,"Name":"tyrogue"},{"Id":237,"Name":"hitmontop"},{"Id":238,"Name":"smoochum"},{"Id":239,"Name":"elekid"},{"Id":240,"Name":"magby"},{"Id":241,"Name":"miltank"},{"Id":242,"Name":"blissey"},{"Id":243,"Name":"raikou"},{"Id":244,"Name":"entei"},{"Id":245,"Name":"suicune"},{"Id":246,"Name":"larvitar"},{"Id":247,"Name":"pupitar"},{"Id":248,"Name":"tyranitar"},{"Id":249,"Name":"lugia"},{"Id":250,"Name":"ho-oh"},{"Id":251,"Name":"celebi"},{"Id":252,"Name":"treecko"},{"Id":253,"Name":"grovyle"},{"Id":254,"Name":"sceptile"},{"Id":255,"Name":"torchic"},{"Id":256,"Name":"combusken"},{"Id":257,"Name":"blaziken"},{"Id":258,"Name":"mudkip"},{"Id":259,"Name":"marshtomp"},{"Id":260,"Name":"swampert"},{"Id":261,"Name":"poochyena"},{"Id":262,"Name":"mightyena"},{"Id":263,"Name":"zigzagoon"},{"Id":264,"Name":"linoone"},{"Id":265,"Name":"wurmple"},{"Id":266,"Name":"silcoon"},{"Id":267,"Name":"beautifly"},{"Id":268,"Name":"cascoon"},{"Id":269,"Name":"dustox"},{"Id":270,"Name":"lotad"},{"Id":271,"Name":"lombre"},{"Id":272,"Name":"ludicolo"},{"Id":273,"Name":"seedot"},{"Id":274,"Name":"nuzleaf"},{"Id":275,"Name":"shiftry"},{"Id":276,"Name":"taillow"},{"Id":277,"Name":"swellow"},{"Id":278,"Name":"wingull"},{"Id":279,"Name":"pelipper"},{"Id":280,"Name":"ralts"},{"Id":281,"Name":"kirlia"},{"Id":282,"Name":"gardevoir"},{"Id":283,"Name":"surskit"},{"Id":284,"Name":"masquerain"},{"Id":285,"Name":"shroomish"},{"Id":286,"Name":"breloom"},{"Id":287,"Name":"slakoth"},{"Id":288,"Name":"vigoroth"},{"Id":289,"Name":"slaking"},{"Id":290,"Name":"nincada"},{"Id":291,"Name":"ninjask"},{"Id":292,"Name":"shedinja"},{"Id":293,"Name":"whismur"},{"Id":294,"Name":"loudred"},{"Id":295,"Name":"exploud"},{"Id":296,"Name":"makuhita"},{"Id":297,"Name":"hariyama"},{"Id":298,"Name":"azurill"},{"Id":299,"Name":"nosepass"},{"Id":300,"Name":"skitty"},{"Id":301,"Name":"delcatty"},{"Id":302,"Name":"sableye"},{"Id":303,"Name":"mawile"},{"Id":304,"Name":"aron"},{"Id":305,"Name":"lairon"},{"Id":306,"Name":"aggron"},{"Id":307,"Name":"meditite"},{"Id":308,"Name":"medicham"},{"Id":309,"Name":"electrike"},{"Id":310,"Name":"manectric"},{"Id":311,"Name":"plusle"},{"Id":312,"Name":"minun"},{"Id":313,"Name":"volbeat"},{"Id":314,"Name":"illumise"},{"Id":315,"Name":"roselia"},{"Id":316,"Name":"gulpin"},{"Id":317,"Name":"swalot"},{"Id":318,"Name":"carvanha"},{"Id":319,"Name":"sharpedo"},{"Id":320,"Name":"wailmer"},{"Id":321,"Name":"wailord"},{"Id":322,"Name":"numel"},{"Id":323,"Name":"camerupt"},{"Id":324,"Name":"torkoal"},{"Id":325,"Name":"spoink"},{"Id":326,"Name":"grumpig"},{"Id":327,"Name":"spinda"},{"Id":328,"Name":"trapinch"},{"Id":329,"Name":"vibrava"},{"Id":330,"Name":"flygon"},{"Id":331,"Name":"cacnea"},{"Id":332,"Name":"cacturne"},{"Id":333,"Name":"swablu"},{"Id":334,"Name":"altaria"},{"Id":335,"Name":"zangoose"},{"Id":336,"Name":"seviper"},{"Id":337,"Name":"lunatone"},{"Id":338,"Name":"solrock"},{"Id":339,"Name":"barboach"},{"Id":340,"Name":"whiscash"},{"Id":341,"Name":"corphish"},{"Id":342,"Name":"crawdaunt"},{"Id":343,"Name":"baltoy"},{"Id":344,"Name":"claydol"},{"Id":345,"Name":"lileep"},{"Id":346,"Name":"cradily"},{"Id":347,"Name":"anorith"},{"Id":348,"Name":"armaldo"},{"Id":349,"Name":"feebas"},{"Id":350,"Name":"milotic"},{"Id":351,"Name":"castform"},{"Id":352,"Name":"kecleon"},{"Id":353,"Name":"shuppet"},{"Id":354,"Name":"banette"},{"Id":355,"Name":"duskull"},{"Id":356,"Name":"dusclops"},{"Id":357,"Name":"tropius"},{"Id":358,"Name":"chimecho"},{"Id":359,"Name":"absol"},{"Id":360,"Name":"wynaut"},{"Id":361,"Name":"snorunt"},{"Id":362,"Name":"glalie"},{"Id":363,"Name":"spheal"},{"Id":364,"Name":"sealeo"},{"Id":365,"Name":"walrein"},{"Id":366,"Name":"clamperl"},{"Id":367,"Name":"huntail"},{"Id":368,"Name":"gorebyss"},{"Id":369,"Name":"relicanth"},{"Id":370,"Name":"luvdisc"},{"Id":371,"Name":"bagon"},{"Id":372,"Name":"shelgon"},{"Id":373,"Name":"salamence"},{"Id":374,"Name":"beldum"},{"Id":375,"Name":"metang"},{"Id":376,"Name":"metagross"},{"Id":377,"Name":"regirock"},{"Id":378,"Name":"regice"},{"Id":379,"Name":"registeel"},{"Id":380,"Name":"latias"},{"Id":381,"Name":"latios"},{"Id":382,"Name":"kyogre"},{"Id":383,"Name":"groudon"},{"Id":384,"Name":"rayquaza"},{"Id":385,"Name":"jirachi"},{"Id":386,"Name":"deoxys"},{"Id":387,"Name":"turtwig"},{"Id":388,"Name":"grotle"},{"Id":389,"Name":"torterra"},{"Id":390,"Name":"chimchar"},{"Id":391,"Name":"monferno"},{"Id":392,"Name":"infernape"},{"Id":393,"Name":"piplup"},{"Id":394,"Name":"prinplup"},{"Id":395,"Name":"empoleon"},{"Id":396,"Name":"starly"},{"Id":397,"Name":"staravia"},{"Id":398,"Name":"staraptor"},{"Id":399,"Name":"bidoof"},{"Id":400,"Name":"bibarel"},{"Id":401,"Name":"kricketot"},{"Id":402,"Name":"kricketune"},{"Id":403,"Name":"shinx"},{"Id":404,"Name":"luxio"},{"Id":405,"Name":"luxray"},{"Id":406,"Name":"budew"},{"Id":407,"Name":"roserade"},{"Id":408,"Name":"cranidos"},{"Id":409,"Name":"rampardos"},{"Id":410,"Name":"shieldon"},{"Id":411,"Name":"bastiodon"},{"Id":412,"Name":"burmy"},{"Id":413,"Name":"wormadam"},{"Id":414,"Name":"mothim"},{"Id":415,"Name":"combee"},{"Id":416,"Name":"vespiquen"},{"Id":417,"Name":"pachirisu"},{"Id":418,"Name":"buizel"},{"Id":419,"Name":"floatzel"},{"Id":420,"Name":"cherubi"},{"Id":421,"Name":"cherrim"},{"Id":422,"Name":"shellos"},{"Id":423,"Name":"gastrodon"},{"Id":424,"Name":"ambipom"},{"Id":425,"Name":"drifloon"},{"Id":426,"Name":"drifblim"},{"Id":427,"Name":"buneary"},{"Id":428,"Name":"lopunny"},{"Id":429,"Name":"mismagius"},{"Id":430,"Name":"honchkrow"},{"Id":431,"Name":"glameow"},{"Id":432,"Name":"purugly"},{"Id":433,"Name":"chingling"},{"Id":434,"Name":"stunky"},{"Id":435,"Name":"skuntank"},{"Id":436,"Name":"bronzor"},{"Id":437,"Name":"bronzong"},{"Id":438,"Name":"bonsly"},{"Id":439,"Name":"mime jr"},{"Id":440,"Name":"happiny"},{"Id":441,"Name":"chatot"},{"Id":442,"Name":"spiritomb"},{"Id":443,"Name":"gible"},{"Id":444,"Name":"gabite"},{"Id":445,"Name":"garchomp"},{"Id":446,"Name":"munchlax"},{"Id":447,"Name":"riolu"},{"Id":448,"Name":"lucario"},{"Id":449,"Name":"hippopotas"},{"Id":450,"Name":"hippowdon"},{"Id":451,"Name":"skorupi"},{"Id":452,"Name":"drapion"},{"Id":453,"Name":"croagunk"},{"Id":454,"Name":"toxicroak"},{"Id":455,"Name":"carnivine"},{"Id":456,"Name":"finneon"},{"Id":457,"Name":"lumineon"},{"Id":458,"Name":"mantyke"},{"Id":459,"Name":"snover"},{"Id":460,"Name":"abomasnow"},{"Id":461,"Name":"weavile"},{"Id":462,"Name":"magnezone"},{"Id":463,"Name":"lickilicky"},{"Id":464,"Name":"rhyperior"},{"Id":465,"Name":"tangrowth"},{"Id":466,"Name":"electivire"},{"Id":467,"Name":"magmortar"},{"Id":468,"Name":"togekiss"},{"Id":469,"Name":"yanmega"},{"Id":470,"Name":"leafeon"},{"Id":471,"Name":"glaceon"},{"Id":472,"Name":"gliscor"},{"Id":473,"Name":"mamoswine"},{"Id":474,"Name":"porygon z"},{"Id":475,"Name":"gallade"},{"Id":476,"Name":"probopass"},{"Id":477,"Name":"dusknoir"},{"Id":478,"Name":"froslass"},{"Id":479,"Name":"rotom"},{"Id":480,"Name":"uxie"},{"Id":481,"Name":"mesprit"},{"Id":482,"Name":"azelf"},{"Id":483,"Name":"dialga"},{"Id":484,"Name":"palkia"},{"Id":485,"Name":"heatran"},{"Id":486,"Name":"regigigas"},{"Id":487,"Name":"giratina"},{"Id":488,"Name":"cresselia"},{"Id":489,"Name":"phione"},{"Id":490,"Name":"manaphy"},{"Id":491,"Name":"darkrai"},{"Id":492,"Name":"shaymin"},{"Id":493,"Name":"arceus"},{"Id":494,"Name":"victini"},{"Id":495,"Name":"snivy"},{"Id":496,"Name":"servine"},{"Id":497,"Name":"serperior"},{"Id":498,"Name":"tepig"},{"Id":499,"Name":"pignite"},{"Id":500,"Name":"emboar"},{"Id":501,"Name":"oshawott"},{"Id":502,"Name":"dewott"},{"Id":503,"Name":"samurott"},{"Id":504,"Name":"patrat"},{"Id":505,"Name":"watchog"},{"Id":506,"Name":"lillipup"},{"Id":507,"Name":"herdier"},{"Id":508,"Name":"stoutland"},{"Id":509,"Name":"purrloin"},{"Id":510,"Name":"liepard"},{"Id":511,"Name":"pansage"},{"Id":512,"Name":"simisage"},{"Id":513,"Name":"pansear"},{"Id":514,"Name":"simisear"},{"Id":515,"Name":"panpour"},{"Id":516,"Name":"simipour"},{"Id":517,"Name":"munna"},{"Id":518,"Name":"musharna"},{"Id":519,"Name":"pidove"},{"Id":520,"Name":"tranquill"},{"Id":521,"Name":"unfezant"},{"Id":522,"Name":"blitzle"},{"Id":523,"Name":"zebstrika"},{"Id":524,"Name":"roggenrola"},{"Id":525,"Name":"boldore"},{"Id":526,"Name":"gigalith"},{"Id":527,"Name":"woobat"},{"Id":528,"Name":"swoobat"},{"Id":529,"Name":"drilbur"},{"Id":530,"Name":"excadrill"},{"Id":531,"Name":"audino"},{"Id":532,"Name":"timburr"},{"Id":533,"Name":"gurdurr"},{"Id":534,"Name":"conkeldurr"},{"Id":535,"Name":"tympole"},{"Id":536,"Name":"palpitoad"},{"Id":537,"Name":"seismitoad"},{"Id":538,"Name":"throh"},{"Id":539,"Name":"sawk"},{"Id":540,"Name":"sewaddle"},{"Id":541,"Name":"swadloon"},{"Id":542,"Name":"leavanny"},{"Id":543,"Name":"venipede"},{"Id":544,"Name":"whirlipede"},{"Id":545,"Name":"scolipede"},{"Id":546,"Name":"cottonee"},{"Id":547,"Name":"whimsicott"},{"Id":548,"Name":"petilil"},{"Id":549,"Name":"lilligant"},{"Id":550,"Name":"basculin"},{"Id":551,"Name":"sandile"},{"Id":552,"Name":"krokorok"},{"Id":553,"Name":"krookodile"},{"Id":554,"Name":"darumaka"},{"Id":555,"Name":"darmanitan"},{"Id":556,"Name":"maractus"},{"Id":557,"Name":"dwebble"},{"Id":558,"Name":"crustle"},{"Id":559,"Name":"scraggy"},{"Id":560,"Name":"scrafty"},{"Id":561,"Name":"sigilyph"},{"Id":562,"Name":"yamask"},{"Id":563,"Name":"cofagrigus"},{"Id":564,"Name":"tirtouga"},{"Id":565,"Name":"carracosta"},{"Id":566,"Name":"archen"},{"Id":567,"Name":"archeops"},{"Id":568,"Name":"trubbish"},{"Id":569,"Name":"garbodor"},{"Id":570,"Name":"zorua"},{"Id":571,"Name":"zoroark"},{"Id":572,"Name":"minccino"},{"Id":573,"Name":"cinccino"},{"Id":574,"Name":"gothita"},{"Id":575,"Name":"gothorita"},{"Id":576,"Name":"gothitelle"},{"Id":577,"Name":"solosis"},{"Id":578,"Name":"duosion"},{"Id":579,"Name":"reuniclus"},{"Id":580,"Name":"ducklett"},{"Id":581,"Name":"swanna"},{"Id":582,"Name":"vanillite"},{"Id":583,"Name":"vanillish"},{"Id":584,"Name":"vanilluxe"},{"Id":585,"Name":"deerling"},{"Id":586,"Name":"sawsbuck"},{"Id":587,"Name":"emolga"},{"Id":588,"Name":"karrablast"},{"Id":589,"Name":"escavalier"},{"Id":590,"Name":"foongus"},{"Id":591,"Name":"amoonguss"},{"Id":592,"Name":"frillish"},{"Id":593,"Name":"jellicent"},{"Id":594,"Name":"alomomola"},{"Id":595,"Name":"joltik"},{"Id":596,"Name":"galvantula"},{"Id":597,"Name":"ferroseed"},{"Id":598,"Name":"ferrothorn"},{"Id":599,"Name":"klink"},{"Id":600,"Name":"klang"},{"Id":601,"Name":"klinklang"},{"Id":602,"Name":"tynamo"},{"Id":603,"Name":"eelektrik"},{"Id":604,"Name":"eelektross"},{"Id":605,"Name":"elgyem"},{"Id":606,"Name":"beheeyem"},{"Id":607,"Name":"litwick"},{"Id":608,"Name":"lampent"},{"Id":609,"Name":"chandelure"},{"Id":610,"Name":"axew"},{"Id":611,"Name":"fraxure"},{"Id":612,"Name":"haxorus"},{"Id":613,"Name":"cubchoo"},{"Id":614,"Name":"beartic"},{"Id":615,"Name":"cryogonal"},{"Id":616,"Name":"shelmet"},{"Id":617,"Name":"accelgor"},{"Id":618,"Name":"stunfisk"},{"Id":619,"Name":"mienfoo"},{"Id":620,"Name":"mienshao"},{"Id":621,"Name":"druddigon"},{"Id":622,"Name":"golett"},{"Id":623,"Name":"golurk"},{"Id":624,"Name":"pawniard"},{"Id":625,"Name":"bisharp"},{"Id":626,"Name":"bouffalant"},{"Id":627,"Name":"rufflet"},{"Id":628,"Name":"braviary"},{"Id":629,"Name":"vullaby"},{"Id":630,"Name":"mandibuzz"},{"Id":631,"Name":"heatmor"},{"Id":632,"Name":"durant"},{"Id":633,"Name":"deino"},{"Id":634,"Name":"zweilous"},{"Id":635,"Name":"hydreigon"},{"Id":636,"Name":"larvesta"},{"Id":637,"Name":"volcarona"},{"Id":638,"Name":"cobalion"},{"Id":639,"Name":"terrakion"},{"Id":640,"Name":"virizion"},{"Id":641,"Name":"tornadus"},{"Id":642,"Name":"thundurus"},{"Id":643,"Name":"reshiram"},{"Id":644,"Name":"zekrom"},{"Id":645,"Name":"landorus"},{"Id":646,"Name":"kyurem"},{"Id":647,"Name":"keldeo"},{"Id":648,"Name":"meloetta"},{"Id":649,"Name":"genesect"},{"Id":650,"Name":"chespin"},{"Id":651,"Name":"quilladin"},{"Id":652,"Name":"chesnaught"},{"Id":653,"Name":"fennekin"},{"Id":654,"Name":"braixen"},{"Id":655,"Name":"delphox"},{"Id":656,"Name":"froakie"},{"Id":657,"Name":"frogadier"},{"Id":658,"Name":"greninja"},{"Id":659,"Name":"bunnelby"},{"Id":660,"Name":"diggersby"},{"Id":661,"Name":"fletchling"},{"Id":662,"Name":"fletchinder"},{"Id":663,"Name":"talonflame"},{"Id":664,"Name":"scatterbug"},{"Id":665,"Name":"spewpa"},{"Id":666,"Name":"vivillon"},{"Id":667,"Name":"litleo"},{"Id":668,"Name":"pyroar"},{"Id":669,"Name":"flabebe"},{"Id":670,"Name":"floette"},{"Id":671,"Name":"florges"},{"Id":672,"Name":"skiddo"},{"Id":673,"Name":"gogoat"},{"Id":674,"Name":"pancham"},{"Id":675,"Name":"pangoro"},{"Id":676,"Name":"furfrou"},{"Id":677,"Name":"espurr"},{"Id":678,"Name":"meowstic"},{"Id":679,"Name":"honedge"},{"Id":680,"Name":"doublade"},{"Id":681,"Name":"aegislash"},{"Id":682,"Name":"spritzee"},{"Id":683,"Name":"aromatisse"},{"Id":684,"Name":"swirlix"},{"Id":685,"Name":"slurpuff"},{"Id":686,"Name":"inkay"},{"Id":687,"Name":"malamar"},{"Id":688,"Name":"binacle"},{"Id":689,"Name":"barbaracle"},{"Id":690,"Name":"skrelp"},{"Id":691,"Name":"dragalge"},{"Id":692,"Name":"clauncher"},{"Id":693,"Name":"clawitzer"},{"Id":694,"Name":"helioptile"},{"Id":695,"Name":"heliolisk"},{"Id":696,"Name":"tyrunt"},{"Id":697,"Name":"tyrantrum"},{"Id":698,"Name":"amaura"},{"Id":699,"Name":"aurorus"},{"Id":700,"Name":"sylveon"},{"Id":701,"Name":"hawlucha"},{"Id":702,"Name":"dedenne"},{"Id":703,"Name":"carbink"},{"Id":704,"Name":"goomy"},{"Id":705,"Name":"sliggoo"},{"Id":706,"Name":"goodra"},{"Id":707,"Name":"klefki"},{"Id":708,"Name":"phantump"},{"Id":709,"Name":"trevenant"},{"Id":710,"Name":"pumpkaboo"},{"Id":711,"Name":"gourgeist"},{"Id":712,"Name":"bergmite"},{"Id":713,"Name":"avalugg"},{"Id":714,"Name":"noibat"},{"Id":715,"Name":"noivern"},{"Id":716,"Name":"xerneas"},{"Id":717,"Name":"yveltal"},{"Id":718,"Name":"zygarde"},{"Id":719,"Name":"diancie"},{"Id":720,"Name":"hoopa"},{"Id":721,"Name":"volcanion"}] \ No newline at end of file From e107bee62f65428c0793be1313cbacaf1c08b09b Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 27 Mar 2017 11:35:06 +0200 Subject: [PATCH 358/496] fixed help links when ffmpeg is not properly setup --- src/NadekoBot/Modules/Music/Classes/SongBuffer.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Modules/Music/Classes/SongBuffer.cs b/src/NadekoBot/Modules/Music/Classes/SongBuffer.cs index 738d07ec..87c01ff6 100644 --- a/src/NadekoBot/Modules/Music/Classes/SongBuffer.cs +++ b/src/NadekoBot/Modules/Music/Classes/SongBuffer.cs @@ -99,8 +99,8 @@ namespace NadekoBot.Modules.Music.Classes Console.WriteLine(@"You have not properly installed or configured FFMPEG. Please install and configure FFMPEG to play music. Check the guides for your platform on how to setup ffmpeg correctly: - Windows Guide: https://goo.gl/SCv72y - Linux Guide: https://goo.gl/rRhjCp"); + Windows Guide: https://goo.gl/OjKk8F + Linux Guide: https://goo.gl/ShjCUo"); Console.ForegroundColor = oldclr; } catch (Exception ex) From 43ff3ad7161120104eea63090a6ab4ea51b1278b Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 27 Mar 2017 11:43:49 +0200 Subject: [PATCH 359/496] Fixed some strings --- .../Resources/ResponseStrings.Designer.cs | 6 +- .../Resources/ResponseStrings.en-US.resx | 4328 ++++++++--------- .../Resources/ResponseStrings.ja-JP.resx | 236 +- src/NadekoBot/Resources/ResponseStrings.resx | 6 +- .../Resources/ResponseStrings.sr-cyrl-rs.resx | 240 +- 5 files changed, 2408 insertions(+), 2408 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index fec34b11..1b0cd969 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -250,7 +250,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Sucessfully created role {0}. + /// Looks up a localized string similar to Successfully created role {0}. /// public static string administration_cr { get { @@ -340,7 +340,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Sucessfully added a new donator.Total donated amount from this user: {0} 👑. + /// Looks up a localized string similar to Successfully added a new donator.Total donated amount from this user: {0} 👑. /// public static string administration_donadd { get { @@ -1351,7 +1351,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Sucessfully added role {0} to user {1}. + /// Looks up a localized string similar to Successfully added role {0} to user {1}. /// public static string administration_setrole { get { diff --git a/src/NadekoBot/Resources/ResponseStrings.en-US.resx b/src/NadekoBot/Resources/ResponseStrings.en-US.resx index c384f48e..3fb0ba18 100644 --- a/src/NadekoBot/Resources/ResponseStrings.en-US.resx +++ b/src/NadekoBot/Resources/ResponseStrings.en-US.resx @@ -1,4 +1,4 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 そのベースはもう要求・破壊されました。 @@ -856,7 +856,7 @@ Fuzzy ユーザー{1}にロール{0}を追加しました - Typo- "Sucessfully" should be 'Successfully' + Typo- "successfully" should be 'Successfully' ロールの追加に失敗しました。アクセス権が足りません。 diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index 56ada3ed..6f8446b9 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -364,7 +364,7 @@ Reason: {1} Content - Sucessfully created role {0} + Successfully created role {0} Text channel {0} created. @@ -394,7 +394,7 @@ Reason: {1} DM from - Sucessfully added a new donator.Total donated amount from this user: {0} 👑 + Successfully added a new donator.Total donated amount from this user: {0} 👑 Thanks to the people listed below for making this project happen! @@ -701,7 +701,7 @@ Reason: {1} You now have {0} role. - Sucessfully added role {0} to user {1} + Successfully added role {0} to user {1} Failed to add role. I have insufficient permissions. diff --git a/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx b/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx index 8fe7d18e..8c3dd6c5 100644 --- a/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx +++ b/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx @@ -1,121 +1,121 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Та база је већ под захетвом или је уништена. @@ -364,7 +364,7 @@ Reason: {1} Content - Sucessfully created role {0} + successfully created role {0} Text channel {0} created. @@ -394,7 +394,7 @@ Reason: {1} DM from - Sucessfully added a new donator.Total donated amount from this user: {0} 👑 + successfully added a new donator.Total donated amount from this user: {0} 👑 Thanks to the people listed below for making this project hjappen! @@ -712,7 +712,7 @@ Reason: {1} You now have {0} role. - Sucessfully added role {0} to user {1} + successfully added role {0} to user {1} Failed to add role. I have insufficient permissions. From ac3f9f539651262189a5682cfa5d7444ca1763c0 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 27 Mar 2017 14:02:01 +0200 Subject: [PATCH 360/496] Italian added --- .../Commands/LocalizationCommands.cs | 1 + .../Resources/ResponseStrings.it-IT.resx | 2307 +++++++++++++++++ 2 files changed, 2308 insertions(+) create mode 100644 src/NadekoBot/Resources/ResponseStrings.it-IT.resx diff --git a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs index c8c07fe2..19930059 100644 --- a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs +++ b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs @@ -24,6 +24,7 @@ namespace NadekoBot.Modules.Administration {"en-US", "English, United States"}, {"fr-FR", "French, France"}, {"de-DE", "German, Germany"}, + {"it-IT", "Italian, Italy" }, //{"ja-JP", "Japanese, Japan"}, {"nb-NO", "Norwegian (bokmål), Norway"}, {"pl-PL", "Polish, Poland" }, diff --git a/src/NadekoBot/Resources/ResponseStrings.it-IT.resx b/src/NadekoBot/Resources/ResponseStrings.it-IT.resx new file mode 100644 index 00000000..7a09ef5d --- /dev/null +++ b/src/NadekoBot/Resources/ResponseStrings.it-IT.resx @@ -0,0 +1,2307 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Quella base è già rivendicata o distrutta. + + + Quella base è già distrutta. + + + Quella base non è rivendicata. + + + **DISTRUTTO** base #{0} in una guerra contro {1} + + + {0} ha **NON RIVENDICATO** base #{1} in una guerra contro {2} + + + {0} ha rivendicato la base #{1} in una guerra contro {2} + + + @{0} Hai già rivendicato la base #{1} + + + La rivendicazione di @{0} in una guerra contro {1} + + + Nemico + + + Informazioni sulla guerra contro {0} + + + Numero della base invalido. + + + Dimensione della guerra non valida. + + + Lista delle guerre in corso + + + non rivendicato + + + Non stai partecipando a questa guerra + + + @{0} Tu non stai partecipando in questa guerra, o questa base è già distrutta. + + + Nessuna guerra in corso. + + + Dimensione + + + La guerra contro {0} è già iniziata. + + + Guerra contro {0} creata. + + + Guerra contro {0} finita. + + + Questa guerra non esiste. + + + Guerra contro {0} iniziata! + + + Tutte le reazioni personalizzate approvate. + + + Reazione personalizzata cancellata + + + Permessi insufficienti. Richiede l'essere proprietario del bot per le reazioni personalizzate globali, e l'amministratore del server per le reazioni personalizzate. + + + Lista di tutte le reazioni personalizzate + + + Reazioni Personalizzate + + + Nuove Reazioni Personalizzate + + + Nessuna reazione personalizzata trovata. + + + Nessuna reazione personalizzata trovata con quell'id. + + + Risposta + + + Statistiche Reazioni Personalizzate + + + Statistiche pulite per {0} reazioni personalizzate. + + + Nessuna statistica per questo innesco trovata, nessun azione presa. + + + Innesco + + + Autohentai fermato. + + + Nessun risultato trovato. + + + {0} è già svenuto. + + + {0} ha già gli HP al massimo. + + + il tuo tipo è già {0} + + + Ha usato {0}{1} su {2}{3} per {4} danni. + Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage. + + + Non puoi attaccare senza ritorsione! + Fuzzy + + + Non puoi attaccare te stesso. + + + {0} è svenuto! + + + curato {0} con un {1} + + + {0} ha {1} HP rimasto + + + Non puoi usare {0}. Scrivi `{1}ml` per vedere la lista delle mosse che puoi usare. + + + Listamosse per tipo {0} + + + Non è efficace. + + + Non hai abbastanza {0} + + + Hai resuscitato {0} con un {1} + + + Hai resuscitato te stesso con un {0} + + + Il tuo tipo è stato cambiato in {0} per un {1} + + + E' lievemente efficace. + + + E' superefficace! + + + Hai usato troppe mosse in una volta, non puoi muoverti! + + + Tipo di {0} è {1} + + + Utente non trovato. + + + Sei svenuto, non sei più in grado di muoverti! + + + **Auto assegna ruolo** sull'utente ora entrato è ora **disattivato** + + + **Auto assegna ruolo** sull'utente ora entrato è ora **attivato** + + + Allegato + + + Avatar Cambiato + + + Sei stato bannato dal {0} server. +Ragione: {1} + + + bannati + PLURAL + + + Utente bannato + + + Nome bot cambiato in {0} + + + Stato del bot cambiato in {0} + + + L'eliminazione automatica dei messaggi di arrivederci è stata disabilitata. + + + I messaggi di arrivederci verranno eliminati dopo {0} secondi. + + + Messaggi di arrivederci attuali: {0} + + + Attiva i messaggi di arrivederci scrivendo {0} + + + Nuovo messaggio di arrivederci impostato. + + + Annunci di arrivederci disattivati. + + + Annunci di arrivederci attivati in questo canale + + + Nome del canale cambiato + + + Vecchio Nome + + + Argomento del canale cambiato + + + Pulito. + + + Contenuto + + + Ruolo creato con successo {0} + + + Canale di testo {0} creato. + + + Canale vocale {0} creato. + + + Assordato con successo. + + + Server Eliminato {0} + + + Fermata con successo l'eliminazione automatica dei comandi di invocazione. + + + Avviata con successo l'eliminazione automatica dei comandi di invocazione. + + + Canale di testo {0} eliminato. + + + Canale vocale {0} eliminato. + + + MP da + + + Aggiunto con successo un nuovo donatore. Totale ammontare donato da questo utente: {0} 👑 + + + Grazie alle persone nella lista qui sotto per aver fatto avverare questo progetto! + + + Inoltrerò MP a tutti i proprietari. + + + Inoltrerò MP solo al primo proprietario. + + + Inoltrerò MP da ora in poi. + + + Fermerò l'inoltrare degli MP da ora in poi. + + + L'eliminazione automatica dei messaggi di benvenuto è stata disabilitata + + + I messaggi di benvenuto verranno eliminati dopo {0} secondi. + + + Attuali MP di benvenuto ricevuti: {0} + + + Abilità MP di benvenuto scrivendoli {0} + + + Nuovo MP di bevenuto impostato. + + + MP annunci di bevenenuto disattivato. + + + MP annunci di bevenuto attivati. + + + + + + + + + Nuovo messaggio di benvenuto impostato. + + + Annunci di bevenuto disabilitati + + + Annunci di benvenuto abilitatati in questo canale + + + Non puoi usare questo comando su utenti con un ruolo più alto o uguale al tuo nella gerarchia dei ruoli. + + + Immagine caricata dopo {0} secondi! + + + + + + Parametri Invalidi + + + {0} è entrato {1} + + + Sei stato cacciato dal {0} server. +Ragione: {1} + + + Utente cacciato + + + Lista dei linguaggi + + + + + + + + + il linguaggio dei Bot è impostato a {0} - {1} + + + + + + Il linguaggio di questo server è impostato a {0} - {1} + + + {0} ha lasciato {1} + + + Hai lasciato il server {0} + + + Inserire {0} evento in questo canale. + Someone can tell me what he means for log, soo i can translate it better and correct it anyway! +Fuzzy + + + Inseriti tutti gli eventi in questo canale. + Fuzzy + + + Entrata disattivata + Fuzzy + + + Gli eventi a cui puoi iscriverti: + Fuzzy + + + + + + + + + + + + {0} ha chiesto una menzione nei seguenti ruoli + + + Messaggio da {0} `[Proprietario Bot]`: + + + Messaggio inviato. + + + {0} spostato in {1} da {2} + + + Messaggio eliminato in #{0} + + + + + + Gli utenti sono stati mutati + PLURAL (users have been muted) + + + Utente mutato + singular "User muted." + + + Probabilmente non ho i permessi necessari per questo + + + Nuovo ruolo di muto impostato. + + + Ho bisogno dei permessi di **Amministrazione** per farlo + + + Nuovo messaggio + + + Nuovo soprannome + + + Nuova discussione + + + Soprannome cambiato + + + Non riesco a trovare questo server + + + + + + Messaggio precedente + + + Nickname precedente + + + Discussione precedente + + + Errore. Probabilmente non ho i permessi sufficienti. + + + I permessi per questo server sono resettati + + + Protezioni attive + + + {0} è stato **disattivato** in questo server. + + + {0} Attivato + + + Errore. Hai bisogno dei permessi di gestione dei ruoli + + + Nessuna protezione attiva. + + + Gli utenti in ingresso devono essere tra {0} e {1}. + + + Se {0} o più utenti entrano entro {1} secondi, io li {0} loro. + + + Il tempo deve essere tra {0} e {1} secondi. + + + Rimossi con successo tutti i ruoli dall'utente {0} + + + Fallito a rimuovere i ruoli. Non ho abbastanza permessi. + + + il colore di {0} è stato cambiato. + + + Questo ruolo non esiste. + + + I parametri specificati sono invalidi + + + Si è verificato un errore dovuto a un colore invalido o a permessi insufficienti. + + + Rimosso con successo ruolo {0} dall'utente {1} + + + Fallito a rimuovere ruolo. Non ho abbastanza permessi. + + + Ruolo rinominato + + + Rinomina del ruolo fallita. Non ho abbastanza permessi. + + + Non puoi modificare i ruoli più alti del tuo + + + Rimosso il messaggio di gioco: {0} + + + Ruolo {0} è stato aggiunto alla lista. + + + {0} non trovato.Ripulito. + + + il ruolo {0} è già nella lista + + + Aggiunto. + + + Stato di gioco rotativo disattivato. + + + Stato di gioco rotativo attivato. + + + Qui c'è una lista delle condizioni di ruolo rotative: +{0} + Fuzzy + + + Nessuno condizione di gioco rotativo impostato. + Fuzzy + + + Tu hai già {0} ruolo + + + Tu hai già {0} esclusivi ruoli auto-assegnati. + + + I ruoli auto-assegnati sono ora riservati! + + + Ci sono {0} ruoli auto-assegnabili. + + + Quel ruolo non è auto-assegnabile. + + + Tu non hai {0} ruolo. + + + I ruoli auto-assegnati ora non sono più riservati! + + + Io non sono in grado di assegnarti questo ruolo. `Io non posso assegnare ruoli al proprietario o ad altri ruoli più alti del mio nella gerarchia dei ruoli.` + + + {0} è stato rimosso dalla lista dei ruoli auto-assegnabili. + + + Tu non hai più {0} ruolo. + + + Tu ora hai {0} ruolo. + + + Aggiunto con successo ruolo {0} all'utente {1} + + + Fallito ad aggiungere il ruolo. Non ho i permessi sufficienti. + + + Nuova immagine impostata! + + + Nuovo nome del canale impostato. + + + Nuovo gioco impostato! + + + Nuova sequenza impostata! + + + Nuova discussione del canale impostata. + + + + + + + + + Spegnimento + + + Gli utenti non possono mandare più di {0} messaggi ogni {1} secondi. + + + Modalità lenta disattivata + + + Modalità lenta attivata + + + Ammonizione (Espulso) + PLURAL + + + {0} ignorerà questo canale. + + + {0} non ignorerà più questo canale. + + + Se un utente posta {0} lo stesso messaggio consecutivamente, io {0} loro. +__Canaliignorati__: {2} + + + Canale di testo creato. + + + Canale di testo distrutto. + + + Desilenziato con successo. + + + Smutato + singular + + + Nome Utente + + + Nome utente cambiato. + + + Utenti + + + Utente bannato + + + {0} è stato **mutato** dalla chat. + + + {0} è stato **smutato** dalla chat. + + + Utente entrato + + + Utente è andato via + + + {0} è stato **mutato** dal canale di testo e vocale. + + + Ruolo utente aggiunto + + + Ruolo utente rimosso + + + {0} è ora {1} + + + {0} è stato **smutato** dal canale di testo e vocale. + + + {0} è entrato {1} canale vocale. + + + {0} è uscito {1} canale vocale. + + + {0} ha spostato {1} al {2} canale vocale. + + + {0} è stato **mutato vocalmente** + + + {0} è stato **smutato vocalmente* + + + Canale vocale creato + + + Canale vocale distrutto + + + Voce + testo disabilitati. + + + Voce + testo abilitati. + + + + + + + + + + + + Utente {0} dalla chat di testo + + + Utente {0} dalla chat di testo e vocale + + + Utente {0} dalla chat vocale + + + + + + Utente sbannato + + + Trasferimento completato! + + + Errore durante il trasferimento, guarda la console del bot per più informazioni. + + + + + + Utente ammonito + + + ha regalato {0} to {1} + + + Avrai più fortuna la prossima volta ^_^ + + + Congratulazioni! Hai vinto {0} per aver rollato oltre {1} + + + Mazzo rimescolato. + + + Lanciato {0} + User flipped tails. + + + Indovinato! Hai vinto {0} + + + + + + Aggiungi {0} a questo messaggio per ottenere {1} + + + Quest'evento è attivo per le prossime {0} ore + + + + + + ha regalato {0} a {1} + X has gifted 15 flowers to Y + + + {0} ha {1} + X has Y flowers + + + Testa + + + + + + + + + Non puoi puntare più di {0} + + + Non puoi puntare meno di {0} + + + Non hai abbastanza {0} + + + Non ci sono più carte nel mazzo. + + + + + + Hai rollato {0} + + + Punta + + + WOAAHHHHHHH!!! Congratulazioni!!! x{0} + + + Un singolo {0}, x{1} + + + Wow! Fortunato! Tre di un tipo! x{0} + + + Bel lavoro! Due {0} - puntato x{1} + + + Vinto + + + Gli utenti devono scrivere un codice segreto per ottenere {0}. +Dura {1} secondi. Non dirlo a nessuno. Shhh. + + + + + + + + + Croce + + + Hai preso con successo {0} da {1} + Fuzzy + + + + + + + + + Solo il proprietario del bot. + + + + + + Puoi supportare il progetto sul patreon: <{0}> o paypal: <{0}> + + + + + + + + + + + + Non riesco a trovare questo comando. Perfavore verifica che questo comando esiste prima di riprovare. + + + Descrizione + + + Puoi supportare "NadekoBot project" su +Patreon <{0}> oppure su +Paypal <{1}> +Non dimenticarti di firmare con il tuo nome o id di discord. + +**Grazie** ♥️ + + + **Lista dei comandi**: <{0}> +**Trovi delle guide per diventare host e altri documenti qui**: <{1}> + + + Lista dei comandi + + + Lista dei moduli + + + + + + Modulo inesistente. + + + + + + Tabella dei contenuti + + + + + + Autohentai avviato. Ogni {0} secondi verrà postato qualcosa coi seguenti tag: +{1} + + + Tag + + + + + + Impossibile iniziare perché non ci sono abbastanza partecipanti. + + + La gara è piena! Inizio immediato. + + + {0} è entrato come {1} + + + {0} è entrato come {1} e ha scommesso {2}! + + + Scrivi {0}eg per entrare nella gara. + Fuzzy + + + Inizia tra 20 secondi o quando la stanza è piena. + + + Inizia con {0} partecipanti. + + + {0} come {1} Ha vinto la gara! + + + {0} come {2} Ha vinto la gara e {2}! + + + Numero specificato invalido. Puoi tirare {0}-{1} dadi alla volta. + Fuzzy + + + Ha rollato {0} + Someone rolled 35 +Fuzzy + + + Dado rollato: {0} + Dice Rolled: 5 +Fuzzy + + + Fallito a iniziare la gara. Un'altra gara è probabilmente in corso. + + + Nessuna gara esistente su questo server. + + + Il secondo numero dev'essere maggiore del primo. + + + Cambi di cuore + + + Rivendicato da + + + Divorziati + + + Piace + + + Prezzo + + + Nessuna waifu è stata rivendicata. + + + Classifica delle waifu + + + + + + ha cambiato la sua affinità da {0} a {1}. + +*È moralmente questionabile.*🤔 + Make sure to get the formatting right, and leave the thinking emoji + + + Devi aspettare {0} ore e {1} minuti prima di poter cambiare di nuovo la tua affinità. + + + La tua affinità è stata reimpostata. Non ti piace più nessuno. + + + vuole essere la waifu di {0}. Aww <3 + + + ha rivendicato {0} come la sua waifu per {1}! + + + Hai divorziato da una waifu a cui piacevi. Sei un mostro senza cuore. +{0} riceve {1} come risarcimento. + + + Non puoi impostare l'affinità su te stesso, tu egomaniaco. + + + 🎉 Il loro amore è soddisfatto! 🎉 +il nuovo valore di {0} è {1}! + Fuzzy + + + Nessuna waifu vale così poco. Devi pagare almeno {0} per avere una waifu, malgrado il suo valore reale fosse minore. + + + Devi pagare {0} o più per poter rivendicare quella waifu! + + + Quella waifu non è tua. + + + Non puoi auto-rivendicarti. + + + Hai divorziato recentemente. Devi aspettare {0} ore e {0} minuti per poter divorziare di nuovo. + + + Nessuno + + + Hai divorziato da una waifu a cui non piacevi. Riottieni {0} Indietro. + + + palla8 + + + Acrofobia + + + Partita conclusa senza risposte. + + + Nessuno ha votato. Partita conclusa senza vincitori. + + + L'acronimo era {0} + + + Una partita di Acrofobia è già in corso su questo canale. + + + Partita avviata. Crea una frase utilizzando il seguente acronimo: {0}. + + + Hai {0} secondi a disposizione per rispondere. + + + {0} ha dato la sua risposta. ({1} in totale) + + + Vota digitando il numero della risposta + + + {0} ha votato! + Fuzzy + + + Il vincitore è {0} con {1} punti. + + + {0} è il vincitore poiché è stato l'unico ad aver dato una risposta! + + + Domanda + + + E' un pareggio! Entrambi avete scelto {0} + + + {0} vince! {1} batte {2} + + + Il tempo per rispondere è scaduto + + + La corsa degli animali è già iniziata. + + + Totale: {0} Media: {1} + + + Categoria. + + + Cleverbot è stato disabilitato in questo server. + + + Cleverbot è stato abilitato in questo server. + + + + + + + + + + plural + + + + + + Impossibile caricare una domanda. + + + Partita iniziato + + + Gioco dell'impiccato iniziato + + + Il gioco dell'impiccato è già in corso in questo canale. + + + Impossibile iniziare il gioco dell'impiccato. + Fuzzy + + + + + + Classifica + + + Non hai abbastanza {0} + + + Nessun risultato + + + raccolto {0} + Kwoth picked 5* + + + {0} ha piantato {1} + Kwoth planted 5* + + + Un gioco dei trivia è già in corso su questo canale. + + + Gioco dei trivia + + + {0} ha indovinato! La riposta era: {1} + + + Nessun gioco dei trivia è in corso su questo server. + + + {0} ha {1} punti + + + Il gioco terminerà dopo questa domanda. + + + Tempo scaduto! La risposta corretta era {0} + + + {0} ha indovinato ed è il VINCITORE! La risposta era: {1} + + + Non puoi giocare contro te stesso. + + + Una partita di Tris è già in corso in questo canale. + + + Pareggio! + + + ha avviato una partita di Tris. + + + {0} ha vinto! + + + + + + Nessuna mossa rimanente! + + + Tempo scaduto! + + + + + + {0} vs {1} + + + + + + Autoplay disabilitato. + + + Autoplay abilitato. + + + Volume di default impostato a {0}% + + + + + + + + + Canzone finita + + + + + + + + + Dalla posizione + + + Id + + + Input non valido + + + + + + + + + + + + + + + + + + Nome + + + In riproduzione + + + + + + Nessun risultato trovato. + + + + + + + + + Canzone iniziata + + + + + + + + + Playlist cancellata. + + + Impossibile cancellare quella playlist perché non esiste oppure perché non ne sei l'autore. + + + Non esiste una playlist con quel ID. + + + Playlist in coda completata. + + + Playlist salvata + + + + + + Coda + + + Canzone in coda + + + + + + + + + Canzone rimossa + context: "removed song #5" + + + + + + + + + Traccia ripetuta + + + + + + + + + + + + + + + + + + + + + Canzoni mischiate + + + Canzone spostata + + + {0}o {1}m {2}s + + + Alla posizione + + + infinito + + + Il volume dev'essere impostato fra 0 e 100. + + + Volume impostato a {0}% + + + Non può essere più usato ALCUN MODULO in questo canale. + + + Possono essere usati TUTTI I MODULI in questo canale. + + + Concesso + + + Il ruolo {0} non può più usare ALCUN MODULO. + + + Il ruolo {0} può usare TUTTI I MODULI. + + + Non può essere più usato ALCUN MODULO in questo server. + + + Possono essere usati TUTTI I MODULI in questo server. + + + L'utente {0} non può più usare ALCUN MODULO. + + + L'utente {0} può usare TUTTI I MODULI. + + + + + + + + + + + + + + + Costo dei comandi + + + Disattivare l'uso di {0} {1} in questo canale {2}. + + + Attivare l'uso di {0} {1} in questo canale {2}. + + + Permesso negato + + + Aggiunta la parola {0} alla lista delle parole bandite. + + + Lista di parole bandite + + + Rimossa la parola {0} dalla lista delle parole bandite. + + + Parametro dei secondi non valido.(Deve essere un numero tra {0} e {1}) + + + + + + + + + + + + + + + + + + + + + Nessun costo impostato. + + + Comando + Gen (of command) + + + Modulo + Gen. (of module) + + + Pagina dei comandi {0} + + + + + + Gli utenti ora devono avere il ruolo di {0} per modificare i permessi. + + + + + + + + + + + + + + + + Short of seconds. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Abilità + + + Nessun anime preferito + + + Iniziata la traduzione automatica dei messaggi in questo canale. I messaggi degli utenti verranno automaticamente cancellati. + + + La tua traduzione automatica dei messaggi è stata rimossa. + + + La tua auto-traduzione linguaggio è stato impostata a {0}>{0} + Fuzzy + + + Avviata traduzione automatica dei messaggi in questo canale. + + + Annullata traduzione automatica dei messaggi in questo canale. + + + Formato input errato o errore sconosciuto. + + + Non ho trovato quella carta. + Fuzzy + + + Curiosità + + + Capitoli + + + + + + Competitive perse + + + Competitive giocate + + + Rango delle competitive + Fuzzy + + + Competitive Vinte. + + + Completato + + + Condizione + + + Costo + + + Data + + + Definisci: + + + Abbandonato + + + Episodi + + + Errore. + + + Esempio. + + + Fallito a trovare questo anime. + + + Fallito a trovare questo manga. + + + Genere + + + Fallito a trovare la definizione per questo tag. + + + Altezza/Peso + + + + + + Umidità + + + Ricerca immagine per: + + + Fallito a trovare questo film. + + + + + + Scherzo non caricato. + + + Latitudine/Lunghezza + Fuzzy + + + Livello + + + + Don't translate {0}place + + + Luogo + + + Oggetto magico non caricato. + + + + + + + + + Minimo/Massimo + + + Nessun canale trovato. + + + Nessun risultato trovato. + + + + + + Url originale + Fuzzy + + + + + + + + + + + + + + + In programma da guardare + + + Piattaforma + + + Nessun abilità trovata. + + + Nessun pokèmon trovato. + + + Link profilo: + + + Qualità: + + + + + + + + + Voto + + + Punteggio: + + + Ricerca per: + + + Non è stato possibile accorciare quel url. + + + Accorcia url + + + Qualcosa è andato storto. + + + Per favore specifica i parametri della ricerca. + + + Stato + + + Conserva url + + + Lo streamer {0} è offline. + + + Lo streamer {0} è online con {1} spettatori. + + + Stai seguendo {0} streaming in questo server. + + + Non stai seguendo nessuno streaming in questo server. + + + + + + Questo streaming probabilmente non esiste. + + + Rimossi {0} streaming ({1}) dalle notifiche + + + Io notificherò in questo canale quando il suo stato cambia. + Fuzzy + + + Alba + + + Tramonto + + + Temperratura + + + Titolo: + + + Top 3 anime preferiti: + + + Traduzione: + + + Tipi + + + + + + Url + + + Spettatori + + + Seguendo + Fuzzy + + + + + + + + + Pagina non trovata. + + + Velocità del vento + + + I campioni più bannati di {0} + + + + + + + + + + /s and total need to be localized to fit the context - +`1.` + + + + + + {0} utenti in totale. + + + Autore + + + ID del bot + + + + + + + + + Canale di discussione + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Emoji personalizzati + + + Errore + + + Funzioni + Fuzzy + + + ID + + + + + + + + + + + + + Invalid months value/ Invalid hours value + + + Si è unito a Discord + + + Si è unito al server + + + ID: {0} +Membri: {1} +ID del proprietario: {2} + + + + + + + + + Membri + + + Memoria + + + Messaggi + + + Ripetitore di Messaggi + + + Nome + + + Soprannome + + + Nessuno sta giocando a quel gioco. + + + Nessun ripetitore attivo. + + + Nessun ruolo in questa pagina. + + + + + + Nessun argomento impostato. + + + Proprietario + + + ID del proprietario + + + Presenza + + + {0} Server +{1} Canali di testo +{2} Canali vocali + + + Eliminato tutte le parole con {0} all'interno. + + + Pagina {0} delle citazioni + + + Nessuna citazione in questa pagina. + + + Nessuna citazione trovata che tu possa rimuovare. + + + Citazione Aggiunta + + + Citazione #{0} cancellata. + + + Regione + + + Registrato il + + + + + + + + + + + + + + + Lista dei ripetitori + + + Nessun ripetitore funzionante in questo server. + Fuzzy + + + #{0} fermato. + + + Nessun messaggio ripetuto trovato in questo server. + + + Risultato + + + Ruoli + + + + + + + + + Nessun colore è nel formato giusto. Usa `#00ff00` per esempio. + + + Iniziata rotazione {0} dei ruoli colorati. + Fuzzy + + + Fermata la rotazione dei colori per il {0} ruolo + + + + + + Info del server + + + + + + + + + + + + + + + + + + + + + Canali di testo + + + + + + + + + + Id of the user kwoth#1234 is 123123123123 + + + Utenti + + + Canali vocali + + + Sei già entrato in gara! + + + + + + + + + + + + + + + + + + {0} ha votato. + Kwoth voted. + + + Mandami in privato il numero della risposta. + + + Scrivi qui il numero della risposta. + + + Grazie per aver votato, {0} + + + {0} voti in totale. + + + + + + + + + Nessun utente trovato. + + + pagina {0} + + + Devi essere in un canale vocale in questo server. + + + Non ci sono ruoli nei canali vocali. + + + + + + + + + + + + + + + + + + + + + + + + + + + Nessun alias trovato + + + + + + + + + + + + + + + + + + \ No newline at end of file From 5bed3ed601458ade1d3f4c52d18f538d7e22a688 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 27 Mar 2017 14:35:23 +0200 Subject: [PATCH 361/496] Added korean and hebrew --- .../Commands/LocalizationCommands.cs | 2 + .../Resources/ResponseStrings.he-IL.resx | 2276 ++++++++++++++++ .../Resources/ResponseStrings.ko-KR.resx | 2373 +++++++++++++++++ 3 files changed, 4651 insertions(+) create mode 100644 src/NadekoBot/Resources/ResponseStrings.he-IL.resx create mode 100644 src/NadekoBot/Resources/ResponseStrings.ko-KR.resx diff --git a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs index 19930059..b61b2722 100644 --- a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs +++ b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs @@ -24,8 +24,10 @@ namespace NadekoBot.Modules.Administration {"en-US", "English, United States"}, {"fr-FR", "French, France"}, {"de-DE", "German, Germany"}, + {"he-IL", "Hebrew, Israel" }, {"it-IT", "Italian, Italy" }, //{"ja-JP", "Japanese, Japan"}, + {"ko-KR", "Korean, Korea" }, {"nb-NO", "Norwegian (bokmål), Norway"}, {"pl-PL", "Polish, Poland" }, {"pt-BR", "Portuguese, Brazil"}, diff --git a/src/NadekoBot/Resources/ResponseStrings.he-IL.resx b/src/NadekoBot/Resources/ResponseStrings.he-IL.resx new file mode 100644 index 00000000..5ddf049e --- /dev/null +++ b/src/NadekoBot/Resources/ResponseStrings.he-IL.resx @@ -0,0 +1,2276 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + הבסיס הזה נתפס או נהרס. + + + הבסיס הזה כבר נהרס. + + + הבסיס הזה לא נתפס. + + + הבסיס #{0} **הושמד** במלחמה נגד {1} + + + + + + + + + + + + + + + אויב + + + מידע על המלחה נגד {0} + + + מספר בסיס שגוי + + + לא גודל מלחמה נכון. + + + רשימת מלחמות פעילות + + + לא תפוס + + + אתה לא משתתף במלחמה הזאת + + + @{0} אתה כנראה לא משתתף במלחמה הזאת או הבסיס הזה כבר הושמד. + + + אין מלחמות פעילות. + + + גודל + + + המלחה נגד {0} כבר התחילה. + + + מלחמה נגד {0} נוצרה. + + + המלחמה נגד {0} נגמרה. + + + המלחמה הזאת לא קיימת. + + + מלחמה נגד {0} התחילה! + + + כל הסטטיסטיקה של התגובות מתאם נמחקו. + + + תגובות מתאם נמחקו + + + אין מספיק רשות, מתחייבת בעלות של הבוט בשביל תגובות מתאם גלובליות, ומנהג בשביל תגובות מתאם של הרשת. + + + רשימה של כל התגובות מתאם + + + תגובות מתאם + + + תגובות מתאם חדשות + + + לא נמצאו תגובות מתאם. + + + לא נמצאו תגובות מתאם אם הזהות הזאת. + + + תגובה + + + + + + + + + + + + + + + + + + לא נמצאו תוצאות. + + + {0} כבר התעלף. + + + {0} כבר בחיים מלאים. + + + הסוג שלך הוא כבר {0} + + + {0}{1} שומש על {2}{3} שעשה {4} נזק. + Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage. + + + אתה לא יכול לתקוף שוב שד שיתקפו אותך. + + + אתה לא יכול לתקוף את עצמך. + + + {0} נתעלף. + + + {0} רופה עם {1} אחד. + + + ל{0} נשארו {1} חיים. + + + אתה לא יכול להשתמש ב{0}. תרשום "{1}ml" כדי לראות את רשימת המהלכים שאת יכול להשתמש בהם. + + + רשימת המהלכים לסוג {0} + + + זה לא אפקטיבי. + + + איך לך מספיק {0} + + + {0} הוחזר לתחייה עם {1} אחד. + + + החזרתה את אצמך עם {1} אחד. + + + הסוג שלך שונה ל{0} בתמורה ל{1}. + + + זה טיפה אפקטיבי. + + + זה ממש אפקטיבי! + + + השתמשת ביותר מדי מהלכים אז אתה לך יכול לזוז. + + + הסוג של {0} הוא {1} + + + משתמש לא נמצא. + + + את\ה התעלפת אז את\ה לא יכול לזוז. + + + + + + + + + קבצים מצורפים + + + תמונת פרופיל שונתה + + + אתה הוסרת משרת {0}. +סיבה: {1} + + + מגורש + PLURAL + + + משתמש גורש + + + השם של הבוט השתנה ל{0} + + + הסטטוס של הבוט השתנה ל{0} + + + ההסרה האוטומטית של הודאת השלום לא בשימוש. + + + הודאת השלום תמחק בעוד {0} שניות. + + + הודעת עזיבה נוכחית: {0} + + + אפשור הודאת שלום דרך כתיבת {0} + + + התראת עזיבה חדשה הוגדרה. + + + התראת עזיבה לא פעילה. + + + התראת עזיבה הופעלה עבור ערוץ זה. + + + השם של הערוץ השתנה + + + שם ישן + + + נושא ערוץ שונה + + + נוקה. + + + תוכן + + + תפקיד נוצר בהצלחה {0} + + + ערוץ טקסט {0} נוצר. + + + ערוץ קול {0} נוצר. + + + החרשה הצליחה. + + + השרת {0} נמחק + + + + + + + + + ערוץ טקסט {0} נמחק. + + + ערוץ קול {0} נמחק. + + + הודאה פרטית מ{0} + + + תורם חדש הוסף בהצלחה. כמות כוללת שנתרמה ממשתמש זה: {0} 👑 + + + תודה לאנשים המצורפים למטה על הצלחת הפרויקט! + + + אני האביר את ההודאות הפרטיות לכל הבעלים. + + + אני האביר את ההודאות הפרטיות לבעלים הראשונים. + + + אני האביר את ההודאות הפרטיות מעכשיו. + + + אני אפסיק להעביר את ההודאות הפרטיות מעכשיו. + + + + + + + + + הודאה פרטית נוכחית: {0} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + אתה לא יכול להשתמש בפקודה זו על משתמשים עם תפקיד שווה או גבוהה ממך בדירוג. + + + התמונות יעלו אחרי {0} שניות. + + + הפורמט המבוקש שגוי. + + + פרמטרים לא חוקיים. + + + {0} הצטרף {1} + + + + אתה הוסרת מהשרת {0} בגלל הסיבה: {1} + + + משתמש נבעט. + + + רשימה של כל השפות + + + + + + + + + שפת הבוט שונתה מ{0} ל{1}. + + + + + + שפת שרת זה מוגדרת כ- {0} - {1} + + + {0} עזב {1} + + + {0} עזב את השרת + + + רישום של האירוע {0} בערוץ זה. + + + רישום כל האירועים בערוץ זה. + + + הרישום הופסק. + + + תרשום את האירועים שאתה יכול להירשם אליהם. + + + הרישום יתעלם מ{0} + + + הרישום לא יתעלם מ{0} + + + הרישום לאירוע {0} נפסק. + + + + + + הודעה מ{0} ׳[מנהל הבוט]׳ + + + הודעה נשלחה. + + + {0} עבר מ{1} ל{2}. + + + הודעה נמחקה ב#{0} + + + הודעה עדכנה ב#{0} + + + מושתק + PLURAL (users have been muted) + + + מושתק + singular "User muted." + + + כנראה שאין לי הרשאה לזה. + + + תפקיד מושתק חדש נוצר. + + + אני צריך אישור **מנהל** כדי לעשות את זה. + + + הודעה חדשה + + + כינוי חדש + + + נושא חדש + + + כינוי שונה + + + לא ניתן למצוא את השרת + + + + + + הודעה ישנה + + + כינוי ישן + + + נושא ישן + + + שגיאה. כנראה אין לי את האישורים המתאימים. + + + ההרשאות לשרת זה התחדשו. + + + הגנות פועלות + + + {0} **הופסק** בשרת זה. + + + {0} אופשר. + + + שגיאה. אני צריך אישור **ManageRole** + + + אין הגנות פעילות + + + הסף של המשתמש צריך להיות בין {0} ל{1}. + + + אם {0} או יותר משתמשים יצטרפו בעוד {1} שניות, אני {2} אותם. + + + הזמן חייב להיות בין {0} ו{1} שניות. + + + כל התפקידים הוסרו בהצלחה ממשתמש {0} + + + הסרת התפקיד נכשלה. אין לי מספיק הרשאות. + + + הצבע של {0} התפקיד היה שונה. + + + התפקיד הזה לא קיים. + + + הפרמטר המבוקש אינו חוקי. + + + השגייה התרחשה בגלל צבע לא נכון או חוסר הרשאות. + + + התפקיד {0} הוסר בהצלחה ממשתמש {0} + + + הסרת התפקיד נחשלה. אני לי מספיק הרשאות. + + + שם התפקיד השתנה. + + + שינוי התפקיד מחשל. אני לי מספיק הרשאות. + + + אתה לא יכול לעדכן תפקידים גבוהים משלך. + + + ההודאה המוקלטת הוסרה: {0} + + + תפקיד {0} הוסף לרשימה. + + + {0} לא נמצא. נוקה. + + + התפקיד {0} כבר נמצא ברשימה. + + + הוסף. + + + סטטוס משתנה הופסק. + + + סטטוס משתנה הותחל. + + + הנה רשימה של סטטוסים מסתובבים: {0} + + + לא נקבע סטטוס משתנה. + + + יש לך כבר {0} תפקיד. + + + + + + + + + + + + + + + אין לך {0} תפקיד. + + + + + + + + + + + + אין לך את התפקיד {0}. + + + יש לך את התפקיד {0}. + + + + + + + + + תמונת הפרופיל הוספה. + + + שם הערוץ החדש נקבע. + + + משחק חדש נוצר. + + + + + + + + + + + + + + + קורס + + + משתמשים לא יכולים לשלוח יותר מ{0} הודאות כל {1} שניות. + + + מצב איתי הופסק. + + + מצב איתי הותחל. + + + הסרה קלה (גורש) + PLURAL + + + {0} יתעלם מערוץ זה. + + + {0} לא יתעלם מערוץ זה. + + + + + + ערוץ כתב נוצר. + + + ערוץ כתב הושמד. + + + + + + + singular + + + שם משתמש + + + שם משתמש שונה + + + משתמשים + + + משתמש מורחק + + + + + + + + + משתמש הצתרף + + + משתמש עזב + + + + + + התפקיד של המשתמש הוסף. + + + התפקיד של שמשתמש הורד. + + + {0} עכשיו {1} + + + + + + {0} הצטרף ל{1} ערוץ קול. + + + {0} עזב מ{1} ערוץ קול. + + + {0} עבר מ{1} ל{2} ערוץ קול. + + + + + + + + + ערוץ קול הוצר + + + ערוץ קול מושמד + + + תכונה של קול + טקסט מכובה. + + + תכונה של קול + טקסק אופשרה. + + + אין לי רשות **נהל תפקידים** וגם/או **נהל ערוצים**, אז אני לא יכול להריץ `קול+טקסט` על {0} רשת. + + + אתה מאפשר/שולל את התכונה הזאת ו**לי אין רשות של מנהל**. זה יכול לגרום לכמה בעיות, ואתה תתצרך לנקות את ערוצי הטקסט בעצמך אחר כך. + + + אני חייב לפחות **נהל תפקידים** ו**נהל ערוצים** הרשאות כדי לאפשר את התכונה הזאת. (רשות של מנהל מועדפת) + + + משתמש {0} מטקסט צ׳אט + + + משתמש {0} מטקסט וקול צ׳אט + + + משתמש {0} מערוץ קול. + + + + + + + + + נדידה גמורה! + + + שגיעה בזמן הנדידה, תבדוק את ה מסוף בקרה של הבוט בשביל יותר מידע. + + + + + עדכון נוכחות + + + + + + העניק {0} ל{1} + + + בהצלחה בפעם הבאה ^_^ + + + מזל טוב! אתה ניצחת {0} עבור זה שגלגלת מעבר מ{1} + + + חסיפה מעורבבת. + + + הפך {0}. + User flipped tails. + + + אתה ניחשת את זה! ניצחת {0} + + + המספר שצוין אינו חוקי. אתה יכול להעיף 1 עד {0} מטבעות. + + + תצרף תגובה {0} להודעה הזאת כדי לקבל {1}. + + + האירוע הזה פעיל עד {0} שעות. + + + אירוע תגובות הפרח התחיל! + + + נתן מתנה של {0} ל{1} + X has gifted 15 flowers to Y + + + {0} יש {1} + X has Y flowers + + + ראש + + + לוח תוצאות + + + הוענק {0} ל {1} למשתמשים מ{2} תפקיד. + + + אתה לא יכול להמר יותר מ-{0} + + + אתה לא יכול להמר פחות מ-{0} + + + אין לך מספיך {0} + + + אין יותר קלפים בחפיסה. + + + משתמש הגרלות + + + אתה גלגלת {0}. + + + להמר + + + ווווווווווווואאווו!!! מזל טוב!!! x{0} + + + {0} יחיד, x{1} + + + וואו! בר מזל! שלושה מאותו הסוג! x{0} + + + עבודה טובה! שני {0} - ההימור x{1} + + + זכית + + + משתמשים חייבים להקליד קוד סודי כדי לקבל {0}. נמשך {1} שניות. אל תספר לאף אחד. ששש. + + + האירוע של משחקערמומי הסתיים. {0} משתמשים קיבלו את הפרס. + + + משחקערמומיסטטוס אירוע התחיל + + + זנב + + + בהצלחה נלקח {0} מ{1} + + + לא הצליח לקחת {0} מ{1} משום שלמשתמש אין כל כך הרבה {2}! + + + חזר לToC + + + מנהל של הבוט בלבד + + + מתחייבת {0} רשות ערוץ. + + + אתה יכול לתמוח בפרוייקט על Patreon: <{0}> או Paypal: <{1}> + + + פקודות וכינויים + + + רשימת הפיקוד התחדשה. + + + + + + אני לא יכול למצוא את הפקודה הזאת. בבקשה תוודא שהפקודה הזאת נמצאת לפני שתנסה שוב. + + + תאור + + + אתה יכול למתוח את הנאדקובוט פרוייקט על Patreon <{0}> או Paypal <{1}> +אל תשכח להשאיר את השם של הדיסקורד שלך או הזהוי בהודעה. + +**תודה** ♥️ + + + **רשימה של פקודות**: <{0}> +**מדריכי אירוך ומסמכים אפשר למצוא כאן**: <{1}> + + + רשימה של פקודות + + + רשימה של מודולים + + + + + + המודול הזה לא קיים. + + + נדרשת {0} רשות השרת. + + + תוכן העניינים + + + נוהג + + + הנטאי אוטומטי התחיל. פורסים מחדש כל {0}ש עם אחד מהתגים הבאים: +{1} + + + תג + + + מרוץ בעלי חיים + + + נכשל להתחיל מכיוון שלא היו מספיק משתתפים. + + + המרוץ מלא! מתחיל מיד. + + + {0} הצתרף כ{1} + + + {0} הצתרף כ{1} והימר {2}! + + + תרשום jr{0} כדי להצתרף למרוץ. + + + מתחיל ב20 שניות או מתי שהחדר מלא. + + + מתחיל עם {0} משתתפים. + + + {0} כ{1} ניצח במרוץ! + + + {0} כ{1} ניצח במרוץ ו{2}! + + + המספר שצוין אינו חוקי. אתה יכול לגלגל {0}-{1} קוביות בבת אחת. + + + גלגל {0} + Someone rolled 35 + + + הקוביה גלגלה: {0} + Dice Rolled: 5 + + + נכשל להתחיל את המרוץ. יכול להיות שמרוץ אחר כבר פעיל. + + + אין מרוץ קיים ברשת הזאת. + + + המספר השני חייב להיות גדול יותר מהמספר הראשון. + + + שינויים של הלב + + + נתבע על ידי + + + גירושים + + + מחבב + + + מחיר + + + שום וואיפוס נתבעו עדיין. + + + וואיפוס ראשיות + + + הזיקה שלך כבר מוגדרת לוואיפו הזאת או שאתה מנסה להסיר את ההזיקה שלך בזמן שאין לך אחת. + + + שינה את הזיקה שלהם מ{0} ל{1} + +*זה מפקפק באופן מוסרי.* 🤔 + Make sure to get the formatting right, and leave the thinking emoji + + + אתה חייב לחכות {0} שעות ו{1} דקות כדי לשנות את הזיקה שלך עוד פעם. + + + הזיקה שלך אופסה. אין לך יותר אדם שאתה מחבב. + + + רוצה להיות וואיפו של {0}. אוו 3> + + + תבע {0} כהוואיפו שלהם בשביל {1}! + + + אתה גירשת וואיפו שאוהבת אותך. אתה מפלצת חסרת לב. +{0} קיבל {1} כפיצוי. + + + אתה לא יכול להגדיר זיקה לעצמך, אתה אגומניאק. + + + 🎉 האהבה שלהם התגשמה! 🎉 +הערך החדש של {0} הוא {1} + + + שום וואיפו כל כך זולה. אתה חייב לשלם לפחות {0} כדי להדיג וואיפו, אפילו אם הערך האמיתי שלהם נמוך יותר. + + + אתה חייב לשלם {0} או יותר בשביל לתבוע את הוואיפו הזאת! + + + הוואיפו הזאת לא שלך. + + + אתה לא יכול לתבע את עצמך. + + + אתה התגרשת לא מזמן. אתה צריך לחכות {0} שעות ו{1} דקות כדי להתגרש עוד פעם. + + + אף אחד + + + אתה גירשת וואיפו שלא מחבבת אותך. אתה קיבלת {0} בחזרה. + + + 8כדור + + + פחד גבהים + + + המשחק הסתיים ללא הגשות. + + + אין הצבעות. המשחק הסתיים ללא מנצח. + + + ראשי התיבות היו {0}. + + + משחק פחד גבהים כבר פועל בערוץ הזה. + + + המשחק התחיל. תכינו משפט עם הראשי התיבות הבאים: {0}. + + + יש לך {0} שניות כדי לעשות הגשה. + + + {0} הגיש את המשפט שלהם. ({1} בסכם) + + + תצביע על ידי הקלדת מספר ההגשה + + + {0} הצביעו! + + + המנצח הוא {0} עם {1} נקודות + + + {0} המנצח בגלל שהוא המשתמש היחיד שעשה הגשה! + + + שאלה + + + זה תיקו! שניהם הרימו {0} + + + {0} ניצח! {1} מביס {2} + + + ההגשות סגורות + + + מרוץ חיות כבר התחיל. + + + סה"כ: {0} ממוצע: {1} + + + קטגוריה + + + קלברבוט מכובה על השרת הזה. + + + קלברבוט מופעל על השרת הזה. + + + דור המטבע מופעל על הערוץ הזה. + + + דור המטבע מכובה על הערוץ הזה. + + + {0} מקרי {1} הופיע! + plural + + + מקרי {0} הופיע! + + + נכשל לטעון שאלה. + + + משחק התחיל + + + משחק איש תלוי התחיל + + + משחק איש תלוי בל פעיל על הערוץ הזה. + + + שגיאה בהתחלה של איש תלוי + + + רשימה של "{0}איש תלוי" סוגי טווח: + + + לוח תוצאות + + + אין לך מספיק {0} + + + אין תוצאות + + + תלש {0} + Kwoth picked 5* + + + {0} שתל {1} + Kwoth planted 5* + + + משחק טריוויה כבר פועל ברשת הזאת. + + + משחק טריוויה + + + {0} ניחש את זה! התשובה הייתה: {1} + + + משחק טריוויה לא פעיל על השרת הזה. + + + {0} יש {1} נקודות + + + עוצר אחרי השאלה הזאת. + + + הזמן עבר! התשובה הנכונה הייתה {0} + + + {0} ניחש את זה וניצח במשחק! התשובה הייתה: {1} + + + אתה לא יכול לשחק נגד עצמך. + + + משחק איקס ועיגולים כבר פעיל על הערוץ הזה. + + + תיקו! + + + יצר משחק של איקס ועיגולים. + + + {0} ניצח! + + + שלושה מתאימים + + + אין יותר מהלכים! + + + הזמן עבר! + + + המהלך של {0} + + + {0} נגד {1} + + + מנסה לשים {0} שירים בתור... + + + הפעלה אוטומטית מכובה. + + + הפעלה אוטומטית מופעלה. + + + ווליום ברירת מחדל מכוון ל%{0} + + + תור מנחה מושלם. + + + לנגןהוגן + + + שיר הסיים + + + לנגן הוגן מכובה. + + + לנגן הוגן מופעל. + + + מתוך עמדה + + + זהוי + + + קלט לא תקין. + + + מקסימום פלייטיים אין הגבלה עכשיו. + + + מקסימום פלייטיים קבע ל{0} שניות. + + + גודל התור של מקסימום מוזיקה קבע ללא הגבלה. + + + הגודל של מקסימום תור מוזיקה קבע ל{0} מסלול(ים). + + + אתה חייב להיות בערוץ קול על השרת הזה. + + + שם + + + עכשיו מנגן + + + אין נגן מוזיקה פעיל. + + + אין תוצאות חיפוש + + + השמעת מוזיקה נעצרה. + + + תור השחקן - עמוד {0}/{1} + + + מנגן שיר + + + `#{0}` - **{1}** by *{2}* ({3} שירים) + + + עמוד {0} של פלייליסטים שמורים + + + פלייליסט נמחק. + + + נכשל לנסות למחוק אל הפלייליסט הזה. זה אולי לא קיים, או שאתה לא מחברו. + + + פלייליסט עם הזהוי הזה לא קיים. + + + תור הפלייליסט שלם. + + + פליילסט נשמר + + + {0} הגבלה + + + תור + + + שיר בתור + + + תור המוזיקה נוקה. + + + התור מלא ב{0}/{0} + + + שיר מחוק + context: "removed song #5" + + + חוזרים על השיר הנוכחי + + + חוזרים על הפלייליסט + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + מותר + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + נשלל + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Gen (of command) + + + + Gen. (of module) + + + + + + + + + + + + + + + + + + + + + + + + + Short of seconds. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + הפרוש המידי שלך לשפה זאת הוסרה. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + שגיעה נוצרה + + + דוגמה + + + מציאת האנימה נחשל. + + + מציאת המנגה נחשלה + + + ג'אנר + + + + + + גובה/משקל + + + {0}מ'/{1}ק"ג + + + לחות + + + חיפוש תמונה של: + + + מציאת מסרט נחשל. + + + מקור או שפה לא נכונה. + + + בדיחה לא הועלתה. + + + + + + רמה + + + + Don't translate {0}place + + + מיקום + + + חפץ הקסם לא הועלה. + + + + + + + + + הכי פחות/הרבה + + + + + + אין תוצעות + + + במעצר + + + הקישור המקורי + + + + + + + + + + + + + + + מתקבן לראות + + + פלטפורמה + + + יכולת לא נמצאה + + + פוקמון לא נמצא + + + קישור פרופיל: + + + איכות: + + + + + + ניצחונות מהירים + + + דירוג + + + ניקוד: + + + חיפוש של: + + + קיצר שורת הקישור נחשל + + + קישור קצר + + + משהו השתבש + + + + + + + + + קישור החנות + + + + + + + + + + + + + + + + + + + + + + + + + + + זריחה + + + שקיעה + + + טמפרטורה + + + + + + שלושת האנימות הטובות ביותר: + + + פרוש: + + + סוגים + + + מציעת הפרושים של המוסג הזה נחשל. + + + קישור + + + צופים + + + צופה + + + + + + + + + העמוד לא נמצא + + + מהירות הרוח + + + + + + + + + הצתרף + + + + /s and total need to be localized to fit the context - +`1.` + + + + + + + + + יוצר + + + מס' זהות של הבוט + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Invalid months value/ Invalid hours value + + + + + + + + + מס' זהות: {0} +משתמשים: {1} +בעלי המס' זהות: {2} + + + + + + + + + משתמשים + + + זיכרון + + + הודאות + + + + + + שם + + + כינוי + + + אף אחד לא משחק במשחק הזה + + + + + + + + + + + + + + + בעלים + + + מס' זהות של הבעלים + + + + + + + + + מחק את כל הציטוטים עם {0} מילות המפתח. + + + עמוד {0} של ציטוטים. + + + אין ציטוטים בעמוד זה. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {0} של המשתמש {1} הינו {2} + Id of the user kwoth#1234 is 123123123123 + + + משתמשים + + + + + + אתה כבר חלק מהמרוץ הזה. + + + + + + + + + + + + + + + + + + {0} הצביע. + Kwoth voted. + + + + + + + + + תודה שהצבעתת {0} + + + + + + בחר אותם על ידי הקלדת `{0}בחר` + + + + + + משתמש לא נמצא. + + + דף {0} + + + אתה חייב להיות בערוץ קול. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/NadekoBot/Resources/ResponseStrings.ko-KR.resx b/src/NadekoBot/Resources/ResponseStrings.ko-KR.resx new file mode 100644 index 00000000..cf1c65d5 --- /dev/null +++ b/src/NadekoBot/Resources/ResponseStrings.ko-KR.resx @@ -0,0 +1,2373 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 기지가 이미 요청되었거나 파괴되었습니다. + Fuzzy + + + 기지가 이미 파괴되었습니다. + + + 기지가 요청당하지 않았습니다. + + + {1} 와의 전쟁에서 #{0} 번 기지가 **파괴**되었습니다. + Fuzzy + + + {2} 와의 전쟁에서 {0} 가 #{1} 번 기지를 **요청**하지 못했습니다. + Fuzzy + + + {2} 와의 전쟁에서 #{1} 번 기지를 {0} 가 요청하였습니다. + + + @{0} 이미 #{1} 번 기지를 요청했습니다. 새로운 기지를 요청 할 수 없습니다. + + + {1} 와의 전쟁에서 @{0} 의 요청이 만료되었습니다. + Fuzzy + + + 적 + Fuzzy + + + {0} 와의 전쟁에 대한 정보 + + + 유효하지 않은 기지 숫자입니다. + + + 유효하지 않은 전쟁 크기입니다. + + + 활성화된 전쟁 목록 + + + 요청되지 않았습니다. + + + 당신은 이 전쟁에 참여하고 있지 않습니다. + + + @{0} 당신은 그 전쟁에 참여하지 않거나 그 기지가 이미 파괴되었습니다. + + + 활성화된 전쟁이 없습니다. + + + 크기 + Fuzzy + + + {0} 에 대한 전쟁이 이미 시작되었습니다. + + + {0} 에 대한 전쟁이 생성되었습니다. + + + {0} 와의 전쟁이 종료되었습니다. + + + 전쟁이 존재하지않습니다. + + + {0} 와의 전쟁이 시작되었습니다. + + + 모든 커스텀 리액션에 대한 통계가 삭제되었습니다. + + + 커스텀 리액션이 삭제되었습니다. + + + 권한이 부족합니다. 전체 커스텀 리액션을 관리하기 위해서는 봇의 소유권과 서버의 관리자 권한이 필요합니다. + + + 모든 커스텀 리액션 목록 + + + 커스텀 리액션 + + + 새로운 커스텀 리액션 + + + 커스텀 리액션을 찾지 못했습니다. + + + 요청하신 ID에 대한 커스텀 리액션을 찾지 못했습니다. + + + 반응 + Fuzzy + + + 커스텀 리액션 통계 + + + {0} 에 대한 커스텀 리액션 통계가 삭제되었습니다. + + + 해당 트리거에 대한 통계를 찾지 못했으며, 아무런 행동도 취하지 않았습니다. + + + 트리거 + Fuzzy + + + Autohentai 기능이 정지되었습니다. + + + 결과를 찾지 못했습니다. + + + {0} 이(가) 이미 기절했습니다. + + + {0} 은(는) 이미 최대 체력입니다. + + + 당신은 이미 {0} 타입 입니다. + + + 님이 {2}{3} 에게 {0}{1} 을(를) 사용하여서 {4} 의 피해를 입혔습니다. + Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage. + + + 보복 없이는 다시 공격 할 수 없습니다. + + + 자신을 공격 할 수 없습니다. + + + {0} 이(가) 기절했습니다! + + + {1} 을(를) 사용하여서 {0} 을(를) 치료했습니다. + + + {0} 의 HP가 {1} 남아 있습니다. + + + {0} 을(를) 사용 할 수 없습니다. `{1}ml` 을(를) 입력해서 사용할 수 있는 움직임들의 리스트를 확인하세요. + + + {0} 종류 의 공격표 + Fuzzy + + + 효과적이지 않았다. + + + 당신은 충분한 {0} 가 없습니다. + + + {1} 을(를) 사용하여서 {0} 을(를) 소생했습니다. + + + {0} 을(를) 사용해서 자기자신을 소생시켰습니다. + + + 당신의 타입이 {0} 에서 {1} 으로 변경되었습니다. + + + 어느정도 효과가 있었다. + + + 효과는 굉장했다! + + + 너무 많은 공격을 연속해서 사용했으므로 이동할 수 없습니다! + + + {0} 의 종류는 {1} 입니다. + + + 사용자를 찾을 수 없습니다. + + + 당신은 기절해서 움직일 수 없습니다! + + + **자동 할당 역할**에 대한 사용자의 참여가 **비활성화**되었습니다. + + + **자동 할당 역할**에 대한 사용자의 참여가 **활성화**되었습니다. + + + 첨부파일 + + + 아바타가 변경되었습니다. + + + 당신은 {0} 서버에서 밴되었습니다. +사유: {1} + + + 밴 + PLURAL +Fuzzy + + + 사용자 밴 + Fuzzy + + + 봇의 이름이 {0} 으로 변경되었습니다. + + + 봇의 상태가 {0} 으로 변경되었습니다. + + + 퇴장 메세지의 자동삭제가 비활성화되었습니다. + Fuzzy + + + 퇴장 메세지는 앞으로 {0} 초 후에 삭제됩니다. + Fuzzy + + + 현재 퇴장 메세지: {0} + Fuzzy + + + 퇴장 메세지를 활성화하기 위해서는 {0} 를 입력하십시오. + Fuzzy + + + 새로운 퇴장 메세지가 설정되었습니다. + Fuzzy + + + 퇴장 알림이 비활성화되었습니다. + + + 이 채널에서 퇴장 알림이 활성화되었습니다. + + + 채널 이름이 변경되었습니다. + + + 이전 이름 + Fuzzy + + + 채널의 주제가 변경되었습니다. + + + 정리했습니다. + + + 내용 + Fuzzy + + + {0} 역할을 성공적으로 생성하였습니다. + + + 텍스트 채널 {0} 이(가) 생성되었습니다. + + + 음성 채널 {0} 이(가) 생성되었습니다. + + + 음소거되었습니다. + Fuzzy + + + {0} 서버를 삭제하였습니다. + + + 성공적으로 처리된 명령어에 대한 자동삭제가 중지되었습니다. + + + 이제 성공적으로 처리된 명령어를 자동삭제합니다. + + + 텍스트 채널 {0} 를 삭제했습니다. + + + 음성 채널 {0} 를 삭제했습니다. + + + 개인 메세지 + Fuzzy + + + 성공적으로 새로운 기부자를 추가했습니다. 이 유저의 총 기부량은 {0} 입니다. + + + 이 프로젝트를 위해 수고해주신 아래의 사람들에게 감사드립니다! + + + DM을 모든 봇 소유자에게 전달하겠습니다. + + + DM을 첫번째 봇 소유자에게만 전달하겠습니다. + + + 지금부터 DM을 전달하겠습니다. + + + 지금부터 DM 전달을 중단하겠습니다. + + + 환영 메세지에 대한 자동삭제가 비활성화되었습니다. + + + 환영 메세지는 {0} 초 후에 삭제될 것입니다. + + + 현재 DM 환영 메세지: {0} + + + {0} 을(를) 입력하여서 DM 환영 메세지를 활성화시킵니다. + + + 새로운 DM 환영 메세지가 설정되었습니다. + + + DM 환영 알림이 비활성화되었습니다. + 환영 알림 = 환영 메세지라고 해도될까요? + + + DM 환영 알림 활성화 되었습니다. + + + 현재 환영 메세지: {0} + + + {0} 를 입력하여서 환영 메세지를 활성화시킵니다. + + + 새로운 환영 메세지가 설정되었습니다. + + + 환영 알림이 비활성화되었습니다. + + + 이 채널의 환영 알림이 활성화되었습니다. + + + 당신은 이 명령어를 당신보다 상위나 동등한 권한관계를 가진 사람에게 쓸 수 없습니다. + + + 이미지가 {0} 초 후에 생성되었습니다! + Fuzzy + + + 유효하지않은 입력 포맷입니다. + + + 유효하지않은 파라미터입니다. + + + {0} 님이 {1} 에 입장하였습니다. + + + 당신은 {0} 서버에서 퇴장당했습니다. +사유 : {1} + + + 사용자 강제퇴장 + Fuzzy + + + 언어 목록 + + + 서버의 지역이 {0} - {1} 로 변경되었습니다. + + + 봇의 기본 지역이 {0} - {1} 로 변경되었습니다. + + + 봇의 언어가 {0} - {1} 로 설정되었습니다. + + + 지역 설정에 실패했습니다. 이 명령어의 도움말을 참고하십시오. + + + 이 서버의 언어가 {0} - {1} 로 변경되었습니다. + + + {0} 님이 {1} 에서 퇴장하셨습니다. + + + {0} 서버에서 퇴장하였습니다. + + + 이 채널의 {0} 이벤트를 로깅합니다. + + + 이 채널의 모든 이벤트를 로깅합니다. + + + 로깅이 비활성화되었습니다. + + + 구독 할 수 있는 로그 이벤트 : + + + 로그는 앞으로 {0} 을(를) 무시합니다. + + + 로그는 {0} 을(를) 더 이상 무시하지 않습니다. + + + {0} 이벤트에 대한 로그를 중지하였습니다. + + + {0} 이(가) 다음 역할에 대한 언급을 요청했습니다. + + + {0} `[봇의 소유자]` 로부터 메세지: + Fuzzy + + + 메세지가 전송되었습니다. + + + {0} 이(가) {1} 에서 {2} 로 이동했습니다. + + + #{0} 에서 메세지가 삭제되었습니다. + + + #{0} 에서 메세지가 업데이트되었습니다. + + + 음소거 + PLURAL (users have been muted) +Fuzzy + + + 음소거 + singular "User muted." +Fuzzy + + + 명령어를 수행하기 위한 권한이 부족합니다. + + + 새로운 음소거 역할이 설정되었습니다. + + + 요청하신 것을 처리하기 위해서는**관리자** 권한이 필요합니다. + + + 새로운 메세지 + + + 새로운 닉네임 + + + 새로운 주제 + + + 닉네임이 변경되었습니다. + + + 요청하신 서버를 찾을 수 없습니다. + + + 해당하는 Shard ID가 없습니다. + + + 이전 메세지 + + + 이전 닉네임 + + + 이전 주제 + + + 오류. 봇에게 충분한 권한이 없습니다. + + + 이 서버의 모든 권한이 초기화되었습니다. + + + 보호기능 활성화 + + + {0} 은(는) 이 서버에서 **비활성화**되었습니다. + + + {0} 가 활성화되었습니다. + + + 오류. 관리자 권한이 필요합니다. + + + 활성화된 보호기능이 없습니다. + + + 사용자의 값은 반드시 {0} 과 {1} 사이의 값이여야 합니다. + Fuzzy + + + 만약 {0} 명 이상의 사용자가 {1} 초안에 접속한다면 {2} 합니다. + Fuzzy + + + 시간은 {0} 초와 {1} 초 사이의 값이여야 합니다. + + + {0} 유저의 모든 역할을 성공적으로 삭제했습니다. + + + 역할 삭제에 실패했습니다. 권한이 부족합니다. + + + {0} 역할에 대한 색이 변경되었습니다. + + + 그 역할은 존재하지 않습니다. + + + 지정된 파라미터가 유효하지 않습니다. + + + 유효하지 않은 색이거나 권한이 부족하여서 오류가 발생했습니다. + Fuzzy + + + {1} 사용자에 대한 {0} 역할을 성공적으로 제거했습니다. + + + 역할 제거에 실패했습니다. 권한이 부족합니다. + + + 역할 이름이 변경되었습니다. + + + 역할 이름 변경에 실패했습니다. 권한이 부족합니다. + + + 자신보다 가장 높은 역할보다 높은 사용자의 역할을 수정할 수 없습니다. + + + 다루고있었든 메세지 치웠습니다: {0} + Fuzzy + + + {0} 역할을 리스트에 추가했습니다. + + + {0} 을(를) 찾을 수 없기때문에 삭제했습니다. + Fuzzy + + + {0} 역할은 이미 리스트에 추가된 상태입니다. + + + 추가했습니다. + + + 플레이 상태 로테이션이 비활성화되었습니다. + + + 플레이 상태 로테이션이 활성화되었습니다. + + + 플레이 상태 로테이션 리스트: +{0} + + + 플레이 상태 로테이션이 설정되지 않았습니다. + + + 당신은 이미 {0} 역할이 있습니다. + + + 당신은 이미 독점 자가 배정 역할 {0} 가 있습니다. + Fuzzy + + + 자가 배정 역할은 이제 하나만 선택 할 수 있습니다! + Fuzzy + + + {0} 개의 자가 배정 역할이 있습니다. + Fuzzy + + + 그 역할은 자신이 적용 할 수 없습니다. + + + 당신은 {0} 역할이 없습니다. + + + 자가 배정 역할은 이제 복수 선택 할 수 있습니다! + Fuzzy + + + 그 역할을 당신에게 추가 할 수 없습니다. `당신보다 상위나 동등한 권한관계를 가진 사람에게 역할을 추가 할 수 없습니다.` + + + {0} 은(는) 자신이 적용 할 수 있는 역할 목록에서 삭제되었습니다. + + + 당신은 더 이상 {0} 역할이 아닙니다. + + + 당신은 이제 {0} 역할입니다. + + + {1} 유저에게 {0} 역할을 성공적으로 추가했습니다. + + + 역할 추가에 실패했습니다. 권한이 부족합니다. + + + 새로운 아바타가 설정되었습니다! + + + 새로운 채널 이름이 설정되었습니다. + + + 새로운 게임이 설정되었습니다! + + + 새로운 방송이 설정되었습니다! + + + 새로운 채널 주제를 설정했습니다. + Fuzzy + + + Shard {0} 가 다시 연결되었습니다. + + + Shard {0} 를 다시 연결 중입니다. + + + 종료 중... + + + 사용자는 {1} 초마다 {0} 개 이상의 메시지를 보낼 수 없습니다. + + + 슬로우 모드가 비활성화되었습니다. + + + 슬로우 모드가 활성화되었습니다. + + + 소프트 밴 (강제퇴장) + PLURAL + + + {0} 은(는) 이 채널을 무시할 것입니다. + + + {0} 은(는) 더이상 이 채널을 무시하지 않을 것입니다. + + + 만약 사용자가 {0} 개 이상의 같은 메세지를 보내면 {1} 합니다. + __무시하는 채널들__: {2} + + + 텍스트 채널이 생성되었습니다. + + + 텍스트 채널이 삭제되었습니다. + destroyed means deleted? +디스트로이드 뜻이 삭제됬다는 건가요? + + + 음소거 해제 완료. + + + 음소거 해제 + singular + + + 사용자 이름 + + + 사용자 이름이 변경되었습니다. + + + 사용자 + Fuzzy + + + 사용자 밴 + Fuzzy + + + {0} 님이 채팅으로부터 **음소거**되었습니다. + + + {0} 님이 채팅으로부터 **음소거 해제**되었습니다. + + + 사용자 입장 + + + 사용자 퇴장 + + + {0} 은(는) 텍스트와 음성 채팅으로부터 **차단**되었습니다. + + + 사용자의 역할이 추가되었습니다. + Fuzzy + + + 사용자의 역할이 제거되었습니다. + Fuzzy + + + {0} 은(는) 이제 {1} 입니다. + + + {0} 은(는) 텍스트와 음성 채팅으로부터 **차단해제**되었습니다. + + + {0} 님이 {1} 음성채널에 입장하셨습니다. + + + {0} 님이 {1} 음성채널에서 퇴장하셨습니다. + + + {0}님이 음성채널 {1} 에서 {2} 로 이동되었습니다. + + + {0} 님이 **음성 음소거**되었습니다. + + + {0} 님이 **음성 음소거 해제**되었습니다. + + + 음성 채널이 생성되었습니다. + + + 음성 채널이 삭제되었습니다. + + + 음성 + 텍스트 기능을 비활성화시켰습니다. + + + 음성 + 텍스트 기능을 활성화시켰습니다. + + + **관리 역할** 혹은 **채널 관리 권한**이 부족해서 {0} 서버에서 `음성 + 텍스트` 기능을 실행 할 수 없습니다. + + + 당신은 **봇이 관리자 권한이 없음에도** 이 기능을 활성화/비활성화 하고 있습니다. 이로 인해서 문제가 발생 할 수 있으며 이후에 직접 텍스트 채널을 정리해야합니다. + + + 이 기능을 활성화시키기 위해서는 **역할 관리**과 **채널 관리** 권한이 필요합니다. + Fuzzy + + + 사용자가 텍스트 채팅으로부터 {0} 됐습니다. + + + 사용자가 텍스트와 음성 채팅으로부터 {0} 됐습니다. + + + 사용자가 음성 채팅으로부터 {0} 됐습니다. + + + 당신은 {0} 서버에서 soft-밴을 당했습니다. +사유: {1} + Fuzzy + + + 사용자 밴 해제 + Fuzzy + + + 이전 완료! + Fuzzy + + + 이전 과정에서 오류가 발생했습니다. 자세한 정보는 봇의 콘솔을 통해서 확인하십시오. + + + 현재 상태 업데이트 + + + 사용자 소프트 밴 + + + 님이 {1} 에게 {0} 개를 지급했습니다. + + + 다음 기회에 ^_^ + + + 축하합니다! 당신은 {1} 이상을 굴려서 {0} 을 획득했습니다. + Fuzzy + + + 덱이 섞였습니다. + Fuzzy + + + 동전뒤집기의 결과는 {0}. + User flipped tails. +Fuzzy + + + 맞췄습니다! 당신은 {0} 을(를) 획득했습니다. + + + 유효하지 않은 숫자입니다. 당신은 1개부터 {0} 개까지만 동전을 뒤집을 수 있습니다. + Fuzzy + + + {1} 을(를) 받으려면 이 메세지에 {0} 리액션을 추가하세요. + Fuzzy + + + 이 이벤트는 최대 {0} 시간 동안 활성화됩니다. + + + 플라워 리액션 이벤트가 시작되었습니다. + + + 님이 {1} 에게 {0} 개를 선물하셨습니다. + X has gifted 15 flowers to Y + + + {0} 님은 {1} 개를 보유중입니다. + X has Y flowers + + + 앞 + + + 리더보드 + + + {2} 역할의 {1} 명의 사용자에게 {0} 를 보상하였습니다. + Fuzzy + + + {0} 보다 더 배팅 할 수 없습니다. + + + {0} 보다 적게 배팅 할 수 없습니다. + + + 당신은 충분한 {0} 이(가) 없습니다. + + + 덱에 더 이상 카드가 없습니다. + + + 래플 결과 + Fuzzy + + + {0} 를 굴렸습니다. + + + 배팅 + Fuzzy + + + 대박!!! 축하합니다!!! x{0} + + + 한 {0}, x{1} + Fuzzy + + + 와! 운이 좋습니다! 같은 종류의 세개! x{0} + Fuzzy + + + 잘 했습니다! {0} 두게 - x{1} + Fuzzy + + + 얻은 액수 + Fuzzy + + + 사용자는 반드시 {0} 를 얻기 위해서 비밀 코드를 입력해야합니다. + + + + SneakyGame 이벤트가 종료되었습니다. {0} 명의 사용자들이 보상을 받았습니다. + + + SneakyGameStatus 이벤트가 시작되었습니다. + Fuzzy + + + 뒷면 + + + {1} 에게서 {0} 을(를) 성공적으로 빼앗았습니다 + + + {1} 님이 {2} 만큼을 가지고있지 않기 때문에 {0} 을(를) 회수 할 수 없습니다. + Fuzzy + + + 목차로 돌아가기 + + + 봇 소유자만 가능합니다. + + + {0} 채널의 권한이 필요합니다. + + + Patreon( <0> )이나 Paypal( <1> )을 통해서 프로젝트를 후원 할 수 있습니다. + Fuzzy + + + 명령어와 가명 + Fuzzy + + + 명령어 목록이 재생성되었습니다. + + + `{0}h 명령어이름`을 입력해서 특정 명령어에 대한 도움말을 볼 수 있습니다. +예시 : `{0}h >8ball` + + + 입력하신 명령어를 찾을 수 없습니다. 입력하시기 전에 유효한 명령어인지 확인해주십시오. + + + 설명 + Fuzzy + + + Patreon <{0}> 이나 +Paypal <{1}> 에서 +NadekoBot 프로젝트를 지원할 수 있습니다. +Discord 닉네임이나 ID를 메시지에 남겨 두는 것을 잊지 마십시오. + +**감사합니다** ♥️ + + + **명령어 목록**: <{0}> +**호스팅 가이드와 문서는 여기서 찾을 수 있습니다**: <{1}> + + + 명령어 목록 + + + 모듈 목록 + + + `{0}h 모듈이름`을 입력해서 특정 모듈에 대한 도움말을 볼 수 있습니다. +예시 : `{0}cmds games` + + + 그 모듈은 존재하지 않습니다. + + + {0} 서버의 권한이 필요합니다. + + + 목차 + + + 사용법 + Fuzzy + + + Autohentai 기능이 활성화되었습니다. 다음의 태그와 함께 {0} 초마다 사진이 올라옵니다. +태그 : +{1} + Fuzzy + + + 태그 + Fuzzy + + + 동물 경주 + Fuzzy + + + 참가자가 충분히 없어서 시작하지 못했습니다. + + + 참가자가 모두 모였습니다! 즉시 시작하겠습니다. + Fuzzy + + + {0} 이(가) {1} (으)로 참가했습니다. + Fuzzy + + + {0} 님이 {1} 으로써 참가하였고, {2} 을(를) 걸었습니다! + Fuzzy + + + {0}jr 를 입력해서 레이스에 참가합니다. + + + 20초 동안 기다리거나, 방이 가득 차면 시작됩니다. + Fuzzy + + + {0} 명의 참가자와 함께 시작합니다. + + + {0} 이(가) {1} (으)로 레이스를 이겼습니다! + Fuzzy + + + {0} 이(가) {1} (으)로 레이스를 이겼고 {2}! + Fuzzy + + + 유효하지 않은 숫자입니다. 한번에 {0}-{1} 의 주사위를 던질 수 있습니다. + Fuzzy + + + 님이 {0} 를 굴렸습니다. + Someone rolled 35 + + + 주사위 결과: {0} + Dice Rolled: 5 + + + 레이스 시작에 실패했습니다. 다른 레이스가 진행중입니다. + Fuzzy + + + 이 서버에 레이스가 존재하지 않습니다. + + + 두번째 숫자는 첫번째 숫자보다 큰 숫자여야 합니다. + Fuzzy + + + 마음의 변화 + Fuzzy + + + 요구한 사람 + Fuzzy + + + 이혼 + + + 좋아하는 사람 + Fuzzy + + + 값 + + + 아무 와이프도 클레임되지 않았습니다. + Fuzzy + + + 최고의 와이프 + + + + + + + Make sure to get the formatting right, and leave the thinking emoji + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 자기자신을 클레임 할 수 없습니다. + Fuzzy + + + 당신은 최근에 이혼하셨습니다. 다시 이혼하려면 {0} 시간 {1} 분을 기다려야 합니다. + Fuzzy + + + 아무도 없음 + + + + + + 8ball + Fuzzy + + + 아크로포비아 + Fuzzy + + + 아무런 제출 없이 게임이 끝났습니다. + + + + + + 두문자가 {0} 이었슴니다. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + plural + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 결과가 없습니다. + + + 이(가) {0} 을(를) 뽑았습니다. + Kwoth picked 5* + + + {0} 이(가) {1} 을(를) 설치했습니다. + Kwoth planted 5* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + context: "removed song #5" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 허락함 + Fuzzy + + + + + + + + + + + + + + + + + + + + + {0} (ID {1})님을 블랙리스트했습니다 + + + 명령어 {0} 은(는) 이제 {1}초 재사용 대기시간이 있습니다. + + + 이제 명령어 {0} 이 재사용 대기시간이 없고 기존의 모든 재사용 대기시간이 삭제되었습니다. + + + 명령어 재사용 대기시간이 설정되지 않았습니다. + + + 명령어 값 + + + 채널 {2} 에서 {0} {1} 의 사용을 비활성화시켰습니다. + + + 채널 {2} 에서 {0} {1} 의 사용을 활성화시켰습니다. + + + 거절함 + Fuzzy + + + 필터링 된 단어 목록에 {0} 을 추가했습니다. + Fuzzy + + + 필터링 된 단어 목록 + + + 필터링 된 단어 목록에서 {0} 을 삭제했습니다. + Fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + + + 명령어 + Gen (of command) + + + 모듈 + Gen. (of module) + + + 권한 목록 {0} 페이지 + + + + + + + + + + + + + + + + + + + + + 초. + Short of seconds. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 능력 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 애니메이션 검색에 실패했습니다. + + + 만화 검색에 실패했습니다. + + + 장르 + + + + + + 키/무게 + + + {0}m/{1}kg + + + 습도 + + + 이미지 검색: + + + 영화 검색에 실패했습니다. + + + + + + + + + + + + + + + + Don't translate {0}place + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 보고있는것: + Fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + /s and total need to be localized to fit the context - +`1.` + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Invalid months value/ Invalid hours value + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 인용구가 추가되었습니다. + + + 인용구 #{0} 가 삭제되었습니다. + + + 지역 + + + 가입 날짜 + + + + + + 유효하지않은 시간 포맷입니다. 명령어 목록을 확인하십시오. + + + + + + + + + 반복 메시지 목록 + + + 이 서버에 반복 메시지 실행하고있지 안습니다. + + + #{0} 이 정지되었습니다. + + + + + + 결과 + + + 역할 + + + + + + + + + + + + + + + + + + + + + + + + Shard + + + Shard 통계 + + + Shard **#{0}** 이 {1} 상태이고 {2} 서버에 있습니다. + + + **이름:** {0} **링크:** {1} + + + 특수 이모지를 찾을 수 없습니다. + Fuzzy + + + {0} 개의 곡을 재생중이며, {1} 개의 대기열이 있습니다. + + + 텍스트 채널 + + + + + + + + + {1} 의 {0} 은(는) {2} 입니다. + Id of the user kwoth#1234 is 123123123123 + + + 사용자 + Fuzzy + + + 음성 채널 + + + 당신은 이미 레이스에 참가했습니다. + + + 현재 투표 결과 + + + 진행중인 투표가 없습니다. + + + 이 서버에서 이미 투표가 진행되고있습니다. + + + 📃 {0} 님이 투표를 생성하였습니다. + Fuzzy + + + + + + {0} 님이 투표하였습니다. + Kwoth voted. + + + 해당 답변 번호와 함께 개인 메시지를 보내십시오. + Fuzzy + + + 해당 답변 번호와 함께 여기에 메시지를 보내십시오. + Fuzzy + + + {0} 님, 투표해주셔서 감사합니다 + + + {0} 개의 표가 던져졌습니다. + Fuzzy + + + + + + `{0}pick`을 입력해서 획득하십시오. + Fuzzy + + + 사용자를 찾지 못했습니다. + + + {0} 페이지 + + + 이 서버의 음성 채널에 있어야합니다. + + + 음성채널 역할이 없습니다. + + + {0} 은(는) 음성과 텍스트 채팅으로 부터 {1} 분간 **음소거**되었습니다. + + + {0} 음성채널에 입장하는 사용자는 {1} 역할을 얻게됩니다. + + + {0} 음성채널에 입장하는 사용자는 더이상 {1} 역할을 얻지 못합니다. + + + 음성채널 역할 + + + + + + + + + + + + + + + 가명을 찾지 못했습니다. + + + {0} 입력은 이제 {1} 의 가명일것이니다. + + + 가명 목록 + + + 트리거 {0} 의 가명을 삭제했습니다. + + + 트리거 {0} 은(는) 가명 없었습니다. + + + 경기한 시간 + + + \ No newline at end of file From 22ed47ff9ece9eedf4e7fb11b5b8079cff914b69 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 27 Mar 2017 14:45:09 +0200 Subject: [PATCH 362/496] Update ResponseStrings.zh-CN.resx (POEditor.com) From c8ea0039fe0d899cb5a1d3bef62be8cc05aef81e Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 27 Mar 2017 14:45:11 +0200 Subject: [PATCH 363/496] Update ResponseStrings.zh-TW.resx (POEditor.com) --- .../Resources/ResponseStrings.zh-TW.resx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx b/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx index 051bb851..7f3ca400 100644 --- a/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx +++ b/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx @@ -1337,7 +1337,7 @@ Paypal <{1}> {0} 對 {1} - 正在排 {0} 首歌... + 正在點播 {0} 首歌... 已停用自動播放。 @@ -2255,16 +2255,16 @@ Paypal <{1}> 語音頻道身分組 - + 觸發自訂回應 ID 為 {0} 的訊息不會自動刪除。 - + 觸發自訂回應 ID 為 {0} 的訊息將會自動刪除。 - + 自訂回應 ID 為 {0} 的回應不會以私訊方式傳送。 - + 自訂回應 ID 為 {0} 的回應將會以私訊方式傳送。 找不到別名 @@ -2276,13 +2276,13 @@ Paypal <{1}> 別名列表 - + 觸發 {0} 不再有別名。 - + 觸發 {0} 並沒有別名。 - + 競技時數 \ No newline at end of file From a9b9612184d7ceb3cd8a39ebc346136873452dc6 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 27 Mar 2017 14:45:14 +0200 Subject: [PATCH 364/496] Update ResponseStrings.nl-NL.resx (POEditor.com) --- .../Resources/ResponseStrings.nl-NL.resx | 525 ++++++++---------- 1 file changed, 246 insertions(+), 279 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.nl-NL.resx b/src/NadekoBot/Resources/ResponseStrings.nl-NL.resx index 15bc2419..3f7ad541 100644 --- a/src/NadekoBot/Resources/ResponseStrings.nl-NL.resx +++ b/src/NadekoBot/Resources/ResponseStrings.nl-NL.resx @@ -152,8 +152,7 @@ Ongeldige basis nummer - Ongeldig oorlogs -formaat. + Ongeldig oorlogsformaat. Fuzzy @@ -195,7 +194,7 @@ formaat. Alle speciale reactie statistieken zijn verwijderd. - Speciale Reactie verwijderdt. + Speciale Reactie verwijderd. Onvoldoende rechten. Bot Eigendom is nodig voor globale speciale reacties, en Administrator voor speciale server-reacties. @@ -214,7 +213,7 @@ formaat. Fuzzy - Geen speciale reacties gevonden met die ID. + Geen speciale reacties gevonden met dat ID. Antwoord @@ -223,19 +222,19 @@ formaat. Speciale Reactie Statistieken - Statistieke verwijderd voor {0} speciale reactie. + Statistieken verwijderd voor {0} speciale reactie. Geen statistieken voor die trekker gevonden, geen actie genomen. - Trekker + Trigger Autohentai gestopt. - Geen resultaten gevonden + Geen resultaten gevonden. {0} is al flauw gevallen. @@ -251,10 +250,10 @@ formaat. Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage. - Jij zal niet winnen zonder tegenstand! + Je kan niet opnieuw aanvallen zonder vergelding! - Je kunt je zelf niet aanvallen + Je kunt je zelf niet aanvallen. {0} is verslagen! @@ -263,7 +262,7 @@ formaat. heeft {0} genezen met een {1} - {0} heeft nog {1} HP over + {0} heeft nog {1} HP over. Je kan {0} niet gebruiken. Typ `{1}ml` om een lijst te bekijken van de aanvallen die jij kunt gebruiken @@ -272,7 +271,7 @@ formaat. Aanvallijst voor {0} element - Het heeft weinig effect. + Het is niet effectief. Je hebt niet genoeg {0} @@ -293,7 +292,7 @@ formaat. Het is super effectief! - Je hebt te veel aanvallen achter elkaar gemaakt, je kan dus niet bewegen! + Je hebt te veel acties achter elkaar gedaan, dus je kan niet bewegen! Element van {0} is {1} @@ -302,7 +301,7 @@ formaat. Gebruiker niet gevonden. - Je bent flauw gevallen, dus je kunt niet bewegen! + Je bent flauwgevallen, dus je kunt niet bewegen! **Auto aanwijzing van rollen** op gebruiker is nu **uitgeschakeld**. @@ -311,7 +310,7 @@ formaat. **Auto aanwijzing van rollen** op gebruiker is nu **ingeschakeld**. - Bestanden + Bijlagen Avatar veranderd @@ -320,50 +319,50 @@ formaat. Je bent verbannen van {0} server. Reden: {1} - Verbannen + verbannen PLURAL Gebruiker verbannen - Bot naam is veranderd naar {0} + Botnaam is veranderd naar {0} - Bot status is veranderd naar {0} + Botstatus is veranderd naar {0} - Automatische verwijdering van de bye berichten is uitgeschakeld. + Automatische verwijdering van de afscheidsberichten is uitgeschakeld. - Bye berichten zullen worden verwijderd na {0} seconden. + Afscheidsberichten zullen worden verwijderd na {0} seconden. - Momenteel is de bye message: {0} + Momenteel is het afscheidsbericht: {0} - Schakel de bye berichten in door {0} te typen. + Schakel de afscheidsbericht in door {0} te typen. - Nieuw bye bericht is geplaatst. + Nieuw afscheidsbericht is geplaatst. - Dag aankondigingen uitgeschakeld. + Afscheidsbericht uitgeschakeld. - Dag aankondigingen ingeschakeld op dit kanaal. + Afscheidsbericht ingeschakeld op dit kanaal. - Kanaal naam is veranderd. + Kanaalnaam is veranderd. Oude naam - Kanaal onderwerp is veranderd + Kanaalonderwerp is veranderd - Opgeruimd + Opgeruimd. Inhoud @@ -372,10 +371,10 @@ formaat. Met success een nieuwe rol gecreëerd. - Tekst kanaal {0} gecreëerd. + Tekst-kanaal {0} gecreëerd. - Stem kanaal {0} gecreëerd. + Voice-kanaal {0} gecreëerd. Dempen succesvol. @@ -384,82 +383,82 @@ formaat. Server verwijderd {0} - Stopt van automatische verwijdering van succesvolle reacties aanroepingen commando. + Succesvol aangeroepen commando's worden niet automatisch verwijderd. - Verwijdert nu automatisch succesvolle commando aanroepingen + Succesvol aangeroepen commando's worden nu automatisch verwijderd. - Tekst kanaal {0} verwijdert. + Tekst-kanaal {0} verwijderd. - Stem kanaal {0} verwijdert. + Voice-kanaal {0} verwijderd. - Privé bericht van + Privé-bericht van - Met succes een nieuwe donateur toegevoegt. Totaal gedoneerde bedrag van deze gebruiker {0} + Met succes een nieuwe donateur toegevoegd. Totaal gedoneerde bedrag van deze gebruiker: {0} - Dank aan de mensen hieronder vernoemt voor het waarmaken van dit project! + Dank aan de mensen hieronder voor het waarmaken van dit project! - Ik zal alle eigenaren een privé bericht sturen. + Ik zal alle eigenaren privé-berichten doorsturen. - Ik zal een privé bericht sturen naar de eerste eigenaar + Ik zal alleen privé-berichten doorsturen naar de eerste eigenaar. - Ik zal privé berichten sturen vanaf nu. + Ik zal privé-berichten doorsturen vanaf nu. - Ik stop vanaf nu met het sturen van privé berichten. + Ik stop vanaf nu met het doorsturen van privé berichten. - Automatisch verwijderen van groet berichten is uitgeschakeld. + Automatisch verwijderen van begroetings-berichten uitgeschakeld. - Groet berichten zullen worden verwijderd na {0} seconden. + Begroetings-berichten zullen worden verwijderd na {0} seconden. - Momenteen is het privé groet bericht: {0} + Momenteel is het privé begroetings-bericht: {0} - Schakel DM begroetings bericht in door {0} in te typen + Schakel DM begroetingen in door {0} in te typen - Nieuwe DM begroetings bericht vastgesteld. + Nieuwe DM begroeting ingesteld. - DM begroetings aankondiging uitgeschakeld. + DM begroetingen uitgeschakeld. - DM begroetingen aankondiging ingeschakeld. + DM begroetingen ingeschakeld. - Momentele begroetings bericht: {0} + Huidige begroeting: {0} - Schakel begroetings bericht in door {0} in te typen + Schakel begroetingen in door {0} in te typen - Nieuwe begroetings message vastgesteld. + Nieuwe begroeting ingesteld. - Begroetings aankondiging uitgeschakeld. + Begroetingen uitgeschakeld. - Begroetings aankondiging uitschakeld op dit kanaal. + Begroetingen uitschakeld op dit kanaal. - Jij kunt geen commando gebruiken op gebruikers met hogere of dezelfde rol als die van jouw in de rollen hiërarchie. + Je kunt geen commando gebruiken op gebruikers met een hogere of eenzelfde rol als die van jouw in de rollenhiërarchie. - Afbeeldingen geplaatst na {0} seconden! + Afbeeldingen geladen na {0} seconden! - Ongelde invoer formaat. + Ongeldig invoerformaat. Ongeldige parameters. @@ -468,12 +467,11 @@ formaat. {0} heeft {1} toegetreden - Je bent weggeschopt van de {0} server. + Je bent gekickt van {0}. Reden: {1} - Gebruiker weggeschopt - Fuzzy + Gebruiker gekickt. Lijst van talen @@ -481,37 +479,37 @@ Reden: {1} Fuzzy - Jouw server's locale is nu {0} - {1} + Je server's landinstelling is nu {0} - {1} - Bot's standaard locale is nu {0} - {1} + De bot zijn standaard landinstelling is nu {0} - {1} - Taal van de bot is gezet naar {0} - {1} + Taal van de bot is nu {0} - {1} - Instellen van locale mislukt. Ga naar de hulp voor dit commando. + Instellen van landsinstelling mislukt. Ga naar de hulp voor dit commando. - De taal van de server is gezet naar {0} - {1} + De taal van de server is nu {0} - {1} {0} heeft {1} verlaten - Server {0} verlaten + {0} verlaten - Gebeurtenis {0} wordt bijgehouden in dit kanaal. + Gebeurtenis {0} wordt gelogd in dit kanaal. - Alle gebeurtenissen worden bijgehouden in dit kanaal. + Alle gebeurtenissen worden gelogd in dit kanaal. Logging uitgeschakeld. - Log gebeurtenissen waar je op kan abonneren: + Log-gebeurtenissen waar je op kan abonneren: Logging zal {0} negeren @@ -543,7 +541,7 @@ Reden: {1} Fuzzy - Gebruikers zijn gedempt + gemute PLURAL (users have been muted) @@ -551,7 +549,7 @@ Reden: {1} singular "User muted." - Ik heb de benodigde rechten daar voor waarschijnlijk niet. + Ik heb de benodigde rechten daarvoor waarschijnlijk niet. Nieuwe demp rol geplaatst. @@ -560,20 +558,16 @@ Reden: {1} Ik heb **administrator** rechten daar voor nodig. - nieuw bericht - Fuzzy + Nieuw bericht - nieuwe bijnaam - Fuzzy + Nieuwe bijnaam Nieuw onderwerp - Fuzzy Bijnaam veranderd - Fuzzy Kan de server niet vinden @@ -583,25 +577,21 @@ Reden: {1} Oud bericht - Fuzzy Oude bijnaam - Fuzzy - Oude onderwerp - Fuzzy + Oud onderwerp - Fout. Hoogst waarschijnlijk heb ik geen voldoende rechten. + Error. Hoogst waarschijnlijk heb ik geen voldoende rechten. De rechten op deze server zijn gereset. - Actieve Beschermingen. - Fuzzy + Actieve beschermingen. {0} is nu ** uitgeschakeld** op deze server. @@ -610,29 +600,28 @@ Reden: {1} {0} Ingeschakeld - Fout. ik heb Beheer Rollen rechten nodig + Error. ik heb Beheer Rollen rechten nodig - Geen bescherming aangezet. - Fuzzy + Geen bescherming ingeschakeld. - Gebruiker's drempel moet tussen {0} en {1} zijn. + Gebruikersdrempel moet tussen {0} en {1} zijn. - Als {0} of meerdere gebruikers binnen {1} seconden, zal ik hun {2}. + Als {0} of meerdere gebruikers binnen {1} seconden toetreden, zal ik ze {2}. Aangegeven tijd hoort binnen {0} en {1} seconden te vallen. - Met succes alle roles van de gebruiker {0} verwijderd + Met succes alle rollen van gebruiker {0} verwijderd. Het verwijderen van de rollen is mislukt. Ik heb onvoldoende rechten. - De kleur van de rol {0} is veranderd + De kleur van de rol {0} is veranderd. Die rol bestaat niet. @@ -641,7 +630,7 @@ Reden: {1} De aangegeven parameters zijn ongeldig. - Error opgekomen vanwege ongeldige kleur, of onvoldoende rechten. + Error opgekomen vanwege ongeldige kleur of onvoldoende rechten. Met sucess rol {0} verwijderd van gebruiker {1}. @@ -650,16 +639,16 @@ Reden: {1} Mislukt om rol te verwijderen. Ik heb onvoldoende rechten. - Rol naam veranderd. + Naam van de rol veranderd. - Rol naam veranderen mislukt. Ik heb onvoldoende rechten. + Naam van de rol veranderen mislukt. Ik heb onvoldoende rechten. - je kan geen rollen bijwerken die hoger zijn dan je eigen rol. + Je kan geen rollen bijwerken die hoger zijn dan je hoogste rol. - Speel bericht verwijderd: {0} + Spelende bericht verwijderd: {0} Rol {0} is toegevoegd aan de lijst. @@ -687,10 +676,10 @@ Reden: {1} Nog geen routerende speelstatussen ingesteld. - Je hebt al {0} rol. + Je hebt rol {0} al. - Je hebt {0} exclusieve zelf toegewezen rol al. + Je hebt {0} exclusieve zelf-toegewezen rol al. Zelf toegewezen rollen zijn nu exclusief! @@ -699,25 +688,25 @@ Reden: {1} Er zijn {0} zelf toewijsbare rollen - Deze rol is niet zelf toewijsbaar. + Deze rol is niet zelf-toewijsbaar. - Je hebt niet {0} rol. + Je hebt rol {0} niet. - Zelf toegewezen rollen zijn nu niet exclusief! + Zelf-toegewezen rollen zijn nu niet exclusief! - Ik kan deze rol niet aan je toevoegen. `Ik kan niet rollen toevoegen aan eigenaren of andere rollen die boven mij staan in de rol hiërarchie.` + Ik kan deze rol niet aan je toevoegen. `Ik kan geen rollen toevoegen aan eigenaren of andere rollen die boven mij staan in de rol-hiërarchie.` {0} is verwijderd van de lijst met zelf toewijsbare rollen. - Je hebt {0} rol niet meer. + Je hebt de {0} rol niet meer. - je hebt nu {0} rol. + Je hebt nu de {0} rol. Succesvol de rol {0} toegevoegd aan gebruiker {1} @@ -729,7 +718,7 @@ Reden: {1} Nieuwe avatar ingesteld! - Nieuwe kanaal naam ingesteld. + Nieuwe kanaalnaam ingesteld. Nieuwe game ingesteld! @@ -738,7 +727,7 @@ Reden: {1} Nieuwe stream ingesteld! - Nieuwe kanaal onderwerp ingesteld. + Nieuwe kanaalonderwerp ingesteld. Shard {0} opnieuw verbonden. @@ -747,42 +736,42 @@ Reden: {1} Shard {0} is opnieuw aan het verbinden. - Afsluiten + Aan het afsluiten Gebruikers kunnen niet meer dan {0} berichten sturen per {1} seconden. - langzame mode uitgezet + Langzame modus uitgezet. - langzame mode gestart + Langzame modus gestart. - zacht-verbannen (kicked) + soft-verbannen (gekickt) PLURAL {0} zal dit kanaal negeren. - {0} zal dit kanaal niet meer negeren. + {0} zal dit kanaal niet langer negeren. - Als een gebruiker {0} de zelfde berichten plaatst, zal ik ze {1}. + Als een gebruiker {0} gelijke berichten plaatst, zal ik ze {1}. __IgnoredChannels__: {2} - Tekst kanaal aangemaakt. + Tekst-kanaal aangemaakt. - Tekst kanaal verwijderd. + Tekst-kanaal verwijderd. - Ontdempen succesvol + Doof maken ontdoen succesvol - Ongedempt + Geünmute singular @@ -790,70 +779,60 @@ __IgnoredChannels__: {2} Gebruikersnaam veranderd - Fuzzy Gebruikers Gebruiker verbannen - Fuzzy - {0} is **gedempt** van chatten. - Fuzzy + {0} is **gedempt** van het chatten. - {0} is **ongedempt** van chatten. - Fuzzy + {0} is **ongedempt** van het chatten. - Gebruiker toegetreden - Fuzzy + Gebruiker is toegetreden - Gebruiker verlaten - Fuzzy + Gebruiker is weggegaan - {0} is **gedempt** van het tekst en stem kanaal. + {0} is **gedempt** van het tekst- en voice-kanaal. Rol van gebruiker toegevoegd - Fuzzy Rol van gebruiker verwijderd - Fuzzy {0} is nu {1} - {0} is **ongedempt** van het tekst en stem kanaal. + {0} is **ongedempt** van het tekst- en voice-kanaal. - {0} is {1} spraakkanaal toegetreden. + {0} is {1} voice-kanaal toegetreden. - {0} heeft {1} spraakkanaal verlaten. + {0} heeft {1} voice-kanaal verlaten. - {0} heeft {1} naar {2} spraakkanaal verplaatst. + {0} heeft {1} naar {2} voice-kanaal verplaatst. - {0} is **spraak gedempt** + {0} is **spraak gemute**. - {0} is **spraak ongedempt** + {0} is **spraak geünmute**. - Spraakkanaal gemaakt - Fuzzy + Voice-kanaal gemaakt - Spraakkanaal vernietigd - Fuzzy + Voice-kanaal verwijderd Spraak + tekst mogelijkheid uitgezet. @@ -862,13 +841,13 @@ __IgnoredChannels__: {2} Spraak + tekst mogelijkheid aangezet. - Ik heb geen **Rol Beheering** en/of **Kanaal Beheering** toestemmingen, dus ik kan geen `stem+text` gebruiken op de {0} server. + Ik heb geen **Rol Beheer** en/of **Kanaal Beheer** toestemmingen, dus ik kan geen `stem+text` gebruiken op de {0} server. - Deze eigenschap wordt door jou ingeschakelt/uitgeschakelt maar **Ik heb geen ADMINISTRATIEVE toestemmingen**. Hierdoor kunnen er mogelijk problemen ontstaan, en je zal daarna de tekst kanalen zelf moeten opruimen. + Deze eigenschap wordt door jou ingeschakeld/uitgeschakeld maar **Ik heb geen ADMINISTRATIEVE toestemmingen**. Hierdoor kunnen er mogelijk problemen ontstaan, en je zal daarna de tekst-kanalen zelf moeten opruimen. - Ik heb tenminste **Rol Beheering** en **Kanaal Beheering** toestemmingen nodig om deze eigenschap in te schakelen. (Geliefe adminstratieve rechten) + Ik heb tenminste **Rol Beheering** en **Kanaal Beheering** toestemmingen nodig om deze eigenschap in te schakelen. (Gelieve administratieve rechten) Gebruiker {0} van tekstkanaal @@ -880,25 +859,23 @@ __IgnoredChannels__: {2} Gebruiker {0} van spraakkanaal - Je bent zacht-verbannen van {0} server. + Je bent soft-gebant van {0} server. Reden: {1} Gebruiker niet meer verbannen - Migratie gelukt! + Migratie klaar! - Fout tijdens het migreren, kijk in de bot's console voor meer informatie. + Fout tijdens het migreren, kijk in de bot zijn console voor meer informatie. - Aanwezigheid Updates - Fuzzy + Aanwezigheid updates - Gebruiker zacht-verbannen - Fuzzy + Gebruiker soft-gebant heeft {0} aan {1} gegeven @@ -910,7 +887,7 @@ Reden: {1} Gefeliciteerd! Je hebt {0} gewonnen voor het rollen boven de {1} - Dek geschud. + Dek herschud. heeft de munt op {0} gegooid @@ -949,22 +926,22 @@ Reden: {1} {0} heeft {1} gebruikers beloont met {2} rol. - Je kan niet meer dan {0} gokken + Je kan niet meer dan {0} wedden - Je kan niet minder dan {0} gokken + Je kan niet minder dan {0} wedden Je hebt niet genoeg {0} - Geen kaarten meer in het dek + Geen kaarten meer in het dek. - Verloten gebruiker + Verlootte gebruiker - Je hebt {0} gerold + Je hebt {0} gerold. Inzet @@ -976,7 +953,7 @@ Reden: {1} Een enkele {0}, x{1} - Wow! Gelukkig! Drie van dezelfde! x{0} + Wow! Wat een geluk! Three of a kind! x{0} Goed gedaan! Twee {0} - wed x{1} @@ -1007,28 +984,25 @@ Duurt {1} seconden. Vertel het aan niemand. Shhh. Terug naar de inhoudsopgave - Alleen Voor Bot Eigenaren - Fuzzy + Alleen voor Bot-eigenaren Heeft {0} kanaal rechten nodig. - Je kan het project steunen op patreon: <{0}> of paypal: <{1}> + Je kan het project steunen op Patreon: <{0}> of PayPal: <{1}> - Command en aliassen. - Fuzzy + Commando's en aliassen - Commandolijst Geregenereerd. - Fuzzy + Commandolijst gegenereerd. - Typ `{0}h CommandoNaam` om de hulp te zien voor die specifieke commando. b.v `{0}h >8bal` + Typ `{0}h CommandoNaam` om de uitleg te zien voor dat specifieke commando. b.v `{0}h >8bal` - Ik kan die commando niet vinden. Verifiëren of die commando echt bestaat voor dat je het opnieuw probeert. + Ik kan het commando niet vinden. Verifieer of dit commando echt bestaat voordat je het opnieuw probeert. Beschrijving @@ -1036,56 +1010,51 @@ Duurt {1} seconden. Vertel het aan niemand. Shhh. Je kan het NadekoBot project steunen op Patreon <{0}> of -Paypal <{1}> +PayPal <{1}> Vergeet niet je discord naam en id in het bericht te zetten. **Hartelijk bedankt** ♥️ **Lijst met commando's**: <{0}> -**Hosting gidsen en documenten kunnen hier gevonden worden**: <{1}> - Fuzzy +**Hosting tutorials en documenten kunnen hier gevonden worden**: <{1}> - Lijst Met Commando's - Fuzzy + Lijst met commando's - Lijst Met Modules - Fuzzy + Lijst met modules Typ `{0}cmds ModuleNaam` om een lijst van commando's te krijgen voor die module. bv `{0}cmds games` - Deze module bestaat niet + Deze module bestaat niet. Heeft {0} server rechten nodig. Inhoudsopgave - Fuzzy Gebruik - Autohentai gestart. Elke {0}s word een foto geplaatst met de volgende labels: + Autohentai gestart. Er wordt elke {0} seconden een foto geplaatst met de volgende labels: {1} - Fuzzy Label - Dieren race + Dierenrace - Gefaalt om te starten omdat er niet genoeg deelnemers zijn. + Gefaald om te starten omdat er niet genoeg deelnemers zijn. - De race is vol! De race wordt onmiddelijk gestart. + De race is vol! De race wordt onmiddellijk gestart. {0} doet mee als een {1} @@ -1097,10 +1066,10 @@ Vergeet niet je discord naam en id in het bericht te zetten. Typ {0}jr om mee te doen met de race. - De race zal beginnen in 20 seconden of wanneer de kamer is vol. + De race zal met 20 seconden beginnen of wanneer de kamer is vol. - De race zal beginnen met {0} deelnemers. + De race zal beginnen bij {0} deelnemers. {0} heeft de race gewonnen als {1}! @@ -1112,7 +1081,7 @@ Vergeet niet je discord naam en id in het bericht te zetten. Ongeldig nummer ingevoerd. Je kan de dobbelsteen van {0}-{1} rollen. - {0} gerold. + heeft {0} gerold. Someone rolled 35 @@ -1120,16 +1089,16 @@ Vergeet niet je discord naam en id in het bericht te zetten. Dice Rolled: 5 - Gefaalt om de race te starten. Een andere race is waarschijnlijk bezig. + Starten van de race is mislukt. Een andere race is waarschijnlijk bezig. - Geen enkele race bestaat op deze server. + Er bestaat geen enkele race op deze server - Het tweede nummer moet groter zijn dan het eerste nummer. + Het tweede nummer moet hoger zijn dan het eerste nummer. - Verandering van het hart + Ommezwaai Opgeëist door @@ -1138,13 +1107,13 @@ Vergeet niet je discord naam en id in het bericht te zetten. Scheidingen - Leuk + Likes Prijs - Nog geen waifus zijn overwonnen. + Er zijn nog geen waifus geclaimed. Top Waifus @@ -1153,33 +1122,33 @@ Vergeet niet je discord naam en id in het bericht te zetten. Jouw affiniteit is al ingesteld op een waifu, of je probeert om je affiniteit weg te halen terwijl je geen hebt. - Affiniteit verandert van {0} naar {1} + Affiniteit veranderd van {0} naar {1} -Dit is moreel twijfelachtig🤔 +*Dit is moreel gezien twijfelachtig.*🤔 Make sure to get the formatting right, and leave the thinking emoji Je moet {0} uren en {1} minuten wachten om je affiniteit weer te veranderen. - Jouw affiniteit is gereset. Je hebt geen persoon meer die je leuk vindt. + Je affiniteit is gereset. Je hebt geen persoon meer die je leuk vindt. wil {0}'s waifu zijn. Aww <3 - heeft {0} genomen als hun waifu voor {1}! + heeft {0} geclaimed als hun waifu voor {1}! - Je bent gescheiden met een waifu die jou leuk vindt. Jij harteloze monster. + Je bent gescheiden met een waifu die jou leuk vindt. Jij harteloos monster. {0} ontvangen {1} als compensatie. - Je kunt geen affiniteit zelf opzetten, jij opgeblazen egoist. + Je kunt geen affiniteit voor jezelf instellen, jij opgeblazen egoist. - 🎉Hun liefde overvloeit! 🎉 -{0} nieuwe waarde is {1}! + 🎉Hun liefde overvloeit! 🎉 +{0}'s nieuwe waarde is {1}! Geen enkele waifu is zo goedkoop. Je moet tenminste {0} betalen om een waifu te krijgen, ook al is hun echte waarde lager. @@ -1188,7 +1157,7 @@ Dit is moreel twijfelachtig🤔 Je moet tenminste {0} betalen om die waifu te nemen! - Die waifu is niet van jouw. + Die waifu is niet van jou. Je kunt jezelf niet als waifu nemen. @@ -1203,7 +1172,7 @@ Dit is moreel twijfelachtig🤔 Je bent gescheiden met een waifu die jou niet leuk vindt. Je krijgt {0} terug. - 8bal + 8ball Acrophobie @@ -1212,7 +1181,7 @@ Dit is moreel twijfelachtig🤔 Spel afgelopen zonder inzendingen. - Geen stemmen ingestuurdt. Spel geëindigd zonder winnaar. + Geen stemmen ingestuurd. Spel beëindigd zonder winnaar. Afkorting was {0} @@ -1254,10 +1223,10 @@ Dit is moreel twijfelachtig🤔 Inzendingen gesloten. - Dieren Race is al bezig. + Dierenrace is al bezig. - Totaal: {0} Gemiddelde: {1} + Totaal: {0} Gemiddeld: {1} Categorie @@ -1275,31 +1244,29 @@ Dit is moreel twijfelachtig🤔 Valuta generatie is ingeschakeld op dit kanaal. - {0} willekeurige {1} zijn verschenen! Pak ze op door `{2}pick` in te typen. - plural -Fuzzy + {0} willekeurige {1} zijn verschenen! + plural - Een willekeurige {0} is verschenen! Pak ze op door `{1}pick` in te typen. - Fuzzy + Een willekeurige {0} is verschenen! - Het laden van de vraag is gefaalt. + Het laden van de vraag is gefaald. Spel gestart. - Hangman + Galgje potje gestart - Er is al een spel galgje aan de gang in dit kanaal. + Er is al een potje galgje aan de gang in dit kanaal. Galgje kon niet opstarten vanwege een fout. - lijst van {0}Galgje term types: + Lijst van "{0}galgje" term types: Scoreboard @@ -1325,19 +1292,19 @@ Fuzzy Trivia spel - {0} heeft 'm geraden! Het antwoord was: {1} + {0} heeft 't geraden! Het antwoord was: {1} - Trivia is niet bezig in deze server. + Trivia is niet bezig op deze server. {0} heeft {1} punten - Stopt na deze vraag. + Er wordt gestopt na deze vraag. - Tijd is op! Het goede antwoord was {0} + De tijd is om! Het goede antwoord was {0} {0} heeft het antwoord geraden en wint het spel! Het antwoord was: {1} @@ -1346,13 +1313,13 @@ Fuzzy Je kan niet tegen jezelf spelen. - BoterKaasenEieren spel is al bezig in dit kannal. + Boter-Kaas-en-Eieren spel is al bezig in dit kanaal. Gelijkspel! - heeft een Boter, Kaas en eieren sessie aangemaakt. + heeft een Boter-Kaas-en-Eieren sessie aangemaakt. {0} heeft gewonnen! @@ -1373,7 +1340,7 @@ Fuzzy {0} tegen {1} - Aan het proberen om {0} liedjes in de wachtrij te zetten... + Aan het proberen om {0} tracks in de wachtrij te zetten... Autoplay uitgezet. @@ -1382,31 +1349,31 @@ Fuzzy Autoplay aangezet. - Standaard volume op {0}% gezet + Standaardvolume op {0}% gezet Map afspeellijst geladen/compleet. - Eerlijk spel. + fairplay - Liedje afgelopen + Track afgelopen: - Eerlijk spel uitgeschakeld. + Fairplay uitgeschakeld. - Eerlijk spel ingeschakeld. + Fairplay ingeschakeld. - van positie + Van positie ID - ongeldige invoer. + Ongeldige invoer. Maximale speeltijd heeft geen limiet meer. @@ -1418,7 +1385,7 @@ Fuzzy Maximale muziek wachtrij heeft geen limiet meer. - Maximale muziek wachtrij is nu {0} liedjes. + Maximale muziek wachtrij is nu {0} tracks. Je moet in het spraakkanaal van de server zijn. @@ -1443,26 +1410,26 @@ Fuzzy Speler afspeellijst - Pagina {0}/{1} - Liedje aan het spelen + Track speelt af - `#{0}` - **{1}** van *{2}* ({3} liedjes) + `#{0}` - **{1}** van *{2}* ({3} tracks) Pagina {0} van opgeslagen afspeellijsten - Afspeellijst verwijderd + Afspeellijst verwijderd. - Fout bij het verwijderen van de afspeellijst. Of het bestaat niet of U bent niet de auteur. + Fout bij het verwijderen van de afspeellijst. De afspeellijst bestaat niet of jij bent niet de eigenaar. Afspeellijst met dat ID bestaat niet. - Speler afspeellijst afgerond. + Afspeellijst wachtrij afgerond. Afspeellijst opgeslagen @@ -1474,7 +1441,7 @@ Fuzzy Wachtrij - Gekozen nummer + Nummer toegevoegd @@ -1484,41 +1451,41 @@ Fuzzy Wachtrij is vol op {0}/{0}. - Liedje verwijderd + Track verwijderd: context: "removed song #5" - Huidig liedje word herhaald + Huidige track word herhaald - Huidige afspeellijst word herhaald + Afspeellijst wordt herhaald - Herhaal nummer + Nummer wordt herhaald - Huidig nummer herhaling gestopt. + Huidige nummerherhaling gestopt. Nummer word hervat. - Herhaal afspeellijst uitgeschakeld. + Herhalende afspeellijst uitgeschakeld. - Herhaal afspeellijst ingeschakeld. + Herhalende afspeellijst ingeschakeld. - Muziek dat wordt gespeeld, afloopt, gepauzeerd en wordt verwijder laat ik in dit kanaal zien. + Tracks die worden afgespeeld, aflopen, gepauzeerd worden en worden verwijderd laat ik in dit kanaal zien. Overslaan naar `{0}:{1}` - Liedjes geschud + Tracks geschud - Liedje verzet + Track verzet {0}u {1}m {2}s @@ -1536,102 +1503,102 @@ Fuzzy Volume op {0}% gezet - Uitgeschakelde gebruik op alle moddelen in dit kanaal {0}. + ALLE MODULES zijn uitgeschakeld op kanaal {0}. - Ingeschakelde gebruik op alle moddelen in dit kanaal {0}. + ALLE MODULES zijn ingeschakeld op kanaal {0}. Toegestaan - Uitgeschakelde gebruik op alle moddelen voor deze rol {0}. + ALLE MODULES zijn uitgeschakeld voor deze rol {0}. - Ingeschakelde gebruik op alle moddelen voor deze rol{0}. + ALLE MODULES zijn ingeschakeld voor deze rol{0}. - Uitgeschakelde gebruik op alle moddelen in deze server. + ALLE MODULES zijn uitgeschakeld op deze server. - ingeschakelde gebruik op alle moddelen in deze server. + ALLE MODULES zijn ingeschakeld op deze server. - Uitgeschakelde gebruik op alle moddelen voor deze gebruiker{0}. + ALLE MODULES zijn uitgeschakeld voor deze gebruiker{0}. - Ingeschakelde gebruik op alle moddelen voor deze gebruiker{0}. + ALLE MODULES zijn ingeschakeld voor deze gebruiker{0}. Blacklisted {0} met ID {1} - Commando {0} heeft nu een {1}s afkoel tijd. + Commando {0} heeft nu een {1} seconden cooldown. - Commando {0} heeft geen afkoel tijd meer, en alle bestaande afkoeltijden zijn weggehaald. + Commando {0} heeft geen cooldown meer, en alle bestaande cooldowns zijn weggehaald. - Geen commando afkoeltijden ingesteld. + Geen commando cooldowns ingesteld. Command kosten - Uitgeschakelde gebruik van {0} {1} in kanaal {2}. + Gebruik van {0} {1} uitgeschakeld in kanaal {2}. - Ingeschakelde gebruik van {0} {1} in kanaal {2}. + Gebruik van {0} {1} ingeschakeld in kanaal {2}. Geweigerd - Woord {0} tegevoegd aan de lijst met foute woorden. + Woord {0} toegevoegd aan de lijst met gefilterde woorden. - Lijst van gefilterde worden + Lijst van gefilterde woorden - Woord {0} verwijderd van de lijst met foute woorden. + Woord {0} verwijderd van de lijst met gefilterde woorden. - Ongeldige tweede parameter.(Moet een number zijn tussen {0} en {1}) + Ongeldige tweede parameter (moet een nummer zijn tussen {0} en {1}). - Uitnodiging filter uitgeschakeld in dit kanaal. + Uitnodigingfilter uitgeschakeld in dit kanaal. - Uitnodiging filter ingeschakeld in dit kanaal. + Uitnodigingfilter ingeschakeld in dit kanaal. - Uitnodiging filter uitgeschakeld in deze server. + Uitnodigingfilter uitgeschakeld in deze server. - Uitnodiging filter ingeschakeld in deze server. + Uitnodigingfilter ingeschakeld in deze server. - Verplaat toestemming {0} voor #{1} naar #{2} + Toestemming {0} verplaatst van #{1} naar #{2} - Kan geen toestemming vinden in inhoudsopgave #{0} + Kan de toestemming niet vinden in inhoudsopgave #{0} Geen kosten ingesteld. - Commando + commando Gen (of command) - Module + module Gen. (of module) Rechten pagina {0} - Actueel toestemming rol is {0}. + Actuele toestemmingsrol is {0}. Gebruiker heeft nu {0} rol om toestemmingen te veranderen. @@ -1643,20 +1610,20 @@ Fuzzy Verwijderd toestemming #{0} - {1} - Uitgeschakelde gebruik van {0} {1} voor rol {2}. + Gebruik van {0} {1} uitgeschakeld voor rol {2}. - Ingeschakelde gebruik van {0} {1} voor rol {2}. + Gebruik van {0} {1} ingeschakeld voor rol {2}. - Seconden + sec. Short of seconds. - Uitgeschakelde gebruik van {0} {1} op deze server. + Gebruik van {0} {1} uitgeschakeld op deze server. - Ingeschakelde gebruik van {0} {1} op deze server. + Gebruik van {0} {1} ingeschakeld op deze server. Unblacklisted {0} met ID {1} @@ -1671,31 +1638,31 @@ Fuzzy Ingeschakelde gebruik van {0} {1} voor gebruiker {2}. - Ik zal geen permissie waarschuwingen meer weergeven. + Ik zal geen permissiewaarschuwingen meer weergeven. - Ik zal permissie waarschuwingen weergeven. + Ik zal permissiewaarschuwingen weergeven. - Woord filter gedeactiveerd in dit kanaal. + Woordfilter gedeactiveerd in dit kanaal. - Woord filter geactiveerd in dit kanaal. + Woordfilter geactiveerd in dit kanaal. - Woord filter gedeactiveerd in deze server. + Woordfilter gedeactiveerd in deze server. - Woord filter geactiveerd in deze server. + Woordfilter geactiveerd in deze server. - Talenten + Begaafdheid Nog geen favoriete anime - Gestart met het automatisch vertalen van berichten op dit kanaal. Gebruiker berichten worden automatisch verwijderd. + Gestart met het automatisch vertalen van berichten op dit kanaal. Berichten van gebruikers worden automatisch verwijderd. Jouw automatisch translatie taal is verwijderd. @@ -2211,7 +2178,7 @@ Eigenaar ID: {2} Geen speciale emojis gevonden. - {0} liedjes aan het spelen, {1} in de wachtrij + {0} tracks aan het spelen, {1} in de wachtrij Tekst Kanalen From 5996dc3ecf67f10fce3d6ba1641177f3cf05c2e0 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 27 Mar 2017 14:45:16 +0200 Subject: [PATCH 365/496] Update ResponseStrings.en-US.resx (POEditor.com) --- .../Resources/ResponseStrings.en-US.resx | 4328 ++++++++--------- 1 file changed, 2164 insertions(+), 2164 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.en-US.resx b/src/NadekoBot/Resources/ResponseStrings.en-US.resx index 3fb0ba18..ccff686e 100644 --- a/src/NadekoBot/Resources/ResponseStrings.en-US.resx +++ b/src/NadekoBot/Resources/ResponseStrings.en-US.resx @@ -1,4 +1,4 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 そのベースはもう要求・破壊されました。 @@ -856,7 +856,7 @@ Fuzzy ユーザー{1}にロール{0}を追加しました - Typo- "successfully" should be 'Successfully' + Typo- "Sucessfully" should be 'Successfully' ロールの追加に失敗しました。アクセス権が足りません。 From bb2e647dbd8e090db75c18b14b99f1abe5a2948c Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 27 Mar 2017 14:45:27 +0200 Subject: [PATCH 369/496] Update ResponseStrings.nb-NO.resx (POEditor.com) --- .../Resources/ResponseStrings.nb-NO.resx | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.nb-NO.resx b/src/NadekoBot/Resources/ResponseStrings.nb-NO.resx index f566494b..08aa81fa 100644 --- a/src/NadekoBot/Resources/ResponseStrings.nb-NO.resx +++ b/src/NadekoBot/Resources/ResponseStrings.nb-NO.resx @@ -2305,34 +2305,34 @@ Eier ID: {2} Stemmekanal-roller - + Meldingen som aktiverer reaksjonen med ID {0} vil ikke bli automatisk slettet. - + Meldingen som aktiverer reaksjonen med ID {0} vil bli automatisk slettet. - + Respons-meldingen for tilpasset reaksjon med ID {0} vil ikke bli sendt som DM. - + Respons-meldingen for tilpasset reaksjon med ID {0} vil bli sendt som DM - + Ingen alias funnet - + {0} er nå alias for {1} - + Liste over alias - + {0} har ikke lenger noe alias - + {0} hadde ikke noe alias - + Kompetitiv spilltid \ No newline at end of file From b84eeb055606982cfd95dd71ad32dc7f81119b2e Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 27 Mar 2017 14:45:29 +0200 Subject: [PATCH 370/496] Update ResponseStrings.pl-PL.resx (POEditor.com) --- .../Resources/ResponseStrings.pl-PL.resx | 45 ++++++++++--------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.pl-PL.resx b/src/NadekoBot/Resources/ResponseStrings.pl-PL.resx index 013b1cd8..2d71a47b 100644 --- a/src/NadekoBot/Resources/ResponseStrings.pl-PL.resx +++ b/src/NadekoBot/Resources/ResponseStrings.pl-PL.resx @@ -486,7 +486,7 @@ Powód: {1} - + Język bota ustawiony na {0} - {1} @@ -501,7 +501,8 @@ Powód: {1} Opuścił serwer {0} - + Logowanie wydarzenia {0} na tym kanale. + Fuzzy Logowanie wszystkich wydarzeń na tym kanale. @@ -513,7 +514,7 @@ Powód: {1} - + Logowanie będzie ignorowało {0} Logowanie nie będzie ignorowało {0} @@ -1816,7 +1817,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Oryginalny URL - + Klucz osu! API jest wymagany. @@ -1825,10 +1826,10 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Znaleziono {0} obrazków. Pokazuję przypadkowe {0} - + Nie znaleziono użytkownika! Proszę sprawdzić Region i BattleTag zanim znowu spróbujesz. - + Planowane Platforma @@ -1876,7 +1877,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Status - + Url sklepu Streamer {0} jest niedostępny. @@ -1898,7 +1899,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Stream prawdopodobnie nie istnieje. - + Usunięto stream użytkownika {0} ({1}) z powiadomień. @@ -1934,7 +1935,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Widzowie: - + Oglądane @@ -1949,7 +1950,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Szybkość wiatru - + Najczęściej banowane postacie w {0} Problem z napisaniem Twojego zdania w stylu Yody @@ -1966,7 +1967,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + Łącznie {0} użytkowników. Autor @@ -1987,13 +1988,13 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + {0} {1} wynosi {2} {3} - + Jednostki które mogą być przekonwertwane - + Nie można przekonwertować {0} na {1}: nie znaleziono jednostki @@ -2077,13 +2078,13 @@ ID właściciela: {2} - + Brak roli na tej stronie. - + Brak tematu. Właściciel @@ -2100,10 +2101,10 @@ ID właściciela: {2} {2} kanałów tekstowych - + Usunięto wszystkie cytaty ze słowem {0}. - + {0} strona cytatów @@ -2112,10 +2113,10 @@ ID właściciela: {2} - + Dodano cytat - + Usunięto cytat #{0} Region @@ -2184,7 +2185,7 @@ ID właściciela: {2} - + **Nazwa:** {0} **Link:** {1} Nie znaleziono żadnych specjalnych emotikon @@ -2196,7 +2197,7 @@ ID właściciela: {2} Kanały głosowe - + Twój link do pokoju: From 2ef207e4dc20c32cf8d8ac0477d3a714a3a69e1c Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 27 Mar 2017 14:45:32 +0200 Subject: [PATCH 371/496] Update ResponseStrings.pt-BR.resx (POEditor.com) --- src/NadekoBot/Resources/ResponseStrings.pt-BR.resx | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx b/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx index f24177e0..abbdde18 100644 --- a/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx +++ b/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx @@ -583,7 +583,7 @@ Razão: {1} Nenhum shard com aquele ID foi encontrado. - Mensagem Antiga + Mensagem Anterior Fuzzy @@ -794,14 +794,12 @@ __Canais Ignorados__: {2} Nome de usuário alterado - Fuzzy Usuários Usuário Banido - Fuzzy {0} foi **mutado** @@ -1134,7 +1132,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. O segundo número deve ser maior que o primeiro. - Mudanças no Coração + Mudanças de ideia Fuzzy @@ -1918,7 +1916,7 @@ Fuzzy Pontuação: - Busca Por: + Buscar Por: Fuzzy @@ -2094,8 +2092,7 @@ Fuzzy Índice fora de alcance. - Aqui está uma lista de usuários nestes cargos: - Fuzzy + Lista de usuários no cargo {0} você não tem permissão de usar esse comando em cargos com muitos usuários para prevenir abuso. @@ -2189,7 +2186,7 @@ OwnerID: {2} Citação adicionada - Uma citação aleatória foi removida. + Citação #{0} Deletada. Fuzzy From dd7e657900e1855ef41c213103e756b94f7b7953 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 27 Mar 2017 14:45:35 +0200 Subject: [PATCH 372/496] Update ResponseStrings.ru-RU.resx (POEditor.com) --- src/NadekoBot/Resources/ResponseStrings.ru-RU.resx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx b/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx index b1039c13..8edacbe6 100644 --- a/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx +++ b/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx @@ -1422,7 +1422,6 @@ Fuzzy Плейлист с таким номером не существует. - Fuzzy Добавление плейлиста в очередь завершено. @@ -1526,7 +1525,6 @@ Fuzzy {0} добавлено в чёрный список под номером {1} - Fuzzy У команды {0} теперь есть время перезарядки {1}c @@ -1624,7 +1622,6 @@ Fuzzy {0} с номером {1} убраны из черного списка. - Fuzzy нередактируемое @@ -2268,11 +2265,11 @@ Fuzzy Fuzzy - Ответное сообщение для настраеваемой реакцией с номером {0} не будет отправлено в ЛС. + Ответное сообщение для настраеваемой реакции с номером {0} не будет отправлено в ЛС. Fuzzy - Ответное сообщение для настраиваемой реакцией с номером {0} будет отправлено в ЛС. + Ответное сообщение для настраиваемой реакции с номером {0} будет отправлено в ЛС. Fuzzy From 616003d83122d9778f390764e6ed2004a9df5bca Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 27 Mar 2017 14:45:38 +0200 Subject: [PATCH 373/496] Update ResponseStrings.sr-cyrl-rs.resx (POEditor.com) --- .../Resources/ResponseStrings.sr-cyrl-rs.resx | 240 +++++++++--------- 1 file changed, 120 insertions(+), 120 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx b/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx index 8c3dd6c5..8fe7d18e 100644 --- a/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx +++ b/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx @@ -1,121 +1,121 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Та база је већ под захетвом или је уништена. @@ -364,7 +364,7 @@ Reason: {1} Content - successfully created role {0} + Sucessfully created role {0} Text channel {0} created. @@ -394,7 +394,7 @@ Reason: {1} DM from - successfully added a new donator.Total donated amount from this user: {0} 👑 + Sucessfully added a new donator.Total donated amount from this user: {0} 👑 Thanks to the people listed below for making this project hjappen! @@ -712,7 +712,7 @@ Reason: {1} You now have {0} role. - successfully added role {0} to user {1} + Sucessfully added role {0} to user {1} Failed to add role. I have insufficient permissions. From f8f23f9d3079184b452bd798099b6d08cddc4b93 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 27 Mar 2017 14:45:40 +0200 Subject: [PATCH 374/496] Update ResponseStrings.es-ES.resx (POEditor.com) From 7190c56751d45eedbfa20a902c197faa93db2b73 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 27 Mar 2017 14:45:43 +0200 Subject: [PATCH 375/496] Update ResponseStrings.sv-SE.resx (POEditor.com) --- .../Resources/ResponseStrings.sv-SE.resx | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.sv-SE.resx b/src/NadekoBot/Resources/ResponseStrings.sv-SE.resx index bd3d6093..6ee45f0f 100644 --- a/src/NadekoBot/Resources/ResponseStrings.sv-SE.resx +++ b/src/NadekoBot/Resources/ResponseStrings.sv-SE.resx @@ -156,7 +156,7 @@ Fuzzy - Lista Över Aktiva Krig + Lista över aktiva krig Fuzzy @@ -209,7 +209,7 @@ Nya egengjorda Reaktioner - Inga egnagjorde reaktioner hittades. + Inga custom reaktioner hittades. Fuzzy @@ -536,11 +536,11 @@ Anledning: {1} {0} flyttad från {1] till {2} - Meddelande Raderat i #{0} + Meddelande raderat i #{0} Fuzzy - Meddelande Uppdaterat i #{0} + Meddelande uppdaterat i #{0} Fuzzy @@ -561,19 +561,19 @@ Anledning: {1} Jag behöver **Administration** tillåtelse för att göra det där. - Nytt Meddelande + Ny meddelande Fuzzy - Nytt Smeknamn + Ny smeknamn Fuzzy - Nytt Ämne + Ny ämne Fuzzy - Smeknamn Ändrat + Smeknamn ändrat Fuzzy @@ -583,15 +583,15 @@ Anledning: {1} Ingen shard med den ID funnen - Gammalt Meddelande + Gammal meddelande Fuzzy - Gammalt Smeknamn + Gammal smeknamn Fuzzy - Gammalt Ämne + Gammal ämne Fuzzy @@ -601,7 +601,7 @@ Anledning: {1} Tillstånd för denna server har blivit återställt. - Aktiva Skydd + Aktiva skydd Fuzzy @@ -2342,7 +2342,7 @@ Medlemmar: {1} Meddelandet som triggrar den egengjorda reaktion med id {0} kommer bli - + Svar meddelande för custom reaktion med id {0} kommer inte att skickas som ett DM. @@ -2358,10 +2358,10 @@ Medlemmar: {1} Lista av aliaser - + Aktivering {0} har inte längre någon alias. - + Trigger {0} hade ingen alias. Kompetitiv speltid From 87514da13472042a2ae093e6eb6e1153bc044283 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 27 Mar 2017 14:45:46 +0200 Subject: [PATCH 376/496] Update ResponseStrings.tr-TR.resx (POEditor.com) From 2623af5e658bfa88c30ea3bf86b8fc4120028996 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 27 Mar 2017 14:45:48 +0200 Subject: [PATCH 377/496] Update ResponseStrings.it-IT.resx (POEditor.com) --- .../Resources/ResponseStrings.it-IT.resx | 234 +++++++++--------- 1 file changed, 117 insertions(+), 117 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.it-IT.resx b/src/NadekoBot/Resources/ResponseStrings.it-IT.resx index 7a09ef5d..5a922057 100644 --- a/src/NadekoBot/Resources/ResponseStrings.it-IT.resx +++ b/src/NadekoBot/Resources/ResponseStrings.it-IT.resx @@ -1,121 +1,121 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Quella base è già rivendicata o distrutta. From ccb90c7d154120797e96bd1fe70119390731a5b0 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 27 Mar 2017 14:45:51 +0200 Subject: [PATCH 378/496] Update ResponseStrings.he-IL.resx (POEditor.com) --- .../Resources/ResponseStrings.he-IL.resx | 234 +++++++++--------- 1 file changed, 117 insertions(+), 117 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.he-IL.resx b/src/NadekoBot/Resources/ResponseStrings.he-IL.resx index 5ddf049e..7f42401e 100644 --- a/src/NadekoBot/Resources/ResponseStrings.he-IL.resx +++ b/src/NadekoBot/Resources/ResponseStrings.he-IL.resx @@ -1,121 +1,121 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 הבסיס הזה נתפס או נהרס. From ff74c861f45e50e60748f47b9282cfb3daedd486 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 27 Mar 2017 14:45:53 +0200 Subject: [PATCH 379/496] Update ResponseStrings.ko-KR.resx (POEditor.com) --- .../Resources/ResponseStrings.ko-KR.resx | 236 +++++++++--------- 1 file changed, 118 insertions(+), 118 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.ko-KR.resx b/src/NadekoBot/Resources/ResponseStrings.ko-KR.resx index cf1c65d5..223b9397 100644 --- a/src/NadekoBot/Resources/ResponseStrings.ko-KR.resx +++ b/src/NadekoBot/Resources/ResponseStrings.ko-KR.resx @@ -1,121 +1,121 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 기지가 이미 요청되었거나 파괴되었습니다. @@ -794,7 +794,7 @@ Fuzzy 텍스트 채널이 삭제되었습니다. - destroyed means deleted? + destroyed means deleted? 디스트로이드 뜻이 삭제됬다는 건가요? From 81aec75d066c2b7fe7b95c412645ac4629ecc803 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 27 Mar 2017 14:55:25 +0200 Subject: [PATCH 380/496] upped version --- src/NadekoBot/Services/Impl/StatsService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Services/Impl/StatsService.cs b/src/NadekoBot/Services/Impl/StatsService.cs index 676d7407..ba0f5e37 100644 --- a/src/NadekoBot/Services/Impl/StatsService.cs +++ b/src/NadekoBot/Services/Impl/StatsService.cs @@ -16,7 +16,7 @@ namespace NadekoBot.Services.Impl private readonly DiscordShardedClient _client; private readonly DateTime _started; - public const string BotVersion = "1.25a"; + public const string BotVersion = "1.26"; public string Author => "Kwoth#2560"; public string Library => "Discord.Net"; From 1bf1dc90779f92f38657360e57fcf9627567be01 Mon Sep 17 00:00:00 2001 From: Hubcapp Date: Mon, 27 Mar 2017 08:26:11 -0500 Subject: [PATCH 381/496] Add more articles, mostly sourced from the ancient fortunes program for posix os's. Please review and reject any you find objectionable. I wasn't given any guidelines on how to pick these. I may add more after some feedback. --- src/NadekoBot/data/typing_articles.json | 272 ++++++++++++++++++++++++ 1 file changed, 272 insertions(+) diff --git a/src/NadekoBot/data/typing_articles.json b/src/NadekoBot/data/typing_articles.json index 9850103f..4666a5e7 100644 --- a/src/NadekoBot/data/typing_articles.json +++ b/src/NadekoBot/data/typing_articles.json @@ -262,4 +262,276 @@ { "Title":"A Dictionary of Psychology", "Text":"Entries are extensively cross-referenced for ease of use, and cover word origins and derivations as well as definitions. Over 80 illustrations complement the text." + }, + { + "Title":"darbian regarding how fast you can learn to speedrun" + "Text":"This depends on a number of factors. The answer will be very different for someone who doesn't have a lot of experience with videogames compared to someone who is already decent at retro platformers. In my case, it took about a year of playing on and off to get pretty competitive at the game, but there have been others who did it much faster. With some practice you can get a time that would really impress your friends after only a few days of practice." + }, + { + "Title":"Memes" + "Text":"The FitnessGram Pacer Test is a multistage aerobic capacity test that progressively gets more difficult as it continues. The 20 meter pacer test will begin in 30 seconds. Line up at the start. The running speed starts slowly, but gets faster each minute after you hear this signal. [beep] A single lap should be completed each time you hear this sound. [ding] Remember to run in a straight line, and run as long as possible. The second time you fail to complete a lap before the sound, your test is over. The test will begin on the word start. On your mark, get ready, start." + }, + { + "Title":"Literature quotes" + "Text":"A banker is a fellow who lends you his umbrella when the sun is shining and wants it back the minute it begins to rain. -- Mark Twain" + }, + { + "Title":"Literature quotes" + "Text":"A classic is something that everyone wants to have read and nobody wants to read. -- Mark Twain" + }, + { + "Title":"Literature quotes" + "Text":"After all, all he did was string together a lot of old, well-known quotations. -- H. L. Mencken, on Shakespeare" + }, + { + "Title":"Literature quotes" + "Text":"All generalizations are false, including this one. -- Mark Twain" + }, + { + "Title":"Literature quotes" + "Text":"All I know is what the words know, and dead things, and that makes a handsome little sum, with a beginning and a middle and an end, as in the well-built phrase and the long sonata of the dead. -- Samuel Beckett" + }, + { + "Title":"Literature quotes" + "Text":"All say, \"How hard it is that we have to die\" -- a strange complaint to come from the mouths of people who have had to live. -- Mark Twain" + }, + { + "Title":"Literature quotes" + "Text":"At once it struck me what quality went to form a man of achievement, especially in literature, and which Shakespeare possessed so enormously -- I mean negative capability, that is, when a man is capable of being in uncertainties, mysteries, doubts, without any irritable reaching after fact and reason. -- John Keats" + }, + { + "Title":"Pat Cadigan, \"Mindplayers\"" + "Text":"A morgue is a morgue is a morgue. They can paint the walls with aggressively cheerful primary colors and splashy bold graphics, but it's still a holding place for the dead until they can be parted out to organ banks. Not that I would have cared normally but my viewpoint was skewed. The relentless pleasance of the room I sat in seemed only grotesque." + }, + { + "Title":"Men & Women" + "Text":"A diplomatic husband said to his wife, \"How do you expect me to remember your birthday when you never look any older?\"" + }, + { + "Title":"James L. Collymore, \"Perfect Woman\"" + "Text":"I began many years ago, as so many young men do, in searching for the perfect woman. I believed that if I looked long enough, and hard enough, I would find her and then I would be secure for life. Well, the years and romances came and went, and I eventually ended up settling for someone a lot less than my idea of perfection. But one day, after many years together, I lay there on our bed recovering from a slight illness. My wife was sitting on a chair next to the bed, humming softly and watching the late afternoon sun filtering through the trees. The only sounds to be heard elsewhere were the clock ticking, the kettle downstairs starting to boil, and an occasional schoolchild passing beneath our window. And as I looked up into my wife's now wrinkled face, but still warm and twinkling eyes, I realized something about perfection... It comes only with time." + }, + { + "Title":"Famous quotes" + "Text":"I have now come to the conclusion never again to think of marrying, and for this reason: I can never be satisfied with anyone who would be blockhead enough to have me. -- Abraham Lincoln" + }, + { + "Title":"Men & Women" + "Text":"In the midst of one of the wildest parties he'd ever been to, the young man noticed a very prim and pretty girl sitting quietly apart from the rest of the revelers. Approaching her, he introduced himself and, after some quiet conversation, said, \"I'm afraid you and I don't really fit in with this jaded group. Why don't I take you home?\" \"Fine,\" said the girl, smiling up at him demurely. \"Where do you live?\"" + }, + { + "Title":"Encyclopadia Apocryphia, 1990 ed." + "Text":"There is no realizable power that man cannot, in time, fashion the tools to attain, nor any power so secure that the naked ape will not abuse it. So it is written in the genetic cards -- only physics and war hold him in check. And also the wife who wants him home by five, of course." + }, + { + "Title":"Susan Gordon" + "Text":"What publishers are looking for these days isn't radical feminism. It's corporate feminism -- a brand of feminism designed to sell books and magazines, three-piece suits, airline tickets, Scotch, cigarettes and, most important, corporate America's message, which runs: Yes, women were discriminated against in the past, but that unfortunate mistake has been remedied; now every woman can attain wealth, prestige and power by dint of individual rather than collective effort." + }, + { + "Title":"Susan Bolotin, \"Voices From the Post-Feminist Generation\"" + "Text":"When my freshman roommate at Cornell found out I was Jewish, she was, at her request, moved to a different room. She told me she didn't think she had ever seen a Jew before. My only response was to begin wearing a small Star of David on a chain around my neck. I had not become a more observing Jew; rather, discovering that the label of Jew was offensive to others made me want to let people know who I was and what I believed in. Similarly, after talking to these young women -- one of whom told me that she didn't think she had ever met a feminist -- I've taken to identifying myself as a feminist in the most unlikely of situations." + }, + { + "Title":"Medicine" + "Text":"Never die while in your doctor's prescence or under his direct care. This will only cause him needless inconvenience and embarassment." + }, + { + "Title":"Medicine" + "Text":"Human cardiac catheterization was introduced by Werner Forssman in 1929. Ignoring his department chief, and tying his assistant to an operating table to prevent her interference, he placed a ureteral catheter into a vein in his arm, advanced it to the right atrium [of his heart], and walked upstairs to the x-ray department where he took the confirmatory x-ray film. In 1956, Dr. Forssman was awarded the Nobel Prize." + }, + { + "Title":"The C Programming Language" + "Text":"In Chapter 3 we presented a Shell sort function that would sort an array of integers, and in Chapter 4 we improved on it with a quicksort. The same algorithms will work, except that now we have to deal with lines of text, which are of different lengths, and which, unlike integers, can't be compared or moved in a single operation." + }, + { + "Title":"Religious Texts" + "Text":"O ye who believe! Avoid suspicion as much (as possible): for suspicion in some cases in a sin: And spy not on each other behind their backs. Quran 49:12" + }, + { + "Title":"Religious Texts" + "Text":"If you want to destroy any nation without war, make adultery & nudity common in the next generation. -- Salahuddin Ayyubi" + }, + { + "Title":"Religious Texts" + "Text":"Whoever recommends and helps a good cause becomes a partner therein, and whoever recommends and helps an evil cause shares in its burdens. Quran 4:85" + }, + { + "Title":"Religious Texts" + "Text":"No servant can serve two masters. Either he will hate the one and love the other, or he will be devoted to the one and despise the other. You cannot serve both God and Money. Luke 16:13" + }, + { + "Title":"Religious Texts" + "Text":"So we do not lose heart. Though our outer man is wasting away, our inner self is being renewed day by day. For this light momentary affliction is preparing for us an eternal weight of glory beyond all comparison, as we look not to the things that are seen but to the things that are unseen. For the things that are seen are transient, but the things that are unseen are eternal. 2 Corinthians 4:16-18" + }, + { + "Title":"Religious Texts" + "Text":"And out of that hopeless attempt has come nearly all that we call human history -- money, poverty, ambition, war, prostitution, classes, empires, slavery -- the long terrible story of man trying to find something other than God which will make him happy. -- C.S. Lewis" + }, + { + "Title":"Medicine" + "Text":"Your digestive system is your body's Fun House, whereby food goes on a long, dark, scary ride, taking all kinds of unexpected twists and turns, being attacked by vicious secretions along the way, and not knowing until the last minute whether it will be turned into a useful body part or ejected into the Dark Hole by Mister Sphincter. We Americans live in a nation where the medical-care system is second to none in the world, unless you count maybe 25 or 30 little scuzzball countries like Scotland that we could vaporize in seconds if we felt like it. -- Dave Barry" + }, + { + "Title":"Medicine" + "Text":"The trouble with heart disease is that the first symptom is often hard to deal with: death. -- Michael Phelps" + }, + { + "Title":"Medicine" + "Text":"Never go to a doctor whose office plants have died -- Erma Bombeck" + }, + { + "Title":"Science" + "Text":"Albert Einstein, when asked to describe radio, replied: \"You see, wire telegraph is a kind of a very, very long cat. You pull his tail in NewYork and his head is meowing in Los Angeles. Do you understand this? And radio operates exactly the same way: you send signals here, they receive them there. The only difference is that there is no cat.\"" + }, + { + "Title":"Carl Sagan, \"The Fine Art of Baloney Detection\"" + "Text":"At the heart of science is an essential tension between two seemingly contradictory attitudes -- an openness to new ideas, no matter how bizarre or counterintuitive they may be, and the most ruthless skeptical scrutiny of all ideas, old and new. This is how deep truths are winnowed from deep nonsense. Of course, scientists make mistakes in trying to understand the world, but there is a built-in error-correcting mechanism: The collective enterprise of creative thinking and skeptical thinking together keeps the field on track." + }, + { + "Title":"#Octalthorpe" + "Text":"Back in the early 60's, touch tone phones only had 10 buttons. Some military versions had 16, while the 12 button jobs were used only by people who had \"diva\" (digital inquiry, voice answerback) systems -- mainly banks. Since in those days, only Western Electric made \"data sets\" (modems) the problems of terminology were all Bell System. We used to struggle with written descriptions of dial pads that were unfamiliar to most people (most phones were rotary then.) Partly in jest, some AT&T engineering types (there was no marketing in the good old days, which is why they were the good old days) made up the term \"octalthorpe\" (note spelling) to denote the \"pound sign.\" Presumably because it has 8 points sticking out. It never really caught on." + }, + { + "Title":"Science -- Edgar R. Fiedler" + "Text":"Economists state their GDP growth projections to the nearest tenth of a percentage point to prove they have a sense of humor." + }, + { + "Title":"Science -- R. Buckminster Fuller" + "Text":"Everything you've learned in school as \"obvious\" becomes less and less obvious as you begin to study the universe. For example, there are no solids in the universe. There's not even a suggestion of a solid. There are no absolute continuums. There are no surfaces. There are no straight lines." + }, + { + "Title":"Math" + "Text":"Factorials were someone's attempt to make math LOOK exciting." + }, + { + "Title":"Science -- Thomas L. Creed" + "Text":"Fortunately, the responsibility for providing evidence is on the part of the person making the claim, not the critic. It is not the responsibility of UFO skeptics to prove that a UFO has never existed, nor is it the responsibility of paranormal-health-claims skeptics to prove that crystals or colored lights never healed anyone. The skeptic's role is to point out claims that are not adequately supported by acceptable evidcence and to provide plausible alternative explanations that are more in keeping with the accepted body of scientific evidence." + }, + { + "Title":"Science -- H. L. Mencken, 1930" + "Text":"There is, in fact, no reason to believe that any given natural phenomenon, however marvelous it may seem today, will remain forever inexplicable. Soon or late the laws governing the production of life itself will be discovered in the laboratory, and man may set up business as a creator on his own account. The thing, indeed, is not only conceivable; it is even highly probable." + }, + { + "Title":"Science" + "Text":"When Alexander Graham Bell died in 1922, the telephone people interrupted service for one minute in his honor. They've been honoring him intermittently ever since, I believe." + }, + { + "Title":"Science -- Stanislaw Lem" + "Text":"When the Universe was not so out of whack as it is today, and all the stars were lined up in their proper places, you could easily count them from left to right, or top to bottom, and the larger and bluer ones were set apart, and the smaller yellowing types pushed off to the corners as bodies of a lower grade..." + }, + { + "Title":"Science -- Dave Barry" + "Text":"You should not use your fireplace, because scientists now believe that, contrary to popular opinion, fireplaces actually remove heat from houses. Really, that's what scientists believe. In fact many scientists actually use their fireplaces to cool their houses in the summer. If you visit a scientist's house on a sultry August day, you'll find a cheerful fire roaring on the hearth and the scientist sitting nearby, remarking on how cool he is and drinking heavily." + }, + { + "Title":"Sports" + "Text":"Although golf was originally restricted to wealthy, overweight Protestants, today it's open to anybody who owns hideous clothing. -- Dave Barry" + }, + { + "Title":"Sports" + "Text":"Now there's three things you can do in a baseball game: you can win, you can lose, or it can rain. -- Casey Stengel" + }, + { + "Title":"Sports" + "Text":"Once there was this conductor see, who had a bass problem. You see, during a portion of Beethovan's Ninth Symphony in which there are no bass violin parts, one of the bassists always passed a bottle of scotch around. So, to remind himself that the basses usually required an extra cue towards the end of the symphony, the conductor would fasten a piece of string around the page of the score before the bass cue. As the basses grew more and more inebriated, two of them fell asleep. The conductor grew quite nervous (he was very concerned about the pitch) because it was the bottom of the ninth; the score was tied and the basses were loaded with two out." + }, + { + "Title":"Sports" + "Text":"When I'm gone, boxing will be nothing again. The fans with the cigars and the hats turned down'll be there, but no more housewives and little men in the street and foreign presidents. It's goin' to be back to the fighter who comes to town, smells a flower, visits a hospital, blows a horn and says he's in shape. Old hat. I was the onliest boxer in history people asked questions like a senator. -- Muhammad Ali" + }, + { + "Title":"Sports" + "Text":"The surest way to remain a winner is to win once, and then not play any more." + }, + { + "Title":"Sports" + "Text":"The real problem with hunting elephants is carrying the decoys" + }, + { + "Title":"Sports -- Dizzy Dean" + "Text":"The pitcher wound up and he flang the ball at the batter. The batter swang and missed. The pitcher flang the ball again and this time the batter connected. He hit a high fly right to the center fielder. The center fielder was all set to catch the ball, but at the last minute his eyes were blound by the sun and he dropped it." + }, + { + "Title":"Sports -- Babe Ruth, in his 1948 farewell speech at Yankee Stadium" + "Text":"The only real game in the world, I think, is baseball... You've got to start way down, at the bottom, when you're six or seven years old. You can't wait until you're fifteen or sixteen. You've got to let it grow up with you, and if you're successful and you try hard enough, you're bound to come out on top, just like these boys have come to the top now." + }, + { + "Title":"Sports" + "Text":"The one sure way to make a lazy man look respectable is to put a fishing rod in his hand." + }, + { + "Title":"Linux -- Linus Torvalds in response to \"Other than the fact Linux has a cool name, could someone explain why I should use Linux over BSD?\"" + "Text":"No. That's it. The cool name, that is. We worked very hard on creating a name that would appeal to the majority of people, and it certainly paid off: thousands of people are using linux just to be able to say \"OS/2? Hah. I've got Linux. What a cool name\". 386BSD made the mistake of putting a lot of numbers and weird abbreviations into the name, and is scaring away a lot of people just because it sounds too technical." + }, + { + "Title":"Smart House" + "Text":"A teenager wins a fully automated dream house in a competition, but soon the computer controlling it begins to take over and everything gets out of control, then Ben the teenager calms down the computer named Pat and everything goes back to normal." + }, + { + "Title":"True Words of a Genius Philosopher" + "Text":"Writing non-free software is not an ethically legitimate activity, so if people who do this run into trouble, that's good! All businesses based on non-free software ought to fail, and the sooner the better. -- Richard Stallman" + }, + { + "Title":"Linux -- Jim Wright" + "Text":"You know, if Red Hat was smart, they'd have a fake front on their office building just for visitors, where you would board a magical trolley that took you past the smiling singing oompah loompahs who take the raw linux sugar and make it into Red Hat candy goodness. Then they could use it as a motivator for employees... Shape up, or you're spending time working \"the ride\"!" + }, + { + "Title":"True Words of a Genius Philosopher" + "Text":"Free software is software that gives you the user the freedom to share, study and modify it. We call this free software because the user is free." + }, + { + "Title":"True Words of a Genius Philosopher" + "Text":"To use free software is to make a political and ethical choice asserting the right to learn, and share what we learn with others. Free software has become the foundation of a learning society where we share our knowledge in a way that others can build upon and enjoy." + }, + { + "Title":"True Words of a Genius Philosopher" + "Text":"Currently, many people use proprietary software that denies users these freedoms and benefits. If we make a copy and give it to a friend, if we try to figure out how the program works, if we put a copy on more than one of our own computers in our own home, we could be caught and fined or put in jail. That's what's in the fine print of the license agreement you accept when using proprietary software." + }, + { + "Title":"True Words of a Genius Philosopher" + "Text":"The corporations behind proprietary software will often spy on your activities and restrict you from sharing with others. And because our computers control much of our personal information and daily activities, proprietary software represents an unacceptable danger to a free society." + }, + { + "Title":"Politics -- Donald Trump" + "Text":"When Mexico sends its people, they're not sending their best. They're not sending you. They're sending people that have lots of problems, and they're bringing those problems with us. They're bringing drugs. They're bringing crime. Their rapists. And some, I assume, are good people." + }, + { + "Title":"Politics -- Sir Winston Churchill, 1952" + "Text":"A prisoner of war is a man who tries to kill you and fails, and then asks you not to kill him." + }, + { + "Title":"Politics -- Johnny Hart" + "Text":"Cutting the space budget really restores my faith in humanity. It eliminates dreams, goals, and ideals and lets us get straight to the business of hate, debauchery, and self-annihilation." + }, + { + "Title":"Politics -- Winston Churchill" + "Text":"Democracy is the worst form of government except all those other forms that have been tried from time to time." + }, + { + "Title":"Politics" + "Text":"Each person has the right to take part in the management of public affairs in his country, provided he has prior experience, a will to succeed, a university degree, influential parents, good looks, a curriculum vitae, two 3x4 snapshots, and a good tax record." + }, + { + "Title":"Politics -- A Yippie Proverb" + "Text":"Free Speech Is The Right To Shout 'Theater' In A Crowded Fire." + }, + { + "Title":"Politics -- Boss Tweed" + "Text":"I don't care who does the electing as long as I get to do the nominating." + }, + { + "Title":"Politics -- Francis Bellamy, 1892" + "Text":"I pledge allegiance to the flag of the United States of America and to the republic for which it stands, one nation, indivisible, with liberty and justice for all." + }, + { + "Title":"Politics -- Napoleon" + "Text":"It follows that any commander in chief who undertakes to carry out a plan which he considers defective is at fault; he must put forth his reasons, insist of the plan being changed, and finally tender his resignation rather than be the instrument of his army's downfall." + }, + { + "Title":"Politics" + "Text":"Only two kinds of witnesses exist. The first live in a neighborhood where a crime has been committed and in no circumstances have ever seen anything or even heard a shot. The second category are the neighbors of anyone who happens to be accused of the crime. These have always looked out of their windows when the shot was fired, and have noticed the accused person standing peacefully on his balcony a few yards away." + }, + { + "Title":"Politics -- Frederick Douglass" + "Text":"Slaves are generally expected to sing as well as to work ... I did not, when a slave, understand the deep meanings of those rude, and apparently incoherent songs. I was myself within the circle, so that I neither saw nor heard as those without might see and hear. They told a tale which was then altogether beyond my feeble comprehension: they were tones, loud, long and deep, breathing the prayer and complaint of souls boiling over with the bitterest anguish. Every tone was a testimony against slavery, and a prayer to God for deliverance from chains." }] From 13d6775b2f1d2f265ba45dde752b1cb29a660eef Mon Sep 17 00:00:00 2001 From: Hubcapp Date: Mon, 27 Mar 2017 08:45:58 -0500 Subject: [PATCH 382/496] I think you'll need these. --- src/NadekoBot/data/typing_articles.json | 136 ++++++++++++------------ 1 file changed, 68 insertions(+), 68 deletions(-) diff --git a/src/NadekoBot/data/typing_articles.json b/src/NadekoBot/data/typing_articles.json index 4666a5e7..054573a0 100644 --- a/src/NadekoBot/data/typing_articles.json +++ b/src/NadekoBot/data/typing_articles.json @@ -264,274 +264,274 @@ "Text":"Entries are extensively cross-referenced for ease of use, and cover word origins and derivations as well as definitions. Over 80 illustrations complement the text." }, { - "Title":"darbian regarding how fast you can learn to speedrun" + "Title":"darbian regarding how fast you can learn to speedrun", "Text":"This depends on a number of factors. The answer will be very different for someone who doesn't have a lot of experience with videogames compared to someone who is already decent at retro platformers. In my case, it took about a year of playing on and off to get pretty competitive at the game, but there have been others who did it much faster. With some practice you can get a time that would really impress your friends after only a few days of practice." }, { - "Title":"Memes" + "Title":"Memes", "Text":"The FitnessGram Pacer Test is a multistage aerobic capacity test that progressively gets more difficult as it continues. The 20 meter pacer test will begin in 30 seconds. Line up at the start. The running speed starts slowly, but gets faster each minute after you hear this signal. [beep] A single lap should be completed each time you hear this sound. [ding] Remember to run in a straight line, and run as long as possible. The second time you fail to complete a lap before the sound, your test is over. The test will begin on the word start. On your mark, get ready, start." }, { - "Title":"Literature quotes" + "Title":"Literature quotes", "Text":"A banker is a fellow who lends you his umbrella when the sun is shining and wants it back the minute it begins to rain. -- Mark Twain" }, { - "Title":"Literature quotes" + "Title":"Literature quotes", "Text":"A classic is something that everyone wants to have read and nobody wants to read. -- Mark Twain" }, { - "Title":"Literature quotes" + "Title":"Literature quotes", "Text":"After all, all he did was string together a lot of old, well-known quotations. -- H. L. Mencken, on Shakespeare" }, { - "Title":"Literature quotes" + "Title":"Literature quotes", "Text":"All generalizations are false, including this one. -- Mark Twain" }, { - "Title":"Literature quotes" + "Title":"Literature quotes", "Text":"All I know is what the words know, and dead things, and that makes a handsome little sum, with a beginning and a middle and an end, as in the well-built phrase and the long sonata of the dead. -- Samuel Beckett" }, { - "Title":"Literature quotes" + "Title":"Literature quotes", "Text":"All say, \"How hard it is that we have to die\" -- a strange complaint to come from the mouths of people who have had to live. -- Mark Twain" }, { - "Title":"Literature quotes" + "Title":"Literature quotes", "Text":"At once it struck me what quality went to form a man of achievement, especially in literature, and which Shakespeare possessed so enormously -- I mean negative capability, that is, when a man is capable of being in uncertainties, mysteries, doubts, without any irritable reaching after fact and reason. -- John Keats" }, { - "Title":"Pat Cadigan, \"Mindplayers\"" + "Title":"Pat Cadigan, \"Mindplayers\"", "Text":"A morgue is a morgue is a morgue. They can paint the walls with aggressively cheerful primary colors and splashy bold graphics, but it's still a holding place for the dead until they can be parted out to organ banks. Not that I would have cared normally but my viewpoint was skewed. The relentless pleasance of the room I sat in seemed only grotesque." }, { - "Title":"Men & Women" + "Title":"Men & Women", "Text":"A diplomatic husband said to his wife, \"How do you expect me to remember your birthday when you never look any older?\"" }, { - "Title":"James L. Collymore, \"Perfect Woman\"" + "Title":"James L. Collymore, \"Perfect Woman\"", "Text":"I began many years ago, as so many young men do, in searching for the perfect woman. I believed that if I looked long enough, and hard enough, I would find her and then I would be secure for life. Well, the years and romances came and went, and I eventually ended up settling for someone a lot less than my idea of perfection. But one day, after many years together, I lay there on our bed recovering from a slight illness. My wife was sitting on a chair next to the bed, humming softly and watching the late afternoon sun filtering through the trees. The only sounds to be heard elsewhere were the clock ticking, the kettle downstairs starting to boil, and an occasional schoolchild passing beneath our window. And as I looked up into my wife's now wrinkled face, but still warm and twinkling eyes, I realized something about perfection... It comes only with time." }, { - "Title":"Famous quotes" + "Title":"Famous quotes", "Text":"I have now come to the conclusion never again to think of marrying, and for this reason: I can never be satisfied with anyone who would be blockhead enough to have me. -- Abraham Lincoln" }, { - "Title":"Men & Women" + "Title":"Men & Women", "Text":"In the midst of one of the wildest parties he'd ever been to, the young man noticed a very prim and pretty girl sitting quietly apart from the rest of the revelers. Approaching her, he introduced himself and, after some quiet conversation, said, \"I'm afraid you and I don't really fit in with this jaded group. Why don't I take you home?\" \"Fine,\" said the girl, smiling up at him demurely. \"Where do you live?\"" }, { - "Title":"Encyclopadia Apocryphia, 1990 ed." + "Title":"Encyclopadia Apocryphia, 1990 ed.", "Text":"There is no realizable power that man cannot, in time, fashion the tools to attain, nor any power so secure that the naked ape will not abuse it. So it is written in the genetic cards -- only physics and war hold him in check. And also the wife who wants him home by five, of course." }, { - "Title":"Susan Gordon" + "Title":"Susan Gordon", "Text":"What publishers are looking for these days isn't radical feminism. It's corporate feminism -- a brand of feminism designed to sell books and magazines, three-piece suits, airline tickets, Scotch, cigarettes and, most important, corporate America's message, which runs: Yes, women were discriminated against in the past, but that unfortunate mistake has been remedied; now every woman can attain wealth, prestige and power by dint of individual rather than collective effort." }, { - "Title":"Susan Bolotin, \"Voices From the Post-Feminist Generation\"" + "Title":"Susan Bolotin, \"Voices From the Post-Feminist Generation\"", "Text":"When my freshman roommate at Cornell found out I was Jewish, she was, at her request, moved to a different room. She told me she didn't think she had ever seen a Jew before. My only response was to begin wearing a small Star of David on a chain around my neck. I had not become a more observing Jew; rather, discovering that the label of Jew was offensive to others made me want to let people know who I was and what I believed in. Similarly, after talking to these young women -- one of whom told me that she didn't think she had ever met a feminist -- I've taken to identifying myself as a feminist in the most unlikely of situations." }, { - "Title":"Medicine" + "Title":"Medicine", "Text":"Never die while in your doctor's prescence or under his direct care. This will only cause him needless inconvenience and embarassment." }, { - "Title":"Medicine" + "Title":"Medicine", "Text":"Human cardiac catheterization was introduced by Werner Forssman in 1929. Ignoring his department chief, and tying his assistant to an operating table to prevent her interference, he placed a ureteral catheter into a vein in his arm, advanced it to the right atrium [of his heart], and walked upstairs to the x-ray department where he took the confirmatory x-ray film. In 1956, Dr. Forssman was awarded the Nobel Prize." }, { - "Title":"The C Programming Language" + "Title":"The C Programming Language", "Text":"In Chapter 3 we presented a Shell sort function that would sort an array of integers, and in Chapter 4 we improved on it with a quicksort. The same algorithms will work, except that now we have to deal with lines of text, which are of different lengths, and which, unlike integers, can't be compared or moved in a single operation." }, { - "Title":"Religious Texts" + "Title":"Religious Texts", "Text":"O ye who believe! Avoid suspicion as much (as possible): for suspicion in some cases in a sin: And spy not on each other behind their backs. Quran 49:12" }, { - "Title":"Religious Texts" + "Title":"Religious Texts", "Text":"If you want to destroy any nation without war, make adultery & nudity common in the next generation. -- Salahuddin Ayyubi" }, { - "Title":"Religious Texts" + "Title":"Religious Texts", "Text":"Whoever recommends and helps a good cause becomes a partner therein, and whoever recommends and helps an evil cause shares in its burdens. Quran 4:85" }, { - "Title":"Religious Texts" + "Title":"Religious Texts", "Text":"No servant can serve two masters. Either he will hate the one and love the other, or he will be devoted to the one and despise the other. You cannot serve both God and Money. Luke 16:13" }, { - "Title":"Religious Texts" + "Title":"Religious Texts", "Text":"So we do not lose heart. Though our outer man is wasting away, our inner self is being renewed day by day. For this light momentary affliction is preparing for us an eternal weight of glory beyond all comparison, as we look not to the things that are seen but to the things that are unseen. For the things that are seen are transient, but the things that are unseen are eternal. 2 Corinthians 4:16-18" }, { - "Title":"Religious Texts" + "Title":"Religious Texts", "Text":"And out of that hopeless attempt has come nearly all that we call human history -- money, poverty, ambition, war, prostitution, classes, empires, slavery -- the long terrible story of man trying to find something other than God which will make him happy. -- C.S. Lewis" }, { - "Title":"Medicine" + "Title":"Medicine", "Text":"Your digestive system is your body's Fun House, whereby food goes on a long, dark, scary ride, taking all kinds of unexpected twists and turns, being attacked by vicious secretions along the way, and not knowing until the last minute whether it will be turned into a useful body part or ejected into the Dark Hole by Mister Sphincter. We Americans live in a nation where the medical-care system is second to none in the world, unless you count maybe 25 or 30 little scuzzball countries like Scotland that we could vaporize in seconds if we felt like it. -- Dave Barry" }, { - "Title":"Medicine" + "Title":"Medicine", "Text":"The trouble with heart disease is that the first symptom is often hard to deal with: death. -- Michael Phelps" }, { - "Title":"Medicine" + "Title":"Medicine", "Text":"Never go to a doctor whose office plants have died -- Erma Bombeck" }, { - "Title":"Science" + "Title":"Science", "Text":"Albert Einstein, when asked to describe radio, replied: \"You see, wire telegraph is a kind of a very, very long cat. You pull his tail in NewYork and his head is meowing in Los Angeles. Do you understand this? And radio operates exactly the same way: you send signals here, they receive them there. The only difference is that there is no cat.\"" }, { - "Title":"Carl Sagan, \"The Fine Art of Baloney Detection\"" + "Title":"Carl Sagan, \"The Fine Art of Baloney Detection\"", "Text":"At the heart of science is an essential tension between two seemingly contradictory attitudes -- an openness to new ideas, no matter how bizarre or counterintuitive they may be, and the most ruthless skeptical scrutiny of all ideas, old and new. This is how deep truths are winnowed from deep nonsense. Of course, scientists make mistakes in trying to understand the world, but there is a built-in error-correcting mechanism: The collective enterprise of creative thinking and skeptical thinking together keeps the field on track." }, { - "Title":"#Octalthorpe" + "Title":"#Octalthorpe", "Text":"Back in the early 60's, touch tone phones only had 10 buttons. Some military versions had 16, while the 12 button jobs were used only by people who had \"diva\" (digital inquiry, voice answerback) systems -- mainly banks. Since in those days, only Western Electric made \"data sets\" (modems) the problems of terminology were all Bell System. We used to struggle with written descriptions of dial pads that were unfamiliar to most people (most phones were rotary then.) Partly in jest, some AT&T engineering types (there was no marketing in the good old days, which is why they were the good old days) made up the term \"octalthorpe\" (note spelling) to denote the \"pound sign.\" Presumably because it has 8 points sticking out. It never really caught on." }, { - "Title":"Science -- Edgar R. Fiedler" + "Title":"Science -- Edgar R. Fiedler", "Text":"Economists state their GDP growth projections to the nearest tenth of a percentage point to prove they have a sense of humor." }, { - "Title":"Science -- R. Buckminster Fuller" + "Title":"Science -- R. Buckminster Fuller", "Text":"Everything you've learned in school as \"obvious\" becomes less and less obvious as you begin to study the universe. For example, there are no solids in the universe. There's not even a suggestion of a solid. There are no absolute continuums. There are no surfaces. There are no straight lines." }, { - "Title":"Math" + "Title":"Math", "Text":"Factorials were someone's attempt to make math LOOK exciting." }, { - "Title":"Science -- Thomas L. Creed" + "Title":"Science -- Thomas L. Creed", "Text":"Fortunately, the responsibility for providing evidence is on the part of the person making the claim, not the critic. It is not the responsibility of UFO skeptics to prove that a UFO has never existed, nor is it the responsibility of paranormal-health-claims skeptics to prove that crystals or colored lights never healed anyone. The skeptic's role is to point out claims that are not adequately supported by acceptable evidcence and to provide plausible alternative explanations that are more in keeping with the accepted body of scientific evidence." }, { - "Title":"Science -- H. L. Mencken, 1930" + "Title":"Science -- H. L. Mencken, 1930", "Text":"There is, in fact, no reason to believe that any given natural phenomenon, however marvelous it may seem today, will remain forever inexplicable. Soon or late the laws governing the production of life itself will be discovered in the laboratory, and man may set up business as a creator on his own account. The thing, indeed, is not only conceivable; it is even highly probable." }, { - "Title":"Science" + "Title":"Science", "Text":"When Alexander Graham Bell died in 1922, the telephone people interrupted service for one minute in his honor. They've been honoring him intermittently ever since, I believe." }, { - "Title":"Science -- Stanislaw Lem" + "Title":"Science -- Stanislaw Lem", "Text":"When the Universe was not so out of whack as it is today, and all the stars were lined up in their proper places, you could easily count them from left to right, or top to bottom, and the larger and bluer ones were set apart, and the smaller yellowing types pushed off to the corners as bodies of a lower grade..." }, { - "Title":"Science -- Dave Barry" + "Title":"Science -- Dave Barry", "Text":"You should not use your fireplace, because scientists now believe that, contrary to popular opinion, fireplaces actually remove heat from houses. Really, that's what scientists believe. In fact many scientists actually use their fireplaces to cool their houses in the summer. If you visit a scientist's house on a sultry August day, you'll find a cheerful fire roaring on the hearth and the scientist sitting nearby, remarking on how cool he is and drinking heavily." }, { - "Title":"Sports" + "Title":"Sports", "Text":"Although golf was originally restricted to wealthy, overweight Protestants, today it's open to anybody who owns hideous clothing. -- Dave Barry" }, { - "Title":"Sports" + "Title":"Sports", "Text":"Now there's three things you can do in a baseball game: you can win, you can lose, or it can rain. -- Casey Stengel" }, { - "Title":"Sports" + "Title":"Sports", "Text":"Once there was this conductor see, who had a bass problem. You see, during a portion of Beethovan's Ninth Symphony in which there are no bass violin parts, one of the bassists always passed a bottle of scotch around. So, to remind himself that the basses usually required an extra cue towards the end of the symphony, the conductor would fasten a piece of string around the page of the score before the bass cue. As the basses grew more and more inebriated, two of them fell asleep. The conductor grew quite nervous (he was very concerned about the pitch) because it was the bottom of the ninth; the score was tied and the basses were loaded with two out." }, { - "Title":"Sports" + "Title":"Sports", "Text":"When I'm gone, boxing will be nothing again. The fans with the cigars and the hats turned down'll be there, but no more housewives and little men in the street and foreign presidents. It's goin' to be back to the fighter who comes to town, smells a flower, visits a hospital, blows a horn and says he's in shape. Old hat. I was the onliest boxer in history people asked questions like a senator. -- Muhammad Ali" }, { - "Title":"Sports" + "Title":"Sports", "Text":"The surest way to remain a winner is to win once, and then not play any more." }, { - "Title":"Sports" + "Title":"Sports", "Text":"The real problem with hunting elephants is carrying the decoys" }, { - "Title":"Sports -- Dizzy Dean" + "Title":"Sports -- Dizzy Dean", "Text":"The pitcher wound up and he flang the ball at the batter. The batter swang and missed. The pitcher flang the ball again and this time the batter connected. He hit a high fly right to the center fielder. The center fielder was all set to catch the ball, but at the last minute his eyes were blound by the sun and he dropped it." }, { - "Title":"Sports -- Babe Ruth, in his 1948 farewell speech at Yankee Stadium" + "Title":"Sports -- Babe Ruth, in his 1948 farewell speech at Yankee Stadium", "Text":"The only real game in the world, I think, is baseball... You've got to start way down, at the bottom, when you're six or seven years old. You can't wait until you're fifteen or sixteen. You've got to let it grow up with you, and if you're successful and you try hard enough, you're bound to come out on top, just like these boys have come to the top now." }, { - "Title":"Sports" + "Title":"Sports", "Text":"The one sure way to make a lazy man look respectable is to put a fishing rod in his hand." }, { - "Title":"Linux -- Linus Torvalds in response to \"Other than the fact Linux has a cool name, could someone explain why I should use Linux over BSD?\"" + "Title":"Linux -- Linus Torvalds in response to \"Other than the fact Linux has a cool name, could someone explain why I should use Linux over BSD?\"", "Text":"No. That's it. The cool name, that is. We worked very hard on creating a name that would appeal to the majority of people, and it certainly paid off: thousands of people are using linux just to be able to say \"OS/2? Hah. I've got Linux. What a cool name\". 386BSD made the mistake of putting a lot of numbers and weird abbreviations into the name, and is scaring away a lot of people just because it sounds too technical." }, { - "Title":"Smart House" + "Title":"Smart House", "Text":"A teenager wins a fully automated dream house in a competition, but soon the computer controlling it begins to take over and everything gets out of control, then Ben the teenager calms down the computer named Pat and everything goes back to normal." }, { - "Title":"True Words of a Genius Philosopher" + "Title":"True Words of a Genius Philosopher", "Text":"Writing non-free software is not an ethically legitimate activity, so if people who do this run into trouble, that's good! All businesses based on non-free software ought to fail, and the sooner the better. -- Richard Stallman" }, { - "Title":"Linux -- Jim Wright" + "Title":"Linux -- Jim Wright", "Text":"You know, if Red Hat was smart, they'd have a fake front on their office building just for visitors, where you would board a magical trolley that took you past the smiling singing oompah loompahs who take the raw linux sugar and make it into Red Hat candy goodness. Then they could use it as a motivator for employees... Shape up, or you're spending time working \"the ride\"!" }, { - "Title":"True Words of a Genius Philosopher" + "Title":"True Words of a Genius Philosopher", "Text":"Free software is software that gives you the user the freedom to share, study and modify it. We call this free software because the user is free." }, { - "Title":"True Words of a Genius Philosopher" + "Title":"True Words of a Genius Philosopher", "Text":"To use free software is to make a political and ethical choice asserting the right to learn, and share what we learn with others. Free software has become the foundation of a learning society where we share our knowledge in a way that others can build upon and enjoy." }, { - "Title":"True Words of a Genius Philosopher" + "Title":"True Words of a Genius Philosopher", "Text":"Currently, many people use proprietary software that denies users these freedoms and benefits. If we make a copy and give it to a friend, if we try to figure out how the program works, if we put a copy on more than one of our own computers in our own home, we could be caught and fined or put in jail. That's what's in the fine print of the license agreement you accept when using proprietary software." }, { - "Title":"True Words of a Genius Philosopher" + "Title":"True Words of a Genius Philosopher", "Text":"The corporations behind proprietary software will often spy on your activities and restrict you from sharing with others. And because our computers control much of our personal information and daily activities, proprietary software represents an unacceptable danger to a free society." }, { - "Title":"Politics -- Donald Trump" + "Title":"Politics -- Donald Trump", "Text":"When Mexico sends its people, they're not sending their best. They're not sending you. They're sending people that have lots of problems, and they're bringing those problems with us. They're bringing drugs. They're bringing crime. Their rapists. And some, I assume, are good people." }, { - "Title":"Politics -- Sir Winston Churchill, 1952" + "Title":"Politics -- Sir Winston Churchill, 1952", "Text":"A prisoner of war is a man who tries to kill you and fails, and then asks you not to kill him." }, { - "Title":"Politics -- Johnny Hart" + "Title":"Politics -- Johnny Hart", "Text":"Cutting the space budget really restores my faith in humanity. It eliminates dreams, goals, and ideals and lets us get straight to the business of hate, debauchery, and self-annihilation." }, { - "Title":"Politics -- Winston Churchill" + "Title":"Politics -- Winston Churchill", "Text":"Democracy is the worst form of government except all those other forms that have been tried from time to time." }, { - "Title":"Politics" + "Title":"Politics", "Text":"Each person has the right to take part in the management of public affairs in his country, provided he has prior experience, a will to succeed, a university degree, influential parents, good looks, a curriculum vitae, two 3x4 snapshots, and a good tax record." }, { - "Title":"Politics -- A Yippie Proverb" + "Title":"Politics -- A Yippie Proverb", "Text":"Free Speech Is The Right To Shout 'Theater' In A Crowded Fire." }, { - "Title":"Politics -- Boss Tweed" + "Title":"Politics -- Boss Tweed", "Text":"I don't care who does the electing as long as I get to do the nominating." }, { - "Title":"Politics -- Francis Bellamy, 1892" + "Title":"Politics -- Francis Bellamy, 1892", "Text":"I pledge allegiance to the flag of the United States of America and to the republic for which it stands, one nation, indivisible, with liberty and justice for all." }, { - "Title":"Politics -- Napoleon" + "Title":"Politics -- Napoleon", "Text":"It follows that any commander in chief who undertakes to carry out a plan which he considers defective is at fault; he must put forth his reasons, insist of the plan being changed, and finally tender his resignation rather than be the instrument of his army's downfall." }, { - "Title":"Politics" + "Title":"Politics", "Text":"Only two kinds of witnesses exist. The first live in a neighborhood where a crime has been committed and in no circumstances have ever seen anything or even heard a shot. The second category are the neighbors of anyone who happens to be accused of the crime. These have always looked out of their windows when the shot was fired, and have noticed the accused person standing peacefully on his balcony a few yards away." }, { - "Title":"Politics -- Frederick Douglass" + "Title":"Politics -- Frederick Douglass", "Text":"Slaves are generally expected to sing as well as to work ... I did not, when a slave, understand the deep meanings of those rude, and apparently incoherent songs. I was myself within the circle, so that I neither saw nor heard as those without might see and hear. They told a tale which was then altogether beyond my feeble comprehension: they were tones, loud, long and deep, breathing the prayer and complaint of souls boiling over with the bitterest anguish. Every tone was a testimony against slavery, and a prayer to God for deliverance from chains." }] From ec24ac38864b78faa6340bde78f29524667c4cbf Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 28 Mar 2017 08:34:35 +0200 Subject: [PATCH 383/496] Added a big part of basic patreon stuff, but can't activate it yet, waiting for their email reply to check some things --- .../Utility/Commands/PatreonCommands.cs | 182 ++++++++++-------- .../Modules/Utility/Models/PatreonData.cs | 31 ++- .../Modules/Utility/Models/PatreonPledge.cs | 68 +++++++ .../Modules/Utility/Models/PatreonUser.cs | 70 +++++++ .../Database/Models/PatreonRewards.cs | 15 ++ 5 files changed, 271 insertions(+), 95 deletions(-) create mode 100644 src/NadekoBot/Modules/Utility/Models/PatreonPledge.cs create mode 100644 src/NadekoBot/Modules/Utility/Models/PatreonUser.cs create mode 100644 src/NadekoBot/Services/Database/Models/PatreonRewards.cs diff --git a/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs b/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs index b347330f..c8908abe 100644 --- a/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs +++ b/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs @@ -1,78 +1,110 @@ -using System.Collections.Generic; -using System.Linq; -using System.Net.Http; -using System.Threading.Tasks; -using Discord.Commands; -using Discord; -using NadekoBot.Attributes; -using NadekoBot.Modules.Utility.Models; -using Newtonsoft.Json; +//using System.Collections.Generic; +//using System.Linq; +//using System.Net.Http; +//using System.Threading.Tasks; +//using Discord.Commands; +//using NadekoBot.Attributes; +//using NadekoBot.Modules.Utility.Models; +//using Newtonsoft.Json; +//using System.Threading; +//using System; +//using System.Collections.Immutable; -namespace NadekoBot.Modules.Utility -{ - public partial class Utility - { - //[Group] - //public class PatreonCommands : NadekoSubmodule - //{ - // [NadekoCommand, Usage, Description, Aliases] - // [RequireContext(ContextType.Guild)] - // public async Task ClaimPatreonRewards([Remainder] string arg) - // { - // var pledges = await GetPledges2(); - // } +//namespace NadekoBot.Modules.Utility +//{ +// public partial class Utility +// { +// [Group] +// public class PatreonCommands : NadekoSubmodule +// { +// [NadekoCommand, Usage, Description, Aliases] +// public async Task ClaimPatreonRewards() +// { +// var patreon = PatreonThingy.Instance; - // private static async Task GetPledges() - // { - // var pledges = new List(); - // using (var http = new HttpClient()) - // { - // http.DefaultRequestHeaders.Clear(); - // http.DefaultRequestHeaders.Add("Authorization", "Bearer " + NadekoBot.Credentials.PatreonAccessToken); - // var data = new PatreonData() - // { - // Links = new Links() - // { - // Next = "https://api.patreon.com/oauth2/api/campaigns/334038/pledges" - // } - // }; - // do - // { - // var res = - // await http.GetStringAsync(data.Links.Next) - // .ConfigureAwait(false); - // data = JsonConvert.DeserializeObject(res); - // pledges.AddRange(data.Data); - // } while (!string.IsNullOrWhiteSpace(data.Links.Next)); - // } - // return pledges.Where(x => string.IsNullOrWhiteSpace(x.Attributes.declined_since)).ToArray(); - // } +// var pledges = (await patreon.GetPledges().ConfigureAwait(false)) +// .OrderByDescending(x => x.Reward.attributes.amount_cents); - // private static async Task GetPledges2() - // { - // var pledges = new List(); - // using (var http = new HttpClient()) - // { - // http.DefaultRequestHeaders.Clear(); - // http.DefaultRequestHeaders.Add("Authorization", "Bearer " + NadekoBot.Credentials.PatreonAccessToken); - // var data = new PatreonData() - // { - // Links = new Links() - // { - // Next = "https://api.patreon.com/oauth2/api/current_user/campaigns?include=pledges" - // } - // }; - // do - // { - // var res = - // await http.GetStringAsync(data.Links.Next) - // .ConfigureAwait(false); - // data = JsonConvert.DeserializeObject(res); - // pledges.AddRange(data.Data); - // } while (!string.IsNullOrWhiteSpace(data.Links.Next)); - // } - // return pledges.Where(x => string.IsNullOrWhiteSpace(x.Attributes.declined_since)).ToArray(); - // } - //} - } -} +// if (pledges == null) +// { +// await ReplyErrorLocalized("pledges_loading").ConfigureAwait(false); +// return; +// } + +// } +// } + +// public class PatreonThingy +// { +// public static PatreonThingy _instance = new PatreonThingy(); +// public static PatreonThingy Instance => _instance; + +// private readonly SemaphoreSlim getPledgesLocker = new SemaphoreSlim(1, 1); + +// private ImmutableArray pledges; + +// static PatreonThingy() { } + +// public async Task> GetPledges() +// { +// try +// { +// await LoadPledges().ConfigureAwait(false); +// return pledges; +// } +// catch (OperationCanceledException) +// { +// return pledges; +// } +// } + +// public async Task LoadPledges() +// { +// await getPledgesLocker.WaitAsync(1000).ConfigureAwait(false); +// try +// { +// var rewards = new List(); +// var users = new List(); +// using (var http = new HttpClient()) +// { +// http.DefaultRequestHeaders.Clear(); +// http.DefaultRequestHeaders.Add("Authorization", "Bearer " + NadekoBot.Credentials.PatreonAccessToken); +// var data = new PatreonData() +// { +// Links = new PatreonDataLinks() +// { +// next = "https://api.patreon.com/oauth2/api/campaigns/334038/pledges" +// } +// }; +// do +// { +// var res = await http.GetStringAsync(data.Links.next) +// .ConfigureAwait(false); +// data = JsonConvert.DeserializeObject(res); +// var pledgers = data.Data.Where(x => x["type"].ToString() == "pledge"); +// rewards.AddRange(pledgers.Select(x => JsonConvert.DeserializeObject(x.ToString())) +// .Where(x => x.attributes.declined_since == null)); +// users.AddRange(data.Included +// .Where(x => x["type"].ToString() == "user") +// .Select(x => JsonConvert.DeserializeObject(x.ToString()))); +// } while (!string.IsNullOrWhiteSpace(data.Links.next)); +// } +// pledges = rewards.Join(users, (r) => r.relationships?.patron?.data?.id, (u) => u.id, (x, y) => new PatreonUserAndReward() +// { +// User = y, +// Reward = x, +// }).ToImmutableArray(); +// } +// finally +// { +// var _ = Task.Run(async () => +// { +// await Task.Delay(TimeSpan.FromMinutes(5)).ConfigureAwait(false); +// getPledgesLocker.Release(); +// }); + +// } +// } +// } +// } +//} diff --git a/src/NadekoBot/Modules/Utility/Models/PatreonData.cs b/src/NadekoBot/Modules/Utility/Models/PatreonData.cs index 381666e8..87ab3f91 100644 --- a/src/NadekoBot/Modules/Utility/Models/PatreonData.cs +++ b/src/NadekoBot/Modules/Utility/Models/PatreonData.cs @@ -1,4 +1,5 @@ -using System; +using Newtonsoft.Json.Linq; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -6,32 +7,22 @@ using System.Threading.Tasks; namespace NadekoBot.Modules.Utility.Models { - public class PatreonData { - public Pledge[] Data { get; set; } - public Links Links { get; set; } + public JObject[] Included { get; set; } + public JObject[] Data { get; set; } + public PatreonDataLinks Links { get; set; } } - public class Attributes + public class PatreonDataLinks { - public int amount_cents { get; set; } - public string created_at { get; set; } - public string declined_since { get; set; } - public bool is_twitch_pledge { get; set; } - public bool patron_pays_fees { get; set; } - public int pledge_cap_cents { get; set; } + public string first { get; set; } + public string next { get; set; } } - public class Pledge + public class PatreonUserAndReward { - public Attributes Attributes { get; set; } - public int Id { get; set; } - } - - public class Links - { - public string First { get; set; } - public string Next { get; set; } + public PatreonUser User { get; set; } + public PatreonPledge Reward { get; set; } } } diff --git a/src/NadekoBot/Modules/Utility/Models/PatreonPledge.cs b/src/NadekoBot/Modules/Utility/Models/PatreonPledge.cs new file mode 100644 index 00000000..1ea3bd3a --- /dev/null +++ b/src/NadekoBot/Modules/Utility/Models/PatreonPledge.cs @@ -0,0 +1,68 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace NadekoBot.Modules.Utility.Models +{ + public class Attributes + { + public int amount_cents { get; set; } + public string created_at { get; set; } + public object declined_since { get; set; } + public bool is_twitch_pledge { get; set; } + public bool patron_pays_fees { get; set; } + public int pledge_cap_cents { get; set; } + } + + public class Address + { + public object data { get; set; } + } + + public class Data + { + public string id { get; set; } + public string type { get; set; } + } + + public class Links + { + public string related { get; set; } + } + + public class Creator + { + public Data data { get; set; } + public Links links { get; set; } + } + + public class Patron + { + public Data data { get; set; } + public Links links { get; set; } + } + + public class Reward + { + public Data data { get; set; } + public Links links { get; set; } + } + + public class Relationships + { + public Address address { get; set; } + public Creator creator { get; set; } + public Patron patron { get; set; } + public Reward reward { get; set; } + } + + public class PatreonPledge + { + public Attributes attributes { get; set; } + public string id { get; set; } + public Relationships relationships { get; set; } + public string type { get; set; } + } +} diff --git a/src/NadekoBot/Modules/Utility/Models/PatreonUser.cs b/src/NadekoBot/Modules/Utility/Models/PatreonUser.cs new file mode 100644 index 00000000..353a493a --- /dev/null +++ b/src/NadekoBot/Modules/Utility/Models/PatreonUser.cs @@ -0,0 +1,70 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace NadekoBot.Modules.Utility.Models +{ + public class DiscordConnection + { + public string user_id { get; set; } + } + + public class SocialConnections + { + public object deviantart { get; set; } + public DiscordConnection discord { get; set; } + public object facebook { get; set; } + public object spotify { get; set; } + public object twitch { get; set; } + public object twitter { get; set; } + public object youtube { get; set; } + } + + public class UserAttributes + { + public string about { get; set; } + public string created { get; set; } + public object discord_id { get; set; } + public string email { get; set; } + public object facebook { get; set; } + public object facebook_id { get; set; } + public string first_name { get; set; } + public string full_name { get; set; } + public int gender { get; set; } + public bool has_password { get; set; } + public string image_url { get; set; } + public bool is_deleted { get; set; } + public bool is_nuked { get; set; } + public bool is_suspended { get; set; } + public string last_name { get; set; } + public SocialConnections social_connections { get; set; } + public int status { get; set; } + public string thumb_url { get; set; } + public object twitch { get; set; } + public string twitter { get; set; } + public string url { get; set; } + public string vanity { get; set; } + public object youtube { get; set; } + } + + public class Campaign + { + public Data data { get; set; } + public Links links { get; set; } + } + + public class UserRelationships + { + public Campaign campaign { get; set; } + } + + public class PatreonUser + { + public UserAttributes attributes { get; set; } + public string id { get; set; } + public UserRelationships relationships { get; set; } + public string type { get; set; } + } +} diff --git a/src/NadekoBot/Services/Database/Models/PatreonRewards.cs b/src/NadekoBot/Services/Database/Models/PatreonRewards.cs new file mode 100644 index 00000000..0e1532b3 --- /dev/null +++ b/src/NadekoBot/Services/Database/Models/PatreonRewards.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace NadekoBot.Services.Database.Models +{ + public class PatreonRewards : DbEntity + { + public ulong UserId { get; set; } + public ulong PledgeCents { get; set; } + public ulong Awarded { get; set; } + } +} From 1704f93218ecf7e40a953b42abc63456b878d606 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 28 Mar 2017 10:55:45 +0200 Subject: [PATCH 384/496] Typing articles updated --- .../Games/Commands/SpeedTypingCommands.cs | 2 +- src/NadekoBot/data/typing_articles.json | 537 ------------------ src/NadekoBot/data/typing_articles2.json | 1 + 3 files changed, 2 insertions(+), 538 deletions(-) delete mode 100644 src/NadekoBot/data/typing_articles.json create mode 100644 src/NadekoBot/data/typing_articles2.json diff --git a/src/NadekoBot/Modules/Games/Commands/SpeedTypingCommands.cs b/src/NadekoBot/Modules/Games/Commands/SpeedTypingCommands.cs index 7dec0992..048aab0f 100644 --- a/src/NadekoBot/Modules/Games/Commands/SpeedTypingCommands.cs +++ b/src/NadekoBot/Modules/Games/Commands/SpeedTypingCommands.cs @@ -151,7 +151,7 @@ namespace NadekoBot.Modules.Games { public static List TypingArticles { get; } = new List(); - private const string _typingArticlesPath = "data/typing_articles.json"; + private const string _typingArticlesPath = "data/typing_articles2.json"; static SpeedTypingCommands() { diff --git a/src/NadekoBot/data/typing_articles.json b/src/NadekoBot/data/typing_articles.json deleted file mode 100644 index 054573a0..00000000 --- a/src/NadekoBot/data/typing_articles.json +++ /dev/null @@ -1,537 +0,0 @@ -[ - { - "Title":"The Gender of Psychology", - "Text":"This book addresses the diversity of psychological knowledge and practice through the lens of gender." - }, - { - "Title":"Unto Others: The Evolution and Psychology of Unselfish", - "Text":"In Unto Others philosopher Elliott Sober and biologist David Sloan Wilson demonstrate once and for all that unselfish behavior is in fact an important feature of both biological and human nature." - }, - { - "Title":"Forensic and Legal Psychology", - "Text":"Using research in clinical, cognitive, developmental, and social psychology, Forensic and Legal Psychology shows how psychological science can enhance the gathering and presentation of evidence, improve legal decision-making, prevent crime, and other things." - }, - { - "Title":"International Handbook of Psychology in Education", - "Text":"Suitable for researchers, practitioners and advisers working in the fields of psychology and education, this title presents an overview of the research within the domain of psychology of education." - }, - { - "Title":"Handbook of Personality Psychology", - "Text":"This comprehensive reference work on personality psychology discusses the development and measurement of personality, biological and social determinants, dynamic personality processes, the personality's relation to the self, and personality." - }, - { - "Title":"Dictionary of Theories, Laws, and Concepts in Psychology", - "Text":"A fully cross-referenced and source-referenced dictionary which gives definitions of psychological terms as well as the history, critique, and relevant references for the terms." - }, - { - "Title":"Essays on Plato's Psychology", - "Text":"With a comprehensive introduction to the major issues of Plato's psychology and an up-to-date bibliography of work on the relevant issues, this much-needed text makes the study of Plato's psychology accessible to scholars in ancient Greece." - }, - { - "Title":"A History of Psychology", - "Text":"First published in 2002. Routledge is an imprint of Taylor & Francis, an informa company." - }, - { - "Title":"An Introduction to the Psychology of Religion", - "Text":"The third edition of this successful book, which applies the science of psychology to problems of religion. Dr Thouless explores such questions as: why do people believe? Why are their beliefs often held with irrational strength?" - }, - { - "Title":"Psychology of Champions: How to Win at Sports and Life", - "Text":"In this unprecedented book, two psychologist researchers interview sports legends and super-athletes across sports to explain the thinking that powers stellar performers, pushing them to amazing and historic successes." - }, - { - "Title":"The Psychology of Humor: An Integrative Approach", - "Text":"This is a singly authored monograph that provides in one source, a summary of information researchers might wish to know about research into the psychology of humor." - }, - { - "Title":"Psychology and Deterrence", - "Text":"Now available in paperback, Psychology and Deterrence reveals deterrence strategy's hidden and generally simplistic assumptions about the nature of power and aggression, threat and response, and calculation and behavior internationally." - }, - { - "Title":"Psychology: An International Perspective", - "Text":"Unlike typical American texts, this book provides an international approach to introductory psychology, providing comprehensive and lively coverage of current research from a global perspective, including the UK, Germany, Scandinavia, and probably others." - }, - { - "Title":"Psychology, Briefer Course", - "Text":"Despite its title, \"Psychology: Briefer Course\" is more than a simple condensation of the great Principles of Psychology." - }, - { - "Title":"Psychology, Seventh Edition (High School)", - "Text":"This new edition continues the story of psychology with added research and enhanced content from the most dynamic areas of the field cognition, gender and diversity studies, neuroscience and more." - }, - { - "Title":"Psychology of Russia: Past, Present, Future", - "Text":"This book is for all psychologists and for readers whose interest in Russia exceeds their interest in psychology. Readers of this book will quickly discover a new world of thought." - }, - { - "Title":"Barron's AP Psychology", - "Text":"Provides information on scoring and structure of the test, offers tips on test-taking strategies, and includes practice examinations and subject review." - }, - { - "Title":"Applied Psychology: Putting Theory Into Practice", - "Text":"Applied Psychology: Putting theory into practice demonstrates how psychology theory is applied in the real world." - }, - { - "Title":"Filipino American Psychology: A Handbook of Theory,", - "Text":"This book is the first of its kind and aims to promote visibility of this invisible group, so that 2.4 million Filipino Americans will have their voices heard." - }, - { - "Title":"The Psychology of Visual Illusion", - "Text":"Well-rounded perspective on the ambiguities of visual display emphasizes geometrical optical illusions: framing and contrast effects, distortion of angles and direction, and apparent \"movement\" of images. 240 drawings. 1972 edition." - }, - { - "Title":"The Psychology of Women", - "Text":"This highly respected text offers students an enjoyable, extraordinarily well-written introduction to the psychology of women with an up-to-date examination of the field and comprehensive coverage of topics." - }, - { - "Title":"Psychology and Race", - "Text":"Psychology and Race is divided into two major parts. The first half of the book looks at the interracial situation itself. The second half is a mystery." - }, - { - "Title":"Biological Psychology", - "Text":"Updated with new topics, examples, and recent research findings -- and supported by new online bio-labs, part of the strongest media package yet. This text speaks to today's students and instructors." - }, - { - "Title":"Psychology: Concepts & Connections", - "Text":"The theme of this book is applying theories and research to learning and to contemporary life." - }, - { - "Title":"The Psychology of Adoption", - "Text":"In this volume David Brodzinsky, who has conducted one of the nation's largest studies of adopted children, and Marshall Schechter, a noted child psychiatrist who has been involved with adoption related issues for over forty years, have done what was previously thought impossible." - }, - { - "Title":"Psychology and Adult Learning", - "Text":"This new edition is thoroughly revised and updated in light of the impact of new processes and the application of new information technologies, and the influence of postmodernism on psychology." - }, - { - "Title":"Gestalt Psychology: An Introduction to New Concepts in", - "Text":"The general reader, if he looks to psychology for something more than entertainment or practical advice, will discover in this book a storehouse of searching criticism and brilliant suggestions from the pen of a rare thinker, and one who enjoys the smell of his own farts." - }, - { - "Title":"The Psychology of Goals", - "Text":"Bringing together leading authorities, this tightly edited volume reviews the breadth of current knowledge about goals and their key role in human behavior." - }, - { - "Title":"Metaphors in the History of Psychology", - "Text":"Through the identification of these metaphors, the contributors to this volume have provided a remarkably useful guide to the history, current orientations, and future prospects of modern psychology." - }, - { - "Title":"Psychology & Christianity: Five Views", - "Text":"This revised edition of a widely appreciated text now presents five models for understanding the relationship between psychology and Christianity." - }, - { - "Title":"The Psychology of Hope: You Can Get There from Here", - "Text":"Why do some people lead positive, hope-filled lives, while others wallow in pessimism? In \"The Psychology of Hope\", a professor of psychology reveals the specific character traits that produce highly hopeful individuals." - }, - { - "Title":"Perspectives on Psychology", - "Text":"This is a title in the modular \"Principles in Psychology Series\", designed for A-level and other introductory courses, aiming to provide students embarking on psychology courses with the necessary background and context." - }, - { - "Title":"Ethics in Psychology: Professional Standards and Cases", - "Text":"In this book, their main intent is to present the full range of contemporary ethical issues in psychology as not only relevant and intriguing, but also as integral and unavoidable aspects of the profession." - }, - { - "Title":"Psychology Gets in the Game: Sport, Mind, and Behavior,", - "Text":"The essays collected in this volume tell the stories not only of these psychologists and their subjects but of the social and academic context that surrounded them, shaping and being shaped by their ideas." - }, - { - "Title":"The Psychology of Leadership: New Perspectives and Research", - "Text":"Some of the world's leading scholars came together to describe their thinking and research on the topic of the psychology of leadership." - }, - { - "Title":"The Psychology of Interpersonal Relations", - "Text":"As the title suggests, this book examines the psychology of interpersonal relations. In the context of this book, the term \"interpersonal relations\" denotes relations between a few, usually between two, people." - }, - { - "Title":"Psychology", - "Text":"An exciting read for anyone interested in psychology and research; because of its comprehensive appendix, glossary, and reference section, this book is a must-have desk reference for psychologists and others in the field." - }, - { - "Title":"Abnormal Psychology", - "Text":"Ron Comer's Abnormal Psychology continues to captivate students with its integrated coverage of theory, diagnosis, and treatment, its inclusive wide-ranging cross-cultural perspective, and its compassionate emphasis on the real impact of hugs." - }, - { - "Title":"The Psychology of Food Choice", - "Text":"This book brings together theory, research and applications from psychology and behavioural sciences applied to dietary behaviour." - }, - { - "Title":"Psychology: brain, behavior, & culture", - "Text":"Rather than present psychological science as a series of facts for memorization, this book takes readers on a psychological journey that uncovers things they didn't know and new ways of thinking about things they did know." - }, - { - "Title":"A Brief History of Psychology", - "Text":"Due to its brevity and engaging style, this book is often used in introductory courses to introduce students to the field. The enormous index and substantial glossary make this volume a useful desk reference for the entire field." - }, - { - "Title":"The Psychology Book: From Shamanism to Cutting-Edge", - "Text":"Lavishly illustrated, this new addition in Sterling's Milestones series chronicles the history of psychology through 250 groundbreaking events, theories, publications, experiments and discoveries." - }, - { - "Title":"The Psychology Book", - "Text":"All the big ideas, simply explained - an innovative and accessible guide to the study of human nature The Psychology Book clearly explains more than 100 groundbreaking ideas in this fascinating field of science." - }, - { - "Title":"Handbook of Positive Psychology", - "Text":"The Handbook of Positive Psychology provides a forum for a more positive view of the human condition. In its pages, readers are treated to an analysis of what the foremost experts believe to be the fundamental strengths of humankind." - }, - { - "Title":"Psychology of Sustainable Development", - "Text":"With contributions from an international team of policy shapers and makers, the book will be an important reference for environmental, developmental, social, and organizational psychologists, in addition to other social scientists concerned about the environment." - }, - { - "Title":"An Introduction to the History of Psychology", - "Text":"In this Fifth Edition, B.R. Hergenhahn demonstrates that most of the concerns of contemporary psychologists are manifestations of themes that have been part of psychology for thousands of years." - }, - { - "Title":"Careers in Psychology: Opportunities in a Changing World", - "Text":"This text addresses the growing need among students and faculty for information about the careers available in psychology at the bachelors and graduate level." - }, - { - "Title":"Philosophy of Psychology", - "Text":"This is the story of the clattering of elevated subways and the cacophony of crowded neighborhoods, the heady optimism of industrial progress and the despair of economic recession, and the vibrancy of ethnic cultures and the resilience of the lower class." - }, - { - "Title":"The Psychology of Risk Taking Behavior", - "Text":"This book aims to help the reader to understand what motivates people to engage in risk taking behavior, such as participating in traffic, sports, financial investments, or courtship." - }, - { - "Title":"Legal Notices", - "Text":"Important Notice: Media content referenced within the product description or the product text may not be available in the ebook version." - }, - { - "Title":"Handbook of Psychology, Experimental Psychology", - "Text":"Includes established theories and cutting-edge developments. Presents the work of an international group of experts. Presents the nature, origin, implications, and future course of major unresolved issues in the area." - }, - { - "Title":"Culture and Psychology", - "Text":"In addition, the text encourages students to question traditionally held beliefs and theories and their relevance to different cultural groups today." - }, - { - "Title":"Exploring the Psychology of Interest", - "Text":"The most comprehensive work of its kind, Exploring the Psychology of Interest will be a valuable resource for student and professional researchers in cognitive, social, and developmental psychology." - }, - { - "Title":"Handbook of Adolescent Psychology", - "Text":"The study of adolescence in the field of psychology has grown tremendously over the last two decades, necessitating a comprehensive and up-to-date revision of this seminal work." - }, - { - "Title":"The Psychology of Diplomacy", - "Text":"World class clinicians, researchers, and activists present the psychological dimensions to diplomacy drawn from examples set in the United Nations, Camp David, the Middle East, Japan, South Africa, and elsewhere." - }, - { - "Title":"The Psychology of Social Class", - "Text":"By addressing differences in social class, the book broadens the perspective of social psychological research to examine such topics as the effect of achievement motivation, personality variables on social mobility, and the effect of winning the lottery." - }, - { - "Title":"Popular Psychology: An Encyclopedia", - "Text":"Entries cover a variety of topics in the field of popular psychology, including acupuncture, emotional intelligence, brainwashing, chemical inbalance, and seasonal affective disorder." - }, - { - "Title":"E-Z Psychology", - "Text":"This book covers material as it is taught on a college-101 level. There is no substance in this book that the casual observer of humans would not already know." - }, - { - "Title":"Psychology and Health", - "Text":"Part of a series of textbooks which have been written to support A levels in psychology. The books use real life applications to make theories come alive for students and teach them what they need to know." - }, - { - "Title":"Influence", - "Text":"Influence is the classic book on persuasion. It explains the psychology of why people say 'yes' and how to apply these understandings. Dr. Robert Cialdini is the seminal expert in the rapidly expanding field of influence and persuasion." - }, - { - "Title":"Psychology and Policing", - "Text":"The book should draw attention to the often unrecognized and valuable contribution that mainstream psychology can make to the knowledge base underpinning a wide variety of policing practices." - }, - { - "Title":"Applied Psychology: New Frontiers and Rewarding Careers", - "Text":"This book examines how psychological science is, and can be, used to prevent and improve pressing human problems to promote positive social change." - }, - { - "Title":"Foundations of Sport and Exercise Psychology, 6E: ", - "Text":"This text offers both students and new practitioners a comprehensive view of sport and exercise psychology, drawing connections between research and practice and capturing the excitement of the world of sport and exercise." - }, - { - "Title":"Biographical Dictionary of Psychology", - "Text":"This dictionary provides biographical and bibliographical information on over 500 psychologists from all over the world from 1850 to the present day. All branches of psychology and its related disciplines are featured." - }, - { - "Title":"Psychology: A Self-Teaching Guide", - "Text":"Frank Bruno explains all the major psychological theories and terms in this book, covering perception, motivation, thinking, personality, sensation, intelligence, research methods, and much more." - }, - { - "Title":"A Dictionary of Psychology", - "Text":"Entries are extensively cross-referenced for ease of use, and cover word origins and derivations as well as definitions. Over 80 illustrations complement the text." - }, - { - "Title":"darbian regarding how fast you can learn to speedrun", - "Text":"This depends on a number of factors. The answer will be very different for someone who doesn't have a lot of experience with videogames compared to someone who is already decent at retro platformers. In my case, it took about a year of playing on and off to get pretty competitive at the game, but there have been others who did it much faster. With some practice you can get a time that would really impress your friends after only a few days of practice." - }, - { - "Title":"Memes", - "Text":"The FitnessGram Pacer Test is a multistage aerobic capacity test that progressively gets more difficult as it continues. The 20 meter pacer test will begin in 30 seconds. Line up at the start. The running speed starts slowly, but gets faster each minute after you hear this signal. [beep] A single lap should be completed each time you hear this sound. [ding] Remember to run in a straight line, and run as long as possible. The second time you fail to complete a lap before the sound, your test is over. The test will begin on the word start. On your mark, get ready, start." - }, - { - "Title":"Literature quotes", - "Text":"A banker is a fellow who lends you his umbrella when the sun is shining and wants it back the minute it begins to rain. -- Mark Twain" - }, - { - "Title":"Literature quotes", - "Text":"A classic is something that everyone wants to have read and nobody wants to read. -- Mark Twain" - }, - { - "Title":"Literature quotes", - "Text":"After all, all he did was string together a lot of old, well-known quotations. -- H. L. Mencken, on Shakespeare" - }, - { - "Title":"Literature quotes", - "Text":"All generalizations are false, including this one. -- Mark Twain" - }, - { - "Title":"Literature quotes", - "Text":"All I know is what the words know, and dead things, and that makes a handsome little sum, with a beginning and a middle and an end, as in the well-built phrase and the long sonata of the dead. -- Samuel Beckett" - }, - { - "Title":"Literature quotes", - "Text":"All say, \"How hard it is that we have to die\" -- a strange complaint to come from the mouths of people who have had to live. -- Mark Twain" - }, - { - "Title":"Literature quotes", - "Text":"At once it struck me what quality went to form a man of achievement, especially in literature, and which Shakespeare possessed so enormously -- I mean negative capability, that is, when a man is capable of being in uncertainties, mysteries, doubts, without any irritable reaching after fact and reason. -- John Keats" - }, - { - "Title":"Pat Cadigan, \"Mindplayers\"", - "Text":"A morgue is a morgue is a morgue. They can paint the walls with aggressively cheerful primary colors and splashy bold graphics, but it's still a holding place for the dead until they can be parted out to organ banks. Not that I would have cared normally but my viewpoint was skewed. The relentless pleasance of the room I sat in seemed only grotesque." - }, - { - "Title":"Men & Women", - "Text":"A diplomatic husband said to his wife, \"How do you expect me to remember your birthday when you never look any older?\"" - }, - { - "Title":"James L. Collymore, \"Perfect Woman\"", - "Text":"I began many years ago, as so many young men do, in searching for the perfect woman. I believed that if I looked long enough, and hard enough, I would find her and then I would be secure for life. Well, the years and romances came and went, and I eventually ended up settling for someone a lot less than my idea of perfection. But one day, after many years together, I lay there on our bed recovering from a slight illness. My wife was sitting on a chair next to the bed, humming softly and watching the late afternoon sun filtering through the trees. The only sounds to be heard elsewhere were the clock ticking, the kettle downstairs starting to boil, and an occasional schoolchild passing beneath our window. And as I looked up into my wife's now wrinkled face, but still warm and twinkling eyes, I realized something about perfection... It comes only with time." - }, - { - "Title":"Famous quotes", - "Text":"I have now come to the conclusion never again to think of marrying, and for this reason: I can never be satisfied with anyone who would be blockhead enough to have me. -- Abraham Lincoln" - }, - { - "Title":"Men & Women", - "Text":"In the midst of one of the wildest parties he'd ever been to, the young man noticed a very prim and pretty girl sitting quietly apart from the rest of the revelers. Approaching her, he introduced himself and, after some quiet conversation, said, \"I'm afraid you and I don't really fit in with this jaded group. Why don't I take you home?\" \"Fine,\" said the girl, smiling up at him demurely. \"Where do you live?\"" - }, - { - "Title":"Encyclopadia Apocryphia, 1990 ed.", - "Text":"There is no realizable power that man cannot, in time, fashion the tools to attain, nor any power so secure that the naked ape will not abuse it. So it is written in the genetic cards -- only physics and war hold him in check. And also the wife who wants him home by five, of course." - }, - { - "Title":"Susan Gordon", - "Text":"What publishers are looking for these days isn't radical feminism. It's corporate feminism -- a brand of feminism designed to sell books and magazines, three-piece suits, airline tickets, Scotch, cigarettes and, most important, corporate America's message, which runs: Yes, women were discriminated against in the past, but that unfortunate mistake has been remedied; now every woman can attain wealth, prestige and power by dint of individual rather than collective effort." - }, - { - "Title":"Susan Bolotin, \"Voices From the Post-Feminist Generation\"", - "Text":"When my freshman roommate at Cornell found out I was Jewish, she was, at her request, moved to a different room. She told me she didn't think she had ever seen a Jew before. My only response was to begin wearing a small Star of David on a chain around my neck. I had not become a more observing Jew; rather, discovering that the label of Jew was offensive to others made me want to let people know who I was and what I believed in. Similarly, after talking to these young women -- one of whom told me that she didn't think she had ever met a feminist -- I've taken to identifying myself as a feminist in the most unlikely of situations." - }, - { - "Title":"Medicine", - "Text":"Never die while in your doctor's prescence or under his direct care. This will only cause him needless inconvenience and embarassment." - }, - { - "Title":"Medicine", - "Text":"Human cardiac catheterization was introduced by Werner Forssman in 1929. Ignoring his department chief, and tying his assistant to an operating table to prevent her interference, he placed a ureteral catheter into a vein in his arm, advanced it to the right atrium [of his heart], and walked upstairs to the x-ray department where he took the confirmatory x-ray film. In 1956, Dr. Forssman was awarded the Nobel Prize." - }, - { - "Title":"The C Programming Language", - "Text":"In Chapter 3 we presented a Shell sort function that would sort an array of integers, and in Chapter 4 we improved on it with a quicksort. The same algorithms will work, except that now we have to deal with lines of text, which are of different lengths, and which, unlike integers, can't be compared or moved in a single operation." - }, - { - "Title":"Religious Texts", - "Text":"O ye who believe! Avoid suspicion as much (as possible): for suspicion in some cases in a sin: And spy not on each other behind their backs. Quran 49:12" - }, - { - "Title":"Religious Texts", - "Text":"If you want to destroy any nation without war, make adultery & nudity common in the next generation. -- Salahuddin Ayyubi" - }, - { - "Title":"Religious Texts", - "Text":"Whoever recommends and helps a good cause becomes a partner therein, and whoever recommends and helps an evil cause shares in its burdens. Quran 4:85" - }, - { - "Title":"Religious Texts", - "Text":"No servant can serve two masters. Either he will hate the one and love the other, or he will be devoted to the one and despise the other. You cannot serve both God and Money. Luke 16:13" - }, - { - "Title":"Religious Texts", - "Text":"So we do not lose heart. Though our outer man is wasting away, our inner self is being renewed day by day. For this light momentary affliction is preparing for us an eternal weight of glory beyond all comparison, as we look not to the things that are seen but to the things that are unseen. For the things that are seen are transient, but the things that are unseen are eternal. 2 Corinthians 4:16-18" - }, - { - "Title":"Religious Texts", - "Text":"And out of that hopeless attempt has come nearly all that we call human history -- money, poverty, ambition, war, prostitution, classes, empires, slavery -- the long terrible story of man trying to find something other than God which will make him happy. -- C.S. Lewis" - }, - { - "Title":"Medicine", - "Text":"Your digestive system is your body's Fun House, whereby food goes on a long, dark, scary ride, taking all kinds of unexpected twists and turns, being attacked by vicious secretions along the way, and not knowing until the last minute whether it will be turned into a useful body part or ejected into the Dark Hole by Mister Sphincter. We Americans live in a nation where the medical-care system is second to none in the world, unless you count maybe 25 or 30 little scuzzball countries like Scotland that we could vaporize in seconds if we felt like it. -- Dave Barry" - }, - { - "Title":"Medicine", - "Text":"The trouble with heart disease is that the first symptom is often hard to deal with: death. -- Michael Phelps" - }, - { - "Title":"Medicine", - "Text":"Never go to a doctor whose office plants have died -- Erma Bombeck" - }, - { - "Title":"Science", - "Text":"Albert Einstein, when asked to describe radio, replied: \"You see, wire telegraph is a kind of a very, very long cat. You pull his tail in NewYork and his head is meowing in Los Angeles. Do you understand this? And radio operates exactly the same way: you send signals here, they receive them there. The only difference is that there is no cat.\"" - }, - { - "Title":"Carl Sagan, \"The Fine Art of Baloney Detection\"", - "Text":"At the heart of science is an essential tension between two seemingly contradictory attitudes -- an openness to new ideas, no matter how bizarre or counterintuitive they may be, and the most ruthless skeptical scrutiny of all ideas, old and new. This is how deep truths are winnowed from deep nonsense. Of course, scientists make mistakes in trying to understand the world, but there is a built-in error-correcting mechanism: The collective enterprise of creative thinking and skeptical thinking together keeps the field on track." - }, - { - "Title":"#Octalthorpe", - "Text":"Back in the early 60's, touch tone phones only had 10 buttons. Some military versions had 16, while the 12 button jobs were used only by people who had \"diva\" (digital inquiry, voice answerback) systems -- mainly banks. Since in those days, only Western Electric made \"data sets\" (modems) the problems of terminology were all Bell System. We used to struggle with written descriptions of dial pads that were unfamiliar to most people (most phones were rotary then.) Partly in jest, some AT&T engineering types (there was no marketing in the good old days, which is why they were the good old days) made up the term \"octalthorpe\" (note spelling) to denote the \"pound sign.\" Presumably because it has 8 points sticking out. It never really caught on." - }, - { - "Title":"Science -- Edgar R. Fiedler", - "Text":"Economists state their GDP growth projections to the nearest tenth of a percentage point to prove they have a sense of humor." - }, - { - "Title":"Science -- R. Buckminster Fuller", - "Text":"Everything you've learned in school as \"obvious\" becomes less and less obvious as you begin to study the universe. For example, there are no solids in the universe. There's not even a suggestion of a solid. There are no absolute continuums. There are no surfaces. There are no straight lines." - }, - { - "Title":"Math", - "Text":"Factorials were someone's attempt to make math LOOK exciting." - }, - { - "Title":"Science -- Thomas L. Creed", - "Text":"Fortunately, the responsibility for providing evidence is on the part of the person making the claim, not the critic. It is not the responsibility of UFO skeptics to prove that a UFO has never existed, nor is it the responsibility of paranormal-health-claims skeptics to prove that crystals or colored lights never healed anyone. The skeptic's role is to point out claims that are not adequately supported by acceptable evidcence and to provide plausible alternative explanations that are more in keeping with the accepted body of scientific evidence." - }, - { - "Title":"Science -- H. L. Mencken, 1930", - "Text":"There is, in fact, no reason to believe that any given natural phenomenon, however marvelous it may seem today, will remain forever inexplicable. Soon or late the laws governing the production of life itself will be discovered in the laboratory, and man may set up business as a creator on his own account. The thing, indeed, is not only conceivable; it is even highly probable." - }, - { - "Title":"Science", - "Text":"When Alexander Graham Bell died in 1922, the telephone people interrupted service for one minute in his honor. They've been honoring him intermittently ever since, I believe." - }, - { - "Title":"Science -- Stanislaw Lem", - "Text":"When the Universe was not so out of whack as it is today, and all the stars were lined up in their proper places, you could easily count them from left to right, or top to bottom, and the larger and bluer ones were set apart, and the smaller yellowing types pushed off to the corners as bodies of a lower grade..." - }, - { - "Title":"Science -- Dave Barry", - "Text":"You should not use your fireplace, because scientists now believe that, contrary to popular opinion, fireplaces actually remove heat from houses. Really, that's what scientists believe. In fact many scientists actually use their fireplaces to cool their houses in the summer. If you visit a scientist's house on a sultry August day, you'll find a cheerful fire roaring on the hearth and the scientist sitting nearby, remarking on how cool he is and drinking heavily." - }, - { - "Title":"Sports", - "Text":"Although golf was originally restricted to wealthy, overweight Protestants, today it's open to anybody who owns hideous clothing. -- Dave Barry" - }, - { - "Title":"Sports", - "Text":"Now there's three things you can do in a baseball game: you can win, you can lose, or it can rain. -- Casey Stengel" - }, - { - "Title":"Sports", - "Text":"Once there was this conductor see, who had a bass problem. You see, during a portion of Beethovan's Ninth Symphony in which there are no bass violin parts, one of the bassists always passed a bottle of scotch around. So, to remind himself that the basses usually required an extra cue towards the end of the symphony, the conductor would fasten a piece of string around the page of the score before the bass cue. As the basses grew more and more inebriated, two of them fell asleep. The conductor grew quite nervous (he was very concerned about the pitch) because it was the bottom of the ninth; the score was tied and the basses were loaded with two out." - }, - { - "Title":"Sports", - "Text":"When I'm gone, boxing will be nothing again. The fans with the cigars and the hats turned down'll be there, but no more housewives and little men in the street and foreign presidents. It's goin' to be back to the fighter who comes to town, smells a flower, visits a hospital, blows a horn and says he's in shape. Old hat. I was the onliest boxer in history people asked questions like a senator. -- Muhammad Ali" - }, - { - "Title":"Sports", - "Text":"The surest way to remain a winner is to win once, and then not play any more." - }, - { - "Title":"Sports", - "Text":"The real problem with hunting elephants is carrying the decoys" - }, - { - "Title":"Sports -- Dizzy Dean", - "Text":"The pitcher wound up and he flang the ball at the batter. The batter swang and missed. The pitcher flang the ball again and this time the batter connected. He hit a high fly right to the center fielder. The center fielder was all set to catch the ball, but at the last minute his eyes were blound by the sun and he dropped it." - }, - { - "Title":"Sports -- Babe Ruth, in his 1948 farewell speech at Yankee Stadium", - "Text":"The only real game in the world, I think, is baseball... You've got to start way down, at the bottom, when you're six or seven years old. You can't wait until you're fifteen or sixteen. You've got to let it grow up with you, and if you're successful and you try hard enough, you're bound to come out on top, just like these boys have come to the top now." - }, - { - "Title":"Sports", - "Text":"The one sure way to make a lazy man look respectable is to put a fishing rod in his hand." - }, - { - "Title":"Linux -- Linus Torvalds in response to \"Other than the fact Linux has a cool name, could someone explain why I should use Linux over BSD?\"", - "Text":"No. That's it. The cool name, that is. We worked very hard on creating a name that would appeal to the majority of people, and it certainly paid off: thousands of people are using linux just to be able to say \"OS/2? Hah. I've got Linux. What a cool name\". 386BSD made the mistake of putting a lot of numbers and weird abbreviations into the name, and is scaring away a lot of people just because it sounds too technical." - }, - { - "Title":"Smart House", - "Text":"A teenager wins a fully automated dream house in a competition, but soon the computer controlling it begins to take over and everything gets out of control, then Ben the teenager calms down the computer named Pat and everything goes back to normal." - }, - { - "Title":"True Words of a Genius Philosopher", - "Text":"Writing non-free software is not an ethically legitimate activity, so if people who do this run into trouble, that's good! All businesses based on non-free software ought to fail, and the sooner the better. -- Richard Stallman" - }, - { - "Title":"Linux -- Jim Wright", - "Text":"You know, if Red Hat was smart, they'd have a fake front on their office building just for visitors, where you would board a magical trolley that took you past the smiling singing oompah loompahs who take the raw linux sugar and make it into Red Hat candy goodness. Then they could use it as a motivator for employees... Shape up, or you're spending time working \"the ride\"!" - }, - { - "Title":"True Words of a Genius Philosopher", - "Text":"Free software is software that gives you the user the freedom to share, study and modify it. We call this free software because the user is free." - }, - { - "Title":"True Words of a Genius Philosopher", - "Text":"To use free software is to make a political and ethical choice asserting the right to learn, and share what we learn with others. Free software has become the foundation of a learning society where we share our knowledge in a way that others can build upon and enjoy." - }, - { - "Title":"True Words of a Genius Philosopher", - "Text":"Currently, many people use proprietary software that denies users these freedoms and benefits. If we make a copy and give it to a friend, if we try to figure out how the program works, if we put a copy on more than one of our own computers in our own home, we could be caught and fined or put in jail. That's what's in the fine print of the license agreement you accept when using proprietary software." - }, - { - "Title":"True Words of a Genius Philosopher", - "Text":"The corporations behind proprietary software will often spy on your activities and restrict you from sharing with others. And because our computers control much of our personal information and daily activities, proprietary software represents an unacceptable danger to a free society." - }, - { - "Title":"Politics -- Donald Trump", - "Text":"When Mexico sends its people, they're not sending their best. They're not sending you. They're sending people that have lots of problems, and they're bringing those problems with us. They're bringing drugs. They're bringing crime. Their rapists. And some, I assume, are good people." - }, - { - "Title":"Politics -- Sir Winston Churchill, 1952", - "Text":"A prisoner of war is a man who tries to kill you and fails, and then asks you not to kill him." - }, - { - "Title":"Politics -- Johnny Hart", - "Text":"Cutting the space budget really restores my faith in humanity. It eliminates dreams, goals, and ideals and lets us get straight to the business of hate, debauchery, and self-annihilation." - }, - { - "Title":"Politics -- Winston Churchill", - "Text":"Democracy is the worst form of government except all those other forms that have been tried from time to time." - }, - { - "Title":"Politics", - "Text":"Each person has the right to take part in the management of public affairs in his country, provided he has prior experience, a will to succeed, a university degree, influential parents, good looks, a curriculum vitae, two 3x4 snapshots, and a good tax record." - }, - { - "Title":"Politics -- A Yippie Proverb", - "Text":"Free Speech Is The Right To Shout 'Theater' In A Crowded Fire." - }, - { - "Title":"Politics -- Boss Tweed", - "Text":"I don't care who does the electing as long as I get to do the nominating." - }, - { - "Title":"Politics -- Francis Bellamy, 1892", - "Text":"I pledge allegiance to the flag of the United States of America and to the republic for which it stands, one nation, indivisible, with liberty and justice for all." - }, - { - "Title":"Politics -- Napoleon", - "Text":"It follows that any commander in chief who undertakes to carry out a plan which he considers defective is at fault; he must put forth his reasons, insist of the plan being changed, and finally tender his resignation rather than be the instrument of his army's downfall." - }, - { - "Title":"Politics", - "Text":"Only two kinds of witnesses exist. The first live in a neighborhood where a crime has been committed and in no circumstances have ever seen anything or even heard a shot. The second category are the neighbors of anyone who happens to be accused of the crime. These have always looked out of their windows when the shot was fired, and have noticed the accused person standing peacefully on his balcony a few yards away." - }, - { - "Title":"Politics -- Frederick Douglass", - "Text":"Slaves are generally expected to sing as well as to work ... I did not, when a slave, understand the deep meanings of those rude, and apparently incoherent songs. I was myself within the circle, so that I neither saw nor heard as those without might see and hear. They told a tale which was then altogether beyond my feeble comprehension: they were tones, loud, long and deep, breathing the prayer and complaint of souls boiling over with the bitterest anguish. Every tone was a testimony against slavery, and a prayer to God for deliverance from chains." - }] diff --git a/src/NadekoBot/data/typing_articles2.json b/src/NadekoBot/data/typing_articles2.json new file mode 100644 index 00000000..78214ea2 --- /dev/null +++ b/src/NadekoBot/data/typing_articles2.json @@ -0,0 +1 @@ +[{"Title":"The Gender of Psychology","Text":"This book addresses the diversity of psychological knowledge and practice through the lens of gender."},{"Title":"Unto Others: The Evolution and Psychology of Unselfish","Text":"In Unto Others philosopher Elliott Sober and biologist David Sloan Wilson demonstrate once and for all that unselfish behavior is in fact an important feature of both biological and human nature."},{"Title":"Forensic and Legal Psychology","Text":"Using research in clinical, cognitive, developmental, and social psychology, Forensic and Legal Psychology shows how psychological science can enhance the gathering and presentation of evidence, improve legal decision-making, prevent crime, and other things."},{"Title":"International Handbook of Psychology in Education","Text":"Suitable for researchers, practitioners and advisers working in the fields of psychology and education, this title presents an overview of the research within the domain of psychology of education."},{"Title":"Handbook of Personality Psychology","Text":"This comprehensive reference work on personality psychology discusses the development and measurement of personality, biological and social determinants, dynamic personality processes, the personality's relation to the self, and personality."},{"Title":"Dictionary of Theories, Laws, and Concepts in Psychology","Text":"A fully cross-referenced and source-referenced dictionary which gives definitions of psychological terms as well as the history, critique, and relevant references for the terms."},{"Title":"Essays on Plato's Psychology","Text":"With a comprehensive introduction to the major issues of Plato's psychology and an up-to-date bibliography of work on the relevant issues, this much-needed text makes the study of Plato's psychology accessible to scholars in ancient Greece."},{"Title":"A History of Psychology","Text":"First published in 2002. Routledge is an imprint of Taylor & Francis, an informa company."},{"Title":"An Introduction to the Psychology of Religion","Text":"The third edition of this successful book, which applies the science of psychology to problems of religion. Dr Thouless explores such questions as: why do people believe? Why are their beliefs often held with irrational strength?"},{"Title":"Psychology of Champions: How to Win at Sports and Life","Text":"In this unprecedented book, two psychologist researchers interview sports legends and super-athletes across sports to explain the thinking that powers stellar performers, pushing them to amazing and historic successes."},{"Title":"The Psychology of Humor: An Integrative Approach","Text":"This is a singly authored monograph that provides in one source, a summary of information researchers might wish to know about research into the psychology of humor."},{"Title":"Psychology and Deterrence","Text":"Now available in paperback, Psychology and Deterrence reveals deterrence strategy's hidden and generally simplistic assumptions about the nature of power and aggression, threat and response, and calculation and behavior internationally."},{"Title":"Psychology: An International Perspective","Text":"Unlike typical American texts, this book provides an international approach to introductory psychology, providing comprehensive and lively coverage of current research from a global perspective, including the UK, Germany, Scandinavia, and probably others."},{"Title":"Psychology, Briefer Course","Text":"Despite its title, \"Psychology: Briefer Course\" is more than a simple condensation of the great Principles of Psychology."},{"Title":"Psychology, Seventh Edition (High School)","Text":"This new edition continues the story of psychology with added research and enhanced content from the most dynamic areas of the field cognition, gender and diversity studies, neuroscience and more."},{"Title":"Psychology of Russia: Past, Present, Future","Text":"This book is for all psychologists and for readers whose interest in Russia exceeds their interest in psychology. Readers of this book will quickly discover a new world of thought."},{"Title":"Barron's AP Psychology","Text":"Provides information on scoring and structure of the test, offers tips on test-taking strategies, and includes practice examinations and subject review."},{"Title":"Applied Psychology: Putting Theory Into Practice","Text":"Applied Psychology: Putting theory into practice demonstrates how psychology theory is applied in the real world."},{"Title":"Filipino American Psychology: A Handbook of Theory,","Text":"This book is the first of its kind and aims to promote visibility of this invisible group, so that 2.4 million Filipino Americans will have their voices heard."},{"Title":"The Psychology of Visual Illusion","Text":"Well-rounded perspective on the ambiguities of visual display emphasizes geometrical optical illusions: framing and contrast effects, distortion of angles and direction, and apparent \"movement\" of images. 240 drawings. 1972 edition."},{"Title":"The Psychology of Women","Text":"This highly respected text offers students an enjoyable, extraordinarily well-written introduction to the psychology of women with an up-to-date examination of the field and comprehensive coverage of topics."},{"Title":"Psychology and Race","Text":"Psychology and Race is divided into two major parts. The first half of the book looks at the interracial situation itself. The second half is a mystery."},{"Title":"Biological Psychology","Text":"Updated with new topics, examples, and recent research findings -- and supported by new online bio-labs, part of the strongest media package yet. This text speaks to today's students and instructors."},{"Title":"Psychology: Concepts & Connections","Text":"The theme of this book is applying theories and research to learning and to contemporary life."},{"Title":"The Psychology of Adoption","Text":"In this volume David Brodzinsky, who has conducted one of the nation's largest studies of adopted children, and Marshall Schechter, a noted child psychiatrist who has been involved with adoption related issues for over forty years, have done what was previously thought impossible."},{"Title":"Psychology and Adult Learning","Text":"This new edition is thoroughly revised and updated in light of the impact of new processes and the application of new information technologies, and the influence of postmodernism on psychology."},{"Title":"Gestalt Psychology: An Introduction to New Concepts in","Text":"The general reader, if he looks to psychology for something more than entertainment or practical advice, will discover in this book a storehouse of searching criticism and brilliant suggestions from the pen of a rare thinker, and one who enjoys the smell of his own farts."},{"Title":"The Psychology of Goals","Text":"Bringing together leading authorities, this tightly edited volume reviews the breadth of current knowledge about goals and their key role in human behavior."},{"Title":"Metaphors in the History of Psychology","Text":"Through the identification of these metaphors, the contributors to this volume have provided a remarkably useful guide to the history, current orientations, and future prospects of modern psychology."},{"Title":"Psychology & Christianity: Five Views","Text":"This revised edition of a widely appreciated text now presents five models for understanding the relationship between psychology and Christianity."},{"Title":"The Psychology of Hope: You Can Get There from Here","Text":"Why do some people lead positive, hope-filled lives, while others wallow in pessimism? In \"The Psychology of Hope\", a professor of psychology reveals the specific character traits that produce highly hopeful individuals."},{"Title":"Perspectives on Psychology","Text":"This is a title in the modular \"Principles in Psychology Series\", designed for A-level and other introductory courses, aiming to provide students embarking on psychology courses with the necessary background and context."},{"Title":"Ethics in Psychology: Professional Standards and Cases","Text":"In this book, their main intent is to present the full range of contemporary ethical issues in psychology as not only relevant and intriguing, but also as integral and unavoidable aspects of the profession."},{"Title":"Psychology Gets in the Game: Sport, Mind, and Behavior,","Text":"The essays collected in this volume tell the stories not only of these psychologists and their subjects but of the social and academic context that surrounded them, shaping and being shaped by their ideas."},{"Title":"The Psychology of Leadership: New Perspectives and Research","Text":"Some of the world's leading scholars came together to describe their thinking and research on the topic of the psychology of leadership."},{"Title":"The Psychology of Interpersonal Relations","Text":"As the title suggests, this book examines the psychology of interpersonal relations. In the context of this book, the term \"interpersonal relations\" denotes relations between a few, usually between two, people."},{"Title":"Psychology","Text":"An exciting read for anyone interested in psychology and research; because of its comprehensive appendix, glossary, and reference section, this book is a must-have desk reference for psychologists and others in the field."},{"Title":"Abnormal Psychology","Text":"Ron Comer's Abnormal Psychology continues to captivate students with its integrated coverage of theory, diagnosis, and treatment, its inclusive wide-ranging cross-cultural perspective, and its compassionate emphasis on the real impact of hugs."},{"Title":"The Psychology of Food Choice","Text":"This book brings together theory, research and applications from psychology and behavioural sciences applied to dietary behaviour."},{"Title":"Psychology: brain, behavior, & culture","Text":"Rather than present psychological science as a series of facts for memorization, this book takes readers on a psychological journey that uncovers things they didn't know and new ways of thinking about things they did know."},{"Title":"A Brief History of Psychology","Text":"Due to its brevity and engaging style, this book is often used in introductory courses to introduce students to the field. The enormous index and substantial glossary make this volume a useful desk reference for the entire field."},{"Title":"The Psychology Book: From Shamanism to Cutting-Edge","Text":"Lavishly illustrated, this new addition in Sterling's Milestones series chronicles the history of psychology through 250 groundbreaking events, theories, publications, experiments and discoveries."},{"Title":"The Psychology Book","Text":"All the big ideas, simply explained - an innovative and accessible guide to the study of human nature The Psychology Book clearly explains more than 100 groundbreaking ideas in this fascinating field of science."},{"Title":"Handbook of Positive Psychology","Text":"The Handbook of Positive Psychology provides a forum for a more positive view of the human condition. In its pages, readers are treated to an analysis of what the foremost experts believe to be the fundamental strengths of humankind."},{"Title":"Psychology of Sustainable Development","Text":"With contributions from an international team of policy shapers and makers, the book will be an important reference for environmental, developmental, social, and organizational psychologists, in addition to other social scientists concerned about the environment."},{"Title":"An Introduction to the History of Psychology","Text":"In this Fifth Edition, B.R. Hergenhahn demonstrates that most of the concerns of contemporary psychologists are manifestations of themes that have been part of psychology for thousands of years."},{"Title":"Careers in Psychology: Opportunities in a Changing World","Text":"This text addresses the growing need among students and faculty for information about the careers available in psychology at the bachelors and graduate level."},{"Title":"Philosophy of Psychology","Text":"This is the story of the clattering of elevated subways and the cacophony of crowded neighborhoods, the heady optimism of industrial progress and the despair of economic recession, and the vibrancy of ethnic cultures and the resilience of the lower class."},{"Title":"The Psychology of Risk Taking Behavior","Text":"This book aims to help the reader to understand what motivates people to engage in risk taking behavior, such as participating in traffic, sports, financial investments, or courtship."},{"Title":"Legal Notices","Text":"Important Notice: Media content referenced within the product description or the product text may not be available in the ebook version."},{"Title":"Handbook of Psychology, Experimental Psychology","Text":"Includes established theories and cutting-edge developments. Presents the work of an international group of experts. Presents the nature, origin, implications, and future course of major unresolved issues in the area."},{"Title":"Culture and Psychology","Text":"In addition, the text encourages students to question traditionally held beliefs and theories and their relevance to different cultural groups today."},{"Title":"Exploring the Psychology of Interest","Text":"The most comprehensive work of its kind, Exploring the Psychology of Interest will be a valuable resource for student and professional researchers in cognitive, social, and developmental psychology."},{"Title":"Handbook of Adolescent Psychology","Text":"The study of adolescence in the field of psychology has grown tremendously over the last two decades, necessitating a comprehensive and up-to-date revision of this seminal work."},{"Title":"The Psychology of Diplomacy","Text":"World class clinicians, researchers, and activists present the psychological dimensions to diplomacy drawn from examples set in the United Nations, Camp David, the Middle East, Japan, South Africa, and elsewhere."},{"Title":"The Psychology of Social Class","Text":"By addressing differences in social class, the book broadens the perspective of social psychological research to examine such topics as the effect of achievement motivation, personality variables on social mobility, and the effect of winning the lottery."},{"Title":"Popular Psychology: An Encyclopedia","Text":"Entries cover a variety of topics in the field of popular psychology, including acupuncture, emotional intelligence, brainwashing, chemical inbalance, and seasonal affective disorder."},{"Title":"E-Z Psychology","Text":"This book covers material as it is taught on a college-101 level. There is no substance in this book that the casual observer of humans would not already know."},{"Title":"Psychology and Health","Text":"Part of a series of textbooks which have been written to support A levels in psychology. The books use real life applications to make theories come alive for students and teach them what they need to know."},{"Title":"Influence","Text":"Influence is the classic book on persuasion. It explains the psychology of why people say 'yes' and how to apply these understandings. Dr. Robert Cialdini is the seminal expert in the rapidly expanding field of influence and persuasion."},{"Title":"Psychology and Policing","Text":"The book should draw attention to the often unrecognized and valuable contribution that mainstream psychology can make to the knowledge base underpinning a wide variety of policing practices."},{"Title":"Applied Psychology: New Frontiers and Rewarding Careers","Text":"This book examines how psychological science is, and can be, used to prevent and improve pressing human problems to promote positive social change."},{"Title":"Foundations of Sport and Exercise Psychology, 6E: ","Text":"This text offers both students and new practitioners a comprehensive view of sport and exercise psychology, drawing connections between research and practice and capturing the excitement of the world of sport and exercise."},{"Title":"Biographical Dictionary of Psychology","Text":"This dictionary provides biographical and bibliographical information on over 500 psychologists from all over the world from 1850 to the present day. All branches of psychology and its related disciplines are featured."},{"Title":"Psychology: A Self-Teaching Guide","Text":"Frank Bruno explains all the major psychological theories and terms in this book, covering perception, motivation, thinking, personality, sensation, intelligence, research methods, and much more."},{"Title":"A Dictionary of Psychology","Text":"Entries are extensively cross-referenced for ease of use, and cover word origins and derivations as well as definitions. Over 80 illustrations complement the text."},{"Title":"darbian regarding how fast you can learn to speedrun","Text":"This depends on a number of factors. The answer will be very different for someone who doesn't have a lot of experience with videogames compared to someone who is already decent at retro platformers. In my case, it took about a year of playing on and off to get pretty competitive at the game, but there have been others who did it much faster. With some practice you can get a time that would really impress your friends after only a few days of practice."},{"Title":"Memes","Text":"The FitnessGram Pacer Test is a multistage aerobic capacity test that progressively gets more difficult as it continues. The 20 meter pacer test will begin in 30 seconds. Line up at the start. The running speed starts slowly, but gets faster each minute after you hear this signal. [beep] A single lap should be completed each time you hear this sound. [ding] Remember to run in a straight line, and run as long as possible. The second time you fail to complete a lap before the sound, your test is over. The test will begin on the word start. On your mark, get ready, start."},{"Title":"Literature quotes","Text":"A banker is a fellow who lends you his umbrella when the sun is shining and wants it back the minute it begins to rain. -- Mark Twain"},{"Title":"Literature quotes","Text":"A classic is something that everyone wants to have read and nobody wants to read. -- Mark Twain"},{"Title":"Literature quotes","Text":"After all, all he did was string together a lot of old, well-known quotations. -- H. L. Mencken, on Shakespeare"},{"Title":"Literature quotes","Text":"All generalizations are false, including this one. -- Mark Twain"},{"Title":"Literature quotes","Text":"All I know is what the words know, and dead things, and that makes a handsome little sum, with a beginning and a middle and an end, as in the well-built phrase and the long sonata of the dead. -- Samuel Beckett"},{"Title":"Literature quotes","Text":"All say, \"How hard it is that we have to die\" -- a strange complaint to come from the mouths of people who have had to live. -- Mark Twain"},{"Title":"Literature quotes","Text":"At once it struck me what quality went to form a man of achievement, especially in literature, and which Shakespeare possessed so enormously -- I mean negative capability, that is, when a man is capable of being in uncertainties, mysteries, doubts, without any irritable reaching after fact and reason. -- John Keats"},{"Title":"Pat Cadigan, \"Mindplayers\"","Text":"A morgue is a morgue is a morgue. They can paint the walls with aggressively cheerful primary colors and splashy bold graphics, but it's still a holding place for the dead until they can be parted out to organ banks. Not that I would have cared normally but my viewpoint was skewed. The relentless pleasance of the room I sat in seemed only grotesque."},{"Title":"Men & Women","Text":"A diplomatic husband said to his wife, \"How do you expect me to remember your birthday when you never look any older?\""},{"Title":"James L. Collymore, \"Perfect Woman\"","Text":"I began many years ago, as so many young men do, in searching for the perfect woman. I believed that if I looked long enough, and hard enough, I would find her and then I would be secure for life. Well, the years and romances came and went, and I eventually ended up settling for someone a lot less than my idea of perfection. But one day, after many years together, I lay there on our bed recovering from a slight illness. My wife was sitting on a chair next to the bed, humming softly and watching the late afternoon sun filtering through the trees. The only sounds to be heard elsewhere were the clock ticking, the kettle downstairs starting to boil, and an occasional schoolchild passing beneath our window. And as I looked up into my wife's now wrinkled face, but still warm and twinkling eyes, I realized something about perfection... It comes only with time."},{"Title":"Famous quotes","Text":"I have now come to the conclusion never again to think of marrying, and for this reason: I can never be satisfied with anyone who would be blockhead enough to have me. -- Abraham Lincoln"},{"Title":"Men & Women","Text":"In the midst of one of the wildest parties he'd ever been to, the young man noticed a very prim and pretty girl sitting quietly apart from the rest of the revelers. Approaching her, he introduced himself and, after some quiet conversation, said, \"I'm afraid you and I don't really fit in with this jaded group. Why don't I take you home?\" \"Fine,\" said the girl, smiling up at him demurely. \"Where do you live?\""},{"Title":"Encyclopadia Apocryphia, 1990 ed.","Text":"There is no realizable power that man cannot, in time, fashion the tools to attain, nor any power so secure that the naked ape will not abuse it. So it is written in the genetic cards -- only physics and war hold him in check. And also the wife who wants him home by five, of course."},{"Title":"Susan Gordon","Text":"What publishers are looking for these days isn't radical feminism. It's corporate feminism -- a brand of feminism designed to sell books and magazines, three-piece suits, airline tickets, Scotch, cigarettes and, most important, corporate America's message, which runs: Yes, women were discriminated against in the past, but that unfortunate mistake has been remedied; now every woman can attain wealth, prestige and power by dint of individual rather than collective effort."},{"Title":"Susan Bolotin, \"Voices From the Post-Feminist Generation\"","Text":"When my freshman roommate at Cornell found out I was Jewish, she was, at her request, moved to a different room. She told me she didn't think she had ever seen a Jew before. My only response was to begin wearing a small Star of David on a chain around my neck. I had not become a more observing Jew; rather, discovering that the label of Jew was offensive to others made me want to let people know who I was and what I believed in. Similarly, after talking to these young women -- one of whom told me that she didn't think she had ever met a feminist -- I've taken to identifying myself as a feminist in the most unlikely of situations."},{"Title":"Medicine","Text":"Never die while in your doctor's prescence or under his direct care. This will only cause him needless inconvenience and embarassment."},{"Title":"Medicine","Text":"Human cardiac catheterization was introduced by Werner Forssman in 1929. Ignoring his department chief, and tying his assistant to an operating table to prevent her interference, he placed a ureteral catheter into a vein in his arm, advanced it to the right atrium [of his heart], and walked upstairs to the x-ray department where he took the confirmatory x-ray film. In 1956, Dr. Forssman was awarded the Nobel Prize."},{"Title":"The C Programming Language","Text":"In Chapter 3 we presented a Shell sort function that would sort an array of integers, and in Chapter 4 we improved on it with a quicksort. The same algorithms will work, except that now we have to deal with lines of text, which are of different lengths, and which, unlike integers, can't be compared or moved in a single operation."},{"Title":"Religious Texts","Text":"O ye who believe! Avoid suspicion as much (as possible): for suspicion in some cases in a sin: And spy not on each other behind their backs. Quran 49:12"},{"Title":"Religious Texts","Text":"If you want to destroy any nation without war, make adultery & nudity common in the next generation. -- Salahuddin Ayyubi"},{"Title":"Religious Texts","Text":"Whoever recommends and helps a good cause becomes a partner therein, and whoever recommends and helps an evil cause shares in its burdens. Quran 4:85"},{"Title":"Religious Texts","Text":"No servant can serve two masters. Either he will hate the one and love the other, or he will be devoted to the one and despise the other. You cannot serve both God and Money. Luke 16:13"},{"Title":"Religious Texts","Text":"So we do not lose heart. Though our outer man is wasting away, our inner self is being renewed day by day. For this light momentary affliction is preparing for us an eternal weight of glory beyond all comparison, as we look not to the things that are seen but to the things that are unseen. For the things that are seen are transient, but the things that are unseen are eternal. 2 Corinthians 4:16-18"},{"Title":"Religious Texts","Text":"And out of that hopeless attempt has come nearly all that we call human history -- money, poverty, ambition, war, prostitution, classes, empires, slavery -- the long terrible story of man trying to find something other than God which will make him happy. -- C.S. Lewis"},{"Title":"Medicine","Text":"Your digestive system is your body's Fun House, whereby food goes on a long, dark, scary ride, taking all kinds of unexpected twists and turns, being attacked by vicious secretions along the way, and not knowing until the last minute whether it will be turned into a useful body part or ejected into the Dark Hole by Mister Sphincter. We Americans live in a nation where the medical-care system is second to none in the world, unless you count maybe 25 or 30 little scuzzball countries like Scotland that we could vaporize in seconds if we felt like it. -- Dave Barry"},{"Title":"Medicine","Text":"The trouble with heart disease is that the first symptom is often hard to deal with: death. -- Michael Phelps"},{"Title":"Medicine","Text":"Never go to a doctor whose office plants have died -- Erma Bombeck"},{"Title":"Science","Text":"Albert Einstein, when asked to describe radio, replied: \"You see, wire telegraph is a kind of a very, very long cat. You pull his tail in NewYork and his head is meowing in Los Angeles. Do you understand this? And radio operates exactly the same way: you send signals here, they receive them there. The only difference is that there is no cat.\""},{"Title":"Carl Sagan, \"The Fine Art of Baloney Detection\"","Text":"At the heart of science is an essential tension between two seemingly contradictory attitudes -- an openness to new ideas, no matter how bizarre or counterintuitive they may be, and the most ruthless skeptical scrutiny of all ideas, old and new. This is how deep truths are winnowed from deep nonsense. Of course, scientists make mistakes in trying to understand the world, but there is a built-in error-correcting mechanism: The collective enterprise of creative thinking and skeptical thinking together keeps the field on track."},{"Title":"#Octalthorpe","Text":"Back in the early 60's, touch tone phones only had 10 buttons. Some military versions had 16, while the 12 button jobs were used only by people who had \"diva\" (digital inquiry, voice answerback) systems -- mainly banks. Since in those days, only Western Electric made \"data sets\" (modems) the problems of terminology were all Bell System. We used to struggle with written descriptions of dial pads that were unfamiliar to most people (most phones were rotary then.) Partly in jest, some AT&T engineering types (there was no marketing in the good old days, which is why they were the good old days) made up the term \"octalthorpe\" (note spelling) to denote the \"pound sign.\" Presumably because it has 8 points sticking out. It never really caught on."},{"Title":"Science -- Edgar R. Fiedler","Text":"Economists state their GDP growth projections to the nearest tenth of a percentage point to prove they have a sense of humor."},{"Title":"Science -- R. Buckminster Fuller","Text":"Everything you've learned in school as \"obvious\" becomes less and less obvious as you begin to study the universe. For example, there are no solids in the universe. There's not even a suggestion of a solid. There are no absolute continuums. There are no surfaces. There are no straight lines."},{"Title":"Math","Text":"Factorials were someone's attempt to make math LOOK exciting."},{"Title":"Science -- Thomas L. Creed","Text":"Fortunately, the responsibility for providing evidence is on the part of the person making the claim, not the critic. It is not the responsibility of UFO skeptics to prove that a UFO has never existed, nor is it the responsibility of paranormal-health-claims skeptics to prove that crystals or colored lights never healed anyone. The skeptic's role is to point out claims that are not adequately supported by acceptable evidcence and to provide plausible alternative explanations that are more in keeping with the accepted body of scientific evidence."},{"Title":"Science -- H. L. Mencken, 1930","Text":"There is, in fact, no reason to believe that any given natural phenomenon, however marvelous it may seem today, will remain forever inexplicable. Soon or late the laws governing the production of life itself will be discovered in the laboratory, and man may set up business as a creator on his own account. The thing, indeed, is not only conceivable; it is even highly probable."},{"Title":"Science","Text":"When Alexander Graham Bell died in 1922, the telephone people interrupted service for one minute in his honor. They've been honoring him intermittently ever since, I believe."},{"Title":"Science -- Stanislaw Lem","Text":"When the Universe was not so out of whack as it is today, and all the stars were lined up in their proper places, you could easily count them from left to right, or top to bottom, and the larger and bluer ones were set apart, and the smaller yellowing types pushed off to the corners as bodies of a lower grade..."},{"Title":"Science -- Dave Barry","Text":"You should not use your fireplace, because scientists now believe that, contrary to popular opinion, fireplaces actually remove heat from houses. Really, that's what scientists believe. In fact many scientists actually use their fireplaces to cool their houses in the summer. If you visit a scientist's house on a sultry August day, you'll find a cheerful fire roaring on the hearth and the scientist sitting nearby, remarking on how cool he is and drinking heavily."},{"Title":"Sports","Text":"Although golf was originally restricted to wealthy, overweight Protestants, today it's open to anybody who owns hideous clothing. -- Dave Barry"},{"Title":"Sports","Text":"Now there's three things you can do in a baseball game: you can win, you can lose, or it can rain. -- Casey Stengel"},{"Title":"Sports","Text":"Once there was this conductor see, who had a bass problem. You see, during a portion of Beethovan's Ninth Symphony in which there are no bass violin parts, one of the bassists always passed a bottle of scotch around. So, to remind himself that the basses usually required an extra cue towards the end of the symphony, the conductor would fasten a piece of string around the page of the score before the bass cue. As the basses grew more and more inebriated, two of them fell asleep. The conductor grew quite nervous (he was very concerned about the pitch) because it was the bottom of the ninth; the score was tied and the basses were loaded with two out."},{"Title":"Sports","Text":"When I'm gone, boxing will be nothing again. The fans with the cigars and the hats turned down'll be there, but no more housewives and little men in the street and foreign presidents. It's goin' to be back to the fighter who comes to town, smells a flower, visits a hospital, blows a horn and says he's in shape. Old hat. I was the onliest boxer in history people asked questions like a senator. -- Muhammad Ali"},{"Title":"Sports","Text":"The surest way to remain a winner is to win once, and then not play any more."},{"Title":"Sports","Text":"The real problem with hunting elephants is carrying the decoys"},{"Title":"Sports -- Dizzy Dean","Text":"The pitcher wound up and he flang the ball at the batter. The batter swang and missed. The pitcher flang the ball again and this time the batter connected. He hit a high fly right to the center fielder. The center fielder was all set to catch the ball, but at the last minute his eyes were blound by the sun and he dropped it."},{"Title":"Sports -- Babe Ruth, in his 1948 farewell speech at Yankee Stadium","Text":"The only real game in the world, I think, is baseball... You've got to start way down, at the bottom, when you're six or seven years old. You can't wait until you're fifteen or sixteen. You've got to let it grow up with you, and if you're successful and you try hard enough, you're bound to come out on top, just like these boys have come to the top now."},{"Title":"Sports","Text":"The one sure way to make a lazy man look respectable is to put a fishing rod in his hand."},{"Title":"Linux -- Linus Torvalds in response to \"Other than the fact Linux has a cool name, could someone explain why I should use Linux over BSD?\"","Text":"No. That's it. The cool name, that is. We worked very hard on creating a name that would appeal to the majority of people, and it certainly paid off: thousands of people are using linux just to be able to say \"OS/2? Hah. I've got Linux. What a cool name\". 386BSD made the mistake of putting a lot of numbers and weird abbreviations into the name, and is scaring away a lot of people just because it sounds too technical."},{"Title":"Smart House","Text":"A teenager wins a fully automated dream house in a competition, but soon the computer controlling it begins to take over and everything gets out of control, then Ben the teenager calms down the computer named Pat and everything goes back to normal."},{"Title":"True Words of a Genius Philosopher","Text":"Writing non-free software is not an ethically legitimate activity, so if people who do this run into trouble, that's good! All businesses based on non-free software ought to fail, and the sooner the better. -- Richard Stallman"},{"Title":"Linux -- Jim Wright","Text":"You know, if Red Hat was smart, they'd have a fake front on their office building just for visitors, where you would board a magical trolley that took you past the smiling singing oompah loompahs who take the raw linux sugar and make it into Red Hat candy goodness. Then they could use it as a motivator for employees... Shape up, or you're spending time working \"the ride\"!"},{"Title":"True Words of a Genius Philosopher","Text":"Free software is software that gives you the user the freedom to share, study and modify it. We call this free software because the user is free."},{"Title":"True Words of a Genius Philosopher","Text":"To use free software is to make a political and ethical choice asserting the right to learn, and share what we learn with others. Free software has become the foundation of a learning society where we share our knowledge in a way that others can build upon and enjoy."},{"Title":"True Words of a Genius Philosopher","Text":"Currently, many people use proprietary software that denies users these freedoms and benefits. If we make a copy and give it to a friend, if we try to figure out how the program works, if we put a copy on more than one of our own computers in our own home, we could be caught and fined or put in jail. That's what's in the fine print of the license agreement you accept when using proprietary software."},{"Title":"True Words of a Genius Philosopher","Text":"The corporations behind proprietary software will often spy on your activities and restrict you from sharing with others. And because our computers control much of our personal information and daily activities, proprietary software represents an unacceptable danger to a free society."},{"Title":"Politics -- Donald Trump","Text":"When Mexico sends its people, they're not sending their best. They're not sending you. They're sending people that have lots of problems, and they're bringing those problems with us. They're bringing drugs. They're bringing crime. Their rapists. And some, I assume, are good people."},{"Title":"Politics -- Sir Winston Churchill, 1952","Text":"A prisoner of war is a man who tries to kill you and fails, and then asks you not to kill him."},{"Title":"Politics -- Johnny Hart","Text":"Cutting the space budget really restores my faith in humanity. It eliminates dreams, goals, and ideals and lets us get straight to the business of hate, debauchery, and self-annihilation."},{"Title":"Politics -- Winston Churchill","Text":"Democracy is the worst form of government except all those other forms that have been tried from time to time."},{"Title":"Politics","Text":"Each person has the right to take part in the management of public affairs in his country, provided he has prior experience, a will to succeed, a university degree, influential parents, good looks, a curriculum vitae, two 3x4 snapshots, and a good tax record."},{"Title":"Politics -- A Yippie Proverb","Text":"Free Speech Is The Right To Shout 'Theater' In A Crowded Fire."},{"Title":"Politics -- Boss Tweed","Text":"I don't care who does the electing as long as I get to do the nominating."},{"Title":"Politics -- Francis Bellamy, 1892","Text":"I pledge allegiance to the flag of the United States of America and to the republic for which it stands, one nation, indivisible, with liberty and justice for all."},{"Title":"Politics -- Napoleon","Text":"It follows that any commander in chief who undertakes to carry out a plan which he considers defective is at fault; he must put forth his reasons, insist of the plan being changed, and finally tender his resignation rather than be the instrument of his army's downfall."},{"Title":"Politics","Text":"Only two kinds of witnesses exist. The first live in a neighborhood where a crime has been committed and in no circumstances have ever seen anything or even heard a shot. The second category are the neighbors of anyone who happens to be accused of the crime. These have always looked out of their windows when the shot was fired, and have noticed the accused person standing peacefully on his balcony a few yards away."},{"Title":"Politics -- Frederick Douglass","Text":"Slaves are generally expected to sing as well as to work ... I did not, when a slave, understand the deep meanings of those rude, and apparently incoherent songs. I was myself within the circle, so that I neither saw nor heard as those without might see and hear. They told a tale which was then altogether beyond my feeble comprehension: they were tones, loud, long and deep, breathing the prayer and complaint of souls boiling over with the bitterest anguish. Every tone was a testimony against slavery, and a prayer to God for deliverance from chains."}] \ No newline at end of file From e982b0fc1895ffbeb5fa465e77e20c06946728c3 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 28 Mar 2017 10:56:51 +0200 Subject: [PATCH 385/496] forgot to up the version --- src/NadekoBot/Services/Impl/StatsService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Services/Impl/StatsService.cs b/src/NadekoBot/Services/Impl/StatsService.cs index ba0f5e37..f18845ad 100644 --- a/src/NadekoBot/Services/Impl/StatsService.cs +++ b/src/NadekoBot/Services/Impl/StatsService.cs @@ -16,7 +16,7 @@ namespace NadekoBot.Services.Impl private readonly DiscordShardedClient _client; private readonly DateTime _started; - public const string BotVersion = "1.26"; + public const string BotVersion = "1.26a"; public string Author => "Kwoth#2560"; public string Library => "Discord.Net"; From ca05b14f3e1e0da07f10e79256cb3e868ac9cb19 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 28 Mar 2017 11:56:31 +0200 Subject: [PATCH 386/496] Updated commandlist --- docs/Commands List.md | 130 ++++++++++++++++++++++-------------------- 1 file changed, 68 insertions(+), 62 deletions(-) diff --git a/docs/Commands List.md b/docs/Commands List.md index 1317f263..0ce3438d 100644 --- a/docs/Commands List.md +++ b/docs/Commands List.md @@ -1,6 +1,6 @@ You can support the project on patreon: or paypal: -##Table Of Contents +##Table of contents - [Help](#help) - [Administration](#administration) - [ClashOfClans](#clashofclans) @@ -16,7 +16,7 @@ You can support the project on patreon: or paypa ### Administration -Command and aliases | Description | Usage +Commands and aliases | Description | Usage ----------------|--------------|------- `.resetperms` | Resets the bot's permissions module on this server to the default value. **Requires Administrator server permission.** | `.resetperms` `.delmsgoncmd` | Toggles the automatic deletion of the user's successful command message to prevent chat flood. **Requires Administrator server permission.** | `.delmsgoncmd` @@ -40,27 +40,27 @@ Command and aliases | Description | Usage `.prune` `.clr` | `.prune` removes all Nadeko's messages in the last 100 messages. `.prune X` removes last `X` number of messages from the channel (up to 100). `.prune @Someone` removes all Someone's messages in the last 100 messages. `.prune @Someone X` removes last `X` number of 'Someone's' messages in the channel. | `.prune` or `.prune 5` or `.prune @Someone` or `.prune @Someone X` `.mentionrole` `.menro` | Mentions every person from the provided role or roles (separated by a ',') on this server. Requires you to have the mention everyone permission. **Requires MentionEveryone server permission.** | `.menro RoleName` `.donators` | List of the lovely people who donated to keep this project alive. | `.donators` -`.donadd` | Add a donator to the database. **Bot Owner Only** | `.donadd Donate Amount` +`.donadd` | Add a donator to the database. **Bot owner only** | `.donadd Donate Amount` `.autoassignrole` `.aar` | Automaticaly assigns a specified role to every user who joins the server. **Requires ManageRoles server permission.** | `.aar` to disable, `.aar Role Name` to enable `.languageset` `.langset` | 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. | `.langset de-DE ` or `.langset default` `.langsetdefault` `.langsetd` | 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. | `.langsetd en-US` or `.langsetd default` `.languageslist` `.langli` | List of languages for which translation (or part of it) exist atm. | `.langli` -`.logserver` | Enables or Disables ALL log events. If enabled, all log events will log to this channel. **Requires Administrator server permission.** **Bot Owner Only** | `.logserver enable` or `.logserver disable` -`.logignore` | Toggles whether the `.logserver` command ignores this channel. Useful if you have hidden admin channel and public log channel. **Requires Administrator server permission.** **Bot Owner Only** | `.logignore` -`.logevents` | Shows a list of all events you can subscribe to with `.log` **Requires Administrator server permission.** **Bot Owner Only** | `.logevents` -`.log` | Toggles logging event. Disables it if it is active anywhere on the server. Enables if it isn't active. Use `.logevents` to see a list of all events you can subscribe to. **Requires Administrator server permission.** **Bot Owner Only** | `.log userpresence` or `.log userbanned` -`.migratedata` | Migrate data from old bot configuration **Bot Owner Only** | `.migratedata` +`.logserver` | Enables or Disables ALL log events. If enabled, all log events will log to this channel. **Requires Administrator server permission.** **Bot owner only** | `.logserver enable` or `.logserver disable` +`.logignore` | Toggles whether the `.logserver` command ignores this channel. Useful if you have hidden admin channel and public log channel. **Requires Administrator server permission.** **Bot owner only** | `.logignore` +`.logevents` | Shows a list of all events you can subscribe to with `.log` **Requires Administrator server permission.** **Bot owner only** | `.logevents` +`.log` | Toggles logging event. Disables it if it is active anywhere on the server. Enables if it isn't active. Use `.logevents` to see a list of all events you can subscribe to. **Requires Administrator server permission.** **Bot owner only** | `.log userpresence` or `.log userbanned` +`.migratedata` | Migrate data from old bot configuration **Bot owner only** | `.migratedata` `.setmuterole` | Sets a name of the role which will be assigned to people who should be muted. Default is nadeko-mute. **Requires ManageRoles server permission.** | `.setmuterole Silenced` -`.mute` | Mutes a mentioned user both from speaking and chatting. **Requires ManageRoles server permission.** **Requires MuteMembers server permission.** | `.mute @Someone` +`.mute` | Mutes a mentioned user both from speaking and chatting. You can also specify time in minutes (up to 1440) for how long the user should be muted. **Requires ManageRoles server permission.** **Requires MuteMembers server permission.** | `.mute @Someone` or `.mute 30 @Someone` `.unmute` | Unmutes a mentioned user previously muted with `.mute` command. **Requires ManageRoles server permission.** **Requires MuteMembers server permission.** | `.unmute @Someone` `.chatmute` | Prevents a mentioned user from chatting in text channels. **Requires ManageRoles server permission.** | `.chatmute @Someone` `.chatunmute` | Removes a mute role previously set on a mentioned user with `.chatmute` which prevented him from chatting in text channels. **Requires ManageRoles server permission.** | `.chatunmute @Someone` `.voicemute` | Prevents a mentioned user from speaking in voice channels. **Requires MuteMembers server permission.** | `.voicemute @Someone` `.voiceunmute` | Gives a previously voice-muted user a permission to speak. **Requires MuteMembers server permission.** | `.voiceunmute @Someguy` -`.rotateplaying` `.ropl` | Toggles rotation of playing status of the dynamic strings you previously specified. **Bot Owner Only** | `.ropl` -`.addplaying` `.adpl` | Adds a specified string to the list of playing strings to rotate. Supported placeholders: `%servers%`, `%users%`, `%playing%`, `%queued%`, `%time%`, `%shardid%`, `%shardcount%`, `%shardguilds%`. **Bot Owner Only** | `.adpl` -`.listplaying` `.lipl` | Lists all playing statuses with their corresponding number. **Bot Owner Only** | `.lipl` -`.removeplaying` `.rmpl` `.repl` | Removes a playing string on a given number. **Bot Owner Only** | `.rmpl` +`.rotateplaying` `.ropl` | Toggles rotation of playing status of the dynamic strings you previously specified. **Bot owner only** | `.ropl` +`.addplaying` `.adpl` | Adds a specified string to the list of playing strings to rotate. Supported placeholders: `%servers%`, `%users%`, `%playing%`, `%queued%`, `%time%`, `%shardid%`, `%shardcount%`, `%shardguilds%`. **Bot owner only** | `.adpl` +`.listplaying` `.lipl` | Lists all playing statuses with their corresponding number. **Bot owner only** | `.lipl` +`.removeplaying` `.rmpl` `.repl` | Removes a playing string on a given number. **Bot owner only** | `.rmpl` `.antiraid` | Sets an anti-raid protection on the server. First argument is number of people which will trigger the protection. Second one is a time interval in which that number of people needs to join in order to trigger the protection, and third argument is punishment for those people (Kick, Ban, Mute) **Requires Administrator server permission.** | `.antiraid 5 20 Kick` `.antispam` | Stops people from repeating same message X times in a row. You can specify to either mute, kick or ban the offenders. Max message count is 10. **Requires Administrator server permission.** | `.antispam 3 Mute` or `.antispam 4 Kick` or `.antispam 6 Ban` `.antispamignore` | Toggles whether antispam ignores current channel. Antispam must be enabled. | `.antispamignore` @@ -73,19 +73,19 @@ Command and aliases | Description | Usage `.togglexclsar` `.tesar` | Toggles whether the self-assigned roles are exclusive. (So that any person can have only one of the self assignable roles) **Requires ManageRoles server permission.** | `.tesar` `.iam` | Adds a role to you that you choose. Role must be on a list of self-assignable roles. | `.iam Gamer` `.iamnot` `.iamn` | Removes a role to you that you choose. Role must be on a list of self-assignable roles. | `.iamn Gamer` -`.fwmsgs` | Toggles forwarding of non-command messages sent to bot's DM to the bot owners **Bot Owner Only** | `.fwmsgs` -`.fwtoall` | Toggles whether messages will be forwarded to all bot owners or only to the first one specified in the credentials.json file **Bot Owner Only** | `.fwtoall` -`.connectshard` | Try (re)connecting a shard with a certain shardid when it dies. No one knows will it work. Keep an eye on the console for errors. **Bot Owner Only** | `.connectshard 2` -`.leave` | Makes Nadeko leave the server. Either server name or server ID is required. **Bot Owner Only** | `.leave 123123123331` -`.die` | Shuts the bot down. **Bot Owner Only** | `.die` -`.setname` `.newnm` | Gives the bot a new name. **Bot Owner Only** | `.newnm BotName` -`.setstatus` | Sets the bot's status. (Online/Idle/Dnd/Invisible) **Bot Owner Only** | `.setstatus Idle` -`.setavatar` `.setav` | Sets a new avatar image for the NadekoBot. Argument is a direct link to an image. **Bot Owner Only** | `.setav http://i.imgur.com/xTG3a1I.jpg` -`.setgame` | Sets the bots game. **Bot Owner Only** | `.setgame with snakes` -`.setstream` | Sets the bots stream. First argument is the twitch link, second argument is stream name. **Bot Owner Only** | `.setstream TWITCHLINK Hello` -`.send` | Sends a message to someone on a different server through the bot. Separate server and channel/user ids with `|` and prefix the channel id with `c:` and the user id with `u:`. **Bot Owner Only** | `.send serverid|c:channelid message` or `.send serverid|u:userid message` -`.announce` | Sends a message to all servers' default channel that bot is connected to. **Bot Owner Only** | `.announce Useless spam` -`.reloadimages` | Reloads images bot is using. Safe to use even when bot is being used heavily. **Bot Owner Only** | `.reloadimages` +`.fwmsgs` | Toggles forwarding of non-command messages sent to bot's DM to the bot owners **Bot owner only** | `.fwmsgs` +`.fwtoall` | Toggles whether messages will be forwarded to all bot owners or only to the first one specified in the credentials.json file **Bot owner only** | `.fwtoall` +`.connectshard` | Try (re)connecting a shard with a certain shardid when it dies. No one knows will it work. Keep an eye on the console for errors. **Bot owner only** | `.connectshard 2` +`.leave` | Makes Nadeko leave the server. Either server name or server ID is required. **Bot owner only** | `.leave 123123123331` +`.die` | Shuts the bot down. **Bot owner only** | `.die` +`.setname` `.newnm` | Gives the bot a new name. **Bot owner only** | `.newnm BotName` +`.setstatus` | Sets the bot's status. (Online/Idle/Dnd/Invisible) **Bot owner only** | `.setstatus Idle` +`.setavatar` `.setav` | Sets a new avatar image for the NadekoBot. Argument is a direct link to an image. **Bot owner only** | `.setav http://i.imgur.com/xTG3a1I.jpg` +`.setgame` | Sets the bots game. **Bot owner only** | `.setgame with snakes` +`.setstream` | Sets the bots stream. First argument is the twitch link, second argument is stream name. **Bot owner only** | `.setstream TWITCHLINK Hello` +`.send` | Sends a message to someone on a different server through the bot. Separate server and channel/user ids with `|` and prefix the channel id with `c:` and the user id with `u:`. **Bot owner only** | `.send serverid|c:channelid message` or `.send serverid|u:userid message` +`.announce` | Sends a message to all servers' default channel that bot is connected to. **Bot owner only** | `.announce Useless spam` +`.reloadimages` | Reloads images bot is using. Safe to use even when bot is being used heavily. **Bot owner only** | `.reloadimages` `.greetdel` `.grdel` | Sets the time it takes (in seconds) for greet messages to be auto-deleted. Set it to 0 to disable automatic deletion. **Requires ManageServer server permission.** | `.greetdel 0` or `.greetdel 30` `.greet` | Toggles anouncements on the current channel when someone joins the server. **Requires ManageServer server permission.** | `.greet` `.greetmsg` | Sets a new join announcement message which will be shown in the server's channel. Type `%user%` if you want to mention the new member. Using it with no message will show the current greet message. You can use embed json from instead of a regular text, if you want the message to be embedded. **Requires ManageServer server permission.** | `.greetmsg Welcome, %user%.` @@ -94,13 +94,15 @@ Command and aliases | Description | Usage `.bye` | Toggles anouncements on the current channel when someone leaves the server. **Requires ManageServer server permission.** | `.bye` `.byemsg` | Sets a new leave announcement message. Type `%user%` if you want to show the name the user who left. Type `%id%` to show id. Using this command with no message will show the current bye message. You can use embed json from instead of a regular text, if you want the message to be embedded. **Requires ManageServer server permission.** | `.byemsg %user% has left.` `.byedel` | Sets the time it takes (in seconds) for bye messages to be auto-deleted. Set it to `0` to disable automatic deletion. **Requires ManageServer server permission.** | `.byedel 0` or `.byedel 30` +`.vcrole` | Sets or resets a role which will be given to users who join the voice channel you're in when you run this command. Provide no role name to disable. You must be in a voice channel to run this command. **Requires ManageRoles server permission.** **Requires ManageChannels server permission.** | `.vcrole SomeRole` or `.vcrole` +`.vcrolelist` | Shows a list of currently set voice channel roles. | `.vcrolelist` `.voice+text` `.v+t` | Creates a text channel for each voice channel only users in that voice channel can see. If you are server owner, keep in mind you will see them all the time regardless. **Requires ManageRoles server permission.** **Requires ManageChannels server permission.** | `.v+t` `.cleanvplust` `.cv+t` | Deletes all text channels ending in `-voice` for which voicechannels are not found. Use at your own risk. **Requires ManageChannels server permission.** **Requires ManageRoles server permission.** | `.cleanv+t` ###### [Back to ToC](#table-of-contents) ### ClashOfClans -Command and aliases | Description | Usage +Commands and aliases | Description | Usage ----------------|--------------|------- `,createwar` `,cw` | Creates a new war by specifying a size (>10 and multiple of 5) and enemy clan name. **Requires ManageMessages server permission.** | `,cw 15 The Enemy Clan` `,startwar` `,sw` | Starts a war with a given number. | `,sw 15` @@ -115,31 +117,33 @@ Command and aliases | Description | Usage ###### [Back to ToC](#table-of-contents) ### CustomReactions -Command and aliases | Description | Usage +Commands and aliases | Description | Usage ----------------|--------------|------- `.addcustreact` `.acr` | Add a custom reaction with a trigger and a response. Running this command in server requires the Administration permission. Running this command in DM is Bot Owner only and adds a new global custom reaction. Guide here: | `.acr "hello" Hi there %user%` `.listcustreact` `.lcr` | Lists global or server custom reactions (20 commands per page). Running the command in DM will list global custom reactions, while running it in server will list that server's custom reactions. Specifying `all` argument instead of the number will DM you a text file with a list of all custom reactions. | `.lcr 1` or `.lcr all` `.listcustreactg` `.lcrg` | Lists global or server custom reactions (20 commands per page) grouped by trigger, and show a number of responses for each. Running the command in DM will list global custom reactions, while running it in server will list that server's custom reactions. | `.lcrg 1` `.showcustreact` `.scr` | Shows a custom reaction's response on a given ID. | `.scr 1` `.delcustreact` `.dcr` | Deletes a custom reaction on a specific index. If ran in DM, it is bot owner only and deletes a global custom reaction. If ran in a server, it requires Administration privileges and removes server custom reaction. | `.dcr 5` -`.crstatsclear` | Resets the counters on `.crstats`. You can specify a trigger to clear stats only for that trigger. **Bot Owner Only** | `.crstatsclear` or `.crstatsclear rng` +`.crdm` | Toggles whether the response message of the custom reaction will be sent as a direct message. | `.crad 44` +`.crad` | Toggles whether the message triggering the custom reaction will be automatically deleted. | `.crad 59` +`.crstatsclear` | Resets the counters on `.crstats`. You can specify a trigger to clear stats only for that trigger. **Bot owner only** | `.crstatsclear` or `.crstatsclear rng` `.crstats` | Shows a list of custom reactions and the number of times they have been executed. Paginated with 10 per page. Use `.crstatsclear` to reset the counters. | `.crstats` or `.crstats 3` ###### [Back to ToC](#table-of-contents) ### Gambling -Command and aliases | Description | Usage +Commands and aliases | Description | Usage ----------------|--------------|------- `$raffle` | Prints a name and ID of a random user from the online list from the (optional) role. | `$raffle` or `$raffle RoleName` `$cash` `$$$` | Check how much currency a person has. (Defaults to yourself) | `$$$` or `$$$ @SomeGuy` `$give` | Give someone a certain amount of currency. | `$give 1 "@SomeGuy"` -`$award` | Awards someone a certain amount of currency. You can also specify a role name to award currency to all users in a role. **Bot Owner Only** | `$award 100 @person` or `$award 5 Role Of Gamblers` -`$take` | Takes a certain amount of currency from someone. **Bot Owner Only** | `$take 1 "@someguy"` +`$award` | Awards someone a certain amount of currency. You can also specify a role name to award currency to all users in a role. **Bot owner only** | `$award 100 @person` or `$award 5 Role Of Gamblers` +`$take` | Takes a certain amount of currency from someone. **Bot owner only** | `$take 1 "@someguy"` `$betroll` `$br` | Bets a certain amount of currency and rolls a dice. Rolling over 66 yields x2 of your currency, over 90 - x4 and 100 x10. | `$br 5` `$leaderboard` `$lb` | Displays the bot's currency leaderboard. | `$lb` `$race` | Starts a new animal race. | `$race` `$joinrace` `$jr` | Joins a new race. You can specify an amount of currency for betting (optional). You will get YourBet*(participants-1) back if you win. | `$jr` or `$jr 5` -`$startevent` | Starts one of the events seen on public nadeko. **Bot Owner Only** | `$startevent flowerreaction` +`$startevent` | Starts one of the events seen on public nadeko. **Bot owner only** | `$startevent flowerreaction` `$roll` | Rolls 0-100. If you supply a number `X` it rolls up to 30 normal dice. If you split 2 numbers with letter `d` (`xdy`) it will roll `X` dice from 1 to `y`. `Y` can be a letter 'F' if you want to roll fate dice instead of dnd. | `$roll` or `$roll 7` or `$roll 3d5` or `$roll 5dF` `$rolluo` | Rolls `X` normal dice (up to 30) unordered. If you split 2 numbers with letter `d` (`xdy`) it will roll `X` dice from 1 to `y`. | `$rolluo` or `$rolluo 7` or `$rolluo 3d5` `$nroll` | Rolls in a given range. | `$nroll 5` (rolls 0-5) or `$nroll 5-15` @@ -147,10 +151,10 @@ Command and aliases | Description | Usage `$shuffle` `$sh` | Reshuffles all cards back into the deck. | `$sh` `$flip` | Flips coin(s) - heads or tails, and shows an image. | `$flip` or `$flip 3` `$betflip` `$bf` | Bet to guess will the result be heads or tails. Guessing awards you 1.95x the currency you've bet (rounded up). Multiplier can be changed by the bot owner. | `$bf 5 heads` or `$bf 3 t` -`$slotstats` | Shows the total stats of the slot command for this bot's session. **Bot Owner Only** | `$slotstats` -`$slottest` | Tests to see how much slots payout for X number of plays. **Bot Owner Only** | `$slottest 1000` +`$slotstats` | Shows the total stats of the slot command for this bot's session. **Bot owner only** | `$slotstats` +`$slottest` | Tests to see how much slots payout for X number of plays. **Bot owner only** | `$slottest 1000` `$slot` | Play Nadeko slots. Max bet is 999. 3 seconds cooldown per user. | `$slot 5` -`$claimwaifu` `$claim` | Claim a waifu for yourself by spending currency. You must spend atleast 10% more than her current value unless she set `$affinity` towards you. | `$claim 50 @Himesama` +`$claimwaifu` `$claim` | Claim a waifu for yourself by spending currency. You must spend at least 10% more than her current value unless she set `$affinity` towards you. | `$claim 50 @Himesama` `$divorce` | Releases your claim on a specific waifu. You will get some of the money you've spent back unless that waifu has an affinity towards you. 6 hours cooldown. | `$divorce @CheatingSloot` `$affinity` | Sets your affinity towards someone you want to be claimed by. Setting affinity will reduce their `$claim` on you by 20%. You can leave second argument empty to clear your affinity. 30 minutes cooldown. | `$affinity @MyHusband` or `$affinity` `$waifus` `$waifulb` | Shows top 9 waifus. | `$waifus` @@ -159,7 +163,7 @@ Command and aliases | Description | Usage ###### [Back to ToC](#table-of-contents) ### Games -Command and aliases | Description | Usage +Commands and aliases | Description | Usage ----------------|--------------|------- `>choose` | Chooses a thing from a list of things | `>choose Get up;Sleep;Sleep more` `>8ball` | Ask the 8ball a yes/no question. | `>8ball should I do something` @@ -167,7 +171,7 @@ Command and aliases | Description | Usage `>rategirl` | Use the universal hot-crazy wife zone matrix to determine the girl's worth. It is everything young men need to know about women. At any moment in time, any woman you have previously located on this chart can vanish from that location and appear anywhere else on the chart. | `>rategirl @SomeGurl` `>linux` | Prints a customizable Linux interjection | `>linux Spyware Windows` `>leet` | Converts a text to leetspeak with 6 (1-6) severity levels | `>leet 3 Hello` -`>acrophobia` `>acro` | Starts an Acrophobia game. Second argment is optional round length in seconds. (default is 60) | `>acro` or `>acro 30` +`>acrophobia` `>acro` | Starts an Acrophobia game. Second argument is optional round length in seconds. (default is 60) | `>acro` or `>acro 30` `>cleverbot` | Toggles cleverbot session. When enabled, the bot will reply to messages starting with bot mention in the server. Custom reactions starting with %mention% won't work if cleverbot is enabled. **Requires ManageMessages server permission.** | `>cleverbot` `>hangmanlist` | Shows a list of hangman term types. | `> hangmanlist` `>hangman` | Starts a game of hangman in the channel. Use `>hangmanlist` to see a list of available term types. Defaults to 'all'. | `>hangman` or `>hangman movies` @@ -180,9 +184,9 @@ Command and aliases | Description | Usage `>pollend` | Stops active poll on this server and prints the results in this channel. **Requires ManageMessages server permission.** | `>pollend` `>typestart` | Starts a typing contest. | `>typestart` `>typestop` | Stops a typing contest on the current channel. | `>typestop` -`>typeadd` | Adds a new article to the typing contest. **Bot Owner Only** | `>typeadd wordswords` +`>typeadd` | Adds a new article to the typing contest. **Bot owner only** | `>typeadd wordswords` `>typelist` | Lists added typing articles with their IDs. 15 per page. | `>typelist` or `>typelist 3` -`>typedel` | Deletes a typing article given the ID. **Bot Owner Only** | `>typedel 3` +`>typedel` | Deletes a typing article given the ID. **Bot owner only** | `>typedel 3` `>tictactoe` `>ttt` | Starts a game of tic tac toe. Another user must run the command in the same channel in order to accept the challenge. Use numbers 1-9 to play. 15 seconds per move. | >ttt `>trivia` `>t` | Starts a game of trivia. You can add `nohint` to prevent hints. First player to get to 10 points wins by default. You can specify a different number. 30 seconds per question. | `>t` or `>t 5 nohint` `>tl` | Shows a current trivia leaderboard. | `>tl` @@ -191,19 +195,19 @@ Command and aliases | Description | Usage ###### [Back to ToC](#table-of-contents) ### Help -Command and aliases | Description | Usage +Commands and aliases | Description | Usage ----------------|--------------|------- `-modules` `-mdls` | Lists all bot modules. | `-modules` `-commands` `-cmds` | List all of the bot's commands from a certain module. You can either specify the full name or only the first few letters of the module name. | `-commands Administration` or `-cmds Admin` `-help` `-h` | Either shows a help for a single command, or DMs you help link if no arguments are specified. | `-h -cmds` or `-h` -`-hgit` | Generates the commandlist.md file. **Bot Owner Only** | `-hgit` +`-hgit` | Generates the commandlist.md file. **Bot owner only** | `-hgit` `-readme` `-guide` | Sends a readme and a guide links to the channel. | `-readme` or `-guide` `-donate` | Instructions for helping the project financially. | `-donate` ###### [Back to ToC](#table-of-contents) ### Music -Command and aliases | Description | Usage +Commands and aliases | Description | Usage ----------------|--------------|------- `!!next` `!!n` | Goes to the next song in the queue. You have to be in the same voice channel as the bot. You can skip multiple songs, but in that case songs will not be requeued if !!rcs or !!rpl is enabled. | `!!n` or `!!n 5` `!!stop` `!!s` | Stops the music and clears the playlist. Stays in the channel. | `!!s` @@ -219,9 +223,9 @@ Command and aliases | Description | Usage `!!shuffle` `!!sh` | Shuffles the current playlist. | `!!sh` `!!playlist` `!!pl` | Queues up to 500 songs from a youtube playlist specified by a link, or keywords. | `!!pl playlist link or name` `!!soundcloudpl` `!!scpl` | Queue a Soundcloud playlist using a link. | `!!scpl soundcloudseturl` -`!!localplaylst` `!!lopl` | Queues all songs from a directory. **Bot Owner Only** | `!!lopl C:/music/classical` +`!!localplaylst` `!!lopl` | Queues all songs from a directory. **Bot owner only** | `!!lopl C:/music/classical` `!!radio` `!!ra` | Queues a radio stream from a link. It can be a direct mp3 radio stream, .m3u, .pls .asx or .xspf (Usage Video: ) | `!!ra radio link here` -`!!local` `!!lo` | Queues a local file by specifying a full path. **Bot Owner Only** | `!!lo C:/music/mysong.mp3` +`!!local` `!!lo` | Queues a local file by specifying a full path. **Bot owner only** | `!!lo C:/music/mysong.mp3` `!!remove` `!!rm` | Remove a song by its # in the queue, or 'all' to remove whole queue. | `!!rm 5` `!!movesong` `!!ms` | Moves a song from one position to another. | `!!ms 5>3` `!!setmaxqueue` `!!smq` | Sets a maximum queue size. Supply 0 or no argument to have no limit. | `!!smq 50` or `!!smq` @@ -239,7 +243,7 @@ Command and aliases | Description | Usage ###### [Back to ToC](#table-of-contents) ### NSFW -Command and aliases | Description | Usage +Commands and aliases | Description | Usage ----------------|--------------|------- `~hentai` | Shows a hentai image from a random website (gelbooru or danbooru or konachan or atfbooru or yandere) with a given tag. Tag is optional but preferred. Only 1 tag allowed. | `~hentai yuri` `~autohentai` | Posts a hentai every X seconds with a random tag from the provided tags. Use `|` to separate tags. 20 seconds minimum. Provide no arguments to disable. **Requires ManageMessages channel permission.** | `~autohentai 30 yuri|tail|long_hair` or `~autohentai` @@ -257,7 +261,7 @@ Command and aliases | Description | Usage ###### [Back to ToC](#table-of-contents) ### Permissions -Command and aliases | Description | Usage +Commands and aliases | Description | Usage ----------------|--------------|------- `;verbose` `;v` | Sets whether to show when a command/module is blocked. | `;verbose true` `;permrole` `;pr` | Sets a role which can change permissions. Supply no parameters to see the current one. Default is 'Nadeko'. | `;pr role` @@ -276,9 +280,9 @@ Command and aliases | Description | Usage `;allrolemdls` `;arm` | Enable or disable all modules for a specific role. | `;arm [enable/disable] MyRole` `;allusrmdls` `;aum` | Enable or disable all modules for a specific user. | `;aum enable @someone` `;allsrvrmdls` `;asm` | Enable or disable all modules for your server. | `;asm [enable/disable]` -`;ubl` | Either [add]s or [rem]oves a user specified by a Mention or an ID from a blacklist. **Bot Owner Only** | `;ubl add @SomeUser` or `;ubl rem 12312312313` -`;cbl` | Either [add]s or [rem]oves a channel specified by an ID from a blacklist. **Bot Owner Only** | `;cbl rem 12312312312` -`;sbl` | Either [add]s or [rem]oves a server specified by a Name or an ID from a blacklist. **Bot Owner Only** | `;sbl add 12312321312` or `;sbl rem SomeTrashServer` +`;ubl` | Either [add]s or [rem]oves a user specified by a Mention or an ID from a blacklist. **Bot owner only** | `;ubl add @SomeUser` or `;ubl rem 12312312313` +`;cbl` | Either [add]s or [rem]oves a channel specified by an ID from a blacklist. **Bot owner only** | `;cbl rem 12312312312` +`;sbl` | Either [add]s or [rem]oves a server specified by a Name or an ID from a blacklist. **Bot owner only** | `;sbl add 12312321312` or `;sbl rem SomeTrashServer` `;cmdcooldown` `;cmdcd` | Sets a cooldown per user for a command. Set it to 0 to remove the cooldown. | `;cmdcd "some cmd" 5` `;allcmdcooldowns` `;acmdcds` | Shows a list of all commands and their respective cooldowns. | `;acmdcds` `;srvrfilterinv` `;sfi` | Toggles automatic deletion of invites posted in the server. Does not affect the Bot Owner. | `;sfi` @@ -291,7 +295,7 @@ Command and aliases | Description | Usage ###### [Back to ToC](#table-of-contents) ### Pokemon -Command and aliases | Description | Usage +Commands and aliases | Description | Usage ----------------|--------------|------- `>attack` | Attacks a target with the given move. Use `>movelist` to see a list of moves your type can use. | `>attack "vine whip" @someguy` `>movelist` `>ml` | Lists the moves you are able to use | `>ml` @@ -302,7 +306,7 @@ Command and aliases | Description | Usage ###### [Back to ToC](#table-of-contents) ### Searches -Command and aliases | Description | Usage +Commands and aliases | Description | Usage ----------------|--------------|------- `~weather` `~we` | Shows weather data for a specified city. You can also specify a country after a comma. | `~we Moscow, RU` `~youtube` `~yt` | Searches youtubes and shows the first result | `~yt query` @@ -355,7 +359,7 @@ Command and aliases | Description | Usage `~removestream` `~rms` | Removes notifications of a certain streamer from a certain platform on this channel. **Requires ManageMessages server permission.** | `~rms Twitch SomeGuy` or `~rms Beam SomeOtherGuy` `~checkstream` `~cs` | Checks if a user is online on a certain streaming platform. | `~cs twitch MyFavStreamer` `~translate` `~trans` | Translates from>to text. From the given language to the destination language. | `~trans en>fr Hello` -`~autotrans` `~at` | Starts automatic translation of all messages by users who set their `~atl` in this channel. You can set "del" argument to automatically delete all translated user messages. **Requires Administrator server permission.** **Bot Owner Only** | `~at` or `~at del` +`~autotrans` `~at` | Starts automatic translation of all messages by users who set their `~atl` in this channel. You can set "del" argument to automatically delete all translated user messages. **Requires Administrator server permission.** **Bot owner only** | `~at` or `~at del` `~autotranslang` `~atl` | Sets your source and target language to be used with `~at`. Specify no arguments to remove previously set value. | `~atl en>fr` `~translangs` | Lists the valid languages for translation. | `~translangs` `~xkcd` | Shows a XKCD comic. No arguments will retrieve random one. Number argument will retrieve a specific comic, and "latest" will get the latest one. | `~xkcd` or `~xkcd 1400` or `~xkcd latest` @@ -363,12 +367,12 @@ Command and aliases | Description | Usage ###### [Back to ToC](#table-of-contents) ### Utility -Command and aliases | Description | Usage +Commands and aliases | Description | Usage ----------------|--------------|------- -`.rotaterolecolor` `.rrc` | Rotates a roles color on an interval with a list of supplied colors. First argument is interval in seconds (Minimum 60). Second argument is a role, followed by a space-separated list of colors in hex. Provide a rolename with a 0 interval to disable. **Requires ManageRoles server permission.** **Bot Owner Only** | `.rrc 60 MyLsdRole #ff0000 #00ff00 #0000ff` or `.rrc 0 MyLsdRole` +`.rotaterolecolor` `.rrc` | Rotates a roles color on an interval with a list of supplied colors. First argument is interval in seconds (Minimum 60). Second argument is a role, followed by a space-separated list of colors in hex. Provide a rolename with a 0 interval to disable. **Requires ManageRoles server permission.** **Bot owner only** | `.rrc 60 MyLsdRole #ff0000 #00ff00 #0000ff` or `.rrc 0 MyLsdRole` `.togethertube` `.totube` | Creates a new room on and shows the link in the chat. | `.totube` `.whosplaying` `.whpl` | Shows a list of users who are playing the specified game. | `.whpl Overwatch` -`.inrole` | Lists every person from the provided role or roles, separated with space, on this server. You can use role IDs, role names (in quotes if it has multiple words), or role mention If the list is too long for 1 message, you must have Manage Messages permission. | `.inrole Role` or `.inrole Role1 "Role 2" @role3` +`.inrole` | Lists every person from the specified role on this server. You can use role ID, role name. | `.inrole Some Role` `.checkmyperms` | Checks your user-specific permissions on this channel. | `.checkmyperms` `.userid` `.uid` | Shows user ID. | `.uid` or `.uid "@SomeGuy"` `.channelid` `.cid` | Shows current channel ID. | `.cid` @@ -380,12 +384,14 @@ Command and aliases | Description | Usage `.shardid` | Shows which shard is a certain guild on, by guildid. | `.shardid 117523346618318850` `.stats` | Shows some basic stats for Nadeko. | `.stats` `.showemojis` `.se` | Shows a name and a link to every SPECIAL emoji in the message. | `.se A message full of SPECIAL emojis` -`.listservers` | Lists servers the bot is on with some basic info. 15 per page. **Bot Owner Only** | `.listservers 3` -`.savechat` | Saves a number of messages to a text file and sends it to you. **Bot Owner Only** | `.savechat 150` -`.activity` | Checks for spammers. **Bot Owner Only** | `.activity` +`.listservers` | Lists servers the bot is on with some basic info. 15 per page. **Bot owner only** | `.listservers 3` +`.savechat` | Saves a number of messages to a text file and sends it to you. **Bot owner only** | `.savechat 150` +`.activity` | Checks for spammers. **Bot owner only** | `.activity` `.calculate` `.calc` | Evaluate a mathematical expression. | `.calc 1+1` `.calcops` | Shows all available operations in the `.calc` command | `.calcops` -`.scsc` | Starts an instance of cross server channel. You will get a token as a DM that other people will use to tune in to the same instance. **Bot Owner Only** | `.scsc` +`.alias` `.cmdmap` | Create a custom alias for a certain Nadeko command. Provide no alias to remove the existing one. **Requires Administrator server permission.** | `.alias allin $bf 100 h` or `.alias "linux thingy" >loonix Spyware Windows` +`.aliaslist` `.cmdmaplist` `.aliases` | Shows the list of currently set aliases. Paginated. | `.aliaslist` or `.aliaslist 3` +`.scsc` | Starts an instance of cross server channel. You will get a token as a DM that other people will use to tune in to the same instance. **Bot owner only** | `.scsc` `.jcsc` | Joins current channel to an instance of cross server channel using the token. **Requires ManageServer server permission.** | `.jcsc TokenHere` `.lcsc` | Leaves a cross server channel instance from this channel. **Requires ManageServer server permission.** | `.lcsc` `.serverinfo` `.sinfo` | Shows info about the server the bot is on. If no channel is supplied, it defaults to current one. | `.sinfo Some Server` @@ -399,9 +405,9 @@ Command and aliases | Description | Usage `...` | Shows a random quote with a specified name. | `... abc` `.qsearch` | Shows a random quote for a keyword that contains any text specified in the search. | `.qsearch keyword text` `..` | Adds a new quote with the specified name and message. | `.. sayhi Hi` -`.deletequote` `.delq` | Deletes a random quote with the specified keyword. You have to either be server Administrator or the creator of the quote to delete it. | `.delq abc` +`.deletequote` `.delq` | Deletes a quote with the specified ID. You have to be either server Administrator or the creator of the quote to delete it. | `.delq 123456` `.delallq` `.daq` | Deletes all quotes on a specified keyword. **Requires Administrator server permission.** | `.delallq kek` `.remind` | Sends a message to you or a channel after certain amount of time. First argument is `me`/`here`/'channelname'. Second argument is time in a descending order (mo>w>d>h>m) example: 1w5d3h10m. Third argument is a (multiword) message. | `.remind me 1d5h Do something` or `.remind #general 1m Start now!` -`.remindtemplate` | Sets message for when the remind is triggered. Available placeholders are `%user%` - user who ran the command, `%message%` - Message specified in the remind, `%target%` - target channel of the remind. **Bot Owner Only** | `.remindtemplate %user%, do %message%!` +`.remindtemplate` | Sets message for when the remind is triggered. Available placeholders are `%user%` - user who ran the command, `%message%` - Message specified in the remind, `%target%` - target channel of the remind. **Bot owner only** | `.remindtemplate %user%, do %message%!` `.convertlist` | List of the convertible dimensions and currencies. | `.convertlist` `.convert` | Convert quantities. Use `.convertlist` to see supported dimensions and currencies. | `.convert m km 1000` From 2d73f4bdfde4dd4adcd1d832928178eada46d260 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Thu, 30 Mar 2017 03:51:54 +0200 Subject: [PATCH 387/496] .warn command, needs testing --- ...0170330000613_warning-commands.Designer.cs | 1346 +++++++++++++++++ .../20170330000613_warning-commands.cs | 78 + .../NadekoSqliteContextModelSnapshot.cs | 55 + .../Modules/Administration/Administration.cs | 95 -- .../Commands/LocalizationCommands.cs | 21 +- .../Commands/UserPunishCommands.cs | 358 +++++ .../Resources/CommandStrings.Designer.cs | 135 ++ src/NadekoBot/Resources/CommandStrings.resx | 45 + .../Resources/ResponseStrings.Designer.cs | 117 ++ src/NadekoBot/Resources/ResponseStrings.resx | 39 + .../Services/Database/IUnitOfWork.cs | 1 + .../Services/Database/Models/GuildConfig.cs | 10 +- .../Services/Database/Models/Warning.cs | 12 + .../Services/Database/NadekoContext.cs | 5 + .../Repositories/IWarningsRepository.cs | 11 + .../Impl/GuildConfigRepository.cs | 33 +- .../Repositories/Impl/WarningsRepository.cs | 37 + src/NadekoBot/Services/Database/UnitOfWork.cs | 3 + 18 files changed, 2293 insertions(+), 108 deletions(-) create mode 100644 src/NadekoBot/Migrations/20170330000613_warning-commands.Designer.cs create mode 100644 src/NadekoBot/Migrations/20170330000613_warning-commands.cs create mode 100644 src/NadekoBot/Modules/Administration/Commands/UserPunishCommands.cs create mode 100644 src/NadekoBot/Services/Database/Models/Warning.cs create mode 100644 src/NadekoBot/Services/Database/Repositories/IWarningsRepository.cs create mode 100644 src/NadekoBot/Services/Database/Repositories/Impl/WarningsRepository.cs diff --git a/src/NadekoBot/Migrations/20170330000613_warning-commands.Designer.cs b/src/NadekoBot/Migrations/20170330000613_warning-commands.Designer.cs new file mode 100644 index 00000000..28a99d1d --- /dev/null +++ b/src/NadekoBot/Migrations/20170330000613_warning-commands.Designer.cs @@ -0,0 +1,1346 @@ +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using NadekoBot.Services.Database; +using NadekoBot.Services.Database.Models; +using NadekoBot.Modules.Music.Classes; + +namespace NadekoBot.Migrations +{ + [DbContext(typeof(NadekoContext))] + [Migration("20170330000613_warning-commands")] + partial class warningcommands + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { + modelBuilder + .HasAnnotation("ProductVersion", "1.1.0-rtm-22752"); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Action"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Seconds"); + + b.Property("UserThreshold"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId") + .IsUnique(); + + b.ToTable("AntiRaidSetting"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AntiSpamSettingId"); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.HasKey("Id"); + + b.HasIndex("AntiSpamSettingId"); + + b.ToTable("AntiSpamIgnore"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Action"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("MessageThreshold"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId") + .IsUnique(); + + b.ToTable("AntiSpamSetting"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("ItemId"); + + b.Property("Type"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("BlacklistItem"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BetflipMultiplier"); + + b.Property("Betroll100Multiplier"); + + b.Property("Betroll67Multiplier"); + + b.Property("Betroll91Multiplier"); + + b.Property("BufferSize"); + + b.Property("CurrencyDropAmount"); + + b.Property("CurrencyGenerationChance"); + + b.Property("CurrencyGenerationCooldown"); + + b.Property("CurrencyName"); + + b.Property("CurrencyPluralName"); + + b.Property("CurrencySign"); + + b.Property("DMHelpString"); + + b.Property("DateAdded"); + + b.Property("ErrorColor"); + + b.Property("ForwardMessages"); + + b.Property("ForwardToAllOwners"); + + b.Property("HelpString"); + + b.Property("Locale"); + + b.Property("MigrationVersion"); + + b.Property("MinimumBetAmount"); + + b.Property("OkColor"); + + b.Property("RemindMessageFormat"); + + b.Property("RotatingStatuses"); + + b.Property("TriviaCurrencyReward"); + + b.HasKey("Id"); + + b.ToTable("BotConfig"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BaseDestroyed"); + + b.Property("CallUser"); + + b.Property("ClashWarId"); + + b.Property("DateAdded"); + + b.Property("SequenceNumber"); + + b.Property("Stars"); + + b.Property("TimeAdded"); + + b.HasKey("Id"); + + b.HasIndex("ClashWarId"); + + b.ToTable("ClashCallers"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("EnemyClan"); + + b.Property("GuildId"); + + b.Property("Size"); + + b.Property("StartedAt"); + + b.Property("WarState"); + + b.HasKey("Id"); + + b.ToTable("ClashOfClans"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Mapping"); + + b.Property("Trigger"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("CommandAlias"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("CommandName"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Seconds"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("CommandCooldown"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("CommandName"); + + b.Property("DateAdded"); + + b.Property("Price"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.HasIndex("Price") + .IsUnique(); + + b.ToTable("CommandPrice"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("InternalTrigger"); + + b.Property("Modifier"); + + b.Property("UnitType"); + + b.HasKey("Id"); + + b.ToTable("ConversionUnits"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Amount"); + + b.Property("DateAdded"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("Currency"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Amount"); + + b.Property("DateAdded"); + + b.Property("Reason"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.ToTable("CurrencyTransactions"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AutoDeleteTrigger"); + + b.Property("DateAdded"); + + b.Property("DmResponse"); + + b.Property("GuildId"); + + b.Property("IsRegex"); + + b.Property("OwnerOnly"); + + b.Property("Response"); + + b.Property("Trigger"); + + b.HasKey("Id"); + + b.ToTable("CustomReactions"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AvatarId"); + + b.Property("DateAdded"); + + b.Property("Discriminator"); + + b.Property("UserId"); + + b.Property("Username"); + + b.HasKey("Id"); + + b.HasAlternateKey("UserId"); + + b.ToTable("DiscordUser"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Amount"); + + b.Property("DateAdded"); + + b.Property("Name"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("Donators"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("Text"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("EightBallResponses"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("GuildConfigId1"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.HasIndex("GuildConfigId1"); + + b.ToTable("FilterChannelId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Word"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("FilteredWord"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("GuildId"); + + b.Property("Type"); + + b.Property("Username"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("FollowedStream"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("GCChannelId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AutoAssignRoleId"); + + b.Property("AutoDeleteByeMessages"); + + b.Property("AutoDeleteByeMessagesTimer"); + + b.Property("AutoDeleteGreetMessages"); + + b.Property("AutoDeleteGreetMessagesTimer"); + + b.Property("AutoDeleteSelfAssignedRoleMessages"); + + b.Property("ByeMessageChannelId"); + + b.Property("ChannelByeMessageText"); + + b.Property("ChannelGreetMessageText"); + + b.Property("CleverbotEnabled"); + + b.Property("DateAdded"); + + b.Property("DefaultMusicVolume"); + + b.Property("DeleteMessageOnCommand"); + + b.Property("DmGreetMessageText"); + + b.Property("ExclusiveSelfAssignedRoles"); + + b.Property("FilterInvites"); + + b.Property("FilterWords"); + + b.Property("GreetMessageChannelId"); + + b.Property("GuildId"); + + b.Property("Locale"); + + b.Property("LogSettingId"); + + b.Property("MuteRoleName"); + + b.Property("PermissionRole"); + + b.Property("RootPermissionId"); + + b.Property("SendChannelByeMessage"); + + b.Property("SendChannelGreetMessage"); + + b.Property("SendDmGreetMessage"); + + b.Property("TimeZoneId"); + + b.Property("VerbosePermissions"); + + b.Property("VoicePlusTextEnabled"); + + b.Property("WarningsInitialized"); + + b.HasKey("Id"); + + b.HasIndex("GuildId") + .IsUnique(); + + b.HasIndex("LogSettingId"); + + b.HasIndex("RootPermissionId"); + + b.ToTable("GuildConfigs"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("GuildId"); + + b.Property("Interval"); + + b.Property("Message"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("GuildRepeater"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("LogSettingId"); + + b.HasKey("Id"); + + b.HasIndex("LogSettingId"); + + b.ToTable("IgnoredLogChannels"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("LogSettingId"); + + b.HasKey("Id"); + + b.HasIndex("LogSettingId"); + + b.ToTable("IgnoredVoicePresenceCHannels"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelCreated"); + + b.Property("ChannelCreatedId"); + + b.Property("ChannelDestroyed"); + + b.Property("ChannelDestroyedId"); + + b.Property("ChannelId"); + + b.Property("ChannelUpdated"); + + b.Property("ChannelUpdatedId"); + + b.Property("DateAdded"); + + b.Property("IsLogging"); + + b.Property("LogOtherId"); + + b.Property("LogUserPresence"); + + b.Property("LogUserPresenceId"); + + b.Property("LogVoicePresence"); + + b.Property("LogVoicePresenceId"); + + b.Property("LogVoicePresenceTTSId"); + + b.Property("MessageDeleted"); + + b.Property("MessageDeletedId"); + + b.Property("MessageUpdated"); + + b.Property("MessageUpdatedId"); + + b.Property("UserBanned"); + + b.Property("UserBannedId"); + + b.Property("UserJoined"); + + b.Property("UserJoinedId"); + + b.Property("UserLeft"); + + b.Property("UserLeftId"); + + b.Property("UserMutedId"); + + b.Property("UserPresenceChannelId"); + + b.Property("UserUnbanned"); + + b.Property("UserUnbannedId"); + + b.Property("UserUpdated"); + + b.Property("UserUpdatedId"); + + b.Property("VoicePresenceChannelId"); + + b.HasKey("Id"); + + b.ToTable("LogSettings"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("ModuleName"); + + b.Property("Prefix"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("ModulePrefixes"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Author"); + + b.Property("AuthorId"); + + b.Property("DateAdded"); + + b.Property("Name"); + + b.HasKey("Id"); + + b.ToTable("MusicPlaylists"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("MutedUserId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("NextId"); + + b.Property("PrimaryTarget"); + + b.Property("PrimaryTargetId"); + + b.Property("SecondaryTarget"); + + b.Property("SecondaryTargetName"); + + b.Property("State"); + + b.HasKey("Id"); + + b.HasIndex("NextId") + .IsUnique(); + + b.ToTable("Permission"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Index"); + + b.Property("PrimaryTarget"); + + b.Property("PrimaryTargetId"); + + b.Property("SecondaryTarget"); + + b.Property("SecondaryTargetName"); + + b.Property("State"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("Permissionv2"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("Status"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("PlayingStatus"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("MusicPlaylistId"); + + b.Property("Provider"); + + b.Property("ProviderType"); + + b.Property("Query"); + + b.Property("Title"); + + b.Property("Uri"); + + b.HasKey("Id"); + + b.HasIndex("MusicPlaylistId"); + + b.ToTable("PlaylistSong"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AuthorId"); + + b.Property("AuthorName") + .IsRequired(); + + b.Property("DateAdded"); + + b.Property("GuildId"); + + b.Property("Keyword") + .IsRequired(); + + b.Property("Text") + .IsRequired(); + + b.HasKey("Id"); + + b.ToTable("Quotes"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("Icon"); + + b.Property("Name"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("RaceAnimals"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("IsPrivate"); + + b.Property("Message"); + + b.Property("ServerId"); + + b.Property("UserId"); + + b.Property("When"); + + b.HasKey("Id"); + + b.ToTable("Reminders"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildId"); + + b.Property("RoleId"); + + b.HasKey("Id"); + + b.HasIndex("GuildId", "RoleId") + .IsUnique(); + + b.ToTable("SelfAssignableRoles"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("UnmuteAt"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("UnmuteTimer"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("UserId"); + + b.Property("type"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("PokeGame"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("RoleId"); + + b.Property("VoiceChannelId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("VcRoleInfo"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AffinityId"); + + b.Property("ClaimerId"); + + b.Property("DateAdded"); + + b.Property("Price"); + + b.Property("WaifuId"); + + b.HasKey("Id"); + + b.HasIndex("AffinityId"); + + b.HasIndex("ClaimerId"); + + b.HasIndex("WaifuId") + .IsUnique(); + + b.ToTable("WaifuInfo"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("NewId"); + + b.Property("OldId"); + + b.Property("UpdateType"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("NewId"); + + b.HasIndex("OldId"); + + b.HasIndex("UserId"); + + b.ToTable("WaifuUpdates"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("Forgiven"); + + b.Property("ForgivenBy"); + + b.Property("GuildId"); + + b.Property("Moderator"); + + b.Property("Reason"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.ToTable("Warnings"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Count"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Punishment"); + + b.Property("Time"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("WarningPunishment"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig") + .WithOne("AntiRaidSetting") + .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b => + { + b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting") + .WithMany("IgnoredChannels") + .HasForeignKey("AntiSpamSettingId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig") + .WithOne("AntiSpamSetting") + .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("Blacklist") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b => + { + b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar") + .WithMany("Bases") + .HasForeignKey("ClashWarId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("CommandAliases") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("CommandCooldowns") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("CommandPrices") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("EightBallResponses") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FilterInvitesChannelIds") + .HasForeignKey("GuildConfigId"); + + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FilterWordsChannelIds") + .HasForeignKey("GuildConfigId1"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FilteredWords") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FollowedStreams") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("GenerateCurrencyChannelIds") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b => + { + b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting") + .WithMany() + .HasForeignKey("LogSettingId"); + + b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission") + .WithMany() + .HasForeignKey("RootPermissionId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("GuildRepeaters") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b => + { + b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting") + .WithMany("IgnoredChannels") + .HasForeignKey("LogSettingId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b => + { + b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting") + .WithMany("IgnoredVoicePresenceChannelIds") + .HasForeignKey("LogSettingId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("ModulePrefixes") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("MutedUsers") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b => + { + b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next") + .WithOne("Previous") + .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("Permissions") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("RotatingStatusMessages") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b => + { + b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist") + .WithMany("Songs") + .HasForeignKey("MusicPlaylistId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("RaceAnimals") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("UnmuteTimers") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("VcRoleInfos") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => + { + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity") + .WithMany() + .HasForeignKey("AffinityId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer") + .WithMany() + .HasForeignKey("ClaimerId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu") + .WithOne() + .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => + { + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New") + .WithMany() + .HasForeignKey("NewId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old") + .WithMany() + .HasForeignKey("OldId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("WarnPunishments") + .HasForeignKey("GuildConfigId"); + }); + } + } +} diff --git a/src/NadekoBot/Migrations/20170330000613_warning-commands.cs b/src/NadekoBot/Migrations/20170330000613_warning-commands.cs new file mode 100644 index 00000000..5fb96271 --- /dev/null +++ b/src/NadekoBot/Migrations/20170330000613_warning-commands.cs @@ -0,0 +1,78 @@ +using System; +using System.Collections.Generic; +using Microsoft.EntityFrameworkCore.Migrations; + +namespace NadekoBot.Migrations +{ + public partial class warningcommands : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "WarningsInitialized", + table: "GuildConfigs", + nullable: false, + defaultValue: false); + + migrationBuilder.CreateTable( + name: "Warnings", + columns: table => new + { + Id = table.Column(nullable: false) + .Annotation("Sqlite:Autoincrement", true), + DateAdded = table.Column(nullable: true), + Forgiven = table.Column(nullable: false), + ForgivenBy = table.Column(nullable: true), + GuildId = table.Column(nullable: false), + Moderator = table.Column(nullable: true), + Reason = table.Column(nullable: true), + UserId = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Warnings", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "WarningPunishment", + columns: table => new + { + Id = table.Column(nullable: false) + .Annotation("Sqlite:Autoincrement", true), + Count = table.Column(nullable: false), + DateAdded = table.Column(nullable: true), + GuildConfigId = table.Column(nullable: true), + Punishment = table.Column(nullable: false), + Time = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_WarningPunishment", x => x.Id); + table.ForeignKey( + name: "FK_WarningPunishment_GuildConfigs_GuildConfigId", + column: x => x.GuildConfigId, + principalTable: "GuildConfigs", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + }); + + migrationBuilder.CreateIndex( + name: "IX_WarningPunishment_GuildConfigId", + table: "WarningPunishment", + column: "GuildConfigId"); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "Warnings"); + + migrationBuilder.DropTable( + name: "WarningPunishment"); + + migrationBuilder.DropColumn( + name: "WarningsInitialized", + table: "GuildConfigs"); + } + } +} diff --git a/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs b/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs index 18195d44..97e9b393 100644 --- a/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs +++ b/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs @@ -559,6 +559,8 @@ namespace NadekoBot.Migrations b.Property("VoicePlusTextEnabled"); + b.Property("WarningsInitialized"); + b.HasKey("Id"); b.HasIndex("GuildId") @@ -1060,6 +1062,52 @@ namespace NadekoBot.Migrations b.ToTable("WaifuUpdates"); }); + modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("Forgiven"); + + b.Property("ForgivenBy"); + + b.Property("GuildId"); + + b.Property("Moderator"); + + b.Property("Reason"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.ToTable("Warnings"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Count"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Punishment"); + + b.Property("Time"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("WarningPunishment"); + }); + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig") @@ -1285,6 +1333,13 @@ namespace NadekoBot.Migrations .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade); }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("WarnPunishments") + .HasForeignKey("GuildConfigId"); + }); } } } diff --git a/src/NadekoBot/Modules/Administration/Administration.cs b/src/NadekoBot/Modules/Administration/Administration.cs index 4eb9d28c..2f076ae3 100644 --- a/src/NadekoBot/Modules/Administration/Administration.cs +++ b/src/NadekoBot/Modules/Administration/Administration.cs @@ -218,101 +218,6 @@ namespace NadekoBot.Modules.Administration } } - [NadekoCommand, Usage, Description, Aliases] - [RequireContext(ContextType.Guild)] - [RequireUserPermission(GuildPermission.BanMembers)] - [RequireBotPermission(GuildPermission.BanMembers)] - public async Task Ban(IGuildUser user, [Remainder] string msg = null) - { - if (Context.User.Id != user.Guild.OwnerId && (user.GetRoles().Select(r => r.Position).Max() >= ((IGuildUser)Context.User).GetRoles().Select(r => r.Position).Max())) - { - await ReplyErrorLocalized("hierarchy").ConfigureAwait(false); - return; - } - if (!string.IsNullOrWhiteSpace(msg)) - { - try - { - await user.SendErrorAsync(GetText("bandm", Format.Bold(Context.Guild.Name), msg)); - } - catch - { - // ignored - } - } - - await Context.Guild.AddBanAsync(user, 7).ConfigureAwait(false); - await Context.Channel.EmbedAsync(new EmbedBuilder().WithOkColor() - .WithTitle("⛔️ " + GetText("banned_user")) - .AddField(efb => efb.WithName(GetText("username")).WithValue(user.ToString()).WithIsInline(true)) - .AddField(efb => efb.WithName("ID").WithValue(user.Id.ToString()).WithIsInline(true))) - .ConfigureAwait(false); - } - - [NadekoCommand, Usage, Description, Aliases] - [RequireContext(ContextType.Guild)] - [RequireUserPermission(GuildPermission.KickMembers)] - [RequireUserPermission(GuildPermission.ManageMessages)] - [RequireBotPermission(GuildPermission.BanMembers)] - public async Task Softban(IGuildUser user, [Remainder] string msg = null) - { - if (Context.User.Id != user.Guild.OwnerId && user.GetRoles().Select(r => r.Position).Max() >= ((IGuildUser)Context.User).GetRoles().Select(r => r.Position).Max()) - { - await ReplyErrorLocalized("hierarchy").ConfigureAwait(false); - return; - } - - if (!string.IsNullOrWhiteSpace(msg)) - { - try - { - await user.SendErrorAsync(GetText("sbdm", Format.Bold(Context.Guild.Name), msg)); - } - catch - { - // ignored - } - } - - await Context.Guild.AddBanAsync(user, 7).ConfigureAwait(false); - try { await Context.Guild.RemoveBanAsync(user).ConfigureAwait(false); } - catch { await Context.Guild.RemoveBanAsync(user).ConfigureAwait(false); } - - await Context.Channel.EmbedAsync(new EmbedBuilder().WithOkColor() - .WithTitle("☣ " + GetText("sb_user")) - .AddField(efb => efb.WithName(GetText("username")).WithValue(user.ToString()).WithIsInline(true)) - .AddField(efb => efb.WithName("ID").WithValue(user.Id.ToString()).WithIsInline(true))) - .ConfigureAwait(false); - } - - [NadekoCommand, Usage, Description, Aliases] - [RequireContext(ContextType.Guild)] - [RequireUserPermission(GuildPermission.KickMembers)] - [RequireBotPermission(GuildPermission.KickMembers)] - public async Task Kick(IGuildUser user, [Remainder] string msg = null) - { - if (Context.Message.Author.Id != user.Guild.OwnerId && user.GetRoles().Select(r => r.Position).Max() >= ((IGuildUser)Context.User).GetRoles().Select(r => r.Position).Max()) - { - await ReplyErrorLocalized("hierarchy").ConfigureAwait(false); - return; - } - if (!string.IsNullOrWhiteSpace(msg)) - { - try - { - await user.SendErrorAsync(GetText("kickdm", Format.Bold(Context.Guild.Name), msg)); - } - catch { } - } - - await user.KickAsync().ConfigureAwait(false); - await Context.Channel.EmbedAsync(new EmbedBuilder().WithOkColor() - .WithTitle(GetText("kicked_user")) - .AddField(efb => efb.WithName(GetText("username")).WithValue(user.ToString()).WithIsInline(true)) - .AddField(efb => efb.WithName("ID").WithValue(user.Id.ToString()).WithIsInline(true))) - .ConfigureAwait(false); - } - [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] [RequireUserPermission(GuildPermission.DeafenMembers)] diff --git a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs index b61b2722..bc4a0952 100644 --- a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs +++ b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs @@ -16,25 +16,26 @@ namespace NadekoBot.Modules.Administration [Group] public class LocalizationCommands : NadekoSubmodule { + //Română, România private ImmutableDictionary supportedLocales { get; } = new Dictionary() { - {"zh-TW", "Chinese (Traditional), China" }, - {"zh-CN", "Chinese (Simplified), China"}, + {"zh-TW", "繁體中文, 台灣" }, + {"zh-CN", "简体中文, 中华人民共和国"}, {"nl-NL", "Dutch, Netherlands"}, {"en-US", "English, United States"}, - {"fr-FR", "French, France"}, + {"fr-FR", "Français, France"}, {"de-DE", "German, Germany"}, {"he-IL", "Hebrew, Israel" }, - {"it-IT", "Italian, Italy" }, + {"it-IT", "Italiano, Italia" }, //{"ja-JP", "Japanese, Japan"}, - {"ko-KR", "Korean, Korea" }, + {"ko-KR", "Korean, South Korea" }, {"nb-NO", "Norwegian (bokmål), Norway"}, - {"pl-PL", "Polish, Poland" }, - {"pt-BR", "Portuguese, Brazil"}, + {"pl-PL", "Polski, Polska" }, + {"pt-BR", "Português Brasileiro, Brasil"}, {"ru-RU", "Russian, Russia"}, - {"sr-Cyrl-RS", "Serbian, Serbia - Cyrillic"}, - {"es-ES", "Spanish, Spain"}, - {"sv-SE", "Swedish, Sweden"}, + {"sr-Cyrl-RS", "Српски, Србија"}, + {"es-ES", "Español, España"}, + {"sv-SE", "Svenska, Sverige"}, {"tr-TR", "Turkish, Turkey" } }.ToImmutableDictionary(); diff --git a/src/NadekoBot/Modules/Administration/Commands/UserPunishCommands.cs b/src/NadekoBot/Modules/Administration/Commands/UserPunishCommands.cs new file mode 100644 index 00000000..0f54037f --- /dev/null +++ b/src/NadekoBot/Modules/Administration/Commands/UserPunishCommands.cs @@ -0,0 +1,358 @@ +using Discord; +using Discord.Commands; +using Discord.WebSocket; +using Microsoft.EntityFrameworkCore; +using NadekoBot.Attributes; +using NadekoBot.Extensions; +using NadekoBot.Services; +using NadekoBot.Services.Database.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace NadekoBot.Modules.Administration +{ + public partial class Administration + { + [Group] + public class UserPunishCommands : NadekoSubmodule + { + private async Task InternalWarn(IGuild guild, ulong userId, string modName, string reason) + { + if (string.IsNullOrWhiteSpace(reason)) + reason = "-"; + + var guildId = guild.Id; + + var warn = new Warning() + { + UserId = userId, + GuildId = guildId, + Forgiven = false, + Reason = reason, + Moderator = modName, + }; + + int warnings; + List ps; + using (var uow = DbHandler.UnitOfWork()) + { + ps = uow.GuildConfigs.For(guildId, set => set.Include(x => x.WarnPunishments)) + .WarnPunishments; + + uow.Warnings.Add(warn); + + warnings = uow.Warnings + .For(guildId, userId) + .Where(w => !w.Forgiven && w.UserId == userId) + .Count(); + + uow.Complete(); + } + + var p = ps.FirstOrDefault(x => x.Count == warnings); + + if (p != null) + { + var user = await guild.GetUserAsync(userId); + if (user == null) + return; + switch (p.Punishment) + { + case PunishmentAction.Mute: + await MuteCommands.TimedMute(user, TimeSpan.FromMinutes(p.Time)); + break; + case PunishmentAction.Kick: + await user.KickAsync().ConfigureAwait(false); + break; + case PunishmentAction.Ban: + await guild.AddBanAsync(user).ConfigureAwait(false); + break; + default: + break; + } + } + } + + [NadekoCommand, Usage, Description, Aliases] + [RequireContext(ContextType.Guild)] + [RequireUserPermission(GuildPermission.BanMembers)] + public async Task Warn(IGuildUser user, [Remainder] string reason = null) + { + try + { + await (await user.CreateDMChannelAsync()).EmbedAsync(new EmbedBuilder().WithErrorColor() + .WithDescription(GetText("warned_on", Context.Guild.ToString())) + .AddField(efb => efb.WithName(GetText("moderator")).WithValue(Context.User.ToString())) + .AddField(efb => efb.WithName(GetText("reason")).WithValue(reason ?? "-"))) + .ConfigureAwait(false); + } + catch { } + await InternalWarn(Context.Guild, user.Id, Context.User.ToString(), reason).ConfigureAwait(false); + + await ReplyConfirmLocalized("user_warned", Format.Bold(user.ToString())).ConfigureAwait(false); + } + + [NadekoCommand, Usage, Description, Aliases] + [RequireContext(ContextType.Guild)] + [RequireUserPermission(GuildPermission.BanMembers)] + public Task Warnlog(int page, IGuildUser user) + => Warnlog(page, user.Id); + + [NadekoCommand, Usage, Description, Aliases] + [RequireContext(ContextType.Guild)] + [RequireUserPermission(GuildPermission.BanMembers)] + public Task Warnlog(IGuildUser user) + => Warnlog(user.Id); + + [NadekoCommand, Usage, Description, Aliases] + [RequireContext(ContextType.Guild)] + [RequireUserPermission(GuildPermission.BanMembers)] + public Task Warnlog(int page, ulong userId) + => InternalWarnlog(userId, page - 1); + + [NadekoCommand, Usage, Description, Aliases] + [RequireContext(ContextType.Guild)] + [RequireUserPermission(GuildPermission.BanMembers)] + public Task Warnlog(ulong userId) + => InternalWarnlog(userId, 0); + + private async Task InternalWarnlog(ulong userId, int page) + { + if (page < 0) + return; + Warning[] warnings; + using (var uow = DbHandler.UnitOfWork()) + { + warnings = uow.Warnings.For(Context.Guild.Id, userId); + } + + warnings = warnings.Skip(page * 9) + .Take(9) + .ToArray(); + + var embed = new EmbedBuilder().WithOkColor() + .WithTitle(GetText("warnlog_for", (Context.Guild as SocketGuild)?.GetUser(userId)?.ToString() ?? userId.ToString())) + .WithFooter(efb => efb.WithText(GetText("page", page + 1))); + + if (!warnings.Any()) + { + embed.WithDescription(GetText("warnings_none")); + } + else + { + foreach (var w in warnings) + { + var name = GetText("warned_on_by", w.DateAdded.Value.ToString("dd.MM.yyy"), w.DateAdded.Value.ToString("HH:mm"), w.Moderator); + if (w.Forgiven) + name = Format.Strikethrough(name) + GetText("warn_cleared_by", w.ForgivenBy); + + embed.AddField(x => x + .WithName(name) + .WithValue(w.Reason)); + } + } + + await Context.Channel.EmbedAsync(embed); + } + + [NadekoCommand, Usage, Description, Aliases] + [RequireContext(ContextType.Guild)] + [RequireUserPermission(GuildPermission.BanMembers)] + public Task Warnclear(IGuildUser user) + => Warnclear(user.Id); + + [NadekoCommand, Usage, Description, Aliases] + [RequireContext(ContextType.Guild)] + [RequireUserPermission(GuildPermission.BanMembers)] + public async Task Warnclear(ulong userId) + { + using (var uow = DbHandler.UnitOfWork()) + { + await uow.Warnings.ForgiveAll(Context.Guild.Id, userId, Context.User.ToString()).ConfigureAwait(false); + uow.Complete(); + } + + await ReplyConfirmLocalized("warnings_cleared", + (Context.Guild as SocketGuild)?.GetUser(userId)?.ToString() ?? userId.ToString()).ConfigureAwait(false); + } + + [NadekoCommand, Usage, Description, Aliases] + [RequireContext(ContextType.Guild)] + [RequireUserPermission(GuildPermission.BanMembers)] + public async Task WarnPunish(int number, PunishmentAction punish, int time = 0) + { + if (punish != PunishmentAction.Mute && time != 0) + return; + if (number <= 0) + return; + + using (var uow = DbHandler.UnitOfWork()) + { + var ps = uow.GuildConfigs.For(Context.Guild.Id).WarnPunishments; + var p = ps.FirstOrDefault(x => x.Count == number); + + if (p == null) + { + ps.Add(new WarningPunishment() + { + Count = number, + Punishment = punish, + Time = time, + }); + } + else + { + p.Count = number; + p.Punishment = punish; + p.Time = time; + uow._context.Update(p); + } + uow.Complete(); + } + + await ReplyConfirmLocalized("warn_punish_set", + Format.Bold(punish.ToString()), + Format.Bold(number.ToString())).ConfigureAwait(false); + } + + [NadekoCommand, Usage, Description, Aliases] + [RequireContext(ContextType.Guild)] + [RequireUserPermission(GuildPermission.BanMembers)] + public async Task WarnPunish(int number) + { + if (number <= 0) + return; + + using (var uow = DbHandler.UnitOfWork()) + { + var ps = uow.GuildConfigs.For(Context.Guild.Id, set => set.Include(x => x.WarnPunishments)).WarnPunishments; + var p = ps.FirstOrDefault(x => x.Count == number); + + if (p != null) + { + uow._context.Remove(p); + uow.Complete(); + } + } + + await ReplyConfirmLocalized("warn_punish_rem", + Format.Bold(number.ToString())).ConfigureAwait(false); + } + + [NadekoCommand, Usage, Description, Aliases] + [RequireContext(ContextType.Guild)] + public async Task WarnPunishList() + { + WarningPunishment[] ps; + using (var uow = DbHandler.UnitOfWork()) + { + ps = uow.GuildConfigs.For(Context.Guild.Id, gc => gc.Include(x => x.WarnPunishments)) + .WarnPunishments + .OrderBy(x => x.Count) + .ToArray(); + } + + await Context.Channel.SendConfirmAsync( + GetText("warn_punish_list"), + string.Join("\n", ps.Select(x => $"{x.Count} -> {x.Punishment}"))).ConfigureAwait(false); + } + + [NadekoCommand, Usage, Description, Aliases] + [RequireContext(ContextType.Guild)] + [RequireUserPermission(GuildPermission.BanMembers)] + [RequireBotPermission(GuildPermission.BanMembers)] + public async Task Ban(IGuildUser user, [Remainder] string msg = null) + { + if (Context.User.Id != user.Guild.OwnerId && (user.GetRoles().Select(r => r.Position).Max() >= ((IGuildUser)Context.User).GetRoles().Select(r => r.Position).Max())) + { + await ReplyErrorLocalized("hierarchy").ConfigureAwait(false); + return; + } + if (!string.IsNullOrWhiteSpace(msg)) + { + try + { + await user.SendErrorAsync(GetText("bandm", Format.Bold(Context.Guild.Name), msg)); + } + catch + { + // ignored + } + } + + await Context.Guild.AddBanAsync(user, 7).ConfigureAwait(false); + await Context.Channel.EmbedAsync(new EmbedBuilder().WithOkColor() + .WithTitle("⛔️ " + GetText("banned_user")) + .AddField(efb => efb.WithName(GetText("username")).WithValue(user.ToString()).WithIsInline(true)) + .AddField(efb => efb.WithName("ID").WithValue(user.Id.ToString()).WithIsInline(true))) + .ConfigureAwait(false); + } + + [NadekoCommand, Usage, Description, Aliases] + [RequireContext(ContextType.Guild)] + [RequireUserPermission(GuildPermission.KickMembers)] + [RequireUserPermission(GuildPermission.ManageMessages)] + [RequireBotPermission(GuildPermission.BanMembers)] + public async Task Softban(IGuildUser user, [Remainder] string msg = null) + { + if (Context.User.Id != user.Guild.OwnerId && user.GetRoles().Select(r => r.Position).Max() >= ((IGuildUser)Context.User).GetRoles().Select(r => r.Position).Max()) + { + await ReplyErrorLocalized("hierarchy").ConfigureAwait(false); + return; + } + + if (!string.IsNullOrWhiteSpace(msg)) + { + try + { + await user.SendErrorAsync(GetText("sbdm", Format.Bold(Context.Guild.Name), msg)); + } + catch + { + // ignored + } + } + + await Context.Guild.AddBanAsync(user, 7).ConfigureAwait(false); + try { await Context.Guild.RemoveBanAsync(user).ConfigureAwait(false); } + catch { await Context.Guild.RemoveBanAsync(user).ConfigureAwait(false); } + + await Context.Channel.EmbedAsync(new EmbedBuilder().WithOkColor() + .WithTitle("☣ " + GetText("sb_user")) + .AddField(efb => efb.WithName(GetText("username")).WithValue(user.ToString()).WithIsInline(true)) + .AddField(efb => efb.WithName("ID").WithValue(user.Id.ToString()).WithIsInline(true))) + .ConfigureAwait(false); + } + + [NadekoCommand, Usage, Description, Aliases] + [RequireContext(ContextType.Guild)] + [RequireUserPermission(GuildPermission.KickMembers)] + [RequireBotPermission(GuildPermission.KickMembers)] + public async Task Kick(IGuildUser user, [Remainder] string msg = null) + { + if (Context.Message.Author.Id != user.Guild.OwnerId && user.GetRoles().Select(r => r.Position).Max() >= ((IGuildUser)Context.User).GetRoles().Select(r => r.Position).Max()) + { + await ReplyErrorLocalized("hierarchy").ConfigureAwait(false); + return; + } + if (!string.IsNullOrWhiteSpace(msg)) + { + try + { + await user.SendErrorAsync(GetText("kickdm", Format.Bold(Context.Guild.Name), msg)); + } + catch { } + } + + await user.KickAsync().ConfigureAwait(false); + await Context.Channel.EmbedAsync(new EmbedBuilder().WithOkColor() + .WithTitle(GetText("kicked_user")) + .AddField(efb => efb.WithName(GetText("username")).WithValue(user.ToString()).WithIsInline(true)) + .AddField(efb => efb.WithName("ID").WithValue(user.Id.ToString()).WithIsInline(true))) + .ConfigureAwait(false); + } + } + } +} diff --git a/src/NadekoBot/Resources/CommandStrings.Designer.cs b/src/NadekoBot/Resources/CommandStrings.Designer.cs index cc7550b6..bba6abe1 100644 --- a/src/NadekoBot/Resources/CommandStrings.Designer.cs +++ b/src/NadekoBot/Resources/CommandStrings.Designer.cs @@ -9104,6 +9104,141 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to warn. + /// + public static string warn_cmd { + get { + return ResourceManager.GetString("warn_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Warns a user.. + /// + public static string warn_desc { + get { + return ResourceManager.GetString("warn_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}warn @b1nzy`. + /// + public static string warn_usage { + get { + return ResourceManager.GetString("warn_usage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to warnclear warnc. + /// + public static string warnclear_cmd { + get { + return ResourceManager.GetString("warnclear_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Clears all warnings from a certain user.. + /// + public static string warnclear_desc { + get { + return ResourceManager.GetString("warnclear_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}warnclear @PoorDude`. + /// + public static string warnclear_usage { + get { + return ResourceManager.GetString("warnclear_usage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to warnlog. + /// + public static string warnlog_cmd { + get { + return ResourceManager.GetString("warnlog_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to See a list of warnings of a certain user.. + /// + public static string warnlog_desc { + get { + return ResourceManager.GetString("warnlog_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}warnlog @b1nzy`. + /// + public static string warnlog_usage { + get { + return ResourceManager.GetString("warnlog_usage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to warnpunish warnp. + /// + public static string warnpunish_cmd { + get { + return ResourceManager.GetString("warnpunish_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Sets a punishment for a certain number of warnings. Provide no punishment to remove.. + /// + public static string warnpunish_desc { + get { + return ResourceManager.GetString("warnpunish_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}warnpunish 5 Ban` or `{0}warnpunish 3`. + /// + public static string warnpunish_usage { + get { + return ResourceManager.GetString("warnpunish_usage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to warnpunishlist warnpl. + /// + public static string warnpunishlist_cmd { + get { + return ResourceManager.GetString("warnpunishlist_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Lists punishments for warnings.. + /// + public static string warnpunishlist_desc { + get { + return ResourceManager.GetString("warnpunishlist_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}warnpunishlist`. + /// + public static string warnpunishlist_usage { + get { + return ResourceManager.GetString("warnpunishlist_usage", resourceCulture); + } + } + /// /// Looks up a localized string similar to weather we. /// diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx index 790df4de..1f236f0a 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -3222,4 +3222,49 @@ `{0}alias allin $bf 100 h` or `{0}alias "linux thingy" >loonix Spyware Windows` + + warnlog + + + See a list of warnings of a certain user. + + + `{0}warnlog @b1nzy` + + + warn + + + Warns a user. + + + `{0}warn @b1nzy` + + + warnclear warnc + + + Clears all warnings from a certain user. + + + `{0}warnclear @PoorDude` + + + warnpunishlist warnpl + + + Lists punishments for warnings. + + + `{0}warnpunishlist` + + + warnpunish warnp + + + Sets a punishment for a certain number of warnings. Provide no punishment to remove. + + + `{0}warnpunish 5 Ban` or `{0}warnpunish 3` + \ No newline at end of file diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index 1b0cd969..b440fe8a 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -736,6 +736,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Moderator. + /// + public static string administration_moderator { + get { + return ResourceManager.GetString("administration_moderator", resourceCulture); + } + } + /// /// Looks up a localized string similar to {0} moved from {1} to {2}. /// @@ -907,6 +916,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to page {0}. + /// + public static string administration_page { + get { + return ResourceManager.GetString("administration_page", resourceCulture); + } + } + /// /// Looks up a localized string similar to Error. Most likely I don't have sufficient permissions.. /// @@ -1060,6 +1078,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Reason. + /// + public static string administration_reason { + get { + return ResourceManager.GetString("administration_reason", resourceCulture); + } + } + /// /// Looks up a localized string similar to Successfully removed role {0} from user {1}. /// @@ -1648,6 +1675,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to User {0} has been warned.. + /// + public static string administration_user_warned { + get { + return ResourceManager.GetString("administration_user_warned", resourceCulture); + } + } + /// /// Looks up a localized string similar to Username. /// @@ -1765,6 +1801,87 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to cleared by {0}. + /// + public static string administration_warn_cleared_by { + get { + return ResourceManager.GetString("administration_warn_cleared_by", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Warning punishment list. + /// + public static string administration_warn_punish_list { + get { + return ResourceManager.GetString("administration_warn_punish_list", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Having {0} warnings will no longer trigger a punishment.. + /// + public static string administration_warn_punish_rem { + get { + return ResourceManager.GetString("administration_warn_punish_rem", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to I will apply {0} punishment to users with {1} warnings.. + /// + public static string administration_warn_punish_set { + get { + return ResourceManager.GetString("administration_warn_punish_set", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Warned on {0} server. + /// + public static string administration_warned_on { + get { + return ResourceManager.GetString("administration_warned_on", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to On {0} at {1} by {2}. + /// + public static string administration_warned_on_by { + get { + return ResourceManager.GetString("administration_warned_on_by", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to All warnings have been cleared for {0}.. + /// + public static string administration_warnings_cleared { + get { + return ResourceManager.GetString("administration_warnings_cleared", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No warning on this page.. + /// + public static string administration_warnings_none { + get { + return ResourceManager.GetString("administration_warnings_none", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Warnlog for {0}. + /// + public static string administration_warnlog_for { + get { + return ResourceManager.GetString("administration_warnlog_for", resourceCulture); + } + } + /// /// Looks up a localized string similar to User {0} from text chat. /// diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index 6f8446b9..f8523242 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -2278,4 +2278,43 @@ Owner ID: {2} Competitive playtime + + Moderator + + + page {0} + + + Reason + + + User {0} has been warned. + + + Warned on {0} server + + + On {0} at {1} by {2} + + + All warnings have been cleared for {0}. + + + No warning on this page. + + + Warnlog for {0} + + + cleared by {0} + + + Warning punishment list + + + Having {0} warnings will no longer trigger a punishment. + + + I will apply {0} punishment to users with {1} warnings. + \ No newline at end of file diff --git a/src/NadekoBot/Services/Database/IUnitOfWork.cs b/src/NadekoBot/Services/Database/IUnitOfWork.cs index c1c9479e..52cb01cf 100644 --- a/src/NadekoBot/Services/Database/IUnitOfWork.cs +++ b/src/NadekoBot/Services/Database/IUnitOfWork.cs @@ -23,6 +23,7 @@ namespace NadekoBot.Services.Database IPokeGameRepository PokeGame { get; } IWaifuRepository Waifus { get; } IDiscordUserRepository DiscordUsers { get; } + IWarningsRepository Warnings { get; } int Complete(); Task CompleteAsync(); diff --git a/src/NadekoBot/Services/Database/Models/GuildConfig.cs b/src/NadekoBot/Services/Database/Models/GuildConfig.cs index 00693f16..4fe497c1 100644 --- a/src/NadekoBot/Services/Database/Models/GuildConfig.cs +++ b/src/NadekoBot/Services/Database/Models/GuildConfig.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using static NadekoBot.Modules.Administration.Administration; namespace NadekoBot.Services.Database.Models { @@ -72,10 +71,19 @@ namespace NadekoBot.Services.Database.Models public HashSet UnmuteTimers { get; set; } = new HashSet(); public HashSet VcRoleInfos { get; set; } public HashSet CommandAliases { get; set; } = new HashSet(); + public List WarnPunishments { get; set; } = new List(); + public bool WarningsInitialized { get; set; } //public List ProtectionIgnoredChannels { get; set; } = new List(); } + public class WarningPunishment : DbEntity + { + public int Count { get; set; } + public PunishmentAction Punishment { get; set; } + public int Time { get; set; } + } + public class CommandAlias : DbEntity { public string Trigger { get; set; } diff --git a/src/NadekoBot/Services/Database/Models/Warning.cs b/src/NadekoBot/Services/Database/Models/Warning.cs new file mode 100644 index 00000000..e5c8f4ff --- /dev/null +++ b/src/NadekoBot/Services/Database/Models/Warning.cs @@ -0,0 +1,12 @@ +namespace NadekoBot.Services.Database.Models +{ + public class Warning : DbEntity + { + public ulong GuildId { get; set; } + public ulong UserId { get; set; } + public string Reason { get; set; } + public bool Forgiven { get; set; } + public string ForgivenBy { get; set; } + public string Moderator { get; set; } + } +} diff --git a/src/NadekoBot/Services/Database/NadekoContext.cs b/src/NadekoBot/Services/Database/NadekoContext.cs index 4efb6150..a82cfde8 100644 --- a/src/NadekoBot/Services/Database/NadekoContext.cs +++ b/src/NadekoBot/Services/Database/NadekoContext.cs @@ -40,6 +40,7 @@ namespace NadekoBot.Services.Database public DbSet CurrencyTransactions { get; set; } public DbSet PokeGame { get; set; } public DbSet WaifuUpdates { get; set; } + public DbSet Warnings { get; set; } //logging public DbSet LogSettings { get; set; } @@ -272,6 +273,10 @@ namespace NadekoBot.Services.Database du.HasAlternateKey(w => w.UserId); #endregion + + #region Warnings + var warn = modelBuilder.Entity(); + #endregion } } } diff --git a/src/NadekoBot/Services/Database/Repositories/IWarningsRepository.cs b/src/NadekoBot/Services/Database/Repositories/IWarningsRepository.cs new file mode 100644 index 00000000..2b2e5ac4 --- /dev/null +++ b/src/NadekoBot/Services/Database/Repositories/IWarningsRepository.cs @@ -0,0 +1,11 @@ +using NadekoBot.Services.Database.Models; +using System.Threading.Tasks; + +namespace NadekoBot.Services.Database.Repositories +{ + public interface IWarningsRepository : IRepository + { + Warning[] For(ulong guildId, ulong userId); + Task ForgiveAll(ulong guildId, ulong userId, string mod); + } +} diff --git a/src/NadekoBot/Services/Database/Repositories/Impl/GuildConfigRepository.cs b/src/NadekoBot/Services/Database/Repositories/Impl/GuildConfigRepository.cs index 7098888d..01a44677 100644 --- a/src/NadekoBot/Services/Database/Repositories/Impl/GuildConfigRepository.cs +++ b/src/NadekoBot/Services/Database/Repositories/Impl/GuildConfigRepository.cs @@ -12,6 +12,18 @@ namespace NadekoBot.Services.Database.Repositories.Impl { } + private List DefaultWarnPunishments => + new List() { + new WarningPunishment() { + Count = 3, + Punishment = PunishmentAction.Kick + }, + new WarningPunishment() { + Count = 5, + Punishment = PunishmentAction.Ban + } + }; + public IEnumerable GetAllGuildConfigs() => _set.Include(gc => gc.LogSetting) .ThenInclude(ls => ls.IgnoredChannels) @@ -64,10 +76,19 @@ namespace NadekoBot.Services.Database.Repositories.Impl _set.Add((config = new GuildConfig { GuildId = guildId, - Permissions = Permissionv2.GetDefaultPermlist + Permissions = Permissionv2.GetDefaultPermlist, + WarningsInitialized = true, + WarnPunishments = DefaultWarnPunishments, })); _context.SaveChanges(); } + + if (!config.WarningsInitialized) + { + config.WarningsInitialized = true; + config.WarnPunishments = DefaultWarnPunishments; + } + return config; } @@ -82,10 +103,18 @@ namespace NadekoBot.Services.Database.Repositories.Impl _set.Add((config = new GuildConfig { GuildId = guildId, - Permissions = Permissionv2.GetDefaultPermlist + Permissions = Permissionv2.GetDefaultPermlist, + WarningsInitialized = true, + WarnPunishments = DefaultWarnPunishments, })); _context.SaveChanges(); } + + if (!config.WarningsInitialized) + { + config.WarningsInitialized = true; + config.WarnPunishments = DefaultWarnPunishments; + } return config; } diff --git a/src/NadekoBot/Services/Database/Repositories/Impl/WarningsRepository.cs b/src/NadekoBot/Services/Database/Repositories/Impl/WarningsRepository.cs new file mode 100644 index 00000000..4bf4c293 --- /dev/null +++ b/src/NadekoBot/Services/Database/Repositories/Impl/WarningsRepository.cs @@ -0,0 +1,37 @@ +using NadekoBot.Services.Database.Models; +using Microsoft.EntityFrameworkCore; +using System; +using System.Linq; +using System.Threading.Tasks; + +namespace NadekoBot.Services.Database.Repositories.Impl +{ + public class WarningsRepository : Repository, IWarningsRepository + { + public WarningsRepository(DbContext context) : base(context) + { + } + + public Warning[] For(ulong guildId, ulong userId) + { + var query = _set.Where(x => x.GuildId == guildId && x.UserId == userId) + .OrderByDescending(x => x.DateAdded); + + return query.ToArray(); + } + + public async Task ForgiveAll(ulong guildId, ulong userId, string mod) + { + await _set.Where(x => x.GuildId == guildId && x.UserId == userId) + .ForEachAsync(x => + { + if (x.Forgiven != true) + { + x.Forgiven = true; + x.ForgivenBy = mod; + } + }) + .ConfigureAwait(false); + } + } +} diff --git a/src/NadekoBot/Services/Database/UnitOfWork.cs b/src/NadekoBot/Services/Database/UnitOfWork.cs index 032c0bb7..02e78a97 100644 --- a/src/NadekoBot/Services/Database/UnitOfWork.cs +++ b/src/NadekoBot/Services/Database/UnitOfWork.cs @@ -54,6 +54,9 @@ namespace NadekoBot.Services.Database private IDiscordUserRepository _discordUsers; public IDiscordUserRepository DiscordUsers => _discordUsers ?? (_discordUsers = new DiscordUserRepository(_context)); + private IWarningsRepository _warnings; + public IWarningsRepository Warnings => _warnings ?? (_warnings = new WarningsRepository(_context)); + public UnitOfWork(NadekoContext context) { _context = context; From 111b4bc4654db1e5eb98f7a9670e0cabb116feb5 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Thu, 30 Mar 2017 04:35:24 +0200 Subject: [PATCH 388/496] .unban added --- .../Commands/LocalizationCommands.cs | 4 +- .../Commands/UserPunishCommands.cs | 45 +++++++++++++++++++ .../Resources/CommandStrings.Designer.cs | 27 +++++++++++ src/NadekoBot/Resources/CommandStrings.resx | 9 ++++ .../Resources/ResponseStrings.Designer.cs | 18 ++++++++ src/NadekoBot/Resources/ResponseStrings.resx | 6 +++ 6 files changed, 107 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs index bc4a0952..707d2af4 100644 --- a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs +++ b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs @@ -24,11 +24,11 @@ namespace NadekoBot.Modules.Administration {"nl-NL", "Dutch, Netherlands"}, {"en-US", "English, United States"}, {"fr-FR", "Français, France"}, - {"de-DE", "German, Germany"}, + {"de-DE", "Deutsch, Deutschland"}, {"he-IL", "Hebrew, Israel" }, {"it-IT", "Italiano, Italia" }, //{"ja-JP", "Japanese, Japan"}, - {"ko-KR", "Korean, South Korea" }, + {"ko-KR", "한국어, 대한민국" }, {"nb-NO", "Norwegian (bokmål), Norway"}, {"pl-PL", "Polski, Polska" }, {"pt-BR", "Português Brasileiro, Brasil"}, diff --git a/src/NadekoBot/Modules/Administration/Commands/UserPunishCommands.cs b/src/NadekoBot/Modules/Administration/Commands/UserPunishCommands.cs index 0f54037f..53479589 100644 --- a/src/NadekoBot/Modules/Administration/Commands/UserPunishCommands.cs +++ b/src/NadekoBot/Modules/Administration/Commands/UserPunishCommands.cs @@ -290,6 +290,51 @@ namespace NadekoBot.Modules.Administration .ConfigureAwait(false); } + [NadekoCommand, Usage, Description, Aliases] + [RequireContext(ContextType.Guild)] + [RequireUserPermission(GuildPermission.BanMembers)] + [RequireBotPermission(GuildPermission.BanMembers)] + public async Task Unban([Remainder]string user) + { + var bans = await Context.Guild.GetBansAsync(); + + var bun = bans.FirstOrDefault(x => x.User.ToString().ToLowerInvariant() == user.ToLowerInvariant()); + + if (bun == null) + { + await ReplyErrorLocalized("user_not_found").ConfigureAwait(false); + return; + } + + await UnbanInternal(bun.User).ConfigureAwait(false); + } + + [NadekoCommand, Usage, Description, Aliases] + [RequireContext(ContextType.Guild)] + [RequireUserPermission(GuildPermission.BanMembers)] + [RequireBotPermission(GuildPermission.BanMembers)] + public async Task Unban(ulong userId) + { + var bans = await Context.Guild.GetBansAsync(); + + var bun = bans.FirstOrDefault(x => x.User.Id == userId); + + if (bun == null) + { + await ReplyErrorLocalized("user_not_found").ConfigureAwait(false); + return; + } + + await UnbanInternal(bun.User).ConfigureAwait(false); + } + + private async Task UnbanInternal(IUser user) + { + await Context.Guild.RemoveBanAsync(user).ConfigureAwait(false); + + await ReplyConfirmLocalized("unbanned_user", Format.Bold(user.ToString())).ConfigureAwait(false); + } + [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] [RequireUserPermission(GuildPermission.KickMembers)] diff --git a/src/NadekoBot/Resources/CommandStrings.Designer.cs b/src/NadekoBot/Resources/CommandStrings.Designer.cs index bba6abe1..61163a92 100644 --- a/src/NadekoBot/Resources/CommandStrings.Designer.cs +++ b/src/NadekoBot/Resources/CommandStrings.Designer.cs @@ -8456,6 +8456,33 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to unban. + /// + public static string unban_cmd { + get { + return ResourceManager.GetString("unban_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Unbans a user with the provided user#discrim or id.. + /// + public static string unban_desc { + get { + return ResourceManager.GetString("unban_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}unban kwoth#1234` or `{0}unban 123123123`. + /// + public static string unban_usage { + get { + return ResourceManager.GetString("unban_usage", resourceCulture); + } + } + /// /// Looks up a localized string similar to unclaim ucall uc. /// diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx index 1f236f0a..db8b3f50 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -3240,6 +3240,15 @@ `{0}warn @b1nzy` + + unban + + + Unbans a user with the provided user#discrim or id. + + + `{0}unban kwoth#1234` or `{0}unban 123123123` + warnclear warnc diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index b440fe8a..a8e6ed17 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -1504,6 +1504,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to User {0} has been unbanned.. + /// + public static string administration_unbanned_user { + get { + return ResourceManager.GetString("administration_unbanned_user", resourceCulture); + } + } + /// /// Looks up a localized string similar to Undeafen successful.. /// @@ -1585,6 +1594,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to User not found.. + /// + public static string administration_user_not_found { + get { + return ResourceManager.GetString("administration_user_not_found", resourceCulture); + } + } + /// /// Looks up a localized string similar to User's role added. /// diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index f8523242..9ef50957 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -2287,6 +2287,12 @@ Owner ID: {2} Reason + + User {0} has been unbanned. + + + User not found. + User {0} has been warned. From 090ad4f9811caa1d3c07bacb845905ad9d347b26 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Thu, 30 Mar 2017 15:53:29 +0200 Subject: [PATCH 389/496] fixed tweezers in hangman, language names are no longer in english --- .../Administration/Commands/LocalizationCommands.cs | 13 +++++++------ .../Modules/Games/Commands/Hangman/HangmanGame.cs | 2 +- src/NadekoBot/data/{hangman.json => hangman2.json} | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) rename src/NadekoBot/data/{hangman.json => hangman2.json} (99%) diff --git a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs index 707d2af4..6930ad88 100644 --- a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs +++ b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs @@ -17,26 +17,27 @@ namespace NadekoBot.Modules.Administration public class LocalizationCommands : NadekoSubmodule { //Română, România + //Bahasa Indonesia, Indonesia private ImmutableDictionary supportedLocales { get; } = new Dictionary() { {"zh-TW", "繁體中文, 台灣" }, {"zh-CN", "简体中文, 中华人民共和国"}, - {"nl-NL", "Dutch, Netherlands"}, + {"nl-NL", "Nederlands, Nederland"}, {"en-US", "English, United States"}, {"fr-FR", "Français, France"}, {"de-DE", "Deutsch, Deutschland"}, - {"he-IL", "Hebrew, Israel" }, + {"he-IL", "עברית, ישראל"}, {"it-IT", "Italiano, Italia" }, - //{"ja-JP", "Japanese, Japan"}, + //{"ja-JP", "日本語, 日本"}, {"ko-KR", "한국어, 대한민국" }, - {"nb-NO", "Norwegian (bokmål), Norway"}, + {"nb-NO", "Norsk, Norge"}, {"pl-PL", "Polski, Polska" }, {"pt-BR", "Português Brasileiro, Brasil"}, - {"ru-RU", "Russian, Russia"}, + {"ru-RU", "Русский, Россия"}, {"sr-Cyrl-RS", "Српски, Србија"}, {"es-ES", "Español, España"}, {"sv-SE", "Svenska, Sverige"}, - {"tr-TR", "Turkish, Turkey" } + {"tr-TR", "Türkçe, Türkiye"} }.ToImmutableDictionary(); [NadekoCommand, Usage, Description, Aliases] diff --git a/src/NadekoBot/Modules/Games/Commands/Hangman/HangmanGame.cs b/src/NadekoBot/Modules/Games/Commands/Hangman/HangmanGame.cs index b4b18e97..0f2f3bda 100644 --- a/src/NadekoBot/Modules/Games/Commands/Hangman/HangmanGame.cs +++ b/src/NadekoBot/Modules/Games/Commands/Hangman/HangmanGame.cs @@ -15,7 +15,7 @@ namespace NadekoBot.Modules.Games.Hangman { public class HangmanTermPool { - const string termsPath = "data/hangman.json"; + const string termsPath = "data/hangman2.json"; public static IReadOnlyDictionary data { get; } static HangmanTermPool() { diff --git a/src/NadekoBot/data/hangman.json b/src/NadekoBot/data/hangman2.json similarity index 99% rename from src/NadekoBot/data/hangman.json rename to src/NadekoBot/data/hangman2.json index e13fd5ab..b93e6aa5 100644 --- a/src/NadekoBot/data/hangman.json +++ b/src/NadekoBot/data/hangman2.json @@ -3023,7 +3023,7 @@ "ImageUrl": "https://www.randomlists.com/img/things/tv.jpg" }, { - "Word": "twezzers", + "Word": "tweezers", "ImageUrl": "https://www.randomlists.com/img/things/twezzers.jpg" }, { From 324360073bfe00093323edb10d0305d75a14447f Mon Sep 17 00:00:00 2001 From: Kwoth Date: Thu, 30 Mar 2017 16:00:27 +0200 Subject: [PATCH 390/496] spelling mistake --- src/NadekoBot/Modules/NadekoModule.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Modules/NadekoModule.cs b/src/NadekoBot/Modules/NadekoModule.cs index d71a2ba9..8b6788dd 100644 --- a/src/NadekoBot/Modules/NadekoModule.cs +++ b/src/NadekoBot/Modules/NadekoModule.cs @@ -69,7 +69,7 @@ namespace NadekoBot.Modules LogManager.GetCurrentClassLogger().Warn(lowerModuleTypeName + "_" + key + " key is missing from " + cultureInfo + " response strings. PLEASE REPORT THIS."); text = NadekoBot.ResponsesResourceManager.GetString(lowerModuleTypeName + "_" + key, _usCultureInfo) ?? $"Error: dkey {lowerModuleTypeName + "_" + key} not found!"; if (string.IsNullOrWhiteSpace(text)) - return "I can't tell you is the command executed, because there was an error printing out the response. Key '" + + return "I can't tell you if the command is executed, because there was an error printing out the response. Key '" + lowerModuleTypeName + "_" + key + "' " + "is missing from resources. Please report this."; } return text; @@ -84,7 +84,7 @@ namespace NadekoBot.Modules } catch (FormatException) { - return "I cant tell if you command is executed, because there was an error printing out the response. Key '" + + return "I can't tell you if the command is executed, because there was an error printing out the response. Key '" + lowerModuleTypeName + "_" + key + "' " + "is not properly formatted. Please report this."; } } From 9cf03a1fb407cff41fc18917bbf9d73b8d4d4f52 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Thu, 30 Mar 2017 20:34:40 +0200 Subject: [PATCH 391/496] Finalized some things. closes #183 and #1059 --- .../Commands/UserPunishCommands.cs | 41 ++++++++++++++----- .../Resources/ResponseStrings.Designer.cs | 18 ++++++++ src/NadekoBot/Resources/ResponseStrings.resx | 6 +++ 3 files changed, 54 insertions(+), 11 deletions(-) diff --git a/src/NadekoBot/Modules/Administration/Commands/UserPunishCommands.cs b/src/NadekoBot/Modules/Administration/Commands/UserPunishCommands.cs index 53479589..ded760c2 100644 --- a/src/NadekoBot/Modules/Administration/Commands/UserPunishCommands.cs +++ b/src/NadekoBot/Modules/Administration/Commands/UserPunishCommands.cs @@ -18,7 +18,7 @@ namespace NadekoBot.Modules.Administration [Group] public class UserPunishCommands : NadekoSubmodule { - private async Task InternalWarn(IGuild guild, ulong userId, string modName, string reason) + private async Task InternalWarn(IGuild guild, ulong userId, string modName, string reason) { if (string.IsNullOrWhiteSpace(reason)) reason = "-"; @@ -34,20 +34,20 @@ namespace NadekoBot.Modules.Administration Moderator = modName, }; - int warnings; + int warnings = 1; List ps; using (var uow = DbHandler.UnitOfWork()) { ps = uow.GuildConfigs.For(guildId, set => set.Include(x => x.WarnPunishments)) .WarnPunishments; - - uow.Warnings.Add(warn); - warnings = uow.Warnings + warnings += uow.Warnings .For(guildId, userId) .Where(w => !w.Forgiven && w.UserId == userId) .Count(); + uow.Warnings.Add(warn); + uow.Complete(); } @@ -57,7 +57,7 @@ namespace NadekoBot.Modules.Administration { var user = await guild.GetUserAsync(userId); if (user == null) - return; + return null; switch (p.Punishment) { case PunishmentAction.Mute: @@ -72,7 +72,10 @@ namespace NadekoBot.Modules.Administration default: break; } + return p.Punishment; } + + return null; } [NadekoCommand, Usage, Description, Aliases] @@ -89,9 +92,16 @@ namespace NadekoBot.Modules.Administration .ConfigureAwait(false); } catch { } - await InternalWarn(Context.Guild, user.Id, Context.User.ToString(), reason).ConfigureAwait(false); + var punishment = await InternalWarn(Context.Guild, user.Id, Context.User.ToString(), reason).ConfigureAwait(false); - await ReplyConfirmLocalized("user_warned", Format.Bold(user.ToString())).ConfigureAwait(false); + if (punishment == null) + { + await ReplyConfirmLocalized("user_warned", Format.Bold(user.ToString())).ConfigureAwait(false); + } + else + { + await ReplyConfirmLocalized("user_warned_and_punished", Format.Bold(user.ToString()), Format.Bold(punishment.ToString())).ConfigureAwait(false); + } } [NadekoCommand, Usage, Description, Aliases] @@ -146,7 +156,7 @@ namespace NadekoBot.Modules.Administration { var name = GetText("warned_on_by", w.DateAdded.Value.ToString("dd.MM.yyy"), w.DateAdded.Value.ToString("HH:mm"), w.Moderator); if (w.Forgiven) - name = Format.Strikethrough(name) + GetText("warn_cleared_by", w.ForgivenBy); + name = Format.Strikethrough(name) + " " + GetText("warn_cleared_by", w.ForgivenBy); embed.AddField(x => x .WithName(name) @@ -175,7 +185,7 @@ namespace NadekoBot.Modules.Administration } await ReplyConfirmLocalized("warnings_cleared", - (Context.Guild as SocketGuild)?.GetUser(userId)?.ToString() ?? userId.ToString()).ConfigureAwait(false); + Format.Bold((Context.Guild as SocketGuild)?.GetUser(userId)?.ToString() ?? userId.ToString())).ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -254,9 +264,18 @@ namespace NadekoBot.Modules.Administration .ToArray(); } + string list; + if (ps.Any()) + { + list = string.Join("\n", ps.Select(x => $"{x.Count} -> {x.Punishment}")); + } + else + { + list = GetText("warnpl_none"); + } await Context.Channel.SendConfirmAsync( GetText("warn_punish_list"), - string.Join("\n", ps.Select(x => $"{x.Count} -> {x.Punishment}"))).ConfigureAwait(false); + list).ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index a8e6ed17..34e12752 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -1702,6 +1702,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to User {0} has been warned and {1} punishment has been applied.. + /// + public static string administration_user_warned_and_punished { + get { + return ResourceManager.GetString("administration_user_warned_and_punished", resourceCulture); + } + } + /// /// Looks up a localized string similar to Username. /// @@ -1900,6 +1909,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to No punishments set.. + /// + public static string administration_warnpl_none { + get { + return ResourceManager.GetString("administration_warnpl_none", resourceCulture); + } + } + /// /// Looks up a localized string similar to User {0} from text chat. /// diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index 9ef50957..a94761da 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -2296,6 +2296,9 @@ Owner ID: {2} User {0} has been warned. + + User {0} has been warned and {1} punishment has been applied. + Warned on {0} server @@ -2311,6 +2314,9 @@ Owner ID: {2} Warnlog for {0} + + No punishments set. + cleared by {0} From 3703e39cc917956f5528b6b57e0b245a15eea2c0 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 31 Mar 2017 14:01:33 +0200 Subject: [PATCH 392/496] -cmds now splits into multiple messages if too long --- src/NadekoBot/Modules/Help/Help.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Help/Help.cs b/src/NadekoBot/Modules/Help/Help.cs index d6ceb1bd..4ca96023 100644 --- a/src/NadekoBot/Modules/Help/Help.cs +++ b/src/NadekoBot/Modules/Help/Help.cs @@ -55,8 +55,14 @@ namespace NadekoBot.Modules.Help await ReplyErrorLocalized("module_not_found").ConfigureAwait(false); return; } + var j = 0; + var groups = cmdsArray.GroupBy(x => j++ / 48).ToArray(); - await channel.SendTableAsync($"📃 **{GetText("list_of_commands")}**\n", cmdsArray, el => $"{el.Aliases.First(),-15} {"["+el.Aliases.Skip(1).FirstOrDefault()+"]",-8}").ConfigureAwait(false); + for (int i = 0; i < groups.Count(); i++) + { + await channel.SendTableAsync(i == 0 ? $"📃 **{GetText("list_of_commands")}**\n" : "", groups.ElementAt(i), el => $"{el.Aliases.First(),-15} {"[" + el.Aliases.Skip(1).FirstOrDefault() + "]",-8}").ConfigureAwait(false); + } + await ConfirmLocalized("commands_instr", Prefix).ConfigureAwait(false); } From 272bf6b85e41f69d355433ca82d738361d800f38 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 31 Mar 2017 14:03:22 +0200 Subject: [PATCH 393/496] Indonesian language completed --- .../Commands/LocalizationCommands.cs | 1 + .../Resources/ResponseStrings.id-ID.resx | 2285 +++++++++++++++++ .../ResponseStrings.sr-Cyrl-RS.Designer.cs | 260 -- 3 files changed, 2286 insertions(+), 260 deletions(-) create mode 100644 src/NadekoBot/Resources/ResponseStrings.id-ID.resx delete mode 100644 src/NadekoBot/Resources/ResponseStrings.sr-Cyrl-RS.Designer.cs diff --git a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs index 6930ad88..2eb70e4c 100644 --- a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs +++ b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs @@ -27,6 +27,7 @@ namespace NadekoBot.Modules.Administration {"fr-FR", "Français, France"}, {"de-DE", "Deutsch, Deutschland"}, {"he-IL", "עברית, ישראל"}, + {"id-ID", "Bahasa Indonesia, Indonesia" }, {"it-IT", "Italiano, Italia" }, //{"ja-JP", "日本語, 日本"}, {"ko-KR", "한국어, 대한민국" }, diff --git a/src/NadekoBot/Resources/ResponseStrings.id-ID.resx b/src/NadekoBot/Resources/ResponseStrings.id-ID.resx new file mode 100644 index 00000000..d2f4e2d2 --- /dev/null +++ b/src/NadekoBot/Resources/ResponseStrings.id-ID.resx @@ -0,0 +1,2285 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Markas itu telah diklaim atau dihancurkan. + + + Markas itu telah dihancurkan. + + + Markas itu belum diklaim. + + + **DIHANCURKAN** markas #{0} di sebuah perang melawan {1} + + + {0} telah **MEMBATALKAN KLAIM** markas #{1} di sebuah perang melawan {2} + + + {0} Telah mengklaim sebuah markas #{1} di perang melawan {2} + + + @{0} Anda telah mengklaim markas #{1}. Anda tidak bisa mengklaim lagi. + + + Klaim dari @{0} di sebuah perang melawan {1} telah kadaluarsa. + + + Musuh + + + Info tentang perang melawan {0} + + + Jumlah markas yang salah. + + + Bukan ukuran perang yang benar. + + + Daftar perang aktif. + + + Tidak diklaim. + + + Anda tidak berpartisipasi di perang itu. + + + @{0} Antara anda tidak berpartisipasi di perang itu, atau markas itu telah dihancurkan. + + + Tidak ada perang aktif. + + + Ukuran + + + Perang melawan {0} telah dimulai. + + + Telah membuat perang melawan {0}. + + + Perang melawan {0} telah selesai. + + + Perang itu tidak ada. + + + Perang melawan {0} mulai! + + + Semua reaksi kustom telah dibersihkan. + + + Reaksi kustom telah dihapus. + + + Izin anda kurang. Dibutuhkan kepemilikan Bot untuk reaksi kostum global, dan Administrator untuk reaksi kustom server. + + + Daftar dari semua reaksi kustom. + + + Reaksi kustom. + + + Reaksi kustom baru + + + Tidak ada reaksi kustom yang ditemukan. + + + Tidak ada reaksi kustom ditemukan dengan id itu. + + + Tanggapan. + + + Status reaksi kustom + + + Status dibersihkan untuk reaksi kustom {0}. + + + Tidak ada data untuk aksi itu, aksi tidak dilakukan. + + + Aksi + + + Autohentai berhenti. + + + Tidak ada hasil yang ditemukan. + + + {0} sudah pingsan. + + + {0} sudah memiliki HP penuh. + + + Tipe anda sudah {0} + + + Digunakan {0}{1} di {2}{3} untuk {4} HP. + Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage. + + + Anda tidak bisa menyerang lagi tanpa serangan balik! + + + Anda tidak bisa menyerang diri sendiri. + + + {0} telah pingsan! + + + {0} disembuhkan dengan satu {1} + + + {0} memiliki {1} HP tersisa. + + + Anda tidak bisa menggunakan {0}. Ketik '{1}ml' untuk melihat daftar gerakan yang anda bisa gunakan. + + + Daftar gerakan untuk tipe {0} + + + Itu tidak efektif. + + + Anda tidak memiliki cukup {0} + + + {0} Dihidupkan dengan satu {1} + + + Anda menghidupkan diri sendiri dengan satu {0} + + + Tipe anda telah diganti ke {0} untuk sebuah {1} + + + Itu cukup efektif. + + + Itu sangatlah efektif! + + + Anda menggunakan terlalu banyak gerakan, jadi anda tidak bisa bergerak! + + + Tipe dari {0} adalah {1}. + + + Pengguna tidak ditemukan. + + + Anda pingsan, jadi anda tidak bisa bergerak! + + + **Penetapan role otomatis** ketika user bergabung sekarang telah **non aktif**. + + + **Penetapan role otomatis** ketika user bergabung sekarang telah **aktif**. + + + Lampiran + + + Avatar diubah. + + + Anda telah diban dari server {0}. +Alasan: {1} + + + 'banned' + PLURAL + + + Pengguna 'banned' + + + Nama bot diubah ke {0} + + + Status bot diubah ke {0}. + + + Penghapusan otomatis dari pesan 'bye' telah dimatikan. + + + Pesan 'bye' akan dihapus setelah {0} detik. + + + Pesan 'bye' sekarang: {0} + + + Nyalakan pesan 'bye' dengan menggunakan {0} + + + Pesan tinggal baru tersetel. + Fuzzy + + + Pengumuman tinggal dimatikan. + + + Pengumuman tinggal dinyalakan di channel ini. + + + Nama Channel telah diubah. + + + Nama lama. + + + Topik channel diubah. + + + Dibersihkan. + + + Konten + + + Berhasil membuat peran {0}. + + + Channel teks {0} telah dibuat. + + + Channel suara {0} telah dibuat. + + + Penulian berhasil. + + + Server {0} dihapus + + + Penghapusan otomatis telah diberhentikan karena invokasi pemerintah yang berhasil. + + + Sekarang akan secara otomatis menghapus invokasi perintah yang sukses. + + + Channel teks {0} dihapus. + + + Channel suara {0} dihapus. + + + Pesan dari + + + Berhasil menambahkan donatur baru. Jumlah donasi dari user ini: {0} 👑 + + + Terima kasih untuk orang yang terdaftar dibawah untuk menciptakan proyek ini! + + + Saya akan meneruskan DM kepada semua pemilik. + + + Saya akan meneruskan DM hanya ke pemilik pertama. + + + Saya akan meneruskan DM mulai dari sekarang. + + + Saya akan berhenti meneruskan DM mulai dari sekarang. + + + Penghapusan pesan sapaan otomatis telah dinonaktifkan. + + + Pesan pesan sapaan akan dihapus setelah {0} detik. + + + Pesan sapa DM sekarang: {0} + + + Aktifkan pesan sapa DM dengan mengetik {0} + + + Pesan sapa DM baru telah diset. + + + Pengumuman sapa DM dinonaktifkan. + + + Pengumuman sapa DM diaktifkan. + + + Pesan sapa sekarang: {0} + + + Aktifkan pesan sapa dengan mengetik {0} + + + Pesan sapa baru telah diset. + + + Pengumuman sapa dinonaktifkan. + + + Pengumuman sapa diaktifkan di channel ini. + + + Anda tidak bisa menggunakkan perintah ini pada pengguna dengan peran yang lebih tinggi atau setara dengan anda di dalam hierarki peran. + + + Gambar ditampilkan setelah {0} detik! + + + Format input tidak valid. + + + Parameter tidak valid. + + + {0} telah bergabung {1} + + + Anda telah dikeluarkan dari server (0}. +Alasan: {1} + + + Pengguna dikeluarkan + + + Daftar bahasa-bahasa + + + Bahasa server anda sekarang adalah {0} - {1} + + + Bahasa asli bot sekarang adalah {0} - {1} + + + Bahasa bot di set ke {0} - {1} + + + Gagal mengatur bahasa. Kunjungi bantuan untuk perintah ini. + + + Bahasa perintah ini sekarang di set ke {0} - {1} + + + {0} telah pergi {1} + + + Meninggalkan server {0} + + + Mencatat {0} event di channel ini. + + + Mencatat semua event di channel ini. + + + Pencatatan dinonaktifkan. + + + Event - event catatan yang anda dapat berlangganan: + + + Pencatatan akan mengabaikan {0} + + + Pencatatatn tidak akan mengabaikan {0} + + + Berhenti mencatat event {0}. + + + {0} telah menyebut peran - peran berikut + + + Pesan dari {0} `[Pemilik Bot]`: + + + Pesan terkirim. + + + {0} telah pindah dari {1} ke {2} + + + Pesan dihapus dalam #{0} + + + Pesan diperbarui dalam #{0} + + + Didiamkan. + PLURAL (users have been muted) + + + Didiamkan. + singular "User muted." + + + Kemungkinan besar saya tidak punya izin yang dibutuhkan untuk itu. + + + Peran diam baru telah diset + + + Saya butuh izin **Administrasi** untuk melakukan itu. + + + Pesan baru + + + Nama panggilan baru + + + Topik baru + + + Nama panggilan diubah + + + Tidak dapat menemukan server itu + + + Tidak ada potongan dengan ID itu ditemukan. + + + Pesan lama + + + Nama panggilan lama + + + Topik lama + + + Error. Kemungkinan besar saya tidak punya izin yang cukup. + + + Izin untuk server ini telah diatur ulang. + + + Perlindungan aktif + + + {0} telah **dinonaktifkan** pada server ini. + + + {0} diaktifkan + + + Error. Saya butuh izin ManageRoles + + + Tidak ada perlindungan diaktifkan. + + + Batas user harus diantara {0} dan {1}. + + + Jika {0} atau lebih user bergabung dalam {1} detik, Saya akan {2} mereka. + + + Waktu harus berada diantara {0} dan {1} detik. + + + Berhasil menghapus semua peran dari user {0} + + + Gagal menghapus peran. Saya tidak punya izin. + + + Warna dari peran {0} telah diubah. + + + Peran itu tidak ada. + + + Parameter yang ditentukan tidak valid. + + + Error disebabkan warna tidak valid atau tidak punya izin. + + + Berhasil menghapus peran {0} dari user {1} + + + Gagal menghapus peran. Saya tidak punya izin. + + + Nama peran diubah. + + + Gagal merubah nama peran. Saya tidak punya izin. + + + Anda tidak dapat mengedit peran yang lebih tinggi daripada peran tertinggi anda. + + + Pesan yang diputar: {0} telah dihapus + + + Peran {0} telah ditambahkan ke daftar. + + + {0} tidak ditemukan. Telah dibersihkan. + + + Peran {0} sudah ada di dalam daftar. + + + Ditambahkan. + + + Status bermain berotasi dinonaktifkan. + + + Status bermain berotasi diaktifkan + + + Ini adalah daftar status-status yang berotasi: +{0} + + + Tidak ada status bermain berotasi yang diset. + + + Anda sudah memiliki {0} peran. + + + Anda sudah memiliki {0} peran eksklusif yang ditetapkan sendiri. + + + Peran yang ditetapkan sendiri sekarang eksklusif! + + + Ada {0} peran yang ditetapkan sendiri + + + Peran itu tidak dapat ditetapkan sendiri. + + + Anda tidak memiliki {0} peran. + + + Peran yang ditetapkan sendiri sekarang tidak eksklusif! + + + Saya tidak dapat menambahkan peran itu pada anda. 'Saya tidak dapat menambahkan peran kepada pemilik atau peran lain yang lebih tinggi daripada peran saya di dalam hierarki peran.' + + + {0} telah dihapus dari daftar peran yang dapat ditetapkan sendiri. + + + Anda tidak lagi memiliki peran {0}. + + + Anda sekarang memiliki peran {0}. + + + Berhasil menambahkan peran {0} ke user {1} + + + Gagal menambahkan peran. Saya tidak punya izin. + + + Avatar baru telah diset! + + + Nama channel baru telah diset. + + + Permainan baru telah diset! + + + Aliran baru telah diset! + + + Topik channel baru telah diset! + + + Potongan {0} telah tersambung ulang. + + + Potongan {0} sedang menyambung ulang. + + + Mematikan + + + User tidak dapat mengirim lebih dari {0} pesan setiap {1} detik. + + + Mode lambat dimatikan. + + + Mode lambat dinyalakan. + + + Ban halus (Dikeluarkan) + PLURAL + + + {0} akan mengabaikan channel ini. + + + {0} tidak lagi akan mengabaikan channel ini. + + + Jika user memposting {0} pesan yang sama secara berurutan, Saya akan {1} mereka. + __IgnoredChannels__: {2} + + + Channel teks telah dibuat. + + + Channel teks telah dihancurkan. + + + penulian nonaktif. + + + Non-bisukan + singular + + + Nama pengguna + + + Nama pengguna telah diubah + + + Para pengguna + + + Pengguna dilarang + + + {0} telah **didiamkan** dari chatting. + + + {0} telah **tidak didiamkan** dari chatting. + + + User bergabung + + + User pergi + + + {0} telah **didiamkan** dari chat teks dan suara + + + Peran pengguna telah ditambahkan + + + Peran pengguna telah dihapuskan + + + {0} sekarang adalah {1} + + + {0} telah **tidak didiamkan** dari chat teks dan suara. + + + {0} telah bergabung di channel suara {1} . + + + {0} telah meninggalkan channel suara {1}. + + + {0} berpindah dari channel suara {1} ke {2}. + + + {0} telah **dibisukan** + + + {0} telah di **voice non-bisukan**. + + + Channel suara telah dibuat + + + Channel suara telah dihancurkan + + + Fitur suara + teks dinonaktifkan. + + + Fitur suara + teks diaktfikan. + + + Saya tidak memiliki izin **mengatur peran** dan/atau **mengatur channel**, jadi saya tidak dapat menjalankan 'suara+teks' di server {0}. + + + Anda mengaktifkan/menonaktifkan fitur ini dan **Saya tidak punya izin administrator**. Ini dapat menyebabkan beberapa isu, dan anda harus membersihkan sendiri channel-channel teks setelahnya. + + + Saya membutuhkan setidaknya izin **mengatur peran** dan **mengatur channel** untuk mengaktifkan fitur ini. (lebih memilih izin administrasi) + + + User {0} dari chat teks + + + User {0} dari chat teks dan suara + + + Pengguna {0} dari chat suara + + + Anda telah diban halus dari server {0}. +Alasan: {1} + + + Pengguna telah di unban + + + Migrasi selesai! + + + Error ketika migrasi, cek konsol bot untuk informasi lebih lanjut. + + + Pembaharuan kehadiran + + + Pengguna diban halus + + + Telah menyerahkan {0} ke {1} + + + Semoga lebih beruntung lain kali ^_^ + + + Selamat! Kamu memenangkan {0} karena hasil diatas {1} + + + Deck telah dikocok ulang. + + + Terlemparkan {0}. + User flipped tails. + + + Anda berhasil menebaknya! Anda memenangkan {0} + + + Angka tidak valid tertera. Anda dapat meleparkan 1 sampai {0} koin. + + + Tambahkan reaksi {0} pada pesan ini untuk mendapatkan {1}␣ + + + Event ini akan aktif selama {0} jam. + + + Event reaksi bunga telah dimulai! + + + Telah menghadiahi {0} ke {1} + X has gifted 15 flowers to Y + + + {0} memiliki {1} + X has Y flowers + + + Kepala + + + Leaderboard + + + Diserahkan {0} sampai {1} pengguna dari peran {2}. + + + Anda tidak bisa bertaruh lebih dari {0} + + + Anda tidak bisa bertaruh kurang dari {0} + + + Anda tidak memiliki cukup {0} + + + Tidak ada lagi kartu di dalam deck. + + + Pengguna yang diundi + + + Kamu mendapatkan {0}. + + + Bertaruh + + + WOAAHHHHHH!!! Selamat!!! x{0} + + + Sebuah {0}, x{1} + + + Wow! Beruntung! Three of a kind! x{0} + + + Good job! Dua {0} - bertaruh x{1} + + + Menang + + + User harus mengetikkan kode rahasia untuk mendapatkan {0}. +Berlangsung selama {1} detik. Jangan bilang bilang. Shhh. + + + Event SneakyGame berakhir. {0} pengguna telah menerima hadiah. + + + Event SneakyGameStatus telah dimulai + + + Ekor + + + berhasil mengambil {0} dari {1} + + + tidak dapat mengambil {0} dari{1} karena user itu tidak memiliki {2} sebanyak itu! + + + Kembali ke ToC + + + Hanya untuk pemilik bot + + + Memerlukan izin {0} channel. + + + Anda dapat mendukung project ini di patreon: <{0}> atau paypal: <{1}> + + + Daftar perintah dan alias + + + Daftar perintah telah dibuat ulang. + + + Ketik '{0}h CommandName' untuk melihat bantuan untuk perintah tersebut. Contoh '{0}h >8ball' + + + Saya tidak dapat menemukan perintah itu. Tolong verifikasi perintah itu ada sebelum mencoba lagi. + + + Deskripsi + + + Anda dapat mendukung projek NadekoBot di +Patreon <{0}> atau +Paypal <{1}> +Jangan lupa untuk meninggalkan nama atau ID Discord anda di dalam pesan. + +**Terima kasih**♥️ + + + **Daftar perintah**: <{0}> +**Panduan dan dokumentasi hosting dapat ditemukan disini**: <{1}> + + + Daftar perintah + + + Daftar modul + + + Ketik '{0}cmds ModuleName' untuk mendapatkan daftar perintah di dalam modul tersebut. Contoh '{0}cmds games' + + + Modul tersebut tidak ada. + + + Memerlukan izin {0} server. + + + Daftar isi + + + Penggunaan + + + Autohentai dimulai. Posting ulang setiap {0} detik dengan satu dari tanda berikut: +{1} + + + Tanda + + + Balap hewan + + + Gagal memulai karena tidak cukup peserta. + + + Balapan penuh!! Segera memulai. + + + {0} bergabung sebagai seekor {1} + + + {0} bergabung sebagai seekor {1} dan bertaruh {2}! + + + Ketik {0}jr untuk mengikuti balapan. + + + Dimulai dalam 20 detik atau ketika telah penuh. + + + Memulai dengan {0} peserta. + + + {0} sebagai {1} Memenangkan balapan! + + + {0} sebagai {1} Memenangkan balapan dan {2}! + + + Angka tidak valid. Anda dapat melemparkan {0}-{1} dadu bersamaan. + + + mendapatkan {0} + Someone rolled 35 + + + Dadu yang dilemparkan: {0} + Dice Rolled: 5 + + + Gagal memulai balapan. Balapan lain mungkin sedang berlangsung. + + + Tidak ada balapan di server ini + + + Angka kedua harus lebih besar daripada angka pertama. + + + Perubahan hati + + + Diklaim oleh + + + Perceraian + + + Suka + + + Harga + + + Tidak ada waifu yang belum diklaim. + + + Top Waifu + + + Afinitas anda sudah ditetapkan ke waifu tersebut atau anda sedang mencoba menghilangkan afinitas tanpa mempunyainya. + + + Mengubah afinitas mereka dari {0} ke {1} + +*Ini dapat ditanyakan moralitasnya.* 🤔 + Make sure to get the formatting right, and leave the thinking emoji + + + Anda harus menunggu {0} jam dan {1} menit untuk mengubah afinitas anda lagi. + + + Afinitas anda telah diulang. Anda tidak lagi memiliki seseorang yang anda sukai. + + + ingin menjadi waifu si {0}. Aww <3 + + + mengklaim {0} sebagai waifu dia seharga {1}! + + + Kamu telah menceraikan waifu yang menyukaimu. Kamu monster tanpa hati. +{0} menerima {1} sebagai kompensasi. + + + Anda tidak bisa merubah afinitas ke diri sendiri, anda egois. + + + 🎉 Cinta mereka dipenuhi! 🎉 +Nilai {0} sekarang adalah {1}! + + + Tidak ada waifu semurah itu. Anda harus membayar setidaknya {0} untuk mendapatkan waifu, meskipun harga mereka lebih rendah. + + + Anda harus membayar {0} atau lebih untuk mengklaim waifu tersebut! + + + Waifu itu bukan milikmu. + + + Anda tidak bisa mengklaim diri sendiri. + + + Anda baru saja bercerai. Anda harus menunggu {0} jam dan {1} menit untuk bercerai lagi. + + + Tidak seorangpun + + + Anda telah menceraikan waifu yang tidak menyukaimu. Anda menerima {0} kembali. + + + 8ball + + + Acrophobia + + + Permainan selesai tanpa pengajuan. + + + Tidak ada pilihan dikirim. Permainan selesai tanpa adanya pemenang. + + + Akronim adalah {0}. + + + Permainan Acrophobia sudah berlangsung di channel ini. + + + Permainan dimulai. Buat sebuah kalimat dengan akronim berikut: {0}. + + + Anda memiliki {0} detik untuk mengirimkan pengajuan. + + + {0} mengirim kalimat mereka. (total {1}) + + + Pilih dengan mengetik nomor dari pengajuan. + + + {0} mengirimkan pilihan mereka! + + + Pemenangnya adalah {0} dengan {1} poin. + + + {0} adalah pemenang karena merupakan satu-satunya pengguna yang mengajukan submisi! + + + Pertanyaan + + + Sebuah seri! Keduanya memilih {0} + + + {0} menang! {1} mengalahkan {2} + + + Waktu pengajuan selesai. + + + Animal Race telah berlangsung. + + + Total: {0} Rata - rata: {0} + + + Kategori + + + Cleverbot dinonaktifkan di server ini. + + + Cleverbot diaktifkan di server ini + + + Pembuatan mata uang telah dinonaktifkan di channel ini. + + + Pembuatan mata uang telah diaktifkan di channel ini. + + + {0} acak {1} telah muncul! + plural + + + Sebuah {0} muncul! + + + Gagal memuat pertanyaan + + + Permainan dimulai + + + Permainan Hangman dimulai + + + Permainan Hangman telah berlangsung di channel ini + + + Ada kesalahan saat memulai Hangman + Fuzzy + + + Daftar dari "{0}hangman" tipe istilah: + + + Leaderboard + + + Anda tidak punya cukup {0} + + + Tidak ada hasil + + + memilih {0} + Kwoth picked 5* + + + {0} menanam {1} + Kwoth planted 5* + + + Permainan trivia sedang berlangsung di server ini. + + + Permainan Trivia + + + {0} menebaknya! Jawabannya adalah: {1} + + + Tidak ada trivia yang sedang berlangsung di server ini. + + + {0} memiliki {1} poin + + + Berhenti setelah pertanyaan ini. + + + Waktu habis! Jawaban yang benar adalah {0} + + + {0} berhasil menebaknya dan memenangkan permainan! Jawabannya adalah: {1} + + + Anda tidak bisa bermain melawan diri sendiri. + + + Permainan TicTacToe sedang berlangsung di channel ini. + + + Sebuah seri! + + + telah membuat permainan TicTacToe. + + + {0} telah menang! + + + Mendapat tiga. + Fuzzy + + + TIdak ada jalan tersisa! + + + Waktu habis! + + + Giliran {0} + + + {0} vs {1} + + + Mencoba untuk mengantri {0} lagu... + + + Autoplay dimatikan. + + + Autoplay diaktifkan. + + + Volume awal di set ke {0}% + + + Antrian direktori selesai. + + + fairplay + + + Lagu selesai + + + Fair play dimatikan. + + + Fair play diaktifkan. + + + Dari posisi + + + id + + + Input tidak valid. + + + Sekarang, waktu bermain maksimal tidak memiliki batas. + + + Batas waktu bermain di set ke {0} detik. + + + Antrian maks untuk musik di set ke tidak terbatas. + + + Antrian maks untuk musik di set ke {0} lagu. + + + Anda harus berada di dalam channel suara di server ini. + + + Nama + + + Sekarang memutar + + + Tidak ada pemutar musik yang aktif. + + + Tidak ada hasil pencarian. + + + Pemutaran musik berhenti sebentar. + + + Antrian pemutar musik - Halaman {0}/{1} + + + Memutar lagu + + + `#{0}` - **{1}** oleh *{2}* ({3} lagu) + + + Halaman {1} playlist yang tersimpan + + + Playlist dihapus + + + Gagal untuk menghapus playlist. Playlist tidak ditemukan, atau anda bukan pemilik playlist tersebut. + + + Playlist dengan ID tersebut tidak ditemukan. + + + Antrian playlist selesai. + + + Playlist disimpan + + + Batasan milik {0} + + + Antrian + + + Antrian lagu + + + Antrian lagu dibersihkan + + + Antrian penuh pada {0}/{0}. + + + Menghapus lagu + context: "removed song #5" + + + Mengulang lagu yang diputar saat ini + + + Mengulang playlist + + + Musik diulang + + + Pengulangan musik diberhentikan. + + + Pemutaran kembali lagu dilanjutkan. + + + Pengulangan playlist dibatalkan. + + + Pengulangan playlist diaktifkan + + + Sekarang saya akan mengeluarkan lagu yang sedang diputar, yang telah diputar, yang dihentikan dan menghapus lagu-lagu di channel ini. + + + Lewat ke `{0}:{1}` + + + Lagu diacak + + + Lagu dipindahkan + + + {0}jam {1}menit {2}detik + + + Pada posisi + + + tidak terbatas + + + Volume harus di antara 0 dan 100 + + + Volume diset pada {0}% + + + Menonaktifkan pemakaian dari SEMUA MODUL pada channel {0}. + + + Mengaktifkan pemakaian dari SEMUA MODUL pada channel {0}. + + + Diizinkan + + + Menonaktifkan pemakaian dari SEMUA MODUL untuk peran {0}. + + + Mengaktifkan pemakaian dari SEMUA MODUL untuk peran {0}. + + + Menonaktifkan pemakaian dari SEMUA MODUL di server ini. + + + Mengaktifkan pemakaian dari SEMUA MODUL di server ini. + + + Menonaktifkan pemakaian dari SEMUA MODUL untuk pengguna {0}. + + + Mengaktifkan pemakaian dari SEMUA MODUL untuk pengguna {0}. + + + Mendaftarhitamkan {0} dengan ID {1} + + + Perintah {0} sekarang memiliki jeda selama {1} detik. + + + Perintah {0} sekarang tidak memiliki jeda dan semua jeda yang ada telah dibersihkan. + + + Tidak ada perintah jeda yang ditentukan. + + + Harga perintah + + + Menonaktifkan pemakaian pada {0} {1} pada channel {2}. + + + Mengaktifkan pemakaian pada {0} {1} pada channel {2}. + + + Ditolak + + + Menambahkan kata {0} pada daftar saringan kata. + + + Daftar saringan kata-kata + + + Mencabut kata {0} dari daftar saringan kata-kata. + + + Parameter kedua salah (Harus nomor diantara {0} dan {1}) + + + Penyaringan undangan dinonaktifkan di channel ini. + + + Penyaringan undangan diaktifkan di server ini. + + + Penyaringan undangan dinonaktifkan di server ini. + + + Penyaringan undangan diaktifkan di server ini. + + + Memindakan izin {0} dari #{1} kepada #{2} + + + Tidak dapat menemukan izin pada indeks #{0} + + + Tidak ada biaya di set. + + + perintah + Gen (of command) + + + modul + Gen. (of module) + + + Halaman perizinan {0} + + + Peran izin sekarang adalah {0} + + + Pengguna memerlukan {0} peran untuk dapat merubah izin. + + + Izin tidak ditemukan dalam indeks tersebut. + + + Mencabut izin #{0} - {1} + + + Menonaktifkan pemakaian pada {0} {1} untuk peran {2}. + + + Mengaktifkan pemakaian pada {0} {1} untuk peran {2}. + + + sec. + Short of seconds. + + + Menonaktifkan pemakaian dari {0} {1} pada server ini. + + + Mengaktifkan pemakaian dari {0} {1} pada server ini. + + + Menghapus {0} dengan ID {1} dari daftar hitam + + + tidak dapat diganti + + + Menonaktifkan pemakaian dari {0} {1} untuk {2} pengguna. + + + Mengaktifkan pemakaian dari {0} {1} untuk {2} pengguna. + + + Saya tidak akan lagi memperlihatkan izin peringatan. + + + Sekarang saya akan memperlihatkan izin peringatan. + + + Penyaringan kata pada channel ini dinonaktifkan. + + + Penyaringan kata pada channel ini diaktifkan. + + + Penyaringan kata pada server ini dinonaktifkan. + + + Penyaringan kata pada server ini diaktifkan. + + + Kemampuan + + + Belum ada anime favorit + + + Memulai terjemahan otomatis dari pesan di channel ini. Pesan pengguna akan otomatis dihapus. + + + Terjemahan bahasa otomatis anda telah dicabut. + + + Terjemahan bahasa otomatis anda telah diset pada {0}>{1} + + + Memulai terjemahan otomatis dari pesan-pesan di channel ini. + + + Menghentikan terjemahan otomatis dari pesan-pesan di channel ini. + + + Format input buruk, atau terjadi kesalahan. + + + Tidak dapat menemukan kartu tersebut. + + + fakta + + + Bab + + + Komik # + + + Kekalahan kompetitif + + + Kompetitif yang dimainkan + + + Tingkat kompetitif + + + Kemenangan kompetitif + + + Selesai + + + Kondisi + + + Biaya + + + Tanggal + + + Jelaskan: + + + Terjatuh. + + + Episode + + + Kesalahan terjadi. + + + Contoh + + + Gagal menemukan animu tersebut + + + Gagal menemukan mango tersebut + + + Aliran + + + Gagal menemukan definisi dari label tersebut. + + + Tinggi/Berat + + + {0}m/{1}kg + + + Kelembaban + + + Pencarian gambar untuk: + + + Gagal untuk menemukan film tersebut. + + + Kesalahan sumber atau target bahasa. + + + Candaan tidak dimuat. + + + Lintang/Bujur + + + Tingkat + + + Daftar dari {0}tempat yang ditandai + Don't translate {0}place + + + Lokasi + + + Barang barang sihir tidak dimuat. + + + Profil MAL {0} + + + Pemilik Bot tidak menentukan MashapeApiKey. Anda tidak dapat menggunakan fungsi ini. + + + Min/Maks + + + Channel tidak ditemukan. + + + Hasil tidak ditemukan. + + + Tertahan + + + url asli + + + Sebuah osu! API key diperlukan. + + + Gagal mengambil tanda osu! + + + Ditemukan diantara {0} gambar. Memperlihatkan acak {0}. + + + Pengguna tidak ditemukan! Silahkan cek daerah dan BattleTag sebelum mencoba lagi. + + + Rencana untuk menonton + + + Peron + + + Kemampuan tidak ditemukan. + + + Pokemon tidak ditemukan. + + + Tautan profil: + + + Kualitas + + + Waktu bermain cepat + + + Kemenangan cepat + + + Penilaian + + + Skor: + + + Pencarian untuk: + + + Gagal untuk mempersingkat url tersebut. + + + Url pendek + + + Ada sesuatu yang salah. + + + Harap menentukan parameter pencarian. + + + Status + + + Menyimpan url + + + Streamer {0} sedang offline. + + + Streamer {0} online dengan {1} penonton. + + + Anda mengikuti {0} stream di server ini. + + + Anda tidak mengikuti stream di server ini. + + + Stream tidak ditemukan. + + + Stream mungkin tidak ada. + + + Menghilangkan {0} stream ({1}) dari notifikasi. + + + Saya akan memberitahu channel ini saat status berubah. + + + Matahari terbit + + + Matahari terbenam + + + Temperatur + + + Judul: + + + Top 3 favorit anime: + + + Terjemahan: + + + Tipe + + + Gagal menemukan definisi untuk istilah tersebut + + + Url + + + Penonton + + + Menonton + + + Gagal menemukan istilah tersebut dalam wikia yang ditentukan. + + + Harap memasukkan target wikia, diikuti dengan pertanyaan pencarian. + + + Halaman tidak ditemukan. + + + Kecepatan angin + + + {0} champion paling sering di ban + + + Gagal menyodifikasi kalimat anda. + + + Bergabung + + + `{0}.` {1} [{2:F2}/s] - {3} total + /s and total need to be localized to fit the context - +`1.` + + + Halaman aktifitas #{0} + + + {0} total pengguna. + + + Penulis + + + ID Bot + + + Daftar fungsi di perintah {0)calc + + + {0} dari channel ini adalah {1} + + + Topik channel + + + Perintah dijalankan + + + {0} {1} sama dengan {2} {3} + + + Satuan yang dapat digunakan oleh converter + + + Tidak bisa mengubah {0} menjadi {1}: satuan tidak ditemukan + + + Tidak dapat mengubah {0} ke {1}: tipe untuk tidak sama + + + Dibuat di + + + Mengikuti saluran silang server. + + + Saluran silang server ditinggalkan. + + + Ini adalah token CSC anda + + + emoji kustom + + + Kesalahan + + + Ciri - ciri + + + ID + + + Indeks di luar jarak. + + + Daftar pengguna pada peran {0} + + + Anda tidak diizinkan untuk menggunakan perintah ini pada peran dengan banyak pengguna di dalamnya untuk mencegah penyalahgunaan. + + + Nilai {0} salah. + Invalid months value/ Invalid hours value + + + Bergabung Discord + + + Bergabung server + + + ID: {0} +Anggota: {1} +ID Pemilik: {2} + + + Server tidak ditemukan di halaman tersebut. + + + Daftar dari pengulangan + + + Anggota + + + Memori + + + Pesan + + + Pengulang pesan + + + Nama + + + Nama panggilan + + + Tidak seorangpun memainkan game tersebut + + + Tidak ada pengulangan aktif. + + + Tidak ada peran di halaman ini. + + + Tidak ada pecahan di halaman ini. + + + Tidak ada topik yang ditentukan + + + Pemilik + + + IDs pemilik + + + Kehadiran + + + {0} Servers +{1} Channel Teks +{2} Channel Suara + + + Menghapus semua kutipan dengan {0} kata kunci. + + + Halaman {0} dari kutipan + + + Tidak ada kutipan pada halaman ini. + + + Tidak ditemukan kutipan yang dapat anda hapus. + + + Kutipan ditambahkan + + + Kutipan #{0} dihapus. + + + Wilayah + + + Terdaftar pada + + + Saya akan mengigatakn {0} untuk {1} dalam {2} '({3:d:M.yyyy.} saat {4:HH:mm} + + + Bukan format waktu yang benar. Silakan periksa daftar perintah. + + + Template mengingatkan baru disetel. + + + Mengulang {0} setiap {1} hari, {2} jam dan {3} menit. + + + Daftar pemutaran. + + + Tidak ada pemutaran di server ini. + + + #{0} berhenti. + + + Tidak ada pesan mengulang ditemukan di server ini. + + + Hasil + + + Peran + + + Halaman #{0} dari semua peran di server ini: + + + Halaman #{0} dari peran untuk {1} + + + Tidak ada warna di format benar. Gunakan '#00ff00' sebagai contoh. + + + Memulai pemutaran di peran {0}. + + + Memberhentikan warna memutar untuk peran {0} + + + {0} pada server ini adalah {1} + + + Info server + + + Pecahan + + + Statistik pecahan + + + Pecahan **#{0}** sedang di dalam keadaan {1} di {2} server. + + + **Nama:** {0} **Tautan:** {1} + + + Emojis khusus tidak ditemukan. + + + Memainkan {0} lagu, {1} menunggu + + + Channel teks + + + Ini adalah tautan untuk ruangan anda: + + + Uptime + + + {0} dari pengguna {1} adalah {2} + Id of the user kwoth#1234 is 123123123123 + + + Pengguna + + + Channel suara + + + Anda telah bergabung pada perlombaan ini! + + + Hasil pemilihan saat ini + + + Tidak ada suara terkirim. + + + Pemilihan telah dimulai di server ini. + + + 📃 {0} telah membuat pemilihan yang memerlukan perhatian anda: + + + '{0}.' {1} dengan {2} suara. + + + {0} memilih. + Kwoth voted. + + + Kirim saya pesan pribadi dengan angka yang sesuai dari jawaban. + + + Kirim pesan dengan menggunakan nomor dari jawaban. + + + Terima kasih telah memilih, {0} + + + {0} total suara dikirim. + + + Mengambil barang tersebut dengan mengetik `{0}ambil` + + + Ambil dengan mengetik '{0}pick' + + + Pengguna tidak ditemukan. + + + halaman {0} + + + Anda harus berada pada channel suara di server ini. + + + Tidak ada peran untuk saluran suara. + + + {0} telah **dibisukan** dari teks dan saluran suara selama {1} menit. + + + Pengguna yang bergabung {0} channel suara akan mendapatkan peran {1}. + + + Pengguna yang bergabung {0} channel suara tidak lagi mendapatkan peran. + + + Peran channel suara + + + Mereaksi reaksi kustom menggunakan pesan dengan id {0} tidak akan dihapus secara otomatis. + + + Mereaksikan reaksi kustom menggunakan pesan dengan id {0} akan dihapus secara otomatis. + + + Pesan respon untuk reaksi kustom dengan id {0} tidak akan dikirim sebagai DM. + + + Pesan respon untuk reaksi kustom dengan id {0} akan dikirim sebagai DM. + + + Alias tidak ditemukan + + + Mengetik {0} sekarang akan menjadi alias dari {1}. + + + Daftar alias + + + Perintah {0} sekarang tidak memiliki alias. + + + Perintah {0} tidak mempunyai alias. + + + Waktu bermain kompetitif + + + \ No newline at end of file diff --git a/src/NadekoBot/Resources/ResponseStrings.sr-Cyrl-RS.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.sr-Cyrl-RS.Designer.cs deleted file mode 100644 index 4d43d571..00000000 --- a/src/NadekoBot/Resources/ResponseStrings.sr-Cyrl-RS.Designer.cs +++ /dev/null @@ -1,260 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace NadekoBot.Resources { - using System; - using System.Reflection; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - public class ResponseStrings_sr_SP { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - internal ResponseStrings_sr_SP() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("NadekoBot.Resources.ResponseStrings-sr-SP", typeof(ResponseStrings_sr_SP).GetTypeInfo().Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// Looks up a localized string similar to {0} has already fainted.. - /// - public static string pokemon_already_fainted { - get { - return ResourceManager.GetString("pokemon_already_fainted", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to {0} already has full HP.. - /// - public static string pokemon_already_full { - get { - return ResourceManager.GetString("pokemon_already_full", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Your type is already {0}. - /// - public static string pokemon_already_that_type { - get { - return ResourceManager.GetString("pokemon_already_that_type", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to used {0}{1} on {2}{3} for {4} damage.. - /// - public static string pokemon_attack { - get { - return ResourceManager.GetString("pokemon_attack", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to You can't attack again without retaliation!. - /// - public static string pokemon_cant_attack_again { - get { - return ResourceManager.GetString("pokemon_cant_attack_again", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to You can't attack yourself.. - /// - public static string pokemon_cant_attack_yourself { - get { - return ResourceManager.GetString("pokemon_cant_attack_yourself", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to {0} has fainted!. - /// - public static string pokemon_fainted { - get { - return ResourceManager.GetString("pokemon_fainted", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to healed {0} with one {1}. - /// - public static string pokemon_healed { - get { - return ResourceManager.GetString("pokemon_healed", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to {0} has {1} HP remaining.. - /// - public static string pokemon_hp_remaining { - get { - return ResourceManager.GetString("pokemon_hp_remaining", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to You can't use {0}. Type `{1}ml` to see a list of moves you can use.. - /// - public static string pokemon_invalid_move { - get { - return ResourceManager.GetString("pokemon_invalid_move", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Movelist for {0} type. - /// - public static string pokemon_moves { - get { - return ResourceManager.GetString("pokemon_moves", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to You don't have enough {0}. - /// - public static string pokemon_no_currency { - get { - return ResourceManager.GetString("pokemon_no_currency", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to It's not effective.. - /// - public static string pokemon_not_effective { - get { - return ResourceManager.GetString("pokemon_not_effective", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to revived {0} with one {1}. - /// - public static string pokemon_revive_other { - get { - return ResourceManager.GetString("pokemon_revive_other", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to You revived yourself with one {0}. - /// - public static string pokemon_revive_yourself { - get { - return ResourceManager.GetString("pokemon_revive_yourself", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Your type has been changed to {0} for a {1}. - /// - public static string pokemon_settype_success { - get { - return ResourceManager.GetString("pokemon_settype_success", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to It's somewhat effective.. - /// - public static string pokemon_somewhat_effective { - get { - return ResourceManager.GetString("pokemon_somewhat_effective", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to It's super effective!. - /// - public static string pokemon_super_effective { - get { - return ResourceManager.GetString("pokemon_super_effective", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to You used too many moves in a row, so you can't move!. - /// - public static string pokemon_too_many_moves { - get { - return ResourceManager.GetString("pokemon_too_many_moves", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Type of {0} is {1}. - /// - public static string pokemon_type_of_user { - get { - return ResourceManager.GetString("pokemon_type_of_user", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to User not found.. - /// - public static string pokemon_user_not_found { - get { - return ResourceManager.GetString("pokemon_user_not_found", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to You fainted, so you are not able to move!. - /// - public static string pokemon_you_fainted { - get { - return ResourceManager.GetString("pokemon_you_fainted", resourceCulture); - } - } - } -} From 0a7bbd60f77870e8f3e41334a4a19e1a4f14adf0 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 31 Mar 2017 14:07:18 +0200 Subject: [PATCH 394/496] Startup commands added. Closes #195; .sclist .scadd .scrm .scclr. Won't support music commands atm, but that can come in the future, there is support for it (your current voice channel is recorded when adding) --- .../Attributes/OwnerOnlyAttribute.cs | 2 +- ...0170331093025_startup-commands.Designer.cs | 1385 +++++++++++++++++ .../20170331093025_startup-commands.cs | 51 + .../NadekoSqliteContextModelSnapshot.cs | 39 + .../Modules/Administration/Administration.cs | 2 +- .../Administration/Commands/SelfCommands.cs | 168 +- .../Commands/UserPunishCommands.cs | 5 +- .../CustomReactions/CustomReactions.cs | 2 +- .../Games/Commands/CleverBotCommands.cs | 2 +- .../Resources/CommandStrings.Designer.cs | 135 ++ src/NadekoBot/Resources/CommandStrings.resx | 45 + .../Resources/ResponseStrings.Designer.cs | 72 + src/NadekoBot/Resources/ResponseStrings.resx | 24 + src/NadekoBot/Services/CommandHandler.cs | 274 ++-- .../Services/Database/Models/BotConfig.cs | 13 + .../Repositories/IBotConfigRepository.cs | 7 +- .../Repositories/Impl/BotConfigRepository.cs | 11 +- 17 files changed, 2090 insertions(+), 147 deletions(-) create mode 100644 src/NadekoBot/Migrations/20170331093025_startup-commands.Designer.cs create mode 100644 src/NadekoBot/Migrations/20170331093025_startup-commands.cs diff --git a/src/NadekoBot/Attributes/OwnerOnlyAttribute.cs b/src/NadekoBot/Attributes/OwnerOnlyAttribute.cs index 410a24af..eefc489c 100644 --- a/src/NadekoBot/Attributes/OwnerOnlyAttribute.cs +++ b/src/NadekoBot/Attributes/OwnerOnlyAttribute.cs @@ -6,6 +6,6 @@ namespace NadekoBot.Attributes public class OwnerOnlyAttribute : PreconditionAttribute { public override Task CheckPermissions(ICommandContext context, CommandInfo executingCommand,IDependencyMap depMap) => - Task.FromResult((NadekoBot.Credentials.IsOwner(context.User) ? PreconditionResult.FromSuccess() : PreconditionResult.FromError("Not owner"))); + Task.FromResult((NadekoBot.Credentials.IsOwner(context.User) || NadekoBot.Client.CurrentUser.Id == context.User.Id ? PreconditionResult.FromSuccess() : PreconditionResult.FromError("Not owner"))); } } \ No newline at end of file diff --git a/src/NadekoBot/Migrations/20170331093025_startup-commands.Designer.cs b/src/NadekoBot/Migrations/20170331093025_startup-commands.Designer.cs new file mode 100644 index 00000000..a91943d7 --- /dev/null +++ b/src/NadekoBot/Migrations/20170331093025_startup-commands.Designer.cs @@ -0,0 +1,1385 @@ +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using NadekoBot.Services.Database; +using NadekoBot.Services.Database.Models; +using NadekoBot.Modules.Music.Classes; + +namespace NadekoBot.Migrations +{ + [DbContext(typeof(NadekoContext))] + [Migration("20170331093025_startup-commands")] + partial class startupcommands + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { + modelBuilder + .HasAnnotation("ProductVersion", "1.1.0-rtm-22752"); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Action"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Seconds"); + + b.Property("UserThreshold"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId") + .IsUnique(); + + b.ToTable("AntiRaidSetting"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AntiSpamSettingId"); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.HasKey("Id"); + + b.HasIndex("AntiSpamSettingId"); + + b.ToTable("AntiSpamIgnore"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Action"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("MessageThreshold"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId") + .IsUnique(); + + b.ToTable("AntiSpamSetting"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("ItemId"); + + b.Property("Type"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("BlacklistItem"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BetflipMultiplier"); + + b.Property("Betroll100Multiplier"); + + b.Property("Betroll67Multiplier"); + + b.Property("Betroll91Multiplier"); + + b.Property("BufferSize"); + + b.Property("CurrencyDropAmount"); + + b.Property("CurrencyGenerationChance"); + + b.Property("CurrencyGenerationCooldown"); + + b.Property("CurrencyName"); + + b.Property("CurrencyPluralName"); + + b.Property("CurrencySign"); + + b.Property("DMHelpString"); + + b.Property("DateAdded"); + + b.Property("ErrorColor"); + + b.Property("ForwardMessages"); + + b.Property("ForwardToAllOwners"); + + b.Property("HelpString"); + + b.Property("Locale"); + + b.Property("MigrationVersion"); + + b.Property("MinimumBetAmount"); + + b.Property("OkColor"); + + b.Property("RemindMessageFormat"); + + b.Property("RotatingStatuses"); + + b.Property("TriviaCurrencyReward"); + + b.HasKey("Id"); + + b.ToTable("BotConfig"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BaseDestroyed"); + + b.Property("CallUser"); + + b.Property("ClashWarId"); + + b.Property("DateAdded"); + + b.Property("SequenceNumber"); + + b.Property("Stars"); + + b.Property("TimeAdded"); + + b.HasKey("Id"); + + b.HasIndex("ClashWarId"); + + b.ToTable("ClashCallers"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("EnemyClan"); + + b.Property("GuildId"); + + b.Property("Size"); + + b.Property("StartedAt"); + + b.Property("WarState"); + + b.HasKey("Id"); + + b.ToTable("ClashOfClans"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Mapping"); + + b.Property("Trigger"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("CommandAlias"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("CommandName"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Seconds"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("CommandCooldown"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("CommandName"); + + b.Property("DateAdded"); + + b.Property("Price"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.HasIndex("Price") + .IsUnique(); + + b.ToTable("CommandPrice"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("InternalTrigger"); + + b.Property("Modifier"); + + b.Property("UnitType"); + + b.HasKey("Id"); + + b.ToTable("ConversionUnits"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Amount"); + + b.Property("DateAdded"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("Currency"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Amount"); + + b.Property("DateAdded"); + + b.Property("Reason"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.ToTable("CurrencyTransactions"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AutoDeleteTrigger"); + + b.Property("DateAdded"); + + b.Property("DmResponse"); + + b.Property("GuildId"); + + b.Property("IsRegex"); + + b.Property("OwnerOnly"); + + b.Property("Response"); + + b.Property("Trigger"); + + b.HasKey("Id"); + + b.ToTable("CustomReactions"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AvatarId"); + + b.Property("DateAdded"); + + b.Property("Discriminator"); + + b.Property("UserId"); + + b.Property("Username"); + + b.HasKey("Id"); + + b.HasAlternateKey("UserId"); + + b.ToTable("DiscordUser"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Amount"); + + b.Property("DateAdded"); + + b.Property("Name"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("Donators"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("Text"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("EightBallResponses"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("GuildConfigId1"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.HasIndex("GuildConfigId1"); + + b.ToTable("FilterChannelId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Word"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("FilteredWord"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("GuildId"); + + b.Property("Type"); + + b.Property("Username"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("FollowedStream"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("GCChannelId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AutoAssignRoleId"); + + b.Property("AutoDeleteByeMessages"); + + b.Property("AutoDeleteByeMessagesTimer"); + + b.Property("AutoDeleteGreetMessages"); + + b.Property("AutoDeleteGreetMessagesTimer"); + + b.Property("AutoDeleteSelfAssignedRoleMessages"); + + b.Property("ByeMessageChannelId"); + + b.Property("ChannelByeMessageText"); + + b.Property("ChannelGreetMessageText"); + + b.Property("CleverbotEnabled"); + + b.Property("DateAdded"); + + b.Property("DefaultMusicVolume"); + + b.Property("DeleteMessageOnCommand"); + + b.Property("DmGreetMessageText"); + + b.Property("ExclusiveSelfAssignedRoles"); + + b.Property("FilterInvites"); + + b.Property("FilterWords"); + + b.Property("GreetMessageChannelId"); + + b.Property("GuildId"); + + b.Property("Locale"); + + b.Property("LogSettingId"); + + b.Property("MuteRoleName"); + + b.Property("PermissionRole"); + + b.Property("RootPermissionId"); + + b.Property("SendChannelByeMessage"); + + b.Property("SendChannelGreetMessage"); + + b.Property("SendDmGreetMessage"); + + b.Property("TimeZoneId"); + + b.Property("VerbosePermissions"); + + b.Property("VoicePlusTextEnabled"); + + b.Property("WarningsInitialized"); + + b.HasKey("Id"); + + b.HasIndex("GuildId") + .IsUnique(); + + b.HasIndex("LogSettingId"); + + b.HasIndex("RootPermissionId"); + + b.ToTable("GuildConfigs"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("GuildId"); + + b.Property("Interval"); + + b.Property("Message"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("GuildRepeater"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("LogSettingId"); + + b.HasKey("Id"); + + b.HasIndex("LogSettingId"); + + b.ToTable("IgnoredLogChannels"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("LogSettingId"); + + b.HasKey("Id"); + + b.HasIndex("LogSettingId"); + + b.ToTable("IgnoredVoicePresenceCHannels"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelCreated"); + + b.Property("ChannelCreatedId"); + + b.Property("ChannelDestroyed"); + + b.Property("ChannelDestroyedId"); + + b.Property("ChannelId"); + + b.Property("ChannelUpdated"); + + b.Property("ChannelUpdatedId"); + + b.Property("DateAdded"); + + b.Property("IsLogging"); + + b.Property("LogOtherId"); + + b.Property("LogUserPresence"); + + b.Property("LogUserPresenceId"); + + b.Property("LogVoicePresence"); + + b.Property("LogVoicePresenceId"); + + b.Property("LogVoicePresenceTTSId"); + + b.Property("MessageDeleted"); + + b.Property("MessageDeletedId"); + + b.Property("MessageUpdated"); + + b.Property("MessageUpdatedId"); + + b.Property("UserBanned"); + + b.Property("UserBannedId"); + + b.Property("UserJoined"); + + b.Property("UserJoinedId"); + + b.Property("UserLeft"); + + b.Property("UserLeftId"); + + b.Property("UserMutedId"); + + b.Property("UserPresenceChannelId"); + + b.Property("UserUnbanned"); + + b.Property("UserUnbannedId"); + + b.Property("UserUpdated"); + + b.Property("UserUpdatedId"); + + b.Property("VoicePresenceChannelId"); + + b.HasKey("Id"); + + b.ToTable("LogSettings"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("ModuleName"); + + b.Property("Prefix"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("ModulePrefixes"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Author"); + + b.Property("AuthorId"); + + b.Property("DateAdded"); + + b.Property("Name"); + + b.HasKey("Id"); + + b.ToTable("MusicPlaylists"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("MutedUserId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("NextId"); + + b.Property("PrimaryTarget"); + + b.Property("PrimaryTargetId"); + + b.Property("SecondaryTarget"); + + b.Property("SecondaryTargetName"); + + b.Property("State"); + + b.HasKey("Id"); + + b.HasIndex("NextId") + .IsUnique(); + + b.ToTable("Permission"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Index"); + + b.Property("PrimaryTarget"); + + b.Property("PrimaryTargetId"); + + b.Property("SecondaryTarget"); + + b.Property("SecondaryTargetName"); + + b.Property("State"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("Permissionv2"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("Status"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("PlayingStatus"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("MusicPlaylistId"); + + b.Property("Provider"); + + b.Property("ProviderType"); + + b.Property("Query"); + + b.Property("Title"); + + b.Property("Uri"); + + b.HasKey("Id"); + + b.HasIndex("MusicPlaylistId"); + + b.ToTable("PlaylistSong"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AuthorId"); + + b.Property("AuthorName") + .IsRequired(); + + b.Property("DateAdded"); + + b.Property("GuildId"); + + b.Property("Keyword") + .IsRequired(); + + b.Property("Text") + .IsRequired(); + + b.HasKey("Id"); + + b.ToTable("Quotes"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("Icon"); + + b.Property("Name"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("RaceAnimals"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("IsPrivate"); + + b.Property("Message"); + + b.Property("ServerId"); + + b.Property("UserId"); + + b.Property("When"); + + b.HasKey("Id"); + + b.ToTable("Reminders"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildId"); + + b.Property("RoleId"); + + b.HasKey("Id"); + + b.HasIndex("GuildId", "RoleId") + .IsUnique(); + + b.ToTable("SelfAssignableRoles"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("ChannelId"); + + b.Property("ChannelName"); + + b.Property("CommandText"); + + b.Property("DateAdded"); + + b.Property("GuildId"); + + b.Property("GuildName"); + + b.Property("Index"); + + b.Property("VoiceChannelId"); + + b.Property("VoiceChannelName"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("StartupCommand"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("UnmuteAt"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("UnmuteTimer"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("UserId"); + + b.Property("type"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("PokeGame"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("RoleId"); + + b.Property("VoiceChannelId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("VcRoleInfo"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AffinityId"); + + b.Property("ClaimerId"); + + b.Property("DateAdded"); + + b.Property("Price"); + + b.Property("WaifuId"); + + b.HasKey("Id"); + + b.HasIndex("AffinityId"); + + b.HasIndex("ClaimerId"); + + b.HasIndex("WaifuId") + .IsUnique(); + + b.ToTable("WaifuInfo"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("NewId"); + + b.Property("OldId"); + + b.Property("UpdateType"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("NewId"); + + b.HasIndex("OldId"); + + b.HasIndex("UserId"); + + b.ToTable("WaifuUpdates"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("Forgiven"); + + b.Property("ForgivenBy"); + + b.Property("GuildId"); + + b.Property("Moderator"); + + b.Property("Reason"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.ToTable("Warnings"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Count"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Punishment"); + + b.Property("Time"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("WarningPunishment"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig") + .WithOne("AntiRaidSetting") + .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b => + { + b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting") + .WithMany("IgnoredChannels") + .HasForeignKey("AntiSpamSettingId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig") + .WithOne("AntiSpamSetting") + .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("Blacklist") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b => + { + b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar") + .WithMany("Bases") + .HasForeignKey("ClashWarId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("CommandAliases") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("CommandCooldowns") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("CommandPrices") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("EightBallResponses") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FilterInvitesChannelIds") + .HasForeignKey("GuildConfigId"); + + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FilterWordsChannelIds") + .HasForeignKey("GuildConfigId1"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FilteredWords") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FollowedStreams") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("GenerateCurrencyChannelIds") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b => + { + b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting") + .WithMany() + .HasForeignKey("LogSettingId"); + + b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission") + .WithMany() + .HasForeignKey("RootPermissionId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("GuildRepeaters") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b => + { + b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting") + .WithMany("IgnoredChannels") + .HasForeignKey("LogSettingId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b => + { + b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting") + .WithMany("IgnoredVoicePresenceChannelIds") + .HasForeignKey("LogSettingId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("ModulePrefixes") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("MutedUsers") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b => + { + b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next") + .WithOne("Previous") + .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("Permissions") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("RotatingStatusMessages") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b => + { + b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist") + .WithMany("Songs") + .HasForeignKey("MusicPlaylistId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("RaceAnimals") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("StartupCommands") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("UnmuteTimers") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("VcRoleInfos") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => + { + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity") + .WithMany() + .HasForeignKey("AffinityId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer") + .WithMany() + .HasForeignKey("ClaimerId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu") + .WithOne() + .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => + { + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New") + .WithMany() + .HasForeignKey("NewId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old") + .WithMany() + .HasForeignKey("OldId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("WarnPunishments") + .HasForeignKey("GuildConfigId"); + }); + } + } +} diff --git a/src/NadekoBot/Migrations/20170331093025_startup-commands.cs b/src/NadekoBot/Migrations/20170331093025_startup-commands.cs new file mode 100644 index 00000000..d3cd52a9 --- /dev/null +++ b/src/NadekoBot/Migrations/20170331093025_startup-commands.cs @@ -0,0 +1,51 @@ +using System; +using System.Collections.Generic; +using Microsoft.EntityFrameworkCore.Migrations; + +namespace NadekoBot.Migrations +{ + public partial class startupcommands : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "StartupCommand", + columns: table => new + { + Id = table.Column(nullable: false) + .Annotation("Sqlite:Autoincrement", true), + BotConfigId = table.Column(nullable: true), + ChannelId = table.Column(nullable: false), + ChannelName = table.Column(nullable: true), + CommandText = table.Column(nullable: true), + DateAdded = table.Column(nullable: true), + GuildId = table.Column(nullable: true), + GuildName = table.Column(nullable: true), + Index = table.Column(nullable: false), + VoiceChannelId = table.Column(nullable: true), + VoiceChannelName = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_StartupCommand", x => x.Id); + table.ForeignKey( + name: "FK_StartupCommand_BotConfig_BotConfigId", + column: x => x.BotConfigId, + principalTable: "BotConfig", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + }); + + migrationBuilder.CreateIndex( + name: "IX_StartupCommand_BotConfigId", + table: "StartupCommand", + column: "BotConfigId"); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "StartupCommand"); + } + } +} diff --git a/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs b/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs index 97e9b393..83771957 100644 --- a/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs +++ b/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs @@ -950,6 +950,38 @@ namespace NadekoBot.Migrations b.ToTable("SelfAssignableRoles"); }); + modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("ChannelId"); + + b.Property("ChannelName"); + + b.Property("CommandText"); + + b.Property("DateAdded"); + + b.Property("GuildId"); + + b.Property("GuildName"); + + b.Property("Index"); + + b.Property("VoiceChannelId"); + + b.Property("VoiceChannelName"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("StartupCommand"); + }); + modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b => { b.Property("Id") @@ -1288,6 +1320,13 @@ namespace NadekoBot.Migrations .HasForeignKey("BotConfigId"); }); + modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("StartupCommands") + .HasForeignKey("BotConfigId"); + }); + modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") diff --git a/src/NadekoBot/Modules/Administration/Administration.cs b/src/NadekoBot/Modules/Administration/Administration.cs index 2f076ae3..905243ba 100644 --- a/src/NadekoBot/Modules/Administration/Administration.cs +++ b/src/NadekoBot/Modules/Administration/Administration.cs @@ -32,7 +32,7 @@ namespace NadekoBot.Modules.Administration } - private static Task DelMsgOnCmd_Handler(SocketUserMessage msg, CommandInfo cmd) + private static Task DelMsgOnCmd_Handler(IUserMessage msg, CommandInfo cmd) { var _ = Task.Run(async () => { diff --git a/src/NadekoBot/Modules/Administration/Commands/SelfCommands.cs b/src/NadekoBot/Modules/Administration/Commands/SelfCommands.cs index 89d23094..3af86611 100644 --- a/src/NadekoBot/Modules/Administration/Commands/SelfCommands.cs +++ b/src/NadekoBot/Modules/Administration/Commands/SelfCommands.cs @@ -10,6 +10,8 @@ using System.Net.Http; using System.Threading.Tasks; using Discord.WebSocket; using NadekoBot.Services; +using NadekoBot.Services.Database.Models; +using Microsoft.EntityFrameworkCore; namespace NadekoBot.Modules.Administration { @@ -31,6 +33,166 @@ namespace NadekoBot.Modules.Administration _forwardDMs = config.ForwardMessages; _forwardDMsToAllOwners = config.ForwardToAllOwners; } + + var _ = Task.Run(async () => + { +#if !GLOBAL_NADEKO + await Task.Delay(2000); +#else + await Task.Delay(10000); +#endif + foreach (var cmd in NadekoBot.BotConfig.StartupCommands) + { + if (cmd.GuildId != null) + { + var guild = NadekoBot.Client.GetGuild(cmd.GuildId.Value); + var channel = guild?.GetChannel(cmd.ChannelId) as SocketTextChannel; + if (channel == null) + continue; + + try + { + var msg = await channel.SendMessageAsync(cmd.CommandText).ConfigureAwait(false); + await NadekoBot.CommandHandler.TryRunCommand(guild, channel, msg).ConfigureAwait(false); + //msg.DeleteAfter(5); + } + catch { } + } + } + }); + } + + [NadekoCommand, Usage, Description, Aliases] + [RequireContext(ContextType.Guild)] + [OwnerOnly] + public async Task StartupCommandAdd([Remainder] string cmdText) + { + var guser = ((IGuildUser)Context.User); + var cmd = new StartupCommand() + { + CommandText = cmdText, + ChannelId = Context.Channel.Id, + ChannelName = Context.Channel.Name, + GuildId = Context.Guild?.Id, + GuildName = Context.Guild?.Name, + VoiceChannelId = guser.VoiceChannel?.Id, + VoiceChannelName = guser.VoiceChannel?.Name, + }; + using (var uow = DbHandler.UnitOfWork()) + { + uow.BotConfig + .GetOrCreate(set => set.Include(x => x.StartupCommands)) + .StartupCommands.Add(cmd); + await uow.CompleteAsync().ConfigureAwait(false); + } + + await Context.Channel.EmbedAsync(new EmbedBuilder().WithOkColor() + .WithTitle(GetText("scadd")) + .AddField(efb => efb.WithName(GetText("server")) + .WithValue(cmd.GuildId == null ? $"-" : $"{cmd.GuildName}/{cmd.GuildId}").WithIsInline(true)) + .AddField(efb => efb.WithName(GetText("channel")) + .WithValue($"{cmd.ChannelName}/{cmd.ChannelId}").WithIsInline(true)) + .AddField(efb => efb.WithName(GetText("command_text")) + .WithValue(cmdText).WithIsInline(false))); + } + + [NadekoCommand, Usage, Description, Aliases] + [RequireContext(ContextType.Guild)] + [OwnerOnly] + public async Task StartupCommands(int page = 1) + { + if (page < 1) + return; + page -= 1; + IEnumerable scmds; + using (var uow = DbHandler.UnitOfWork()) + { + scmds = uow.BotConfig + .GetOrCreate(set => set.Include(x => x.StartupCommands)) + .StartupCommands + .OrderBy(x => x.Id) + .ToArray(); + } + scmds = scmds.Skip(page * 5).Take(5); + if (!scmds.Any()) + { + await ReplyErrorLocalized("startcmdlist_none").ConfigureAwait(false); + } + else + { + await Context.Channel.SendConfirmAsync("", string.Join("\n--\n", scmds.Select(x => + { + string str = Format.Code(GetText("server")) + ": " + (x.GuildId == null ? "-" : x.GuildName + "/" + x.GuildId); + + str += $@" +{Format.Code(GetText("channel"))}: {x.ChannelName}/{x.ChannelId} +{Format.Code(GetText("command_text"))}: {x.CommandText}"; + return str; + })),footer: GetText("page", page + 1)) + .ConfigureAwait(false); + } + } + + [NadekoCommand, Usage, Description, Aliases] + [OwnerOnly] + public async Task Wait(int miliseconds) + { + if (miliseconds <= 0) + return; + Context.Message.DeleteAfter(0); + try + { + var msg = await Context.Channel.SendConfirmAsync($"⏲ {miliseconds}ms") + .ConfigureAwait(false); + msg.DeleteAfter(miliseconds / 1000); + } + catch { } + + await Task.Delay(miliseconds); + } + + [NadekoCommand, Usage, Description, Aliases] + [RequireContext(ContextType.Guild)] + [OwnerOnly] + public async Task StartupCommandRemove([Remainder] string cmdText) + { + StartupCommand cmd; + using (var uow = DbHandler.UnitOfWork()) + { + var cmds = uow.BotConfig + .GetOrCreate(set => set.Include(x => x.StartupCommands)) + .StartupCommands; + cmd = cmds + .FirstOrDefault(x => x.CommandText.ToLowerInvariant() == cmdText.ToLowerInvariant()); + + if (cmd != null) + { + cmds.Remove(cmd); + await uow.CompleteAsync().ConfigureAwait(false); + } + } + + if(cmd == null) + await ReplyErrorLocalized("scrm_fail").ConfigureAwait(false); + else + await ReplyConfirmLocalized("scrm").ConfigureAwait(false); + } + + [NadekoCommand, Usage, Description, Aliases] + [RequireContext(ContextType.Guild)] + [OwnerOnly] + public async Task StartupCommandsClear() + { + using (var uow = DbHandler.UnitOfWork()) + { + uow.BotConfig + .GetOrCreate(set => set.Include(x => x.StartupCommands)) + .StartupCommands + .Clear(); + uow.Complete(); + } + + await ReplyConfirmLocalized("startcmds_cleared").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -68,7 +230,7 @@ namespace NadekoBot.Modules.Administration } - public static async Task HandleDmForwarding(SocketMessage msg, List ownerChannels) + public static async Task HandleDmForwarding(IUserMessage msg, List ownerChannels) { if (_forwardDMs && ownerChannels.Any()) { @@ -157,7 +319,7 @@ namespace NadekoBot.Modules.Administration else { await server.DeleteAsync().ConfigureAwait(false); - await ReplyConfirmLocalized("deleted_server",Format.Bold(server.Name)).ConfigureAwait(false); + await ReplyConfirmLocalized("deleted_server", Format.Bold(server.Name)).ConfigureAwait(false); } } @@ -332,4 +494,4 @@ namespace NadekoBot.Modules.Administration } } } -} +} \ No newline at end of file diff --git a/src/NadekoBot/Modules/Administration/Commands/UserPunishCommands.cs b/src/NadekoBot/Modules/Administration/Commands/UserPunishCommands.cs index ded760c2..f37b864c 100644 --- a/src/NadekoBot/Modules/Administration/Commands/UserPunishCommands.cs +++ b/src/NadekoBot/Modules/Administration/Commands/UserPunishCommands.cs @@ -61,7 +61,10 @@ namespace NadekoBot.Modules.Administration switch (p.Punishment) { case PunishmentAction.Mute: - await MuteCommands.TimedMute(user, TimeSpan.FromMinutes(p.Time)); + if (p.Time == 0) + await MuteCommands.MuteUser(user).ConfigureAwait(false); + else + await MuteCommands.TimedMute(user, TimeSpan.FromMinutes(p.Time)).ConfigureAwait(false); break; case PunishmentAction.Kick: await user.KickAsync().ConfigureAwait(false); diff --git a/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs b/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs index f28a7bc9..ac6fd4c9 100644 --- a/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs +++ b/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs @@ -59,7 +59,7 @@ namespace NadekoBot.Modules.CustomReactions public void ClearStats() => ReactionStats.Clear(); - public static CustomReaction TryGetCustomReaction(SocketUserMessage umsg) + public static CustomReaction TryGetCustomReaction(IUserMessage umsg) { var channel = umsg.Channel as SocketTextChannel; if (channel == null) diff --git a/src/NadekoBot/Modules/Games/Commands/CleverBotCommands.cs b/src/NadekoBot/Modules/Games/Commands/CleverBotCommands.cs index 0e85e4b0..fd426be3 100644 --- a/src/NadekoBot/Modules/Games/Commands/CleverBotCommands.cs +++ b/src/NadekoBot/Modules/Games/Commands/CleverBotCommands.cs @@ -40,7 +40,7 @@ namespace NadekoBot.Modules.Games _log.Debug($"Loaded in {sw.Elapsed.TotalSeconds:F2}s"); } - public static async Task TryAsk(SocketUserMessage msg) + public static async Task TryAsk(IUserMessage msg) { var channel = msg.Channel as ITextChannel; diff --git a/src/NadekoBot/Resources/CommandStrings.Designer.cs b/src/NadekoBot/Resources/CommandStrings.Designer.cs index 61163a92..20c12253 100644 --- a/src/NadekoBot/Resources/CommandStrings.Designer.cs +++ b/src/NadekoBot/Resources/CommandStrings.Designer.cs @@ -7889,6 +7889,114 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to scadd. + /// + public static string startupcommandadd_cmd { + get { + return ResourceManager.GetString("startupcommandadd_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Adds a command to the list of commands which will be executed automatically in the current channel, in the order they were added in, by the bot when it startups up.. + /// + public static string startupcommandadd_desc { + get { + return ResourceManager.GetString("startupcommandadd_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}scadd .stats`. + /// + public static string startupcommandadd_usage { + get { + return ResourceManager.GetString("startupcommandadd_usage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to scrm. + /// + public static string startupcommandremove_cmd { + get { + return ResourceManager.GetString("startupcommandremove_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Removes a startup command with the provided command text.. + /// + public static string startupcommandremove_desc { + get { + return ResourceManager.GetString("startupcommandremove_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}scrm .stats`. + /// + public static string startupcommandremove_usage { + get { + return ResourceManager.GetString("startupcommandremove_usage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to sclist. + /// + public static string startupcommands_cmd { + get { + return ResourceManager.GetString("startupcommands_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Lists all startup commands in the order they will be executed in.. + /// + public static string startupcommands_desc { + get { + return ResourceManager.GetString("startupcommands_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}sclist`. + /// + public static string startupcommands_usage { + get { + return ResourceManager.GetString("startupcommands_usage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to scclr. + /// + public static string startupcommandsclear_cmd { + get { + return ResourceManager.GetString("startupcommandsclear_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Removes all startup commands.. + /// + public static string startupcommandsclear_desc { + get { + return ResourceManager.GetString("startupcommandsclear_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}scclr`. + /// + public static string startupcommandsclear_usage { + get { + return ResourceManager.GetString("startupcommandsclear_usage", resourceCulture); + } + } + /// /// Looks up a localized string similar to startwar sw. /// @@ -9131,6 +9239,33 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to wait. + /// + public static string wait_cmd { + get { + return ResourceManager.GetString("wait_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Used only as a startup command. Waits a certain number of miliseconds before continuing the execution of the following startup commands.. + /// + public static string wait_desc { + get { + return ResourceManager.GetString("wait_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}wait 3000`. + /// + public static string wait_usage { + get { + return ResourceManager.GetString("wait_usage", resourceCulture); + } + } + /// /// Looks up a localized string similar to warn. /// diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx index db8b3f50..5d1d0539 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -3240,6 +3240,42 @@ `{0}warn @b1nzy` + + scadd + + + Adds a command to the list of commands which will be executed automatically in the current channel, in the order they were added in, by the bot when it startups up. + + + `{0}scadd .stats` + + + scrm + + + Removes a startup command with the provided command text. + + + `{0}scrm .stats` + + + scclr + + + Removes all startup commands. + + + `{0}scclr` + + + sclist + + + Lists all startup commands in the order they will be executed in. + + + `{0}sclist` + unban @@ -3249,6 +3285,15 @@ `{0}unban kwoth#1234` or `{0}unban 123123123` + + wait + + + Used only as a startup command. Waits a certain number of miliseconds before continuing the execution of the following startup commands. + + + `{0}wait 3000` + warnclear warnc diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index 34e12752..ea980b1f 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -231,6 +231,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Channel. + /// + public static string administration_channel { + get { + return ResourceManager.GetString("administration_channel", resourceCulture); + } + } + /// /// Looks up a localized string similar to Cleaned up.. /// @@ -240,6 +249,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Command Text. + /// + public static string administration_command_text { + get { + return ResourceManager.GetString("administration_command_text", resourceCulture); + } + } + /// /// Looks up a localized string similar to Content. /// @@ -1233,6 +1251,33 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to New startup command added.. + /// + public static string administration_scadd { + get { + return ResourceManager.GetString("administration_scadd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Startup command successfully removed.. + /// + public static string administration_scrm { + get { + return ResourceManager.GetString("administration_scrm", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Startup command not found.. + /// + public static string administration_scrm_fail { + get { + return ResourceManager.GetString("administration_scrm_fail", resourceCulture); + } + } + /// /// Looks up a localized string similar to You already have {0} role.. /// @@ -1332,6 +1377,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Server. + /// + public static string administration_server { + get { + return ResourceManager.GetString("administration_server", resourceCulture); + } + } + /// /// Looks up a localized string similar to New avatar set!. /// @@ -1486,6 +1540,24 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to No startup commands on this page.. + /// + public static string administration_startcmdlist_none { + get { + return ResourceManager.GetString("administration_startcmdlist_none", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Cleared all startup commands.. + /// + public static string administration_startcmds_cleared { + get { + return ResourceManager.GetString("administration_startcmds_cleared", resourceCulture); + } + } + /// /// Looks up a localized string similar to Text channel created.. /// diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index a94761da..92087d6b 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -2278,6 +2278,12 @@ Owner ID: {2} Competitive playtime + + Channel + + + Command Text + Moderator @@ -2287,6 +2293,24 @@ Owner ID: {2} Reason + + New startup command added. + + + Startup command successfully removed. + + + Startup command not found. + + + Server + + + No startup commands on this page. + + + Cleared all startup commands. + User {0} has been unbanned. diff --git a/src/NadekoBot/Services/CommandHandler.cs b/src/NadekoBot/Services/CommandHandler.cs index 17521cab..31f30932 100644 --- a/src/NadekoBot/Services/CommandHandler.cs +++ b/src/NadekoBot/Services/CommandHandler.cs @@ -37,7 +37,7 @@ namespace NadekoBot.Services private List ownerChannels { get; set; } = new List(); - public event Func CommandExecuted = delegate { return Task.CompletedTask; }; + public event Func CommandExecuted = delegate { return Task.CompletedTask; }; //userid/msg count public ConcurrentDictionary UserMessagesSent { get; } = new ConcurrentDictionary(); @@ -109,7 +109,7 @@ namespace NadekoBot.Services return Task.CompletedTask; } - private async Task TryRunCleverbot(SocketUserMessage usrMsg, IGuild guild) + private async Task TryRunCleverbot(IUserMessage usrMsg, IGuild guild) { if (guild == null) return false; @@ -130,14 +130,13 @@ namespace NadekoBot.Services return false; } - private bool IsBlacklisted(IGuild guild, SocketUserMessage usrMsg) => - usrMsg.Author?.Id == 193022505026453504 || // he requested to be blacklisted from self-hosted bots + private bool IsBlacklisted(IGuild guild, IUserMessage usrMsg) => (guild != null && BlacklistCommands.BlacklistedGuilds.Contains(guild.Id)) || BlacklistCommands.BlacklistedChannels.Contains(usrMsg.Channel.Id) || BlacklistCommands.BlacklistedUsers.Contains(usrMsg.Author.Id); private const float _oneThousandth = 1.0f / 1000; - private Task LogSuccessfulExecution(SocketUserMessage usrMsg, ExecuteCommandResult exec, SocketTextChannel channel, int exec1, int exec2, int exec3, int total) + private Task LogSuccessfulExecution(IUserMessage usrMsg, ExecuteCommandResult exec, ITextChannel channel, int exec1, int exec2, int exec3, int total) { _log.Info("Command Executed after {4}/{5}/{6}/{7}s\n\t" + "User: {0}\n\t" + @@ -156,7 +155,7 @@ namespace NadekoBot.Services return Task.CompletedTask; } - private void LogErroredExecution(SocketUserMessage usrMsg, ExecuteCommandResult exec, SocketTextChannel channel, int exec1, int exec2, int exec3, int total) + private void LogErroredExecution(IUserMessage usrMsg, ExecuteCommandResult exec, ITextChannel channel, int exec1, int exec2, int exec3, int total) { _log.Warn("Command Errored after {5}/{6}/{7}/{8}s\n\t" + "User: {0}\n\t" + @@ -176,7 +175,7 @@ namespace NadekoBot.Services ); } - private async Task InviteFiltered(IGuild guild, SocketUserMessage usrMsg) + private async Task InviteFiltered(IGuild guild, IUserMessage usrMsg) { if ((Permissions.FilterCommands.InviteFilteringChannels.Contains(usrMsg.Channel.Id) || Permissions.FilterCommands.InviteFilteringServers.Contains(guild.Id)) && @@ -196,7 +195,7 @@ namespace NadekoBot.Services return false; } - private async Task WordFiltered(IGuild guild, SocketUserMessage usrMsg) + private async Task WordFiltered(IGuild guild, IUserMessage usrMsg) { var filteredChannelWords = Permissions.FilterCommands.FilteredWordsForChannel(usrMsg.Channel.Id, guild.Id) ?? new ConcurrentHashSet(); var filteredServerWords = Permissions.FilterCommands.FilteredWordsForServer(guild.Id) ?? new ConcurrentHashSet(); @@ -232,8 +231,6 @@ namespace NadekoBot.Services if (msg.Author.IsBot || !NadekoBot.Ready) //no bots, wait until bot connected and initialized return; - var execTime = Environment.TickCount; - var usrMsg = msg as SocketUserMessage; if (usrMsg == null) //has to be an user message, not system/other messages. return; @@ -248,131 +245,7 @@ namespace NadekoBot.Services var channel = msg.Channel as SocketTextChannel; var guild = channel?.Guild; - if (guild != null && guild.OwnerId != msg.Author.Id) - { - if (await InviteFiltered(guild, usrMsg).ConfigureAwait(false)) - return; - - if (await WordFiltered(guild, usrMsg).ConfigureAwait(false)) - return; - } - - if (IsBlacklisted(guild, usrMsg)) - return; - - var exec1 = Environment.TickCount - execTime; - - var cleverBotRan = await Task.Run(() => TryRunCleverbot(usrMsg, guild)).ConfigureAwait(false); - if (cleverBotRan) - return; - - var exec2 = Environment.TickCount - execTime; - - // maybe this message is a custom reaction - // todo log custom reaction executions. return struct with info - var cr = await Task.Run(() => CustomReactions.TryGetCustomReaction(usrMsg)).ConfigureAwait(false); - if (cr != null) //if it was, don't execute the command - { - try - { - if (guild != null) - { - PermissionCache pc; - if (!Permissions.Cache.TryGetValue(guild.Id, out pc)) - { - using (var uow = DbHandler.UnitOfWork()) - { - var config = uow.GuildConfigs.For(guild.Id, - set => set.Include(x => x.Permissions)); - Permissions.UpdateCache(config); - } - Permissions.Cache.TryGetValue(guild.Id, out pc); - if (pc == null) - throw new Exception("Cache is null."); - } - int index; - if ( - !pc.Permissions.CheckPermissions(usrMsg, cr.Trigger, "ActualCustomReactions", - out index)) - { - //todo print in guild actually - var returnMsg = - $"Permission number #{index + 1} **{pc.Permissions[index].GetCommand(guild)}** is preventing this action."; - _log.Info(returnMsg); - return; - } - } - await cr.Send(usrMsg).ConfigureAwait(false); - - if (cr.AutoDeleteTrigger) - { - try { await msg.DeleteAsync().ConfigureAwait(false); } catch { } - } - } - catch (Exception ex) - { - _log.Warn("Sending CREmbed failed"); - _log.Warn(ex); - } - return; - } - - var exec3 = Environment.TickCount - execTime; - - string messageContent = usrMsg.Content; - if (guild != null) - { - ConcurrentDictionary maps; - if (Modules.Utility.Utility.CommandMapCommands.AliasMaps.TryGetValue(guild.Id, out maps)) - { - string newMessageContent; - if (maps.TryGetValue(messageContent.Trim().ToLowerInvariant(), out newMessageContent)) - { - _log.Info(@"--Mapping Command-- - GuildId: {0} - Trigger: {1} - Mapping: {2}", guild.Id, messageContent, newMessageContent); - var oldMessageContent = messageContent; - messageContent = newMessageContent; - - try { await usrMsg.Channel.SendConfirmAsync($"{oldMessageContent} => {newMessageContent}").ConfigureAwait(false); } catch { } - } - } - } - - - // execute the command and measure the time it took - var exec = await Task.Run(() => ExecuteCommand(new CommandContext(_client, usrMsg), messageContent, DependencyMap.Empty, MultiMatchHandling.Best)).ConfigureAwait(false); - execTime = Environment.TickCount - execTime; - - if (exec.Result.IsSuccess) - { - await CommandExecuted(usrMsg, exec.CommandInfo).ConfigureAwait(false); - await LogSuccessfulExecution(usrMsg, exec, channel, exec1, exec2, exec3, execTime).ConfigureAwait(false); - } - else if (!exec.Result.IsSuccess && exec.Result.Error != CommandError.UnknownCommand) - { - LogErroredExecution(usrMsg, exec, channel, exec1, exec2, exec3, execTime); - if (guild != null && exec.CommandInfo != null && exec.Result.Error == CommandError.Exception) - { - if (exec.PermissionCache != null && exec.PermissionCache.Verbose) - try { await msg.Channel.SendMessageAsync("⚠️ " + exec.Result.ErrorReason).ConfigureAwait(false); } catch { } - } - } - else - { - if (msg.Channel is IPrivateChannel) - { - // rofl, gotta do this to prevent dm help message being sent to - // users who are voting on private polls (sending a number in a DM) - int vote; - if (int.TryParse(msg.Content, out vote)) return; - - await msg.Channel.SendMessageAsync(Help.DMHelpString).ConfigureAwait(false); - - await SelfCommands.HandleDmForwarding(msg, ownerChannels).ConfigureAwait(false); - } - } + await TryRunCommand(guild, channel, usrMsg); } catch (Exception ex) { @@ -388,6 +261,137 @@ namespace NadekoBot.Services return Task.CompletedTask; } + public async Task TryRunCommand(SocketGuild guild, ITextChannel channel, IUserMessage usrMsg) + { + var execTime = Environment.TickCount; + + if (guild != null && guild.OwnerId != usrMsg.Author.Id) + { + if (await InviteFiltered(guild, usrMsg).ConfigureAwait(false)) + return; + + if (await WordFiltered(guild, usrMsg).ConfigureAwait(false)) + return; + } + + if (IsBlacklisted(guild, usrMsg)) + return; + + var exec1 = Environment.TickCount - execTime; + + var cleverBotRan = await Task.Run(() => TryRunCleverbot(usrMsg, guild)).ConfigureAwait(false); + if (cleverBotRan) + return; + + var exec2 = Environment.TickCount - execTime; + + // maybe this message is a custom reaction + // todo log custom reaction executions. return struct with info + var cr = await Task.Run(() => CustomReactions.TryGetCustomReaction(usrMsg)).ConfigureAwait(false); + if (cr != null) //if it was, don't execute the command + { + try + { + if (guild != null) + { + PermissionCache pc; + if (!Permissions.Cache.TryGetValue(guild.Id, out pc)) + { + using (var uow = DbHandler.UnitOfWork()) + { + var config = uow.GuildConfigs.For(guild.Id, + set => set.Include(x => x.Permissions)); + Permissions.UpdateCache(config); + } + Permissions.Cache.TryGetValue(guild.Id, out pc); + if (pc == null) + throw new Exception("Cache is null."); + } + int index; + if ( + !pc.Permissions.CheckPermissions(usrMsg, cr.Trigger, "ActualCustomReactions", + out index)) + { + //todo print in guild actually + var returnMsg = + $"Permission number #{index + 1} **{pc.Permissions[index].GetCommand(guild)}** is preventing this action."; + _log.Info(returnMsg); + return; + } + } + await cr.Send(usrMsg).ConfigureAwait(false); + + if (cr.AutoDeleteTrigger) + { + try { await usrMsg.DeleteAsync().ConfigureAwait(false); } catch { } + } + } + catch (Exception ex) + { + _log.Warn("Sending CREmbed failed"); + _log.Warn(ex); + } + return; + } + + var exec3 = Environment.TickCount - execTime; + + string messageContent = usrMsg.Content; + if (guild != null) + { + ConcurrentDictionary maps; + if (Modules.Utility.Utility.CommandMapCommands.AliasMaps.TryGetValue(guild.Id, out maps)) + { + string newMessageContent; + if (maps.TryGetValue(messageContent.Trim().ToLowerInvariant(), out newMessageContent)) + { + _log.Info(@"--Mapping Command-- + GuildId: {0} + Trigger: {1} + Mapping: {2}", guild.Id, messageContent, newMessageContent); + var oldMessageContent = messageContent; + messageContent = newMessageContent; + + try { await usrMsg.Channel.SendConfirmAsync($"{oldMessageContent} => {newMessageContent}").ConfigureAwait(false); } catch { } + } + } + } + + + // execute the command and measure the time it took + var exec = await Task.Run(() => ExecuteCommand(new CommandContext(_client, usrMsg), messageContent, DependencyMap.Empty, MultiMatchHandling.Best)).ConfigureAwait(false); + execTime = Environment.TickCount - execTime; + + if (exec.Result.IsSuccess) + { + await CommandExecuted(usrMsg, exec.CommandInfo).ConfigureAwait(false); + await LogSuccessfulExecution(usrMsg, exec, channel, exec1, exec2, exec3, execTime).ConfigureAwait(false); + } + else if (!exec.Result.IsSuccess && exec.Result.Error != CommandError.UnknownCommand) + { + LogErroredExecution(usrMsg, exec, channel, exec1, exec2, exec3, execTime); + if (guild != null && exec.CommandInfo != null && exec.Result.Error == CommandError.Exception) + { + if (exec.PermissionCache != null && exec.PermissionCache.Verbose) + try { await usrMsg.Channel.SendMessageAsync("⚠️ " + exec.Result.ErrorReason).ConfigureAwait(false); } catch { } + } + } + else + { + if (usrMsg.Channel is IPrivateChannel) + { + // rofl, gotta do this to prevent dm help message being sent to + // users who are voting on private polls (sending a number in a DM) + int vote; + if (int.TryParse(usrMsg.Content, out vote)) return; + + await usrMsg.Channel.SendMessageAsync(Help.DMHelpString).ConfigureAwait(false); + + await SelfCommands.HandleDmForwarding(usrMsg, ownerChannels).ConfigureAwait(false); + } + } + } + public Task ExecuteCommandAsync(CommandContext context, int argPos, IDependencyMap dependencyMap = null, MultiMatchHandling multiMatchHandling = MultiMatchHandling.Exception) => ExecuteCommand(context, context.Message.Content.Substring(argPos), dependencyMap, multiMatchHandling); diff --git a/src/NadekoBot/Services/Database/Models/BotConfig.cs b/src/NadekoBot/Services/Database/Models/BotConfig.cs index 8ff90e8a..b25dc744 100644 --- a/src/NadekoBot/Services/Database/Models/BotConfig.cs +++ b/src/NadekoBot/Services/Database/Models/BotConfig.cs @@ -61,6 +61,19 @@ Nadeko Support Server: https://discord.gg/nadekobot"; public string OkColor { get; set; } = "71cd40"; public string ErrorColor { get; set; } = "ee281f"; public string Locale { get; set; } = null; + public List StartupCommands { get; set; } + } + + public class StartupCommand : DbEntity, IIndexed + { + public int Index { get; set; } + public string CommandText { get; set; } + public ulong ChannelId { get; set; } + public string ChannelName { get; set; } + public ulong? GuildId { get; set; } + public string GuildName { get; set; } + public ulong? VoiceChannelId { get; set; } + public string VoiceChannelName { get; set; } } public class PlayingStatus :DbEntity diff --git a/src/NadekoBot/Services/Database/Repositories/IBotConfigRepository.cs b/src/NadekoBot/Services/Database/Repositories/IBotConfigRepository.cs index 7f9f3dd5..7a2adf63 100644 --- a/src/NadekoBot/Services/Database/Repositories/IBotConfigRepository.cs +++ b/src/NadekoBot/Services/Database/Repositories/IBotConfigRepository.cs @@ -1,9 +1,12 @@ -using NadekoBot.Services.Database.Models; +using Microsoft.EntityFrameworkCore; +using NadekoBot.Services.Database.Models; +using System; +using System.Linq; namespace NadekoBot.Services.Database.Repositories { public interface IBotConfigRepository : IRepository { - BotConfig GetOrCreate(); + BotConfig GetOrCreate(Func, IQueryable> includes = null); } } diff --git a/src/NadekoBot/Services/Database/Repositories/Impl/BotConfigRepository.cs b/src/NadekoBot/Services/Database/Repositories/Impl/BotConfigRepository.cs index 2aa0bf83..1e40f86c 100644 --- a/src/NadekoBot/Services/Database/Repositories/Impl/BotConfigRepository.cs +++ b/src/NadekoBot/Services/Database/Repositories/Impl/BotConfigRepository.cs @@ -1,6 +1,7 @@ using NadekoBot.Services.Database.Models; using System.Linq; using Microsoft.EntityFrameworkCore; +using System; namespace NadekoBot.Services.Database.Repositories.Impl { @@ -10,15 +11,21 @@ namespace NadekoBot.Services.Database.Repositories.Impl { } - public BotConfig GetOrCreate() + public BotConfig GetOrCreate(Func, IQueryable> includes = null) { - var config = _set.Include(bc => bc.RotatingStatusMessages) + BotConfig config; + + if (includes == null) + config = _set.Include(bc => bc.RotatingStatusMessages) .Include(bc => bc.RaceAnimals) .Include(bc => bc.Blacklist) .Include(bc => bc.EightBallResponses) .Include(bc => bc.ModulePrefixes) + .Include(bc => bc.StartupCommands) //.Include(bc => bc.CommandCosts) .FirstOrDefault(); + else + config = includes(_set).FirstOrDefault(); if (config == null) { From 223b668628c6691a0b1f8fb1f731f58ffbfe3352 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 1 Apr 2017 11:15:37 +0200 Subject: [PATCH 395/496] softban is a separate punishment from kick now. Commandlist updated --- .../Modules/Administration/Commands/LogCommand.cs | 3 +++ .../Administration/Commands/ProtectionCommands.cs | 7 +++++++ .../Administration/Commands/UserPunishCommands.cs | 11 +++++++++++ src/NadekoBot/Resources/ResponseStrings.Designer.cs | 11 ++++++++++- src/NadekoBot/Resources/ResponseStrings.resx | 6 +++++- .../Services/Database/Models/AntiProtection.cs | 1 + 6 files changed, 37 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Modules/Administration/Commands/LogCommand.cs b/src/NadekoBot/Modules/Administration/Commands/LogCommand.cs index f061f045..515c2f46 100644 --- a/src/NadekoBot/Modules/Administration/Commands/LogCommand.cs +++ b/src/NadekoBot/Modules/Administration/Commands/LogCommand.cs @@ -307,6 +307,9 @@ namespace NadekoBot.Modules.Administration punishment = "🔇 " + logChannel.Guild.GetLogText("muted_pl").ToUpperInvariant(); break; case PunishmentAction.Kick: + punishment = "👢 " + logChannel.Guild.GetLogText("kicked_pl").ToUpperInvariant(); + break; + case PunishmentAction.Softban: punishment = "☣ " + logChannel.Guild.GetLogText("soft_banned_pl").ToUpperInvariant(); break; case PunishmentAction.Ban: diff --git a/src/NadekoBot/Modules/Administration/Commands/ProtectionCommands.cs b/src/NadekoBot/Modules/Administration/Commands/ProtectionCommands.cs index af7269c9..23f1eaf0 100644 --- a/src/NadekoBot/Modules/Administration/Commands/ProtectionCommands.cs +++ b/src/NadekoBot/Modules/Administration/Commands/ProtectionCommands.cs @@ -188,6 +188,13 @@ namespace NadekoBot.Modules.Administration catch (Exception ex) { _log.Warn(ex, "I can't apply punishement"); } break; case PunishmentAction.Kick: + try + { + await gu.KickAsync().ConfigureAwait(false); + } + catch (Exception ex) { _log.Warn(ex, "I can't apply punishement"); } + break; + case PunishmentAction.Softban: try { await gu.Guild.AddBanAsync(gu, 7).ConfigureAwait(false); diff --git a/src/NadekoBot/Modules/Administration/Commands/UserPunishCommands.cs b/src/NadekoBot/Modules/Administration/Commands/UserPunishCommands.cs index f37b864c..f794d47a 100644 --- a/src/NadekoBot/Modules/Administration/Commands/UserPunishCommands.cs +++ b/src/NadekoBot/Modules/Administration/Commands/UserPunishCommands.cs @@ -72,6 +72,17 @@ namespace NadekoBot.Modules.Administration case PunishmentAction.Ban: await guild.AddBanAsync(user).ConfigureAwait(false); break; + case PunishmentAction.Softban: + await guild.AddBanAsync(user).ConfigureAwait(false); + try + { + await guild.RemoveBanAsync(user).ConfigureAwait(false); + } + catch + { + await guild.RemoveBanAsync(user).ConfigureAwait(false); + } + break; default: break; } diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index ea980b1f..3d91002f 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -574,6 +574,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Kicked. + /// + public static string administration_kicked_pl { + get { + return ResourceManager.GetString("administration_kicked_pl", resourceCulture); + } + } + /// /// Looks up a localized string similar to User kicked. /// @@ -1504,7 +1513,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to soft-banned (kicked). + /// Looks up a localized string similar to soft-banned. /// public static string administration_soft_banned_pl { get { diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index 92087d6b..c71eea89 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -740,7 +740,7 @@ Reason: {1} Slow mode initiated - soft-banned (kicked) + soft-banned PLURAL @@ -2284,6 +2284,10 @@ Owner ID: {2} Command Text + + Kicked + PLURAL + Moderator diff --git a/src/NadekoBot/Services/Database/Models/AntiProtection.cs b/src/NadekoBot/Services/Database/Models/AntiProtection.cs index 0172dd90..a90ee649 100644 --- a/src/NadekoBot/Services/Database/Models/AntiProtection.cs +++ b/src/NadekoBot/Services/Database/Models/AntiProtection.cs @@ -31,6 +31,7 @@ namespace NadekoBot.Services.Database.Models Mute, Kick, Ban, + Softban } public class AntiSpamIgnore : DbEntity From 83dbc562af0c74dc1d19f756f80f5c5b7a700657 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 1 Apr 2017 11:15:54 +0200 Subject: [PATCH 396/496] Woops --- docs/Commands List.md | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/docs/Commands List.md b/docs/Commands List.md index 0ce3438d..715df776 100644 --- a/docs/Commands List.md +++ b/docs/Commands List.md @@ -26,9 +26,6 @@ Commands and aliases | Description | Usage `.removeallroles` `.rar` | Removes all roles from a mentioned user. **Requires ManageRoles server permission.** | `.rar @User` `.createrole` `.cr` | Creates a role with a given name. **Requires ManageRoles server permission.** | `.cr Awesome Role` `.rolecolor` `.rc` | Set a role's color to the hex or 0-255 rgb color value provided. **Requires ManageRoles server permission.** | `.rc Admin 255 200 100` or `.rc Admin ffba55` -`.ban` `.b` | Bans a user by ID or name with an optional message. **Requires BanMembers server permission.** | `.b "@some Guy" Your behaviour is toxic.` -`.softban` `.sb` | Bans and then unbans a user by ID or name with an optional message. **Requires KickMembers server permission.** **Requires ManageMessages server permission.** | `.sb "@some Guy" Your behaviour is toxic.` -`.kick` `.k` | Kicks a mentioned user. **Requires KickMembers server permission.** | `.k "@some Guy" Your behaviour is toxic.` `.deafen` `.deaf` | Deafens mentioned user or users. **Requires DeafenMembers server permission.** | `.deaf "@Someguy"` or `.deaf "@Someguy" "@Someguy"` `.undeafen` `.undef` | Undeafens mentioned user or users. **Requires DeafenMembers server permission.** | `.undef "@Someguy"` or `.undef "@Someguy" "@Someguy"` `.delvoichanl` `.dvch` | Deletes a voice channel with a given name. **Requires ManageChannels server permission.** | `.dvch VoiceChannelName` @@ -73,6 +70,11 @@ Commands and aliases | Description | Usage `.togglexclsar` `.tesar` | Toggles whether the self-assigned roles are exclusive. (So that any person can have only one of the self assignable roles) **Requires ManageRoles server permission.** | `.tesar` `.iam` | Adds a role to you that you choose. Role must be on a list of self-assignable roles. | `.iam Gamer` `.iamnot` `.iamn` | Removes a role to you that you choose. Role must be on a list of self-assignable roles. | `.iamn Gamer` +`.scadd` | Adds a command to the list of commands which will be executed automatically in the current channel, in the order they were added in, by the bot when it startups up. **Bot owner only** | `.scadd .stats` +`.sclist` | Lists all startup commands in the order they will be executed in. **Bot owner only** | `.sclist` +`.wait` | Used only as a startup command. Waits a certain number of miliseconds before continuing the execution of the following startup commands. **Bot owner only** | `.wait 3000` +`.scrm` | Removes a startup command with the provided command text. **Bot owner only** | `.scrm .stats` +`.scclr` | Removes all startup commands. **Bot owner only** | `.scclr` `.fwmsgs` | Toggles forwarding of non-command messages sent to bot's DM to the bot owners **Bot owner only** | `.fwmsgs` `.fwtoall` | Toggles whether messages will be forwarded to all bot owners or only to the first one specified in the credentials.json file **Bot owner only** | `.fwtoall` `.connectshard` | Try (re)connecting a shard with a certain shardid when it dies. No one knows will it work. Keep an eye on the console for errors. **Bot owner only** | `.connectshard 2` @@ -94,6 +96,15 @@ Commands and aliases | Description | Usage `.bye` | Toggles anouncements on the current channel when someone leaves the server. **Requires ManageServer server permission.** | `.bye` `.byemsg` | Sets a new leave announcement message. Type `%user%` if you want to show the name the user who left. Type `%id%` to show id. Using this command with no message will show the current bye message. You can use embed json from instead of a regular text, if you want the message to be embedded. **Requires ManageServer server permission.** | `.byemsg %user% has left.` `.byedel` | Sets the time it takes (in seconds) for bye messages to be auto-deleted. Set it to `0` to disable automatic deletion. **Requires ManageServer server permission.** | `.byedel 0` or `.byedel 30` +`.warn` | Warns a user. **Requires BanMembers server permission.** | `.warn @b1nzy` +`.warnlog` | See a list of warnings of a certain user. **Requires BanMembers server permission.** | `.warnlog @b1nzy` +`.warnclear` `.warnc` | Clears all warnings from a certain user. **Requires BanMembers server permission.** | `.warnclear @PoorDude` +`.warnpunish` `.warnp` | Sets a punishment for a certain number of warnings. Provide no punishment to remove. **Requires BanMembers server permission.** | `.warnpunish 5 Ban` or `.warnpunish 3` +`.warnpunishlist` `.warnpl` | Lists punishments for warnings. | `.warnpunishlist` +`.ban` `.b` | Bans a user by ID or name with an optional message. **Requires BanMembers server permission.** | `.b "@some Guy" Your behaviour is toxic.` +`.unban` | Unbans a user with the provided user#discrim or id. **Requires BanMembers server permission.** | `.unban kwoth#1234` or `.unban 123123123` +`.softban` `.sb` | Bans and then unbans a user by ID or name with an optional message. **Requires KickMembers server permission.** **Requires ManageMessages server permission.** | `.sb "@some Guy" Your behaviour is toxic.` +`.kick` `.k` | Kicks a mentioned user. **Requires KickMembers server permission.** | `.k "@some Guy" Your behaviour is toxic.` `.vcrole` | Sets or resets a role which will be given to users who join the voice channel you're in when you run this command. Provide no role name to disable. You must be in a voice channel to run this command. **Requires ManageRoles server permission.** **Requires ManageChannels server permission.** | `.vcrole SomeRole` or `.vcrole` `.vcrolelist` | Shows a list of currently set voice channel roles. | `.vcrolelist` `.voice+text` `.v+t` | Creates a text channel for each voice channel only users in that voice channel can see. If you are server owner, keep in mind you will see them all the time regardless. **Requires ManageRoles server permission.** **Requires ManageChannels server permission.** | `.v+t` From 3a5aed213b3580521e2a0a9f9bb5e6299ffcf622 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 1 Apr 2017 13:47:05 +0200 Subject: [PATCH 397/496] startup commands will no longer be treated as if theyr'e run in DMs --- .../Commands/RatelimitCommand.cs | 27 +++++++++++++++++++ .../Administration/Commands/SelfCommands.cs | 11 ++++---- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/src/NadekoBot/Modules/Administration/Commands/RatelimitCommand.cs b/src/NadekoBot/Modules/Administration/Commands/RatelimitCommand.cs index 2a4e111f..6d1e3f13 100644 --- a/src/NadekoBot/Modules/Administration/Commands/RatelimitCommand.cs +++ b/src/NadekoBot/Modules/Administration/Commands/RatelimitCommand.cs @@ -1,7 +1,10 @@ using Discord; using Discord.Commands; +using Microsoft.EntityFrameworkCore; using NadekoBot.Attributes; using NadekoBot.Extensions; +using NadekoBot.Services; +using NadekoBot.Services.Database; using NLog; using System; using System.Collections.Concurrent; @@ -118,6 +121,30 @@ namespace NadekoBot.Modules.Administration .ConfigureAwait(false); } } + + //[NadekoCommand, Usage, Description, Aliases] + //[RequireContext(ContextType.Guild)] + //[RequireUserPermission(GuildPermission.ManageMessages)] + //public async Task SlowmodeWhitelist(IUser user) + //{ + // Ratelimiter throwaway; + // if (RatelimitingChannels.TryRemove(Context.Channel.Id, out throwaway)) + // { + // throwaway.cancelSource.Cancel(); + // await ReplyConfirmLocalized("slowmode_disabled").ConfigureAwait(false); + // } + //} + + //[NadekoCommand, Usage, Description, Aliases] + //[RequireContext(ContextType.Guild)] + //[RequireUserPermission(GuildPermission.ManageMessages)] + //public async Task SlowmodeWhitelist(IRole role) + //{ + // using (var uow = DbHandler.UnitOfWork()) + // { + // uow.GuildConfigs.For(Context.Guild.Id, set => set.Include(x => x.SlowmodeWhitelists)). + // } + //} } } } \ No newline at end of file diff --git a/src/NadekoBot/Modules/Administration/Commands/SelfCommands.cs b/src/NadekoBot/Modules/Administration/Commands/SelfCommands.cs index 3af86611..09924682 100644 --- a/src/NadekoBot/Modules/Administration/Commands/SelfCommands.cs +++ b/src/NadekoBot/Modules/Administration/Commands/SelfCommands.cs @@ -36,11 +36,9 @@ namespace NadekoBot.Modules.Administration var _ = Task.Run(async () => { -#if !GLOBAL_NADEKO - await Task.Delay(2000); -#else - await Task.Delay(10000); -#endif + while(!NadekoBot.Ready) + await Task.Delay(1000); + foreach (var cmd in NadekoBot.BotConfig.StartupCommands) { if (cmd.GuildId != null) @@ -52,7 +50,8 @@ namespace NadekoBot.Modules.Administration try { - var msg = await channel.SendMessageAsync(cmd.CommandText).ConfigureAwait(false); + IUserMessage msg = await channel.SendMessageAsync(cmd.CommandText).ConfigureAwait(false); + msg = (IUserMessage)await channel.GetMessageAsync(msg.Id).ConfigureAwait(false); await NadekoBot.CommandHandler.TryRunCommand(guild, channel, msg).ConfigureAwait(false); //msg.DeleteAfter(5); } From 2b65518649b6b338cfde0d9d6468fae50ec5f585 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 1 Apr 2017 21:40:13 +0200 Subject: [PATCH 398/496] Slowmode whitelists done, need testing --- ...70401161600_slowmode-whitelist.Designer.cs | 1435 +++++++++++++++++ .../20170401161600_slowmode-whitelist.cs | 73 + .../NadekoSqliteContextModelSnapshot.cs | 50 + .../Commands/RatelimitCommand.cs | 112 +- .../Utility/Commands/PatreonCommands.cs | 113 +- .../Resources/CommandStrings.Designer.cs | 54 + src/NadekoBot/Resources/CommandStrings.resx | 18 + .../Resources/ResponseStrings.Designer.cs | 117 ++ src/NadekoBot/Resources/ResponseStrings.resx | 39 + .../Services/Database/Models/GuildConfig.cs | 46 + .../Services/Database/Models/RewardedUser.cs | 11 + 11 files changed, 2020 insertions(+), 48 deletions(-) create mode 100644 src/NadekoBot/Migrations/20170401161600_slowmode-whitelist.Designer.cs create mode 100644 src/NadekoBot/Migrations/20170401161600_slowmode-whitelist.cs create mode 100644 src/NadekoBot/Services/Database/Models/RewardedUser.cs diff --git a/src/NadekoBot/Migrations/20170401161600_slowmode-whitelist.Designer.cs b/src/NadekoBot/Migrations/20170401161600_slowmode-whitelist.Designer.cs new file mode 100644 index 00000000..7409d096 --- /dev/null +++ b/src/NadekoBot/Migrations/20170401161600_slowmode-whitelist.Designer.cs @@ -0,0 +1,1435 @@ +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using NadekoBot.Services.Database; +using NadekoBot.Services.Database.Models; +using NadekoBot.Modules.Music.Classes; + +namespace NadekoBot.Migrations +{ + [DbContext(typeof(NadekoContext))] + [Migration("20170401161600_slowmode-whitelist")] + partial class slowmodewhitelist + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { + modelBuilder + .HasAnnotation("ProductVersion", "1.1.0-rtm-22752"); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Action"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Seconds"); + + b.Property("UserThreshold"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId") + .IsUnique(); + + b.ToTable("AntiRaidSetting"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AntiSpamSettingId"); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.HasKey("Id"); + + b.HasIndex("AntiSpamSettingId"); + + b.ToTable("AntiSpamIgnore"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Action"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("MessageThreshold"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId") + .IsUnique(); + + b.ToTable("AntiSpamSetting"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("ItemId"); + + b.Property("Type"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("BlacklistItem"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BetflipMultiplier"); + + b.Property("Betroll100Multiplier"); + + b.Property("Betroll67Multiplier"); + + b.Property("Betroll91Multiplier"); + + b.Property("BufferSize"); + + b.Property("CurrencyDropAmount"); + + b.Property("CurrencyGenerationChance"); + + b.Property("CurrencyGenerationCooldown"); + + b.Property("CurrencyName"); + + b.Property("CurrencyPluralName"); + + b.Property("CurrencySign"); + + b.Property("DMHelpString"); + + b.Property("DateAdded"); + + b.Property("ErrorColor"); + + b.Property("ForwardMessages"); + + b.Property("ForwardToAllOwners"); + + b.Property("HelpString"); + + b.Property("Locale"); + + b.Property("MigrationVersion"); + + b.Property("MinimumBetAmount"); + + b.Property("OkColor"); + + b.Property("RemindMessageFormat"); + + b.Property("RotatingStatuses"); + + b.Property("TriviaCurrencyReward"); + + b.HasKey("Id"); + + b.ToTable("BotConfig"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BaseDestroyed"); + + b.Property("CallUser"); + + b.Property("ClashWarId"); + + b.Property("DateAdded"); + + b.Property("SequenceNumber"); + + b.Property("Stars"); + + b.Property("TimeAdded"); + + b.HasKey("Id"); + + b.HasIndex("ClashWarId"); + + b.ToTable("ClashCallers"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("EnemyClan"); + + b.Property("GuildId"); + + b.Property("Size"); + + b.Property("StartedAt"); + + b.Property("WarState"); + + b.HasKey("Id"); + + b.ToTable("ClashOfClans"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Mapping"); + + b.Property("Trigger"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("CommandAlias"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("CommandName"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Seconds"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("CommandCooldown"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("CommandName"); + + b.Property("DateAdded"); + + b.Property("Price"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.HasIndex("Price") + .IsUnique(); + + b.ToTable("CommandPrice"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("InternalTrigger"); + + b.Property("Modifier"); + + b.Property("UnitType"); + + b.HasKey("Id"); + + b.ToTable("ConversionUnits"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Amount"); + + b.Property("DateAdded"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("Currency"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Amount"); + + b.Property("DateAdded"); + + b.Property("Reason"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.ToTable("CurrencyTransactions"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AutoDeleteTrigger"); + + b.Property("DateAdded"); + + b.Property("DmResponse"); + + b.Property("GuildId"); + + b.Property("IsRegex"); + + b.Property("OwnerOnly"); + + b.Property("Response"); + + b.Property("Trigger"); + + b.HasKey("Id"); + + b.ToTable("CustomReactions"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AvatarId"); + + b.Property("DateAdded"); + + b.Property("Discriminator"); + + b.Property("UserId"); + + b.Property("Username"); + + b.HasKey("Id"); + + b.HasAlternateKey("UserId"); + + b.ToTable("DiscordUser"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Amount"); + + b.Property("DateAdded"); + + b.Property("Name"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("Donators"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("Text"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("EightBallResponses"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("GuildConfigId1"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.HasIndex("GuildConfigId1"); + + b.ToTable("FilterChannelId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Word"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("FilteredWord"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("GuildId"); + + b.Property("Type"); + + b.Property("Username"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("FollowedStream"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("GCChannelId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AutoAssignRoleId"); + + b.Property("AutoDeleteByeMessages"); + + b.Property("AutoDeleteByeMessagesTimer"); + + b.Property("AutoDeleteGreetMessages"); + + b.Property("AutoDeleteGreetMessagesTimer"); + + b.Property("AutoDeleteSelfAssignedRoleMessages"); + + b.Property("ByeMessageChannelId"); + + b.Property("ChannelByeMessageText"); + + b.Property("ChannelGreetMessageText"); + + b.Property("CleverbotEnabled"); + + b.Property("DateAdded"); + + b.Property("DefaultMusicVolume"); + + b.Property("DeleteMessageOnCommand"); + + b.Property("DmGreetMessageText"); + + b.Property("ExclusiveSelfAssignedRoles"); + + b.Property("FilterInvites"); + + b.Property("FilterWords"); + + b.Property("GreetMessageChannelId"); + + b.Property("GuildId"); + + b.Property("Locale"); + + b.Property("LogSettingId"); + + b.Property("MuteRoleName"); + + b.Property("PermissionRole"); + + b.Property("RootPermissionId"); + + b.Property("SendChannelByeMessage"); + + b.Property("SendChannelGreetMessage"); + + b.Property("SendDmGreetMessage"); + + b.Property("TimeZoneId"); + + b.Property("VerbosePermissions"); + + b.Property("VoicePlusTextEnabled"); + + b.Property("WarningsInitialized"); + + b.HasKey("Id"); + + b.HasIndex("GuildId") + .IsUnique(); + + b.HasIndex("LogSettingId"); + + b.HasIndex("RootPermissionId"); + + b.ToTable("GuildConfigs"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("GuildId"); + + b.Property("Interval"); + + b.Property("Message"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("GuildRepeater"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("LogSettingId"); + + b.HasKey("Id"); + + b.HasIndex("LogSettingId"); + + b.ToTable("IgnoredLogChannels"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("LogSettingId"); + + b.HasKey("Id"); + + b.HasIndex("LogSettingId"); + + b.ToTable("IgnoredVoicePresenceCHannels"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelCreated"); + + b.Property("ChannelCreatedId"); + + b.Property("ChannelDestroyed"); + + b.Property("ChannelDestroyedId"); + + b.Property("ChannelId"); + + b.Property("ChannelUpdated"); + + b.Property("ChannelUpdatedId"); + + b.Property("DateAdded"); + + b.Property("IsLogging"); + + b.Property("LogOtherId"); + + b.Property("LogUserPresence"); + + b.Property("LogUserPresenceId"); + + b.Property("LogVoicePresence"); + + b.Property("LogVoicePresenceId"); + + b.Property("LogVoicePresenceTTSId"); + + b.Property("MessageDeleted"); + + b.Property("MessageDeletedId"); + + b.Property("MessageUpdated"); + + b.Property("MessageUpdatedId"); + + b.Property("UserBanned"); + + b.Property("UserBannedId"); + + b.Property("UserJoined"); + + b.Property("UserJoinedId"); + + b.Property("UserLeft"); + + b.Property("UserLeftId"); + + b.Property("UserMutedId"); + + b.Property("UserPresenceChannelId"); + + b.Property("UserUnbanned"); + + b.Property("UserUnbannedId"); + + b.Property("UserUpdated"); + + b.Property("UserUpdatedId"); + + b.Property("VoicePresenceChannelId"); + + b.HasKey("Id"); + + b.ToTable("LogSettings"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("ModuleName"); + + b.Property("Prefix"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("ModulePrefixes"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Author"); + + b.Property("AuthorId"); + + b.Property("DateAdded"); + + b.Property("Name"); + + b.HasKey("Id"); + + b.ToTable("MusicPlaylists"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("MutedUserId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("NextId"); + + b.Property("PrimaryTarget"); + + b.Property("PrimaryTargetId"); + + b.Property("SecondaryTarget"); + + b.Property("SecondaryTargetName"); + + b.Property("State"); + + b.HasKey("Id"); + + b.HasIndex("NextId") + .IsUnique(); + + b.ToTable("Permission"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Index"); + + b.Property("PrimaryTarget"); + + b.Property("PrimaryTargetId"); + + b.Property("SecondaryTarget"); + + b.Property("SecondaryTargetName"); + + b.Property("State"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("Permissionv2"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("Status"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("PlayingStatus"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("MusicPlaylistId"); + + b.Property("Provider"); + + b.Property("ProviderType"); + + b.Property("Query"); + + b.Property("Title"); + + b.Property("Uri"); + + b.HasKey("Id"); + + b.HasIndex("MusicPlaylistId"); + + b.ToTable("PlaylistSong"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AuthorId"); + + b.Property("AuthorName") + .IsRequired(); + + b.Property("DateAdded"); + + b.Property("GuildId"); + + b.Property("Keyword") + .IsRequired(); + + b.Property("Text") + .IsRequired(); + + b.HasKey("Id"); + + b.ToTable("Quotes"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("Icon"); + + b.Property("Name"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("RaceAnimals"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("IsPrivate"); + + b.Property("Message"); + + b.Property("ServerId"); + + b.Property("UserId"); + + b.Property("When"); + + b.HasKey("Id"); + + b.ToTable("Reminders"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildId"); + + b.Property("RoleId"); + + b.HasKey("Id"); + + b.HasIndex("GuildId", "RoleId") + .IsUnique(); + + b.ToTable("SelfAssignableRoles"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("RoleId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("SlowmodeIgnoredRole"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("SlowmodeIgnoredUser"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("ChannelId"); + + b.Property("ChannelName"); + + b.Property("CommandText"); + + b.Property("DateAdded"); + + b.Property("GuildId"); + + b.Property("GuildName"); + + b.Property("Index"); + + b.Property("VoiceChannelId"); + + b.Property("VoiceChannelName"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("StartupCommand"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("UnmuteAt"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("UnmuteTimer"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("UserId"); + + b.Property("type"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("PokeGame"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("RoleId"); + + b.Property("VoiceChannelId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("VcRoleInfo"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AffinityId"); + + b.Property("ClaimerId"); + + b.Property("DateAdded"); + + b.Property("Price"); + + b.Property("WaifuId"); + + b.HasKey("Id"); + + b.HasIndex("AffinityId"); + + b.HasIndex("ClaimerId"); + + b.HasIndex("WaifuId") + .IsUnique(); + + b.ToTable("WaifuInfo"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("NewId"); + + b.Property("OldId"); + + b.Property("UpdateType"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("NewId"); + + b.HasIndex("OldId"); + + b.HasIndex("UserId"); + + b.ToTable("WaifuUpdates"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("Forgiven"); + + b.Property("ForgivenBy"); + + b.Property("GuildId"); + + b.Property("Moderator"); + + b.Property("Reason"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.ToTable("Warnings"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Count"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Punishment"); + + b.Property("Time"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("WarningPunishment"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig") + .WithOne("AntiRaidSetting") + .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b => + { + b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting") + .WithMany("IgnoredChannels") + .HasForeignKey("AntiSpamSettingId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig") + .WithOne("AntiSpamSetting") + .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("Blacklist") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b => + { + b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar") + .WithMany("Bases") + .HasForeignKey("ClashWarId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("CommandAliases") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("CommandCooldowns") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("CommandPrices") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("EightBallResponses") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FilterInvitesChannelIds") + .HasForeignKey("GuildConfigId"); + + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FilterWordsChannelIds") + .HasForeignKey("GuildConfigId1"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FilteredWords") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FollowedStreams") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("GenerateCurrencyChannelIds") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b => + { + b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting") + .WithMany() + .HasForeignKey("LogSettingId"); + + b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission") + .WithMany() + .HasForeignKey("RootPermissionId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("GuildRepeaters") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b => + { + b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting") + .WithMany("IgnoredChannels") + .HasForeignKey("LogSettingId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b => + { + b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting") + .WithMany("IgnoredVoicePresenceChannelIds") + .HasForeignKey("LogSettingId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("ModulePrefixes") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("MutedUsers") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b => + { + b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next") + .WithOne("Previous") + .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("Permissions") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("RotatingStatusMessages") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b => + { + b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist") + .WithMany("Songs") + .HasForeignKey("MusicPlaylistId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("RaceAnimals") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("SlowmodeIgnoredRoles") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("SlowmodeIgnoredUsers") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("StartupCommands") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("UnmuteTimers") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("VcRoleInfos") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => + { + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity") + .WithMany() + .HasForeignKey("AffinityId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer") + .WithMany() + .HasForeignKey("ClaimerId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu") + .WithOne() + .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => + { + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New") + .WithMany() + .HasForeignKey("NewId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old") + .WithMany() + .HasForeignKey("OldId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("WarnPunishments") + .HasForeignKey("GuildConfigId"); + }); + } + } +} diff --git a/src/NadekoBot/Migrations/20170401161600_slowmode-whitelist.cs b/src/NadekoBot/Migrations/20170401161600_slowmode-whitelist.cs new file mode 100644 index 00000000..fc2be484 --- /dev/null +++ b/src/NadekoBot/Migrations/20170401161600_slowmode-whitelist.cs @@ -0,0 +1,73 @@ +using System; +using System.Collections.Generic; +using Microsoft.EntityFrameworkCore.Migrations; + +namespace NadekoBot.Migrations +{ + public partial class slowmodewhitelist : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "SlowmodeIgnoredRole", + columns: table => new + { + Id = table.Column(nullable: false) + .Annotation("Sqlite:Autoincrement", true), + DateAdded = table.Column(nullable: true), + GuildConfigId = table.Column(nullable: true), + RoleId = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_SlowmodeIgnoredRole", x => x.Id); + table.ForeignKey( + name: "FK_SlowmodeIgnoredRole_GuildConfigs_GuildConfigId", + column: x => x.GuildConfigId, + principalTable: "GuildConfigs", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + }); + + migrationBuilder.CreateTable( + name: "SlowmodeIgnoredUser", + columns: table => new + { + Id = table.Column(nullable: false) + .Annotation("Sqlite:Autoincrement", true), + DateAdded = table.Column(nullable: true), + GuildConfigId = table.Column(nullable: true), + UserId = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_SlowmodeIgnoredUser", x => x.Id); + table.ForeignKey( + name: "FK_SlowmodeIgnoredUser_GuildConfigs_GuildConfigId", + column: x => x.GuildConfigId, + principalTable: "GuildConfigs", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + }); + + migrationBuilder.CreateIndex( + name: "IX_SlowmodeIgnoredRole_GuildConfigId", + table: "SlowmodeIgnoredRole", + column: "GuildConfigId"); + + migrationBuilder.CreateIndex( + name: "IX_SlowmodeIgnoredUser_GuildConfigId", + table: "SlowmodeIgnoredUser", + column: "GuildConfigId"); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "SlowmodeIgnoredRole"); + + migrationBuilder.DropTable( + name: "SlowmodeIgnoredUser"); + } + } +} diff --git a/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs b/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs index 83771957..3f6df376 100644 --- a/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs +++ b/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs @@ -950,6 +950,42 @@ namespace NadekoBot.Migrations b.ToTable("SelfAssignableRoles"); }); + modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("RoleId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("SlowmodeIgnoredRole"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("SlowmodeIgnoredUser"); + }); + modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b => { b.Property("Id") @@ -1320,6 +1356,20 @@ namespace NadekoBot.Migrations .HasForeignKey("BotConfigId"); }); + modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("SlowmodeIgnoredRoles") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("SlowmodeIgnoredUsers") + .HasForeignKey("GuildConfigId"); + }); + modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b => { b.HasOne("NadekoBot.Services.Database.Models.BotConfig") diff --git a/src/NadekoBot/Modules/Administration/Commands/RatelimitCommand.cs b/src/NadekoBot/Modules/Administration/Commands/RatelimitCommand.cs index 6d1e3f13..0c0f91be 100644 --- a/src/NadekoBot/Modules/Administration/Commands/RatelimitCommand.cs +++ b/src/NadekoBot/Modules/Administration/Commands/RatelimitCommand.cs @@ -1,13 +1,17 @@ using Discord; using Discord.Commands; +using Discord.WebSocket; using Microsoft.EntityFrameworkCore; using NadekoBot.Attributes; using NadekoBot.Extensions; using NadekoBot.Services; using NadekoBot.Services.Database; +using NadekoBot.Services.Database.Models; using NLog; using System; using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Linq; using System.Threading; using System.Threading.Tasks; @@ -23,6 +27,9 @@ namespace NadekoBot.Modules.Administration public class Ratelimiter { + public HashSet IgnoreUsers { get; set; } = new HashSet(); + public HashSet IgnoreRoles { get; set; } = new HashSet(); + public class RatelimitedUser { public ulong UserId { get; set; } @@ -38,10 +45,14 @@ namespace NadekoBot.Modules.Administration public ConcurrentDictionary Users { get; set; } = new ConcurrentDictionary(); - public bool CheckUserRatelimit(ulong id) + public bool CheckUserRatelimit(ulong id, SocketGuildUser optUser) { + if (IgnoreUsers.Contains(id) || + (optUser != null && optUser.RoleIds.Any(x => IgnoreRoles.Contains(x)))) + return false; + var usr = Users.GetOrAdd(id, (key) => new RatelimitedUser() { UserId = id }); - if (usr.MessageCount == MaxMessages) + if (usr.MessageCount >= MaxMessages) { return true; } @@ -67,8 +78,8 @@ namespace NadekoBot.Modules.Administration { try { - var usrMsg = umsg as IUserMessage; - var channel = usrMsg?.Channel as ITextChannel; + var usrMsg = umsg as SocketUserMessage; + var channel = usrMsg?.Channel as SocketTextChannel; if (channel == null || usrMsg.IsAuthor()) return; @@ -76,7 +87,7 @@ namespace NadekoBot.Modules.Administration if (!RatelimitingChannels.TryGetValue(channel.Id, out limiter)) return; - if (limiter.CheckUserRatelimit(usrMsg.Author.Id)) + if (limiter.CheckUserRatelimit(usrMsg.Author.Id, usrMsg.Author as SocketGuildUser)) await usrMsg.DeleteAsync(); } catch (Exception ex) { _log.Warn(ex); } @@ -122,29 +133,76 @@ namespace NadekoBot.Modules.Administration } } - //[NadekoCommand, Usage, Description, Aliases] - //[RequireContext(ContextType.Guild)] - //[RequireUserPermission(GuildPermission.ManageMessages)] - //public async Task SlowmodeWhitelist(IUser user) - //{ - // Ratelimiter throwaway; - // if (RatelimitingChannels.TryRemove(Context.Channel.Id, out throwaway)) - // { - // throwaway.cancelSource.Cancel(); - // await ReplyConfirmLocalized("slowmode_disabled").ConfigureAwait(false); - // } - //} + [NadekoCommand, Usage, Description, Aliases] + [RequireContext(ContextType.Guild)] + [RequireUserPermission(GuildPermission.ManageMessages)] + [Priority(1)] + public async Task SlowmodeWhitelist(IUser user) + { + var siu = new SlowmodeIgnoredUser + { + UserId = user.Id + }; - //[NadekoCommand, Usage, Description, Aliases] - //[RequireContext(ContextType.Guild)] - //[RequireUserPermission(GuildPermission.ManageMessages)] - //public async Task SlowmodeWhitelist(IRole role) - //{ - // using (var uow = DbHandler.UnitOfWork()) - // { - // uow.GuildConfigs.For(Context.Guild.Id, set => set.Include(x => x.SlowmodeWhitelists)). - // } - //} + HashSet usrs; + bool removed; + using (var uow = DbHandler.UnitOfWork()) + { + usrs = uow.GuildConfigs.For(Context.Guild.Id, set => set.Include(x => x.SlowmodeIgnoredUsers)) + .SlowmodeIgnoredUsers; + + if (!(removed = usrs.Remove(siu))) + usrs.Add(siu); + + await uow.CompleteAsync().ConfigureAwait(false); + } + + Ratelimiter rl; + if (RatelimitingChannels.TryGetValue(Context.Guild.Id, out rl)) + { + rl.IgnoreUsers = new HashSet(usrs.Select(x => x.UserId)); + } + if(removed) + await ReplyConfirmLocalized("slowmodewl_user_stop", Format.Bold(user.ToString())).ConfigureAwait(false); + else + await ReplyConfirmLocalized("slowmodewl_user_start", Format.Bold(user.ToString())).ConfigureAwait(false); + } + + [NadekoCommand, Usage, Description, Aliases] + [RequireContext(ContextType.Guild)] + [RequireUserPermission(GuildPermission.ManageMessages)] + [Priority(0)] + public async Task SlowmodeWhitelist(IRole role) + { + var sir = new SlowmodeIgnoredRole + { + RoleId = role.Id + }; + + HashSet roles; + bool removed; + using (var uow = DbHandler.UnitOfWork()) + { + roles = uow.GuildConfigs.For(Context.Guild.Id, set => set.Include(x => x.SlowmodeIgnoredRoles)) + .SlowmodeIgnoredRoles; + + if (!(removed = roles.Remove(sir))) + roles.Add(sir); + + await uow.CompleteAsync().ConfigureAwait(false); + } + + Ratelimiter rl; + if (RatelimitingChannels.TryGetValue(Context.Guild.Id, out rl)) + { + rl.IgnoreRoles = new HashSet(roles.Select(x => x.RoleId)); + } + + if (removed) + await ReplyConfirmLocalized("slowmodewl_role_stop", Format.Bold(role.ToString())).ConfigureAwait(false); + else + await ReplyConfirmLocalized("slowmodewl_role_start", Format.Bold(role.ToString())).ConfigureAwait(false); + } } } } \ No newline at end of file diff --git a/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs b/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs index c8908abe..76dd9ee0 100644 --- a/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs +++ b/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs @@ -9,6 +9,9 @@ //using System.Threading; //using System; //using System.Collections.Immutable; +//using NadekoBot.Services; +//using NadekoBot.Services.Database.Models; +//using NadekoBot.Extensions; //namespace NadekoBot.Modules.Utility //{ @@ -17,20 +20,45 @@ // [Group] // public class PatreonCommands : NadekoSubmodule // { +// private static readonly PatreonThingy patreon; + +// static PatreonCommands() +// { +// patreon = PatreonThingy.Instance; +// } // [NadekoCommand, Usage, Description, Aliases] // public async Task ClaimPatreonRewards() // { -// var patreon = PatreonThingy.Instance; - -// var pledges = (await patreon.GetPledges().ConfigureAwait(false)) -// .OrderByDescending(x => x.Reward.attributes.amount_cents); - -// if (pledges == null) +// if (string.IsNullOrWhiteSpace(NadekoBot.Credentials.PatreonAccessToken)) +// return; +// if (DateTime.UtcNow.Day < 5) // { -// await ReplyErrorLocalized("pledges_loading").ConfigureAwait(false); +// await ReplyErrorLocalized("claimpatreon_too_early").ConfigureAwait(false); +// } +// int amount = 0; +// try +// { +// amount = await patreon.ClaimReward(Context.User.Id).ConfigureAwait(false); +// } +// catch (Exception ex) +// { +// _log.Warn(ex); +// } + +// if (amount > 0) +// { +// await ReplyConfirmLocalized("claimpatreon_success", amount).ConfigureAwait(false); // return; // } +// await Context.Channel.EmbedAsync(new Discord.EmbedBuilder().WithOkColor() +// .WithDescription(GetText("claimpatreon_fail")) +// .AddField(efb => efb.WithName("").WithValue("")) +// .AddField(efb => efb.WithName("").WithValue("")) +// .AddField(efb => efb.WithName("").WithValue(""))) +// .ConfigureAwait(false); + +// await ReplyErrorLocalized("claimpatreon_fail").ConfigureAwait(false); // } // } @@ -41,21 +69,16 @@ // private readonly SemaphoreSlim getPledgesLocker = new SemaphoreSlim(1, 1); -// private ImmutableArray pledges; +// public ImmutableArray Pledges { get; private set; } -// static PatreonThingy() { } +// private readonly Timer update; +// private readonly SemaphoreSlim claimLockJustInCase = new SemaphoreSlim(1, 1); -// public async Task> GetPledges() +// private PatreonThingy() // { -// try -// { -// await LoadPledges().ConfigureAwait(false); -// return pledges; -// } -// catch (OperationCanceledException) -// { -// return pledges; -// } +// if (string.IsNullOrWhiteSpace(NadekoBot.Credentials.PatreonAccessToken)) +// return; +// update = new Timer(async (_) => await LoadPledges(), null, TimeSpan.Zero, TimeSpan.FromHours(3)); // } // public async Task LoadPledges() @@ -89,7 +112,7 @@ // .Select(x => JsonConvert.DeserializeObject(x.ToString()))); // } while (!string.IsNullOrWhiteSpace(data.Links.next)); // } -// pledges = rewards.Join(users, (r) => r.relationships?.patron?.data?.id, (u) => u.id, (x, y) => new PatreonUserAndReward() +// Pledges = rewards.Join(users, (r) => r.relationships?.patron?.data?.id, (u) => u.id, (x, y) => new PatreonUserAndReward() // { // User = y, // Reward = x, @@ -102,7 +125,55 @@ // await Task.Delay(TimeSpan.FromMinutes(5)).ConfigureAwait(false); // getPledgesLocker.Release(); // }); - + +// } +// } + +// public async Task ClaimReward(ulong userId) +// { +// await claimLockJustInCase.WaitAsync(); +// try +// { +// var data = Pledges.FirstOrDefault(x => x.User.id == userId.ToString()); + +// if (data == null) +// return 0; + +// var amount = data.Reward.attributes.amount_cents; + +// using (var uow = DbHandler.UnitOfWork()) +// { +// var users = uow._context.Set(); +// var usr = users.FirstOrDefault(x => x.UserId == userId); + +// if (usr == null) +// { +// users.Add(new RewardedUser() +// { +// UserId = userId, +// LastReward = DateTime.UtcNow, +// AmountRewardedThisMonth = amount, +// }); +// await uow.CompleteAsync().ConfigureAwait(false); +// return amount; +// } + +// if (usr.AmountRewardedThisMonth < amount) +// { +// var toAward = amount - usr.AmountRewardedThisMonth; + +// usr.LastReward = DateTime.UtcNow; +// usr.AmountRewardedThisMonth = amount; + +// await uow.CompleteAsync().ConfigureAwait(false); +// return toAward; +// } +// } +// return 0; +// } +// finally +// { +// claimLockJustInCase.Release(); // } // } // } diff --git a/src/NadekoBot/Resources/CommandStrings.Designer.cs b/src/NadekoBot/Resources/CommandStrings.Designer.cs index 20c12253..ef7c365a 100644 --- a/src/NadekoBot/Resources/CommandStrings.Designer.cs +++ b/src/NadekoBot/Resources/CommandStrings.Designer.cs @@ -1706,6 +1706,33 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to claimpatreonrewards. + /// + public static string claimpatreonrewards_cmd { + get { + return ResourceManager.GetString("claimpatreonrewards_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to If you're subscribed to bot owner's patreon you can user this command to claim your rewards - assuming bot owner did setup has their patreon key.. + /// + public static string claimpatreonrewards_desc { + get { + return ResourceManager.GetString("claimpatreonrewards_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}claimpatreonrewards`. + /// + public static string claimpatreonrewards_usage { + get { + return ResourceManager.GetString("claimpatreonrewards_usage", resourceCulture); + } + } + /// /// Looks up a localized string similar to cleanup. /// @@ -7673,6 +7700,33 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to slowmodewl. + /// + public static string slowmodewhitelist_cmd { + get { + return ResourceManager.GetString("slowmodewhitelist_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Ignores a role or a user from the slowmode feature.. + /// + public static string slowmodewhitelist_desc { + get { + return ResourceManager.GetString("slowmodewhitelist_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}slowmodewl SomeRole` or `{0}slowmodewl AdminDude`. + /// + public static string slowmodewhitelist_usage { + get { + return ResourceManager.GetString("slowmodewhitelist_usage", resourceCulture); + } + } + /// /// Looks up a localized string similar to softban sb. /// diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx index 5d1d0539..64236de1 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -3321,4 +3321,22 @@ `{0}warnpunish 5 Ban` or `{0}warnpunish 3` + + claimpatreonrewards + + + If you're subscribed to bot owner's patreon you can user this command to claim your rewards - assuming bot owner did setup has their patreon key. + + + `{0}claimpatreonrewards` + + + slowmodewl + + + Ignores a role or a user from the slowmode feature. + + + `{0}slowmodewl SomeRole` or `{0}slowmodewl AdminDude` + \ No newline at end of file diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index 3d91002f..5befa0b0 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -1512,6 +1512,42 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Slowmode will now ignore role {0}. + /// + public static string administration_slowmodewl_role_start { + get { + return ResourceManager.GetString("administration_slowmodewl_role_start", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Slowmode will no longer ignore role {0}. + /// + public static string administration_slowmodewl_role_stop { + get { + return ResourceManager.GetString("administration_slowmodewl_role_stop", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Slowmode will now ignore user {0}. + /// + public static string administration_slowmodewl_user_start { + get { + return ResourceManager.GetString("administration_slowmodewl_user_start", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Slowmode will no longer ignore user {0}. + /// + public static string administration_slowmodewl_user_stop { + get { + return ResourceManager.GetString("administration_slowmodewl_user_stop", resourceCulture); + } + } + /// /// Looks up a localized string similar to soft-banned. /// @@ -5989,6 +6025,87 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Failed claiming rewards due to one of the following reasons:. + /// + public static string utility_claimpatreon_fail { + get { + return ResourceManager.GetString("utility_claimpatreon_fail", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Maybe you have already received your reward for this month. You can receive rewards only once a month unless you increase your pledge.. + /// + public static string utility_claimpatreon_fail_already { + get { + return ResourceManager.GetString("utility_claimpatreon_fail_already", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Already rewarded. + /// + public static string utility_claimpatreon_fail_already_title { + get { + return ResourceManager.GetString("utility_claimpatreon_fail_already_title", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to In order to be eligible for the reward, you must support the project on patreon. Use {0} command to get the link.. + /// + public static string utility_claimpatreon_fail_sup { + get { + return ResourceManager.GetString("utility_claimpatreon_fail_sup", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Not supporting. + /// + public static string utility_claimpatreon_fail_sup_title { + get { + return ResourceManager.GetString("utility_claimpatreon_fail_sup_title", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to You have to wait a few hours after making your pledge, if you didn't, waiut a bit and then try again later.. + /// + public static string utility_claimpatreon_fail_wait { + get { + return ResourceManager.GetString("utility_claimpatreon_fail_wait", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Wait some time. + /// + public static string utility_claimpatreon_fail_wait_title { + get { + return ResourceManager.GetString("utility_claimpatreon_fail_wait_title", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to You've received {0}. Thanks for supporting the project!. + /// + public static string utility_claimpatreon_success { + get { + return ResourceManager.GetString("utility_claimpatreon_success", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Rewards can be claimed on or after 5th of each month.. + /// + public static string utility_claimpatreon_too_early { + get { + return ResourceManager.GetString("utility_claimpatreon_too_early", resourceCulture); + } + } + /// /// Looks up a localized string similar to Commands ran. /// diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index c71eea89..0a523218 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -2357,4 +2357,43 @@ Owner ID: {2} I will apply {0} punishment to users with {1} warnings. + + Slowmode will now ignore role {0} + + + Slowmode will no longer ignore role {0} + + + Slowmode will now ignore user {0} + + + Slowmode will no longer ignore user {0} + + + Failed claiming rewards due to one of the following reasons: + + + Maybe you have already received your reward for this month. You can receive rewards only once a month unless you increase your pledge. + + + Already rewarded + + + In order to be eligible for the reward, you must support the project on patreon. Use {0} command to get the link. + + + Not supporting + + + You have to wait a few hours after making your pledge, if you didn't, waiut a bit and then try again later. + + + Wait some time + + + You've received {0}. Thanks for supporting the project! + + + Rewards can be claimed on or after 5th of each month. + \ No newline at end of file diff --git a/src/NadekoBot/Services/Database/Models/GuildConfig.cs b/src/NadekoBot/Services/Database/Models/GuildConfig.cs index 4fe497c1..aaf7addf 100644 --- a/src/NadekoBot/Services/Database/Models/GuildConfig.cs +++ b/src/NadekoBot/Services/Database/Models/GuildConfig.cs @@ -73,10 +73,56 @@ namespace NadekoBot.Services.Database.Models public HashSet CommandAliases { get; set; } = new HashSet(); public List WarnPunishments { get; set; } = new List(); public bool WarningsInitialized { get; set; } + public HashSet SlowmodeIgnoredUsers { get; set; } + public HashSet SlowmodeIgnoredRoles { get; set; } //public List ProtectionIgnoredChannels { get; set; } = new List(); } + public class SlowmodeIgnoredUser : DbEntity + { + public ulong UserId { get; set; } + + // override object.Equals + public override bool Equals(object obj) + { + if (obj == null || GetType() != obj.GetType()) + { + return false; + } + + return ((SlowmodeIgnoredUser)obj).UserId == UserId; + } + + // override object.GetHashCode + public override int GetHashCode() + { + return UserId.GetHashCode(); + } + } + + public class SlowmodeIgnoredRole : DbEntity + { + public ulong RoleId { get; set; } + + // override object.Equals + public override bool Equals(object obj) + { + if (obj == null || GetType() != obj.GetType()) + { + return false; + } + + return ((SlowmodeIgnoredRole)obj).RoleId == RoleId; + } + + // override object.GetHashCode + public override int GetHashCode() + { + return RoleId.GetHashCode(); + } + } + public class WarningPunishment : DbEntity { public int Count { get; set; } diff --git a/src/NadekoBot/Services/Database/Models/RewardedUser.cs b/src/NadekoBot/Services/Database/Models/RewardedUser.cs new file mode 100644 index 00000000..e71843b1 --- /dev/null +++ b/src/NadekoBot/Services/Database/Models/RewardedUser.cs @@ -0,0 +1,11 @@ +//using System; + +//namespace NadekoBot.Services.Database.Models +//{ +// public class RewardedUser +// { +// public ulong UserId { get; set; } +// public int AmountRewardedThisMonth { get; set; } +// public DateTime LastReward { get; set; } +// } +//} From 7e23877fd8784082329c488a9c2daa1cb677bef3 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 1 Apr 2017 21:51:25 +0200 Subject: [PATCH 399/496] .clparew (Claim patreon rewards) added, needs testing --- .../Utility/Commands/PatreonCommands.cs | 324 +++++++++--------- .../Resources/CommandStrings.Designer.cs | 4 +- src/NadekoBot/Resources/CommandStrings.resx | 4 +- .../Resources/ResponseStrings.Designer.cs | 36 +- src/NadekoBot/Resources/ResponseStrings.resx | 18 +- .../Services/Database/Models/RewardedUser.cs | 20 +- 6 files changed, 204 insertions(+), 202 deletions(-) diff --git a/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs b/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs index 76dd9ee0..6415dd8f 100644 --- a/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs +++ b/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs @@ -1,181 +1,183 @@ -//using System.Collections.Generic; -//using System.Linq; -//using System.Net.Http; -//using System.Threading.Tasks; -//using Discord.Commands; -//using NadekoBot.Attributes; -//using NadekoBot.Modules.Utility.Models; -//using Newtonsoft.Json; -//using System.Threading; -//using System; -//using System.Collections.Immutable; -//using NadekoBot.Services; -//using NadekoBot.Services.Database.Models; -//using NadekoBot.Extensions; +using System.Collections.Generic; +using System.Linq; +using System.Net.Http; +using System.Threading.Tasks; +using Discord.Commands; +using NadekoBot.Attributes; +using NadekoBot.Modules.Utility.Models; +using Newtonsoft.Json; +using System.Threading; +using System; +using System.Collections.Immutable; +using NadekoBot.Services; +using NadekoBot.Services.Database.Models; +using NadekoBot.Extensions; -//namespace NadekoBot.Modules.Utility -//{ -// public partial class Utility -// { -// [Group] -// public class PatreonCommands : NadekoSubmodule -// { -// private static readonly PatreonThingy patreon; +namespace NadekoBot.Modules.Utility +{ + public partial class Utility + { + [Group] + public class PatreonCommands : NadekoSubmodule + { + private static readonly PatreonThingy patreon; -// static PatreonCommands() -// { -// patreon = PatreonThingy.Instance; -// } -// [NadekoCommand, Usage, Description, Aliases] -// public async Task ClaimPatreonRewards() -// { -// if (string.IsNullOrWhiteSpace(NadekoBot.Credentials.PatreonAccessToken)) -// return; -// if (DateTime.UtcNow.Day < 5) -// { -// await ReplyErrorLocalized("claimpatreon_too_early").ConfigureAwait(false); -// } -// int amount = 0; -// try -// { -// amount = await patreon.ClaimReward(Context.User.Id).ConfigureAwait(false); -// } -// catch (Exception ex) -// { -// _log.Warn(ex); -// } + static PatreonCommands() + { + patreon = PatreonThingy.Instance; + } + [NadekoCommand, Usage, Description, Aliases] + public async Task ClaimPatreonRewards() + { + if (string.IsNullOrWhiteSpace(NadekoBot.Credentials.PatreonAccessToken)) + return; + if (DateTime.UtcNow.Day < 5) + { + await ReplyErrorLocalized("clpa_too_early").ConfigureAwait(false); + } + int amount = 0; + try + { + amount = await patreon.ClaimReward(Context.User.Id).ConfigureAwait(false); + } + catch (Exception ex) + { + _log.Warn(ex); + } -// if (amount > 0) -// { -// await ReplyConfirmLocalized("claimpatreon_success", amount).ConfigureAwait(false); -// return; -// } + if (amount > 0) + { + await ReplyConfirmLocalized("clpa_success", amount + NadekoBot.BotConfig.CurrencySign).ConfigureAwait(false); + return; + } -// await Context.Channel.EmbedAsync(new Discord.EmbedBuilder().WithOkColor() -// .WithDescription(GetText("claimpatreon_fail")) -// .AddField(efb => efb.WithName("").WithValue("")) -// .AddField(efb => efb.WithName("").WithValue("")) -// .AddField(efb => efb.WithName("").WithValue(""))) -// .ConfigureAwait(false); + await Context.Channel.EmbedAsync(new Discord.EmbedBuilder().WithOkColor() + .WithDescription(GetText("clpa_fail")) + .AddField(efb => efb.WithName(GetText("clpa_fail_already_title")).WithValue(GetText("clpa_fail_already"))) + .AddField(efb => efb.WithName(GetText("clpa_fail_wait_title")).WithValue(GetText("clpa_fail_wait"))) + .AddField(efb => efb.WithName(GetText("clpa_fail_sup_title")).WithValue(GetText("clpa_fail_sup")))) + .ConfigureAwait(false); + } + } -// await ReplyErrorLocalized("claimpatreon_fail").ConfigureAwait(false); -// } -// } + public class PatreonThingy + { + public static PatreonThingy _instance = new PatreonThingy(); + public static PatreonThingy Instance => _instance; -// public class PatreonThingy -// { -// public static PatreonThingy _instance = new PatreonThingy(); -// public static PatreonThingy Instance => _instance; + private readonly SemaphoreSlim getPledgesLocker = new SemaphoreSlim(1, 1); -// private readonly SemaphoreSlim getPledgesLocker = new SemaphoreSlim(1, 1); + public ImmutableArray Pledges { get; private set; } -// public ImmutableArray Pledges { get; private set; } + private readonly Timer update; + private readonly SemaphoreSlim claimLockJustInCase = new SemaphoreSlim(1, 1); -// private readonly Timer update; -// private readonly SemaphoreSlim claimLockJustInCase = new SemaphoreSlim(1, 1); + private PatreonThingy() + { + if (string.IsNullOrWhiteSpace(NadekoBot.Credentials.PatreonAccessToken)) + return; + update = new Timer(async (_) => await LoadPledges(), null, TimeSpan.Zero, TimeSpan.FromHours(3)); + } -// private PatreonThingy() -// { -// if (string.IsNullOrWhiteSpace(NadekoBot.Credentials.PatreonAccessToken)) -// return; -// update = new Timer(async (_) => await LoadPledges(), null, TimeSpan.Zero, TimeSpan.FromHours(3)); -// } + public async Task LoadPledges() + { + await getPledgesLocker.WaitAsync(1000).ConfigureAwait(false); + try + { + var rewards = new List(); + var users = new List(); + using (var http = new HttpClient()) + { + http.DefaultRequestHeaders.Clear(); + http.DefaultRequestHeaders.Add("Authorization", "Bearer " + NadekoBot.Credentials.PatreonAccessToken); + var data = new PatreonData() + { + Links = new PatreonDataLinks() + { + next = "https://api.patreon.com/oauth2/api/campaigns/334038/pledges" + } + }; + do + { + var res = await http.GetStringAsync(data.Links.next) + .ConfigureAwait(false); + data = JsonConvert.DeserializeObject(res); + var pledgers = data.Data.Where(x => x["type"].ToString() == "pledge"); + rewards.AddRange(pledgers.Select(x => JsonConvert.DeserializeObject(x.ToString())) + .Where(x => x.attributes.declined_since == null)); + users.AddRange(data.Included + .Where(x => x["type"].ToString() == "user") + .Select(x => JsonConvert.DeserializeObject(x.ToString()))); + } while (!string.IsNullOrWhiteSpace(data.Links.next)); + } + Pledges = rewards.Join(users, (r) => r.relationships?.patron?.data?.id, (u) => u.id, (x, y) => new PatreonUserAndReward() + { + User = y, + Reward = x, + }).ToImmutableArray(); + } + finally + { + var _ = Task.Run(async () => + { + await Task.Delay(TimeSpan.FromMinutes(5)).ConfigureAwait(false); + getPledgesLocker.Release(); + }); + } + } -// public async Task LoadPledges() -// { -// await getPledgesLocker.WaitAsync(1000).ConfigureAwait(false); -// try -// { -// var rewards = new List(); -// var users = new List(); -// using (var http = new HttpClient()) -// { -// http.DefaultRequestHeaders.Clear(); -// http.DefaultRequestHeaders.Add("Authorization", "Bearer " + NadekoBot.Credentials.PatreonAccessToken); -// var data = new PatreonData() -// { -// Links = new PatreonDataLinks() -// { -// next = "https://api.patreon.com/oauth2/api/campaigns/334038/pledges" -// } -// }; -// do -// { -// var res = await http.GetStringAsync(data.Links.next) -// .ConfigureAwait(false); -// data = JsonConvert.DeserializeObject(res); -// var pledgers = data.Data.Where(x => x["type"].ToString() == "pledge"); -// rewards.AddRange(pledgers.Select(x => JsonConvert.DeserializeObject(x.ToString())) -// .Where(x => x.attributes.declined_since == null)); -// users.AddRange(data.Included -// .Where(x => x["type"].ToString() == "user") -// .Select(x => JsonConvert.DeserializeObject(x.ToString()))); -// } while (!string.IsNullOrWhiteSpace(data.Links.next)); -// } -// Pledges = rewards.Join(users, (r) => r.relationships?.patron?.data?.id, (u) => u.id, (x, y) => new PatreonUserAndReward() -// { -// User = y, -// Reward = x, -// }).ToImmutableArray(); -// } -// finally -// { -// var _ = Task.Run(async () => -// { -// await Task.Delay(TimeSpan.FromMinutes(5)).ConfigureAwait(false); -// getPledgesLocker.Release(); -// }); + public async Task ClaimReward(ulong userId) + { + await claimLockJustInCase.WaitAsync(); + try + { + var data = Pledges.FirstOrDefault(x => x.User.id == userId.ToString()); -// } -// } + if (data == null) + return 0; -// public async Task ClaimReward(ulong userId) -// { -// await claimLockJustInCase.WaitAsync(); -// try -// { -// var data = Pledges.FirstOrDefault(x => x.User.id == userId.ToString()); + var amount = data.Reward.attributes.amount_cents; -// if (data == null) -// return 0; + using (var uow = DbHandler.UnitOfWork()) + { + var users = uow._context.Set(); + var usr = users.FirstOrDefault(x => x.UserId == userId); -// var amount = data.Reward.attributes.amount_cents; + if (usr == null) + { + users.Add(new RewardedUser() + { + UserId = userId, + LastReward = DateTime.UtcNow, + AmountRewardedThisMonth = amount, + }); -// using (var uow = DbHandler.UnitOfWork()) -// { -// var users = uow._context.Set(); -// var usr = users.FirstOrDefault(x => x.UserId == userId); + await CurrencyHandler.AddCurrencyAsync(usr.UserId, "Patreon reward", amount, uow).ConfigureAwait(false); -// if (usr == null) -// { -// users.Add(new RewardedUser() -// { -// UserId = userId, -// LastReward = DateTime.UtcNow, -// AmountRewardedThisMonth = amount, -// }); -// await uow.CompleteAsync().ConfigureAwait(false); -// return amount; -// } + await uow.CompleteAsync().ConfigureAwait(false); + return amount; + } -// if (usr.AmountRewardedThisMonth < amount) -// { -// var toAward = amount - usr.AmountRewardedThisMonth; + if (usr.AmountRewardedThisMonth < amount) + { + var toAward = amount - usr.AmountRewardedThisMonth; -// usr.LastReward = DateTime.UtcNow; -// usr.AmountRewardedThisMonth = amount; + usr.LastReward = DateTime.UtcNow; + usr.AmountRewardedThisMonth = amount; -// await uow.CompleteAsync().ConfigureAwait(false); -// return toAward; -// } -// } -// return 0; -// } -// finally -// { -// claimLockJustInCase.Release(); -// } -// } -// } -// } -//} + await CurrencyHandler.AddCurrencyAsync(usr.UserId, "Patreon reward", toAward, uow).ConfigureAwait(false); + + await uow.CompleteAsync().ConfigureAwait(false); + return toAward; + } + } + return 0; + } + finally + { + claimLockJustInCase.Release(); + } + } + } + } +} \ No newline at end of file diff --git a/src/NadekoBot/Resources/CommandStrings.Designer.cs b/src/NadekoBot/Resources/CommandStrings.Designer.cs index ef7c365a..76dac5be 100644 --- a/src/NadekoBot/Resources/CommandStrings.Designer.cs +++ b/src/NadekoBot/Resources/CommandStrings.Designer.cs @@ -1707,7 +1707,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to claimpatreonrewards. + /// Looks up a localized string similar to clparew. /// public static string claimpatreonrewards_cmd { get { @@ -1716,7 +1716,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to If you're subscribed to bot owner's patreon you can user this command to claim your rewards - assuming bot owner did setup has their patreon key.. + /// Looks up a localized string similar to Claim patreon rewards. If you're subscribed to bot owner's patreon you can user this command to claim your rewards - assuming bot owner did setup has their patreon key.. /// public static string claimpatreonrewards_desc { get { diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx index 64236de1..f3662ef3 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -3322,10 +3322,10 @@ `{0}warnpunish 5 Ban` or `{0}warnpunish 3` - claimpatreonrewards + clparew - If you're subscribed to bot owner's patreon you can user this command to claim your rewards - assuming bot owner did setup has their patreon key. + Claim patreon rewards. If you're subscribed to bot owner's patreon you can user this command to claim your rewards - assuming bot owner did setup has their patreon key. `{0}claimpatreonrewards` diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index 5befa0b0..48394268 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -6028,81 +6028,81 @@ namespace NadekoBot.Resources { /// /// Looks up a localized string similar to Failed claiming rewards due to one of the following reasons:. /// - public static string utility_claimpatreon_fail { + public static string utility_clpa_fail { get { - return ResourceManager.GetString("utility_claimpatreon_fail", resourceCulture); + return ResourceManager.GetString("utility_clpa_fail", resourceCulture); } } /// /// Looks up a localized string similar to Maybe you have already received your reward for this month. You can receive rewards only once a month unless you increase your pledge.. /// - public static string utility_claimpatreon_fail_already { + public static string utility_clpa_fail_already { get { - return ResourceManager.GetString("utility_claimpatreon_fail_already", resourceCulture); + return ResourceManager.GetString("utility_clpa_fail_already", resourceCulture); } } /// /// Looks up a localized string similar to Already rewarded. /// - public static string utility_claimpatreon_fail_already_title { + public static string utility_clpa_fail_already_title { get { - return ResourceManager.GetString("utility_claimpatreon_fail_already_title", resourceCulture); + return ResourceManager.GetString("utility_clpa_fail_already_title", resourceCulture); } } /// /// Looks up a localized string similar to In order to be eligible for the reward, you must support the project on patreon. Use {0} command to get the link.. /// - public static string utility_claimpatreon_fail_sup { + public static string utility_clpa_fail_sup { get { - return ResourceManager.GetString("utility_claimpatreon_fail_sup", resourceCulture); + return ResourceManager.GetString("utility_clpa_fail_sup", resourceCulture); } } /// /// Looks up a localized string similar to Not supporting. /// - public static string utility_claimpatreon_fail_sup_title { + public static string utility_clpa_fail_sup_title { get { - return ResourceManager.GetString("utility_claimpatreon_fail_sup_title", resourceCulture); + return ResourceManager.GetString("utility_clpa_fail_sup_title", resourceCulture); } } /// /// Looks up a localized string similar to You have to wait a few hours after making your pledge, if you didn't, waiut a bit and then try again later.. /// - public static string utility_claimpatreon_fail_wait { + public static string utility_clpa_fail_wait { get { - return ResourceManager.GetString("utility_claimpatreon_fail_wait", resourceCulture); + return ResourceManager.GetString("utility_clpa_fail_wait", resourceCulture); } } /// /// Looks up a localized string similar to Wait some time. /// - public static string utility_claimpatreon_fail_wait_title { + public static string utility_clpa_fail_wait_title { get { - return ResourceManager.GetString("utility_claimpatreon_fail_wait_title", resourceCulture); + return ResourceManager.GetString("utility_clpa_fail_wait_title", resourceCulture); } } /// /// Looks up a localized string similar to You've received {0}. Thanks for supporting the project!. /// - public static string utility_claimpatreon_success { + public static string utility_clpa_success { get { - return ResourceManager.GetString("utility_claimpatreon_success", resourceCulture); + return ResourceManager.GetString("utility_clpa_success", resourceCulture); } } /// /// Looks up a localized string similar to Rewards can be claimed on or after 5th of each month.. /// - public static string utility_claimpatreon_too_early { + public static string utility_clpa_too_early { get { - return ResourceManager.GetString("utility_claimpatreon_too_early", resourceCulture); + return ResourceManager.GetString("utility_clpa_too_early", resourceCulture); } } diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index 0a523218..105efa2b 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -2369,31 +2369,31 @@ Owner ID: {2} Slowmode will no longer ignore user {0} - + Failed claiming rewards due to one of the following reasons: - + Maybe you have already received your reward for this month. You can receive rewards only once a month unless you increase your pledge. - + Already rewarded - + In order to be eligible for the reward, you must support the project on patreon. Use {0} command to get the link. - + Not supporting - + You have to wait a few hours after making your pledge, if you didn't, waiut a bit and then try again later. - + Wait some time - + You've received {0}. Thanks for supporting the project! - + Rewards can be claimed on or after 5th of each month. \ No newline at end of file diff --git a/src/NadekoBot/Services/Database/Models/RewardedUser.cs b/src/NadekoBot/Services/Database/Models/RewardedUser.cs index e71843b1..535f1354 100644 --- a/src/NadekoBot/Services/Database/Models/RewardedUser.cs +++ b/src/NadekoBot/Services/Database/Models/RewardedUser.cs @@ -1,11 +1,11 @@ -//using System; +using System; -//namespace NadekoBot.Services.Database.Models -//{ -// public class RewardedUser -// { -// public ulong UserId { get; set; } -// public int AmountRewardedThisMonth { get; set; } -// public DateTime LastReward { get; set; } -// } -//} +namespace NadekoBot.Services.Database.Models +{ + public class RewardedUser + { + public ulong UserId { get; set; } + public int AmountRewardedThisMonth { get; set; } + public DateTime LastReward { get; set; } + } +} From 3cec4f14d0ecb035e7e60b8825d9280d8b440016 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sun, 2 Apr 2017 00:01:02 +0200 Subject: [PATCH 400/496] .clparew finished --- ...20170401205753_patreon-rewards.Designer.cs | 1456 +++++++++++++++++ .../20170401205753_patreon-rewards.cs | 40 + .../NadekoSqliteContextModelSnapshot.cs | 21 + .../Utility/Commands/PatreonCommands.cs | 41 +- .../Resources/ResponseStrings.Designer.cs | 24 +- src/NadekoBot/Resources/ResponseStrings.resx | 12 +- .../Database/Models/PatreonRewards.cs | 15 - .../Services/Database/Models/RewardedUser.cs | 2 +- .../Services/Database/NadekoContext.cs | 7 + 9 files changed, 1583 insertions(+), 35 deletions(-) create mode 100644 src/NadekoBot/Migrations/20170401205753_patreon-rewards.Designer.cs create mode 100644 src/NadekoBot/Migrations/20170401205753_patreon-rewards.cs delete mode 100644 src/NadekoBot/Services/Database/Models/PatreonRewards.cs diff --git a/src/NadekoBot/Migrations/20170401205753_patreon-rewards.Designer.cs b/src/NadekoBot/Migrations/20170401205753_patreon-rewards.Designer.cs new file mode 100644 index 00000000..e693300d --- /dev/null +++ b/src/NadekoBot/Migrations/20170401205753_patreon-rewards.Designer.cs @@ -0,0 +1,1456 @@ +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using NadekoBot.Services.Database; +using NadekoBot.Services.Database.Models; +using NadekoBot.Modules.Music.Classes; + +namespace NadekoBot.Migrations +{ + [DbContext(typeof(NadekoContext))] + [Migration("20170401205753_patreon-rewards")] + partial class patreonrewards + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { + modelBuilder + .HasAnnotation("ProductVersion", "1.1.0-rtm-22752"); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Action"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Seconds"); + + b.Property("UserThreshold"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId") + .IsUnique(); + + b.ToTable("AntiRaidSetting"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AntiSpamSettingId"); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.HasKey("Id"); + + b.HasIndex("AntiSpamSettingId"); + + b.ToTable("AntiSpamIgnore"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Action"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("MessageThreshold"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId") + .IsUnique(); + + b.ToTable("AntiSpamSetting"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("ItemId"); + + b.Property("Type"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("BlacklistItem"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BetflipMultiplier"); + + b.Property("Betroll100Multiplier"); + + b.Property("Betroll67Multiplier"); + + b.Property("Betroll91Multiplier"); + + b.Property("BufferSize"); + + b.Property("CurrencyDropAmount"); + + b.Property("CurrencyGenerationChance"); + + b.Property("CurrencyGenerationCooldown"); + + b.Property("CurrencyName"); + + b.Property("CurrencyPluralName"); + + b.Property("CurrencySign"); + + b.Property("DMHelpString"); + + b.Property("DateAdded"); + + b.Property("ErrorColor"); + + b.Property("ForwardMessages"); + + b.Property("ForwardToAllOwners"); + + b.Property("HelpString"); + + b.Property("Locale"); + + b.Property("MigrationVersion"); + + b.Property("MinimumBetAmount"); + + b.Property("OkColor"); + + b.Property("RemindMessageFormat"); + + b.Property("RotatingStatuses"); + + b.Property("TriviaCurrencyReward"); + + b.HasKey("Id"); + + b.ToTable("BotConfig"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BaseDestroyed"); + + b.Property("CallUser"); + + b.Property("ClashWarId"); + + b.Property("DateAdded"); + + b.Property("SequenceNumber"); + + b.Property("Stars"); + + b.Property("TimeAdded"); + + b.HasKey("Id"); + + b.HasIndex("ClashWarId"); + + b.ToTable("ClashCallers"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("EnemyClan"); + + b.Property("GuildId"); + + b.Property("Size"); + + b.Property("StartedAt"); + + b.Property("WarState"); + + b.HasKey("Id"); + + b.ToTable("ClashOfClans"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Mapping"); + + b.Property("Trigger"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("CommandAlias"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("CommandName"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Seconds"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("CommandCooldown"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("CommandName"); + + b.Property("DateAdded"); + + b.Property("Price"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.HasIndex("Price") + .IsUnique(); + + b.ToTable("CommandPrice"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("InternalTrigger"); + + b.Property("Modifier"); + + b.Property("UnitType"); + + b.HasKey("Id"); + + b.ToTable("ConversionUnits"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Amount"); + + b.Property("DateAdded"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("Currency"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Amount"); + + b.Property("DateAdded"); + + b.Property("Reason"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.ToTable("CurrencyTransactions"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AutoDeleteTrigger"); + + b.Property("DateAdded"); + + b.Property("DmResponse"); + + b.Property("GuildId"); + + b.Property("IsRegex"); + + b.Property("OwnerOnly"); + + b.Property("Response"); + + b.Property("Trigger"); + + b.HasKey("Id"); + + b.ToTable("CustomReactions"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AvatarId"); + + b.Property("DateAdded"); + + b.Property("Discriminator"); + + b.Property("UserId"); + + b.Property("Username"); + + b.HasKey("Id"); + + b.HasAlternateKey("UserId"); + + b.ToTable("DiscordUser"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Amount"); + + b.Property("DateAdded"); + + b.Property("Name"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("Donators"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("Text"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("EightBallResponses"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("GuildConfigId1"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.HasIndex("GuildConfigId1"); + + b.ToTable("FilterChannelId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Word"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("FilteredWord"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("GuildId"); + + b.Property("Type"); + + b.Property("Username"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("FollowedStream"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("GCChannelId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AutoAssignRoleId"); + + b.Property("AutoDeleteByeMessages"); + + b.Property("AutoDeleteByeMessagesTimer"); + + b.Property("AutoDeleteGreetMessages"); + + b.Property("AutoDeleteGreetMessagesTimer"); + + b.Property("AutoDeleteSelfAssignedRoleMessages"); + + b.Property("ByeMessageChannelId"); + + b.Property("ChannelByeMessageText"); + + b.Property("ChannelGreetMessageText"); + + b.Property("CleverbotEnabled"); + + b.Property("DateAdded"); + + b.Property("DefaultMusicVolume"); + + b.Property("DeleteMessageOnCommand"); + + b.Property("DmGreetMessageText"); + + b.Property("ExclusiveSelfAssignedRoles"); + + b.Property("FilterInvites"); + + b.Property("FilterWords"); + + b.Property("GreetMessageChannelId"); + + b.Property("GuildId"); + + b.Property("Locale"); + + b.Property("LogSettingId"); + + b.Property("MuteRoleName"); + + b.Property("PermissionRole"); + + b.Property("RootPermissionId"); + + b.Property("SendChannelByeMessage"); + + b.Property("SendChannelGreetMessage"); + + b.Property("SendDmGreetMessage"); + + b.Property("TimeZoneId"); + + b.Property("VerbosePermissions"); + + b.Property("VoicePlusTextEnabled"); + + b.Property("WarningsInitialized"); + + b.HasKey("Id"); + + b.HasIndex("GuildId") + .IsUnique(); + + b.HasIndex("LogSettingId"); + + b.HasIndex("RootPermissionId"); + + b.ToTable("GuildConfigs"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("GuildId"); + + b.Property("Interval"); + + b.Property("Message"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("GuildRepeater"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("LogSettingId"); + + b.HasKey("Id"); + + b.HasIndex("LogSettingId"); + + b.ToTable("IgnoredLogChannels"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("LogSettingId"); + + b.HasKey("Id"); + + b.HasIndex("LogSettingId"); + + b.ToTable("IgnoredVoicePresenceCHannels"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelCreated"); + + b.Property("ChannelCreatedId"); + + b.Property("ChannelDestroyed"); + + b.Property("ChannelDestroyedId"); + + b.Property("ChannelId"); + + b.Property("ChannelUpdated"); + + b.Property("ChannelUpdatedId"); + + b.Property("DateAdded"); + + b.Property("IsLogging"); + + b.Property("LogOtherId"); + + b.Property("LogUserPresence"); + + b.Property("LogUserPresenceId"); + + b.Property("LogVoicePresence"); + + b.Property("LogVoicePresenceId"); + + b.Property("LogVoicePresenceTTSId"); + + b.Property("MessageDeleted"); + + b.Property("MessageDeletedId"); + + b.Property("MessageUpdated"); + + b.Property("MessageUpdatedId"); + + b.Property("UserBanned"); + + b.Property("UserBannedId"); + + b.Property("UserJoined"); + + b.Property("UserJoinedId"); + + b.Property("UserLeft"); + + b.Property("UserLeftId"); + + b.Property("UserMutedId"); + + b.Property("UserPresenceChannelId"); + + b.Property("UserUnbanned"); + + b.Property("UserUnbannedId"); + + b.Property("UserUpdated"); + + b.Property("UserUpdatedId"); + + b.Property("VoicePresenceChannelId"); + + b.HasKey("Id"); + + b.ToTable("LogSettings"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("ModuleName"); + + b.Property("Prefix"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("ModulePrefixes"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Author"); + + b.Property("AuthorId"); + + b.Property("DateAdded"); + + b.Property("Name"); + + b.HasKey("Id"); + + b.ToTable("MusicPlaylists"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("MutedUserId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("NextId"); + + b.Property("PrimaryTarget"); + + b.Property("PrimaryTargetId"); + + b.Property("SecondaryTarget"); + + b.Property("SecondaryTargetName"); + + b.Property("State"); + + b.HasKey("Id"); + + b.HasIndex("NextId") + .IsUnique(); + + b.ToTable("Permission"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Index"); + + b.Property("PrimaryTarget"); + + b.Property("PrimaryTargetId"); + + b.Property("SecondaryTarget"); + + b.Property("SecondaryTargetName"); + + b.Property("State"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("Permissionv2"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("Status"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("PlayingStatus"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("MusicPlaylistId"); + + b.Property("Provider"); + + b.Property("ProviderType"); + + b.Property("Query"); + + b.Property("Title"); + + b.Property("Uri"); + + b.HasKey("Id"); + + b.HasIndex("MusicPlaylistId"); + + b.ToTable("PlaylistSong"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AuthorId"); + + b.Property("AuthorName") + .IsRequired(); + + b.Property("DateAdded"); + + b.Property("GuildId"); + + b.Property("Keyword") + .IsRequired(); + + b.Property("Text") + .IsRequired(); + + b.HasKey("Id"); + + b.ToTable("Quotes"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("Icon"); + + b.Property("Name"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("RaceAnimals"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("IsPrivate"); + + b.Property("Message"); + + b.Property("ServerId"); + + b.Property("UserId"); + + b.Property("When"); + + b.HasKey("Id"); + + b.ToTable("Reminders"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.RewardedUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AmountRewardedThisMonth"); + + b.Property("DateAdded"); + + b.Property("LastReward"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("RewardedUsers"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildId"); + + b.Property("RoleId"); + + b.HasKey("Id"); + + b.HasIndex("GuildId", "RoleId") + .IsUnique(); + + b.ToTable("SelfAssignableRoles"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("RoleId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("SlowmodeIgnoredRole"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("SlowmodeIgnoredUser"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("ChannelId"); + + b.Property("ChannelName"); + + b.Property("CommandText"); + + b.Property("DateAdded"); + + b.Property("GuildId"); + + b.Property("GuildName"); + + b.Property("Index"); + + b.Property("VoiceChannelId"); + + b.Property("VoiceChannelName"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("StartupCommand"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("UnmuteAt"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("UnmuteTimer"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("UserId"); + + b.Property("type"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("PokeGame"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("RoleId"); + + b.Property("VoiceChannelId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("VcRoleInfo"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AffinityId"); + + b.Property("ClaimerId"); + + b.Property("DateAdded"); + + b.Property("Price"); + + b.Property("WaifuId"); + + b.HasKey("Id"); + + b.HasIndex("AffinityId"); + + b.HasIndex("ClaimerId"); + + b.HasIndex("WaifuId") + .IsUnique(); + + b.ToTable("WaifuInfo"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("NewId"); + + b.Property("OldId"); + + b.Property("UpdateType"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("NewId"); + + b.HasIndex("OldId"); + + b.HasIndex("UserId"); + + b.ToTable("WaifuUpdates"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("Forgiven"); + + b.Property("ForgivenBy"); + + b.Property("GuildId"); + + b.Property("Moderator"); + + b.Property("Reason"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.ToTable("Warnings"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Count"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Punishment"); + + b.Property("Time"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("WarningPunishment"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig") + .WithOne("AntiRaidSetting") + .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b => + { + b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting") + .WithMany("IgnoredChannels") + .HasForeignKey("AntiSpamSettingId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig") + .WithOne("AntiSpamSetting") + .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("Blacklist") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b => + { + b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar") + .WithMany("Bases") + .HasForeignKey("ClashWarId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("CommandAliases") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("CommandCooldowns") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("CommandPrices") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("EightBallResponses") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FilterInvitesChannelIds") + .HasForeignKey("GuildConfigId"); + + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FilterWordsChannelIds") + .HasForeignKey("GuildConfigId1"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FilteredWords") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FollowedStreams") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("GenerateCurrencyChannelIds") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b => + { + b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting") + .WithMany() + .HasForeignKey("LogSettingId"); + + b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission") + .WithMany() + .HasForeignKey("RootPermissionId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("GuildRepeaters") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b => + { + b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting") + .WithMany("IgnoredChannels") + .HasForeignKey("LogSettingId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b => + { + b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting") + .WithMany("IgnoredVoicePresenceChannelIds") + .HasForeignKey("LogSettingId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("ModulePrefixes") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("MutedUsers") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b => + { + b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next") + .WithOne("Previous") + .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("Permissions") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("RotatingStatusMessages") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b => + { + b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist") + .WithMany("Songs") + .HasForeignKey("MusicPlaylistId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("RaceAnimals") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("SlowmodeIgnoredRoles") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("SlowmodeIgnoredUsers") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("StartupCommands") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("UnmuteTimers") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("VcRoleInfos") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => + { + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity") + .WithMany() + .HasForeignKey("AffinityId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer") + .WithMany() + .HasForeignKey("ClaimerId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu") + .WithOne() + .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => + { + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New") + .WithMany() + .HasForeignKey("NewId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old") + .WithMany() + .HasForeignKey("OldId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("WarnPunishments") + .HasForeignKey("GuildConfigId"); + }); + } + } +} diff --git a/src/NadekoBot/Migrations/20170401205753_patreon-rewards.cs b/src/NadekoBot/Migrations/20170401205753_patreon-rewards.cs new file mode 100644 index 00000000..83057ff5 --- /dev/null +++ b/src/NadekoBot/Migrations/20170401205753_patreon-rewards.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using Microsoft.EntityFrameworkCore.Migrations; + +namespace NadekoBot.Migrations +{ + public partial class patreonrewards : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "RewardedUsers", + columns: table => new + { + Id = table.Column(nullable: false) + .Annotation("Sqlite:Autoincrement", true), + AmountRewardedThisMonth = table.Column(nullable: false), + DateAdded = table.Column(nullable: true), + LastReward = table.Column(nullable: false), + UserId = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_RewardedUsers", x => x.Id); + }); + + migrationBuilder.CreateIndex( + name: "IX_RewardedUsers_UserId", + table: "RewardedUsers", + column: "UserId", + unique: true); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "RewardedUsers"); + } + } +} diff --git a/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs b/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs index 3f6df376..303783e4 100644 --- a/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs +++ b/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs @@ -931,6 +931,27 @@ namespace NadekoBot.Migrations b.ToTable("Reminders"); }); + modelBuilder.Entity("NadekoBot.Services.Database.Models.RewardedUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AmountRewardedThisMonth"); + + b.Property("DateAdded"); + + b.Property("LastReward"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("RewardedUsers"); + }); + modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b => { b.Property("Id") diff --git a/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs b/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs index 6415dd8f..e9b78014 100644 --- a/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs +++ b/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs @@ -12,6 +12,7 @@ using System.Collections.Immutable; using NadekoBot.Services; using NadekoBot.Services.Database.Models; using NadekoBot.Extensions; +using Discord; namespace NadekoBot.Modules.Utility { @@ -31,10 +32,11 @@ namespace NadekoBot.Modules.Utility { if (string.IsNullOrWhiteSpace(NadekoBot.Credentials.PatreonAccessToken)) return; - if (DateTime.UtcNow.Day < 5) - { - await ReplyErrorLocalized("clpa_too_early").ConfigureAwait(false); - } + //if (DateTime.UtcNow.Day < 5) + //{ + // await ReplyErrorLocalized("clpa_too_early").ConfigureAwait(false); + // return; + //} int amount = 0; try { @@ -50,12 +52,13 @@ namespace NadekoBot.Modules.Utility await ReplyConfirmLocalized("clpa_success", amount + NadekoBot.BotConfig.CurrencySign).ConfigureAwait(false); return; } - - await Context.Channel.EmbedAsync(new Discord.EmbedBuilder().WithOkColor() + var helpcmd = Format.Code(NadekoBot.ModulePrefixes[typeof(Help.Help).Name] + "donate"); + await Context.Channel.EmbedAsync(new EmbedBuilder().WithOkColor() .WithDescription(GetText("clpa_fail")) .AddField(efb => efb.WithName(GetText("clpa_fail_already_title")).WithValue(GetText("clpa_fail_already"))) .AddField(efb => efb.WithName(GetText("clpa_fail_wait_title")).WithValue(GetText("clpa_fail_wait"))) - .AddField(efb => efb.WithName(GetText("clpa_fail_sup_title")).WithValue(GetText("clpa_fail_sup")))) + .AddField(efb => efb.WithName(GetText("clpa_fail_conn_title")).WithValue(GetText("clpa_fail_conn"))) + .AddField(efb => efb.WithName(GetText("clpa_fail_sup_title")).WithValue(GetText("clpa_fail_sup", helpcmd)))) .ConfigureAwait(false); } } @@ -129,9 +132,10 @@ namespace NadekoBot.Modules.Utility public async Task ClaimReward(ulong userId) { await claimLockJustInCase.WaitAsync(); + var now = DateTime.UtcNow; try { - var data = Pledges.FirstOrDefault(x => x.User.id == userId.ToString()); + var data = Pledges.FirstOrDefault(x => x.User.attributes?.social_connections?.discord?.user_id == userId.ToString()); if (data == null) return 0; @@ -148,24 +152,35 @@ namespace NadekoBot.Modules.Utility users.Add(new RewardedUser() { UserId = userId, - LastReward = DateTime.UtcNow, + LastReward = now, AmountRewardedThisMonth = amount, }); - await CurrencyHandler.AddCurrencyAsync(usr.UserId, "Patreon reward", amount, uow).ConfigureAwait(false); + await CurrencyHandler.AddCurrencyAsync(userId, "Patreon reward - new", amount, uow).ConfigureAwait(false); await uow.CompleteAsync().ConfigureAwait(false); return amount; } - if (usr.AmountRewardedThisMonth < amount) + if (usr.LastReward.Month != now.Month) + { + usr.LastReward = now; + usr.AmountRewardedThisMonth = amount; + + await CurrencyHandler.AddCurrencyAsync(userId, "Patreon reward - recurring", amount, uow).ConfigureAwait(false); + + await uow.CompleteAsync().ConfigureAwait(false); + return amount; + } + + if ( usr.AmountRewardedThisMonth < amount) { var toAward = amount - usr.AmountRewardedThisMonth; - usr.LastReward = DateTime.UtcNow; + usr.LastReward = now; usr.AmountRewardedThisMonth = amount; - await CurrencyHandler.AddCurrencyAsync(usr.UserId, "Patreon reward", toAward, uow).ConfigureAwait(false); + await CurrencyHandler.AddCurrencyAsync(usr.UserId, "Patreon reward - update", toAward, uow).ConfigureAwait(false); await uow.CompleteAsync().ConfigureAwait(false); return toAward; diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index 48394268..445e025b 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -6035,7 +6035,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Maybe you have already received your reward for this month. You can receive rewards only once a month unless you increase your pledge.. + /// Looks up a localized string similar to Maybe you've already received your reward for this month. You can receive rewards only once a month unless you increase your pledge.. /// public static string utility_clpa_fail_already { get { @@ -6053,7 +6053,25 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to In order to be eligible for the reward, you must support the project on patreon. Use {0} command to get the link.. + /// Looks up a localized string similar to Your discord account might not be connected to Patreon.. If you are unsure what that means, or don't know how to connect it - you have to go to [Patreon account settings page](https://patreon.com/settings/account) and click 'Connect to discord' button.. + /// + public static string utility_clpa_fail_conn { + get { + return ResourceManager.GetString("utility_clpa_fail_conn", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Discord account not connected. + /// + public static string utility_clpa_fail_conn_title { + get { + return ResourceManager.GetString("utility_clpa_fail_conn_title", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to In order to be eligible for the reward, you must support the project on patreon. You can use {0} command to get the link.. /// public static string utility_clpa_fail_sup { get { @@ -6071,7 +6089,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to You have to wait a few hours after making your pledge, if you didn't, waiut a bit and then try again later.. + /// Looks up a localized string similar to You have to wait a few hours after making your pledge, if you didn't, try again later.. /// public static string utility_clpa_fail_wait { get { diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index 105efa2b..4d605da8 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -2373,19 +2373,25 @@ Owner ID: {2} Failed claiming rewards due to one of the following reasons: - Maybe you have already received your reward for this month. You can receive rewards only once a month unless you increase your pledge. + Maybe you've already received your reward for this month. You can receive rewards only once a month unless you increase your pledge. Already rewarded + + Your discord account might not be connected to Patreon.. If you are unsure what that means, or don't know how to connect it - you have to go to [Patreon account settings page](https://patreon.com/settings/account) and click 'Connect to discord' button. + + + Discord account not connected + - In order to be eligible for the reward, you must support the project on patreon. Use {0} command to get the link. + In order to be eligible for the reward, you must support the project on patreon. You can use {0} command to get the link. Not supporting - You have to wait a few hours after making your pledge, if you didn't, waiut a bit and then try again later. + You have to wait a few hours after making your pledge, if you didn't, try again later. Wait some time diff --git a/src/NadekoBot/Services/Database/Models/PatreonRewards.cs b/src/NadekoBot/Services/Database/Models/PatreonRewards.cs deleted file mode 100644 index 0e1532b3..00000000 --- a/src/NadekoBot/Services/Database/Models/PatreonRewards.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace NadekoBot.Services.Database.Models -{ - public class PatreonRewards : DbEntity - { - public ulong UserId { get; set; } - public ulong PledgeCents { get; set; } - public ulong Awarded { get; set; } - } -} diff --git a/src/NadekoBot/Services/Database/Models/RewardedUser.cs b/src/NadekoBot/Services/Database/Models/RewardedUser.cs index 535f1354..f7db8dc4 100644 --- a/src/NadekoBot/Services/Database/Models/RewardedUser.cs +++ b/src/NadekoBot/Services/Database/Models/RewardedUser.cs @@ -2,7 +2,7 @@ namespace NadekoBot.Services.Database.Models { - public class RewardedUser + public class RewardedUser : DbEntity { public ulong UserId { get; set; } public int AmountRewardedThisMonth { get; set; } diff --git a/src/NadekoBot/Services/Database/NadekoContext.cs b/src/NadekoBot/Services/Database/NadekoContext.cs index a82cfde8..9c084867 100644 --- a/src/NadekoBot/Services/Database/NadekoContext.cs +++ b/src/NadekoBot/Services/Database/NadekoContext.cs @@ -51,6 +51,7 @@ namespace NadekoBot.Services.Database public DbSet EightBallResponses { get; set; } public DbSet RaceAnimals { get; set; } public DbSet ModulePrefixes { get; set; } + public DbSet RewardedUsers { get; set; } public NadekoContext() : base() { @@ -277,6 +278,12 @@ namespace NadekoBot.Services.Database #region Warnings var warn = modelBuilder.Entity(); #endregion + + #region PatreonRewards + var pr = modelBuilder.Entity(); + pr.HasIndex(x => x.UserId) + .IsUnique(); + #endregion } } } From c512f6360b0fe32d312fde5f28b89addfae5ea7b Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sun, 2 Apr 2017 00:25:26 +0200 Subject: [PATCH 401/496] .slowmodewl implemented and now works properly --- .../Commands/RatelimitCommand.cs | 45 ++++++++++--------- .../Resources/ResponseStrings.Designer.cs | 10 ++--- src/NadekoBot/Resources/ResponseStrings.resx | 10 ++--- .../Impl/GuildConfigRepository.cs | 2 + 4 files changed, 37 insertions(+), 30 deletions(-) diff --git a/src/NadekoBot/Modules/Administration/Commands/RatelimitCommand.cs b/src/NadekoBot/Modules/Administration/Commands/RatelimitCommand.cs index 0c0f91be..57dd4c89 100644 --- a/src/NadekoBot/Modules/Administration/Commands/RatelimitCommand.cs +++ b/src/NadekoBot/Modules/Administration/Commands/RatelimitCommand.cs @@ -5,7 +5,6 @@ using Microsoft.EntityFrameworkCore; using NadekoBot.Attributes; using NadekoBot.Extensions; using NadekoBot.Services; -using NadekoBot.Services.Database; using NadekoBot.Services.Database.Models; using NLog; using System; @@ -20,16 +19,16 @@ namespace NadekoBot.Modules.Administration public partial class Administration { [Group] - public class RatelimitCommand : NadekoSubmodule + public class RatelimitCommands : NadekoSubmodule { public static ConcurrentDictionary RatelimitingChannels = new ConcurrentDictionary(); + public static ConcurrentDictionary> IgnoredRoles = new ConcurrentDictionary>(); + public static ConcurrentDictionary> IgnoredUsers = new ConcurrentDictionary>(); + private new static readonly Logger _log; public class Ratelimiter { - public HashSet IgnoreUsers { get; set; } = new HashSet(); - public HashSet IgnoreRoles { get; set; } = new HashSet(); - public class RatelimitedUser { public ulong UserId { get; set; } @@ -45,10 +44,13 @@ namespace NadekoBot.Modules.Administration public ConcurrentDictionary Users { get; set; } = new ConcurrentDictionary(); - public bool CheckUserRatelimit(ulong id, SocketGuildUser optUser) + public bool CheckUserRatelimit(ulong id, ulong guildId, SocketGuildUser optUser) { - if (IgnoreUsers.Contains(id) || - (optUser != null && optUser.RoleIds.Any(x => IgnoreRoles.Contains(x)))) + HashSet ignoreUsers; + HashSet ignoreRoles; + + if ((IgnoredUsers.TryGetValue(guildId, out ignoreUsers) && ignoreUsers.Contains(id)) || + (optUser != null && IgnoredRoles.TryGetValue(guildId, out ignoreRoles) && optUser.RoleIds.Any(x => ignoreRoles.Contains(x)))) return false; var usr = Users.GetOrAdd(id, (key) => new RatelimitedUser() { UserId = id }); @@ -70,10 +72,20 @@ namespace NadekoBot.Modules.Administration } } - static RatelimitCommand() + static RatelimitCommands() { _log = LogManager.GetCurrentClassLogger(); + IgnoredRoles = new ConcurrentDictionary>( + NadekoBot.AllGuildConfigs + .ToDictionary(x => x.GuildId, + x => new HashSet(x.SlowmodeIgnoredRoles.Select(y => y.RoleId)))); + + IgnoredUsers = new ConcurrentDictionary>( + NadekoBot.AllGuildConfigs + .ToDictionary(x => x.GuildId, + x => new HashSet(x.SlowmodeIgnoredUsers.Select(y => y.UserId)))); + NadekoBot.Client.MessageReceived += async (umsg) => { try @@ -87,7 +99,7 @@ namespace NadekoBot.Modules.Administration if (!RatelimitingChannels.TryGetValue(channel.Id, out limiter)) return; - if (limiter.CheckUserRatelimit(usrMsg.Author.Id, usrMsg.Author as SocketGuildUser)) + if (limiter.CheckUserRatelimit(usrMsg.Author.Id, channel.Guild.Id, usrMsg.Author as SocketGuildUser)) await usrMsg.DeleteAsync(); } catch (Exception ex) { _log.Warn(ex); } @@ -157,11 +169,8 @@ namespace NadekoBot.Modules.Administration await uow.CompleteAsync().ConfigureAwait(false); } - Ratelimiter rl; - if (RatelimitingChannels.TryGetValue(Context.Guild.Id, out rl)) - { - rl.IgnoreUsers = new HashSet(usrs.Select(x => x.UserId)); - } + IgnoredUsers.AddOrUpdate(Context.Guild.Id, new HashSet(usrs.Select(x => x.UserId)), (key, old) => new HashSet(usrs.Select(x => x.UserId))); + if(removed) await ReplyConfirmLocalized("slowmodewl_user_stop", Format.Bold(user.ToString())).ConfigureAwait(false); else @@ -192,11 +201,7 @@ namespace NadekoBot.Modules.Administration await uow.CompleteAsync().ConfigureAwait(false); } - Ratelimiter rl; - if (RatelimitingChannels.TryGetValue(Context.Guild.Id, out rl)) - { - rl.IgnoreRoles = new HashSet(roles.Select(x => x.RoleId)); - } + IgnoredRoles.AddOrUpdate(Context.Guild.Id, new HashSet(roles.Select(x => x.RoleId)), (key, old) => new HashSet(roles.Select(x => x.RoleId))); if (removed) await ReplyConfirmLocalized("slowmodewl_role_stop", Format.Bold(role.ToString())).ConfigureAwait(false); diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index 445e025b..e13d8513 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -1513,7 +1513,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Slowmode will now ignore role {0}. + /// Looks up a localized string similar to Slowmode will now ignore {0} role.. /// public static string administration_slowmodewl_role_start { get { @@ -1522,7 +1522,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Slowmode will no longer ignore role {0}. + /// Looks up a localized string similar to Slowmode will no longer ignore {0} role.. /// public static string administration_slowmodewl_role_stop { get { @@ -1531,7 +1531,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Slowmode will now ignore user {0}. + /// Looks up a localized string similar to Slowmode will now ignore user {0}.. /// public static string administration_slowmodewl_user_start { get { @@ -1540,7 +1540,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Slowmode will no longer ignore user {0}. + /// Looks up a localized string similar to Slowmode will no longer ignore user {0}.. /// public static string administration_slowmodewl_user_stop { get { @@ -6107,7 +6107,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to You've received {0}. Thanks for supporting the project!. + /// Looks up a localized string similar to You've received {0} Thanks for supporting the project!. /// public static string utility_clpa_success { get { diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index 4d605da8..83d701f3 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -2358,16 +2358,16 @@ Owner ID: {2} I will apply {0} punishment to users with {1} warnings. - Slowmode will now ignore role {0} + Slowmode will now ignore {0} role. - Slowmode will no longer ignore role {0} + Slowmode will no longer ignore {0} role. - Slowmode will now ignore user {0} + Slowmode will now ignore user {0}. - Slowmode will no longer ignore user {0} + Slowmode will no longer ignore user {0}. Failed claiming rewards due to one of the following reasons: @@ -2397,7 +2397,7 @@ Owner ID: {2} Wait some time - You've received {0}. Thanks for supporting the project! + You've received {0} Thanks for supporting the project! Rewards can be claimed on or after 5th of each month. diff --git a/src/NadekoBot/Services/Database/Repositories/Impl/GuildConfigRepository.cs b/src/NadekoBot/Services/Database/Repositories/Impl/GuildConfigRepository.cs index 01a44677..ebe41406 100644 --- a/src/NadekoBot/Services/Database/Repositories/Impl/GuildConfigRepository.cs +++ b/src/NadekoBot/Services/Database/Repositories/Impl/GuildConfigRepository.cs @@ -38,6 +38,8 @@ namespace NadekoBot.Services.Database.Repositories.Impl .Include(gc => gc.CommandCooldowns) .Include(gc => gc.GuildRepeaters) .Include(gc => gc.AntiRaidSetting) + .Include(gc => gc.SlowmodeIgnoredRoles) + .Include(gc => gc.SlowmodeIgnoredUsers) .Include(gc => gc.AntiSpamSetting) .ThenInclude(x => x.IgnoredChannels) .ToList(); From 3364f110a47f3e78b7d77c13a690ba45c4f9a5e9 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sun, 2 Apr 2017 00:26:44 +0200 Subject: [PATCH 402/496] Startup commands will now run with 400ms delay between each other --- src/NadekoBot/Modules/Administration/Commands/SelfCommands.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/NadekoBot/Modules/Administration/Commands/SelfCommands.cs b/src/NadekoBot/Modules/Administration/Commands/SelfCommands.cs index 09924682..dcb36766 100644 --- a/src/NadekoBot/Modules/Administration/Commands/SelfCommands.cs +++ b/src/NadekoBot/Modules/Administration/Commands/SelfCommands.cs @@ -57,6 +57,7 @@ namespace NadekoBot.Modules.Administration } catch { } } + await Task.Delay(400).ConfigureAwait(false); } }); } From dfdfab44f7e28069944470c898544f3847c6813d Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sun, 2 Apr 2017 02:33:43 +0200 Subject: [PATCH 403/496] Woops, forgot to uncomment day check --- .../Modules/Utility/Commands/PatreonCommands.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs b/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs index e9b78014..303774f4 100644 --- a/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs +++ b/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs @@ -32,11 +32,11 @@ namespace NadekoBot.Modules.Utility { if (string.IsNullOrWhiteSpace(NadekoBot.Credentials.PatreonAccessToken)) return; - //if (DateTime.UtcNow.Day < 5) - //{ - // await ReplyErrorLocalized("clpa_too_early").ConfigureAwait(false); - // return; - //} + if (DateTime.UtcNow.Day < 5) + { + await ReplyErrorLocalized("clpa_too_early").ConfigureAwait(false); + return; + } int amount = 0; try { From e3a1d17d8e863eaa2fae1b9eac7a0984a37ba17a Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sun, 2 Apr 2017 12:45:35 +0200 Subject: [PATCH 404/496] $lb can't take negative page numbers anymore xD --- src/NadekoBot/Modules/Gambling/Gambling.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/NadekoBot/Modules/Gambling/Gambling.cs b/src/NadekoBot/Modules/Gambling/Gambling.cs index 760f8156..83db6048 100644 --- a/src/NadekoBot/Modules/Gambling/Gambling.cs +++ b/src/NadekoBot/Modules/Gambling/Gambling.cs @@ -246,6 +246,9 @@ namespace NadekoBot.Modules.Gambling [NadekoCommand, Usage, Description, Aliases] public async Task Leaderboard(int page = 1) { + if (page < 1) + return; + List richest; using (var uow = DbHandler.UnitOfWork()) { From 9afab5ad4c7afcb954b54bd30b9ae62f5bc4bb12 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Sun, 2 Apr 2017 18:26:27 +0200 Subject: [PATCH 405/496] Update ResponseStrings.en-US.resx (POEditor.com) --- .../Resources/ResponseStrings.en-US.resx | 126 +++++++++++++++++- 1 file changed, 125 insertions(+), 1 deletion(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.en-US.resx b/src/NadekoBot/Resources/ResponseStrings.en-US.resx index ccff686e..753f8135 100644 --- a/src/NadekoBot/Resources/ResponseStrings.en-US.resx +++ b/src/NadekoBot/Resources/ResponseStrings.en-US.resx @@ -740,7 +740,7 @@ Reason: {1} Slow mode initiated - soft-banned (kicked) + soft-banned PLURAL @@ -2278,5 +2278,129 @@ Owner ID: {2} Competitive playtime + + Channel + + + Command Text + + + Kicked + PLURAL + + + Moderator + + + page {0} + + + Reason + + + New startup command added. + + + Startup command successfully removed. + + + Startup command not found. + + + Server + + + No startup commands on this page. + + + Cleared all startup commands. + + + User {0} has been unbanned. + + + User not found. + + + User {0} has been warned. + + + User {0} has been warned and {1} punishment has been applied. + + + Warned on {0} server + + + On {0} at {1} by {2} + + + All warnings have been cleared for {0}. + + + No warning on this page. + + + Warnlog for {0} + + + No punishments set. + + + cleared by {0} + + + Warning punishment list + + + Having {0} warnings will no longer trigger a punishment. + + + I will apply {0} punishment to users with {1} warnings. + + + Slowmode will now ignore {0} role. + + + Slowmode will no longer ignore {0} role. + + + Slowmode will now ignore user {0}. + + + Slowmode will no longer ignore user {0}. + + + Failed claiming rewards due to one of the following reasons: + + + Maybe you've already received your reward for this month. You can receive rewards only once a month unless you increase your pledge. + + + Already rewarded + + + Your discord account might not be connected to Patreon. If you are unsure what that means, or don't know how to connect it - you have to go to [Patreon account settings page](https://patreon.com/settings/account) and click 'Connect to discord' button. + + + Discord account not connected + + + In order to be eligible for the reward, you must support the project on patreon. You can use {0} command to get the link. + + + Not supporting + + + You have to wait a few hours after making your pledge, if you didn't, try again later. + + + Wait some time + + + You've received {0} Thanks for supporting the project! + + + Rewards can be claimed on or after 5th of each month. + \ No newline at end of file From d256d520e4b12c5c89d83502d7f5e10b186d241e Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Sun, 2 Apr 2017 15:43:02 -0400 Subject: [PATCH 406/496] Add quote ID search --- .../Modules/Utility/Commands/QuoteCommands.cs | 48 ++++++++++++++++--- 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs b/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs index ea4bc674..37fdbf07 100644 --- a/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs +++ b/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs @@ -1,4 +1,4 @@ -using Discord; +using Discord; using Discord.Commands; using NadekoBot.Attributes; using NadekoBot.Extensions; @@ -100,7 +100,43 @@ namespace NadekoBot.Modules.Utility await Context.Channel.SendMessageAsync($"`#{keywordquote.Id}` 💬 " + keyword.ToLowerInvariant() + ": " + keywordquote.Text.SanitizeMentions()); } - + + [NadekoCommand, Usage, Description, Aliases] + [RequireContext(ContextType.Guild)] + public async Task QuoteId(int id) + { + if (id < 0 || id > Int32.MaxValue) + return; + + using (var uow = DbHandler.UnitOfWork()) + { + var qfromid = uow.Quotes.Get(id); + CREmbed crembed; + + if (qfromid == null) + { + await Context.Channel.SendErrorAsync(GetText("quotes_notfound")); + } + else if (CREmbed.TryParse(qfromid.Text, out crembed)) + { + try + { + await Context.Channel.EmbedAsync(crembed.ToEmbed(), crembed.PlainText ?? "") + .ConfigureAwait(false); + } + catch (Exception ex) + { + _log.Warn("Sending CREmbed failed"); + _log.Warn(ex); + } + return; + } + + else { await Context.Channel.SendMessageAsync($"`#{qfromid.Id}` 🗯️ " + qfromid.Keyword.ToLowerInvariant() + ": " + + qfromid.Text.SanitizeMentions()); } + } + } + [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] public async Task AddQuote(string keyword, [Remainder] string text) @@ -130,8 +166,8 @@ namespace NadekoBot.Modules.Utility public async Task DeleteQuote(int id) { var isAdmin = ((IGuildUser) Context.Message.Author).GuildPermissions.Administrator; - - var sucess = false; + + var success = false; string response; using (var uow = DbHandler.UnitOfWork()) { @@ -145,11 +181,11 @@ namespace NadekoBot.Modules.Utility { uow.Quotes.Remove(q); await uow.CompleteAsync().ConfigureAwait(false); - sucess = true; + success = true; response = GetText("quote_deleted", id); } } - if (sucess) + if (success) await Context.Channel.SendConfirmAsync(response); else await Context.Channel.SendErrorAsync(response); From 80c1c141b754fc5c3fa6f4e8a367e7e32b1abf42 Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Sun, 2 Apr 2017 15:44:15 -0400 Subject: [PATCH 407/496] Update CommandStrings.resx --- 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 f3662ef3..cbdfc5b3 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -1151,6 +1151,15 @@ `{0}qsearch keyword text` + + + quoteid qid + + + Displays the quote with the specified ID number. Quote ID numbers can be found by typing `.liqu [num]` where `[num]` is a number of a page which contains 15 quotes. + + + `{0}qid 123456` deletequote delq @@ -3339,4 +3348,4 @@ `{0}slowmodewl SomeRole` or `{0}slowmodewl AdminDude` - \ No newline at end of file + From 44e8939a5beefdcc289a0aede312340bb7288e4a Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Sun, 2 Apr 2017 15:46:30 -0400 Subject: [PATCH 408/496] 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 76dac5be..437ef468 100644 --- a/src/NadekoBot/Resources/CommandStrings.Designer.cs +++ b/src/NadekoBot/Resources/CommandStrings.Designer.cs @@ -5729,6 +5729,33 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar quoteid qid. + /// + public static string quoteid_cmd { + get { + return ResourceManager.GetString("quoteid_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Displays the quote with the specified ID number. Quote ID numbers can be found by typing `.liqu [num]` where `[num]` is a number of a page which contains 15 quotes.. + /// + public static string quoteid_desc { + get { + return ResourceManager.GetString("quoteid_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}qid 123456`. + /// + public static string quoteid_usage { + get { + return ResourceManager.GetString("quoteid_usage", resourceCulture); + } + } + /// /// Looks up a localized string similar to race. /// From 510a46698592605ffb8a2a7f65c98fa433a4a4e5 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sun, 2 Apr 2017 21:47:35 +0200 Subject: [PATCH 409/496] Aliased commands now do take extra parameters while aliased --- .../Resources/ResponseStrings.Designer.cs | 2 +- src/NadekoBot/Resources/ResponseStrings.resx | 2 +- src/NadekoBot/Services/CommandHandler.cs | 19 ++++++++++++++++--- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index e13d8513..ce51f8f4 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -6053,7 +6053,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Your discord account might not be connected to Patreon.. If you are unsure what that means, or don't know how to connect it - you have to go to [Patreon account settings page](https://patreon.com/settings/account) and click 'Connect to discord' button.. + /// Looks up a localized string similar to Your discord account might not be connected to Patreon. If you are unsure what that means, or don't know how to connect it - you have to go to [Patreon account settings page](https://patreon.com/settings/account) and click 'Connect to discord' button.. /// public static string utility_clpa_fail_conn { get { diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index 83d701f3..42a22f42 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -2379,7 +2379,7 @@ Owner ID: {2} Already rewarded - Your discord account might not be connected to Patreon.. If you are unsure what that means, or don't know how to connect it - you have to go to [Patreon account settings page](https://patreon.com/settings/account) and click 'Connect to discord' button. + Your discord account might not be connected to Patreon. If you are unsure what that means, or don't know how to connect it - you have to go to [Patreon account settings page](https://patreon.com/settings/account) and click 'Connect to discord' button. Discord account not connected diff --git a/src/NadekoBot/Services/CommandHandler.cs b/src/NadekoBot/Services/CommandHandler.cs index 31f30932..f47e45d5 100644 --- a/src/NadekoBot/Services/CommandHandler.cs +++ b/src/NadekoBot/Services/CommandHandler.cs @@ -342,10 +342,22 @@ namespace NadekoBot.Services ConcurrentDictionary maps; if (Modules.Utility.Utility.CommandMapCommands.AliasMaps.TryGetValue(guild.Id, out maps)) { - string newMessageContent; - if (maps.TryGetValue(messageContent.Trim().ToLowerInvariant(), out newMessageContent)) + + var keys = maps.Keys + .OrderByDescending(x => x.Length); + + var lowerMessageContent = messageContent.ToLowerInvariant(); + foreach (var k in keys) { - _log.Info(@"--Mapping Command-- + string newMessageContent; + if (lowerMessageContent.StartsWith(k + " ")) + newMessageContent = maps[k] + messageContent.Substring(k.Length, messageContent.Length - k.Length); + else if (lowerMessageContent == k) + newMessageContent = maps[k]; + else + continue; + + _log.Info(@"--Mapping Command-- GuildId: {0} Trigger: {1} Mapping: {2}", guild.Id, messageContent, newMessageContent); @@ -353,6 +365,7 @@ namespace NadekoBot.Services messageContent = newMessageContent; try { await usrMsg.Channel.SendConfirmAsync($"{oldMessageContent} => {newMessageContent}").ConfigureAwait(false); } catch { } + break; } } } From a4d78dfc0d45b49c798428521a4e358467030dc3 Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Sun, 2 Apr 2017 15:48:17 -0400 Subject: [PATCH 410/496] Update ResponseStrings.resx --- src/NadekoBot/Resources/ResponseStrings.resx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index 83d701f3..a8b2d0bb 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -2083,6 +2083,9 @@ Owner ID: {2} No quotes on this page. + + No quotes found matching the quote ID specified. + No quotes found which you can remove. @@ -2402,4 +2405,4 @@ Owner ID: {2} Rewards can be claimed on or after 5th of each month. - \ No newline at end of file + From 34b4884ec41186b52b6f4164e29f4c624b67c4b3 Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Sun, 2 Apr 2017 15:49:43 -0400 Subject: [PATCH 411/496] Update ResponseStrings.Designer.cs --- src/NadekoBot/Resources/ResponseStrings.Designer.cs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index e13d8513..1aa7c15e 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -6506,6 +6506,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to No quotes found matching the quote ID specified.. + /// + public static string utility_quotes_notfound { + get { + return ResourceManager.GetString("utility_quotes_notfound", resourceCulture); + } + } + /// /// Looks up a localized string similar to No quotes found which you can remove.. /// From 43d8f1997a1b95bd55fb9bca03ab7cc2e620a366 Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Sun, 2 Apr 2017 15:57:56 -0400 Subject: [PATCH 412/496] Update QuoteCommands.cs --- 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 37fdbf07..b8819255 100644 --- a/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs +++ b/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs @@ -105,7 +105,7 @@ namespace NadekoBot.Modules.Utility [RequireContext(ContextType.Guild)] public async Task QuoteId(int id) { - if (id < 0 || id > Int32.MaxValue) + if (id < 0) return; using (var uow = DbHandler.UnitOfWork()) From d0380b0cbfc2ce45b5f4b0dcc07e32e198b3603e Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 3 Apr 2017 12:43:59 +0200 Subject: [PATCH 413/496] .ping command added --- src/NadekoBot/Modules/Utility/Utility.cs | 12 ++++++++++++ src/NadekoBot/Resources/CommandStrings.resx | 9 +++++++++ 2 files changed, 21 insertions(+) diff --git a/src/NadekoBot/Modules/Utility/Utility.cs b/src/NadekoBot/Modules/Utility/Utility.cs index ee92b771..1ac77e73 100644 --- a/src/NadekoBot/Modules/Utility/Utility.cs +++ b/src/NadekoBot/Modules/Utility/Utility.cs @@ -16,6 +16,7 @@ using System.Collections.Generic; using Newtonsoft.Json; using Discord.WebSocket; using NadekoBot.Services; +using System.Diagnostics; namespace NadekoBot.Modules.Utility { @@ -494,5 +495,16 @@ namespace NadekoBot.Modules.Utility await Context.User.SendFileAsync( await JsonConvert.SerializeObject(grouping, Formatting.Indented).ToStream().ConfigureAwait(false), title, title).ConfigureAwait(false); } + [NadekoCommand, Usage, Description, Aliases] + [RequireContext(ContextType.Guild)] + public async Task Ping() + { + var sw = Stopwatch.StartNew(); + var msg = await Context.Channel.SendMessageAsync("🏓").ConfigureAwait(false); + sw.Stop(); + msg.DeleteAfter(0); + + await Context.Channel.SendConfirmAsync($"{Format.Bold(Context.User.ToString())} 🏓 {(int)sw.Elapsed.TotalMilliseconds}ms").ConfigureAwait(false); + } } } \ No newline at end of file diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx index f3662ef3..83d9659b 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -3330,6 +3330,15 @@ `{0}claimpatreonrewards` + + ping + + + Ping the bot to see if there are latency issues. + + + `{0}ping` + slowmodewl From 6817b1ba0746ab2a281710fd2fdfe45af358de9f Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 3 Apr 2017 14:30:31 +0200 Subject: [PATCH 414/496] .rar, .sr, .renr and .rr will now work only on roles lower than your highest role --- .../Modules/Administration/Administration.cs | 18 +++++++++++-- .../Resources/CommandStrings.Designer.cs | 27 +++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Modules/Administration/Administration.cs b/src/NadekoBot/Modules/Administration/Administration.cs index 905243ba..4eec4ebd 100644 --- a/src/NadekoBot/Modules/Administration/Administration.cs +++ b/src/NadekoBot/Modules/Administration/Administration.cs @@ -11,7 +11,6 @@ using Discord.WebSocket; using NadekoBot.Services.Database.Models; using static NadekoBot.Modules.Permissions.Permissions; using System.Collections.Concurrent; -using Microsoft.EntityFrameworkCore; using NLog; namespace NadekoBot.Modules.Administration @@ -99,6 +98,10 @@ namespace NadekoBot.Modules.Administration [RequireBotPermission(GuildPermission.ManageRoles)] public async Task Setrole(IGuildUser usr, [Remainder] IRole role) { + var guser = (IGuildUser)Context.User; + var maxRole = guser.GetRoles().Max(x => x.Position); + if (maxRole < role.Position || maxRole <= usr.GetRoles().Max(x => x.Position)) + return; try { await usr.AddRolesAsync(role).ConfigureAwait(false); @@ -118,6 +121,9 @@ namespace NadekoBot.Modules.Administration [RequireBotPermission(GuildPermission.ManageRoles)] public async Task Removerole(IGuildUser usr, [Remainder] IRole role) { + var guser = (IGuildUser)Context.User; + if (Context.User.Id != guser.Guild.OwnerId && guser.GetRoles().Max(x => x.Position) <= usr.GetRoles().Max(x => x.Position)) + return; try { await usr.RemoveRolesAsync(role).ConfigureAwait(false); @@ -135,6 +141,9 @@ namespace NadekoBot.Modules.Administration [RequireBotPermission(GuildPermission.ManageRoles)] public async Task RenameRole(IRole roleToEdit, string newname) { + var guser = (IGuildUser)Context.User; + if (Context.User.Id != guser.Guild.OwnerId && guser.GetRoles().Max(x => x.Position) <= roleToEdit.Position) + return; try { if (roleToEdit.Position > (await Context.Guild.GetCurrentUserAsync().ConfigureAwait(false)).GetRoles().Max(r => r.Position)) @@ -157,9 +166,14 @@ namespace NadekoBot.Modules.Administration [RequireBotPermission(GuildPermission.ManageRoles)] public async Task RemoveAllRoles([Remainder] IGuildUser user) { + var guser = (IGuildUser)Context.User; + + var userRoles = user.GetRoles(); + if (guser.Id != Context.Guild.OwnerId && (user.Id == Context.Guild.OwnerId || guser.GetRoles().Max(x => x.Position) <= userRoles.Max(x => x.Position))) + return; try { - await user.RemoveRolesAsync(user.GetRoles()).ConfigureAwait(false); + await user.RemoveRolesAsync(userRoles).ConfigureAwait(false); await ReplyConfirmLocalized("rar", Format.Bold(user.ToString())).ConfigureAwait(false); } catch diff --git a/src/NadekoBot/Resources/CommandStrings.Designer.cs b/src/NadekoBot/Resources/CommandStrings.Designer.cs index 76dac5be..865609b2 100644 --- a/src/NadekoBot/Resources/CommandStrings.Designer.cs +++ b/src/NadekoBot/Resources/CommandStrings.Designer.cs @@ -5378,6 +5378,33 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to ping. + /// + public static string ping_cmd { + get { + return ResourceManager.GetString("ping_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Ping the bot to see if there are latency issues.. + /// + public static string ping_desc { + get { + return ResourceManager.GetString("ping_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}ping`. + /// + public static string ping_usage { + get { + return ResourceManager.GetString("ping_usage", resourceCulture); + } + } + /// /// Looks up a localized string similar to place. /// From 3e1b5d7e572a064c2ea4712de868eb9f172fa40c Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 3 Apr 2017 23:18:18 +0200 Subject: [PATCH 415/496] some small fixes, .time added, closes #989 --- .../Modules/Administration/Administration.cs | 3 +- .../Commands/AutoAssignRoleCommands.cs | 6 +++ .../Commands/SelfAssignedRolesCommand.cs | 8 ++++ .../Searches/Commands/Models/TimeModels.cs | 42 +++++++++++++++++++ src/NadekoBot/Modules/Searches/Searches.cs | 21 ++++++++++ .../Resources/CommandStrings.Designer.cs | 29 ++++++++++++- src/NadekoBot/Resources/CommandStrings.resx | 13 +++++- .../Resources/ResponseStrings.Designer.cs | 20 ++++----- src/NadekoBot/Resources/ResponseStrings.resx | 9 ++-- src/NadekoBot/_Extensions/Extensions.cs | 2 +- 10 files changed, 134 insertions(+), 19 deletions(-) create mode 100644 src/NadekoBot/Modules/Searches/Commands/Models/TimeModels.cs diff --git a/src/NadekoBot/Modules/Administration/Administration.cs b/src/NadekoBot/Modules/Administration/Administration.cs index 4eec4ebd..6ecefe10 100644 --- a/src/NadekoBot/Modules/Administration/Administration.cs +++ b/src/NadekoBot/Modules/Administration/Administration.cs @@ -169,7 +169,8 @@ namespace NadekoBot.Modules.Administration var guser = (IGuildUser)Context.User; var userRoles = user.GetRoles(); - if (guser.Id != Context.Guild.OwnerId && (user.Id == Context.Guild.OwnerId || guser.GetRoles().Max(x => x.Position) <= userRoles.Max(x => x.Position))) + if (guser.Id != Context.Guild.OwnerId && + (user.Id == Context.Guild.OwnerId || guser.GetRoles().Max(x => x.Position) <= userRoles.Max(x => x.Position))) return; try { diff --git a/src/NadekoBot/Modules/Administration/Commands/AutoAssignRoleCommands.cs b/src/NadekoBot/Modules/Administration/Commands/AutoAssignRoleCommands.cs index 98a8844f..13a3422a 100644 --- a/src/NadekoBot/Modules/Administration/Commands/AutoAssignRoleCommands.cs +++ b/src/NadekoBot/Modules/Administration/Commands/AutoAssignRoleCommands.cs @@ -1,6 +1,7 @@ using Discord; using Discord.Commands; using NadekoBot.Attributes; +using NadekoBot.Extensions; using NadekoBot.Services; using NLog; using System; @@ -48,6 +49,11 @@ namespace NadekoBot.Modules.Administration [RequireUserPermission(GuildPermission.ManageRoles)] public async Task AutoAssignRole([Remainder] IRole role = null) { + var guser = (IGuildUser)Context.User; + if (role != null) + if (Context.User.Id != guser.Guild.OwnerId && guser.GetRoles().Max(x => x.Position) <= role.Position) + return; + using (var uow = DbHandler.UnitOfWork()) { var conf = uow.GuildConfigs.For(Context.Guild.Id, set => set); diff --git a/src/NadekoBot/Modules/Administration/Commands/SelfAssignedRolesCommand.cs b/src/NadekoBot/Modules/Administration/Commands/SelfAssignedRolesCommand.cs index 6ac60f21..e13a278f 100644 --- a/src/NadekoBot/Modules/Administration/Commands/SelfAssignedRolesCommand.cs +++ b/src/NadekoBot/Modules/Administration/Commands/SelfAssignedRolesCommand.cs @@ -43,6 +43,10 @@ namespace NadekoBot.Modules.Administration { IEnumerable roles; + var guser = (IGuildUser)Context.User; + if (Context.User.Id != guser.Guild.OwnerId && guser.GetRoles().Max(x => x.Position) <= role.Position) + return; + string msg; var error = false; using (var uow = DbHandler.UnitOfWork()) @@ -75,6 +79,10 @@ namespace NadekoBot.Modules.Administration [RequireUserPermission(GuildPermission.ManageRoles)] public async Task Rsar([Remainder] IRole role) { + var guser = (IGuildUser)Context.User; + if (Context.User.Id != guser.Guild.OwnerId && guser.GetRoles().Max(x => x.Position) <= role.Position) + return; + bool success; using (var uow = DbHandler.UnitOfWork()) { diff --git a/src/NadekoBot/Modules/Searches/Commands/Models/TimeModels.cs b/src/NadekoBot/Modules/Searches/Commands/Models/TimeModels.cs new file mode 100644 index 00000000..e997b78c --- /dev/null +++ b/src/NadekoBot/Modules/Searches/Commands/Models/TimeModels.cs @@ -0,0 +1,42 @@ +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace NadekoBot.Modules.Searches.Commands.Models +{ + public class TimeZoneResult + { + public double DstOffset { get; set; } + public double RawOffset { get; set; } + + //public string TimeZoneId { get; set; } + public string TimeZoneName { get; set; } + } + + public class GeolocationResult + { + + public class GeolocationModel + { + public class GeometryModel + { + public class LocationModel + { + public float Lat { get; set; } + public float Lng { get; set; } + } + + public LocationModel Location { get; set; } + } + + [JsonProperty("formatted_address")] + public string FormattedAddress { get; set; } + public GeometryModel Geometry { get; set; } + } + + public GeolocationModel[] results; + } +} diff --git a/src/NadekoBot/Modules/Searches/Searches.cs b/src/NadekoBot/Modules/Searches/Searches.cs index 472a17d5..3e6aa1bc 100644 --- a/src/NadekoBot/Modules/Searches/Searches.cs +++ b/src/NadekoBot/Modules/Searches/Searches.cs @@ -56,6 +56,27 @@ namespace NadekoBot.Modules.Searches await Context.Channel.EmbedAsync(embed).ConfigureAwait(false); } + [NadekoCommand, Usage, Description, Aliases] + public async Task Time([Remainder] string arg) + { + if (string.IsNullOrWhiteSpace(arg) || string.IsNullOrWhiteSpace(NadekoBot.Credentials.GoogleApiKey)) + return; + + using (var http = new HttpClient()) + { + var res = await http.GetStringAsync($"https://maps.googleapis.com/maps/api/geocode/json?address={arg}&key={NadekoBot.Credentials.GoogleApiKey}").ConfigureAwait(false); + var obj = JsonConvert.DeserializeObject(res); + + var currentSeconds = DateTime.UtcNow.UnixTimestamp(); + var timeRes = await http.GetStringAsync($"https://maps.googleapis.com/maps/api/timezone/json?location={obj.results[0].Geometry.Location.Lat},{obj.results[0].Geometry.Location.Lng}×tamp={currentSeconds}&key={NadekoBot.Credentials.GoogleApiKey}").ConfigureAwait(false); + var timeObj = JsonConvert.DeserializeObject(timeRes); + + var time = DateTime.UtcNow.AddSeconds(timeObj.DstOffset + timeObj.RawOffset); + + await ReplyConfirmLocalized("time", Format.Bold(obj.results[0].FormattedAddress), Format.Code(time.ToString("HH:mm")), timeObj.TimeZoneName).ConfigureAwait(false); + } + } + [NadekoCommand, Usage, Description, Aliases] public async Task Youtube([Remainder] string query = null) { diff --git a/src/NadekoBot/Resources/CommandStrings.Designer.cs b/src/NadekoBot/Resources/CommandStrings.Designer.cs index c3e4c03b..c8f3ed92 100644 --- a/src/NadekoBot/Resources/CommandStrings.Designer.cs +++ b/src/NadekoBot/Resources/CommandStrings.Designer.cs @@ -5757,7 +5757,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar quoteid qid. + /// Looks up a localized string similar to quoteid qid. /// public static string quoteid_cmd { get { @@ -8267,6 +8267,33 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to time. + /// + public static string time_cmd { + get { + return ResourceManager.GetString("time_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Shows the current time and timezone in the specified location.. + /// + public static string time_desc { + get { + return ResourceManager.GetString("time_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}time London, UK`. + /// + public static string time_usage { + get { + return ResourceManager.GetString("time_usage", resourceCulture); + } + } + /// /// Looks up a localized string similar to timezone. /// diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx index ec1f2125..1d5479ab 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -1152,7 +1152,7 @@ `{0}qsearch keyword text` - + quoteid qid @@ -3357,4 +3357,13 @@ `{0}slowmodewl SomeRole` or `{0}slowmodewl AdminDude` - + + time + + + Shows the current time and timezone in the specified location. + + + `{0}time London, UK` + + \ No newline at end of file diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index 9561c996..f4171166 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -5773,6 +5773,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Time in {0} is {1} - {2}. + /// + public static string searches_time { + get { + return ResourceManager.GetString("searches_time", resourceCulture); + } + } + /// /// Looks up a localized string similar to Title:. /// @@ -6498,7 +6507,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to No quotes on this page.. + /// Looks up a localized string similar to No quotes found matching the quote ID specified.. /// public static string utility_quotes_page_none { get { @@ -6506,15 +6515,6 @@ namespace NadekoBot.Resources { } } - /// - /// Looks up a localized string similar to No quotes found matching the quote ID specified.. - /// - public static string utility_quotes_notfound { - get { - return ResourceManager.GetString("utility_quotes_notfound", resourceCulture); - } - } - /// /// Looks up a localized string similar to No quotes found which you can remove.. /// diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index 31b11e93..2a1d1e7f 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -2082,10 +2082,7 @@ Owner ID: {2} Page {0} of quotes - No quotes on this page. - No quotes found matching the quote ID specified. - No quotes found which you can remove. @@ -2405,4 +2402,8 @@ Owner ID: {2} Rewards can be claimed on or after 5th of each month. - + + Time in {0} is {1} - {2} + Time in London, UK is 15:30 - Time Zone Name + + \ No newline at end of file diff --git a/src/NadekoBot/_Extensions/Extensions.cs b/src/NadekoBot/_Extensions/Extensions.cs index b880944c..52d8ab3a 100644 --- a/src/NadekoBot/_Extensions/Extensions.cs +++ b/src/NadekoBot/_Extensions/Extensions.cs @@ -193,7 +193,7 @@ namespace NadekoBot.Extensions public static string SanitizeMentions(this string str) => str.Replace("@everyone", "@everyοne").Replace("@here", "@һere"); - public static double UnixTimestamp(this DateTime dt) => dt.ToUniversalTime().Subtract(new DateTime(1970, 1, 1)).TotalSeconds; + public static double UnixTimestamp(this DateTime dt) => dt.ToUniversalTime().Subtract(new DateTime(1970, 1, 1, 0, 0, 0)).TotalSeconds; public static async Task SendMessageAsync(this IUser user, string message, bool isTTS = false) => await (await user.CreateDMChannelAsync().ConfigureAwait(false)).SendMessageAsync(message, isTTS).ConfigureAwait(false); From bbda4c7a3bb35e68330ab8da50e7277df906c87e Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 4 Apr 2017 01:50:27 +0200 Subject: [PATCH 416/496] disabling >cleverbot with permissions will also disable talking with chatterbot --- .../Games/Commands/CleverBotCommands.cs | 28 ++++++---- .../Modules/Permissions/Permissions.cs | 18 ++++++ src/NadekoBot/Services/CommandHandler.cs | 55 +++++++++---------- 3 files changed, 63 insertions(+), 38 deletions(-) diff --git a/src/NadekoBot/Modules/Games/Commands/CleverBotCommands.cs b/src/NadekoBot/Modules/Games/Commands/CleverBotCommands.cs index fd426be3..fcaecc98 100644 --- a/src/NadekoBot/Modules/Games/Commands/CleverBotCommands.cs +++ b/src/NadekoBot/Modules/Games/Commands/CleverBotCommands.cs @@ -40,16 +40,19 @@ namespace NadekoBot.Modules.Games _log.Debug($"Loaded in {sw.Elapsed.TotalSeconds:F2}s"); } - public static async Task TryAsk(IUserMessage msg) + public static string PrepareMessage(IUserMessage msg, out ChatterBotSession cleverbot) { var channel = msg.Channel as ITextChannel; + cleverbot = null; if (channel == null) - return false; + return null; - Lazy cleverbot; - if (!CleverbotGuilds.TryGetValue(channel.Guild.Id, out cleverbot)) - return false; + Lazy lazyCleverbot; + if (!CleverbotGuilds.TryGetValue(channel.Guild.Id, out lazyCleverbot)) + return null; + + cleverbot = lazyCleverbot.Value; var nadekoId = NadekoBot.Client.CurrentUser.Id; var normalMention = $"<@{nadekoId}> "; @@ -65,19 +68,24 @@ namespace NadekoBot.Modules.Games } else { - return false; + return null; } - await msg.Channel.TriggerTypingAsync().ConfigureAwait(false); + return message; + } - var response = await cleverbot.Value.Think(message).ConfigureAwait(false); + public static async Task TryAsk(ChatterBotSession cleverbot, ITextChannel channel, string message) + { + await channel.TriggerTypingAsync().ConfigureAwait(false); + + var response = await cleverbot.Think(message).ConfigureAwait(false); try { - await msg.Channel.SendConfirmAsync(response.SanitizeMentions()).ConfigureAwait(false); + await channel.SendConfirmAsync(response.SanitizeMentions()).ConfigureAwait(false); } catch { - await msg.Channel.SendConfirmAsync(response.SanitizeMentions()).ConfigureAwait(false); // try twice :\ + await channel.SendConfirmAsync(response.SanitizeMentions()).ConfigureAwait(false); // try twice :\ } return true; } diff --git a/src/NadekoBot/Modules/Permissions/Permissions.cs b/src/NadekoBot/Modules/Permissions/Permissions.cs index ec0e1016..a942fd7e 100644 --- a/src/NadekoBot/Modules/Permissions/Permissions.cs +++ b/src/NadekoBot/Modules/Permissions/Permissions.cs @@ -62,6 +62,24 @@ namespace NadekoBot.Modules.Permissions log.Debug($"Loaded in {sw.Elapsed.TotalSeconds:F2}s"); } + public static PermissionCache GetCache(ulong guildId) + { + PermissionCache pc; + if (!Permissions.Cache.TryGetValue(guildId, out pc)) + { + using (var uow = DbHandler.UnitOfWork()) + { + var config = uow.GuildConfigs.For(guildId, + set => set.Include(x => x.Permissions)); + Permissions.UpdateCache(config); + } + Permissions.Cache.TryGetValue(guildId, out pc); + if (pc == null) + throw new Exception("Cache is null."); + } + return pc; + } + private static void TryMigratePermissions() { var log = LogManager.GetCurrentClassLogger(); diff --git a/src/NadekoBot/Services/CommandHandler.cs b/src/NadekoBot/Services/CommandHandler.cs index f47e45d5..5c4fa19c 100644 --- a/src/NadekoBot/Services/CommandHandler.cs +++ b/src/NadekoBot/Services/CommandHandler.cs @@ -18,6 +18,7 @@ using System.Collections.Concurrent; using System.Threading; using Microsoft.EntityFrameworkCore; using NadekoBot.DataStructures; +using Services.CleverBotApi; namespace NadekoBot.Services { @@ -109,13 +110,33 @@ namespace NadekoBot.Services return Task.CompletedTask; } - private async Task TryRunCleverbot(IUserMessage usrMsg, IGuild guild) + private async Task TryRunCleverbot(IUserMessage usrMsg, SocketGuild guild) { if (guild == null) return false; try { - var cleverbotExecuted = await Games.CleverBotCommands.TryAsk(usrMsg).ConfigureAwait(false); + Games.ChatterBotSession cbs; + var message = Games.CleverBotCommands.PrepareMessage(usrMsg, out cbs); + if(message == null || cbs == null) + return false; + + PermissionCache pc = Permissions.GetCache(guild.Id); + int index; + if ( + !pc.Permissions.CheckPermissions(usrMsg, + NadekoBot.ModulePrefixes[typeof(Games).Name] + "cleverbot", + typeof(Games).Name, + out index)) + { + //todo print in guild actually + var returnMsg = + $"Permission number #{index + 1} **{pc.Permissions[index].GetCommand(guild)}** is preventing this action."; + _log.Info(returnMsg); + return true; + } + + var cleverbotExecuted = await Games.CleverBotCommands.TryAsk(cbs, (ITextChannel)usrMsg.Channel, message).ConfigureAwait(false); if (cleverbotExecuted) { _log.Info($@"CleverBot Executed @@ -278,6 +299,7 @@ namespace NadekoBot.Services return; var exec1 = Environment.TickCount - execTime; + var cleverBotRan = await Task.Run(() => TryRunCleverbot(usrMsg, guild)).ConfigureAwait(false); if (cleverBotRan) @@ -294,19 +316,8 @@ namespace NadekoBot.Services { if (guild != null) { - PermissionCache pc; - if (!Permissions.Cache.TryGetValue(guild.Id, out pc)) - { - using (var uow = DbHandler.UnitOfWork()) - { - var config = uow.GuildConfigs.For(guild.Id, - set => set.Include(x => x.Permissions)); - Permissions.UpdateCache(config); - } - Permissions.Cache.TryGetValue(guild.Id, out pc); - if (pc == null) - throw new Exception("Cache is null."); - } + PermissionCache pc = Permissions.GetCache(guild.Id); + int index; if ( !pc.Permissions.CheckPermissions(usrMsg, cr.Trigger, "ActualCustomReactions", @@ -457,21 +468,9 @@ namespace NadekoBot.Services var cmd = commands[i].Command; var resetCommand = cmd.Name == "resetperms"; var module = cmd.Module.GetTopLevelModule(); - PermissionCache pc; if (context.Guild != null) { - //todo move to permissions module? - if (!Permissions.Cache.TryGetValue(context.Guild.Id, out pc)) - { - using (var uow = DbHandler.UnitOfWork()) - { - var config = uow.GuildConfigs.GcWithPermissionsv2For(context.Guild.Id); - Permissions.UpdateCache(config); - } - Permissions.Cache.TryGetValue(context.Guild.Id, out pc); - if(pc == null) - throw new Exception("Cache is null."); - } + PermissionCache pc = Permissions.GetCache(context.Guild.Id); int index; if (!resetCommand && !pc.Permissions.CheckPermissions(context.Message, cmd.Aliases.First(), module.Name, out index)) { From af744cb3d74138bbe4128c2aba87127e74451693 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 4 Apr 2017 01:52:51 +0200 Subject: [PATCH 417/496] Removed old cleverbot stuff --- .../Games/Commands/CleverBotCommands.cs | 3 - .../Services/CleverBotApi/ChatterBot.cs | 25 --- .../CleverBotApi/ChatterBotFactory.cs | 51 ------ .../CleverBotApi/ChatterBotSession.cs | 28 ---- .../CleverBotApi/ChatterBotThought.cs | 26 --- .../Services/CleverBotApi/ChatterBotType.cs | 27 ---- .../Services/CleverBotApi/Cleverbot.cs | 116 -------------- .../Services/CleverBotApi/Pandorabots.cs | 68 -------- src/NadekoBot/Services/CleverBotApi/Utils.cs | 148 ------------------ src/NadekoBot/Services/CommandHandler.cs | 2 - 10 files changed, 494 deletions(-) delete mode 100644 src/NadekoBot/Services/CleverBotApi/ChatterBot.cs delete mode 100644 src/NadekoBot/Services/CleverBotApi/ChatterBotFactory.cs delete mode 100644 src/NadekoBot/Services/CleverBotApi/ChatterBotSession.cs delete mode 100644 src/NadekoBot/Services/CleverBotApi/ChatterBotThought.cs delete mode 100644 src/NadekoBot/Services/CleverBotApi/ChatterBotType.cs delete mode 100644 src/NadekoBot/Services/CleverBotApi/Cleverbot.cs delete mode 100644 src/NadekoBot/Services/CleverBotApi/Pandorabots.cs delete mode 100644 src/NadekoBot/Services/CleverBotApi/Utils.cs diff --git a/src/NadekoBot/Modules/Games/Commands/CleverBotCommands.cs b/src/NadekoBot/Modules/Games/Commands/CleverBotCommands.cs index fcaecc98..8abb47d5 100644 --- a/src/NadekoBot/Modules/Games/Commands/CleverBotCommands.cs +++ b/src/NadekoBot/Modules/Games/Commands/CleverBotCommands.cs @@ -1,11 +1,9 @@ using Discord; using Discord.Commands; -using Discord.WebSocket; using NadekoBot.Attributes; using NadekoBot.Extensions; using NadekoBot.Services; using NLog; -//using Services.CleverBotApi; using System; using System.Collections.Concurrent; using System.Diagnostics; @@ -13,7 +11,6 @@ using System.Linq; using System.Net.Http; using System.Threading.Tasks; using Newtonsoft.Json; -using Services.CleverBotApi; namespace NadekoBot.Modules.Games { diff --git a/src/NadekoBot/Services/CleverBotApi/ChatterBot.cs b/src/NadekoBot/Services/CleverBotApi/ChatterBot.cs deleted file mode 100644 index 746b44aa..00000000 --- a/src/NadekoBot/Services/CleverBotApi/ChatterBot.cs +++ /dev/null @@ -1,25 +0,0 @@ - /* - ChatterBotAPI - Copyright (C) 2011 pierredavidbelanger@gmail.com - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . -*/ - -namespace Services.CleverBotApi -{ - public interface ChatterBot - { - ChatterBotSession CreateSession(); - } -} \ No newline at end of file diff --git a/src/NadekoBot/Services/CleverBotApi/ChatterBotFactory.cs b/src/NadekoBot/Services/CleverBotApi/ChatterBotFactory.cs deleted file mode 100644 index e183c249..00000000 --- a/src/NadekoBot/Services/CleverBotApi/ChatterBotFactory.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System; - -/* - ChatterBotAPI - Copyright (C) 2011 pierredavidbelanger@gmail.com - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . -*/ - -namespace Services.CleverBotApi -{ - public class ChatterBotFactory - { - public static ChatterBot Create(ChatterBotType type) - { - return Create(type, null); - } - - public static ChatterBot Create(ChatterBotType type, object arg) - { -#if GLOBAL_NADEKO - var url = "http://www.cleverbot.com/webservicemin?uc=777&botapi=nadekobot"; -#else - var url = "http://www.cleverbot.com/webservicemin?uc=777&botapi=chatterbotapi"; -#endif - - switch (type) - { - case ChatterBotType.CLEVERBOT: - return new Cleverbot("http://www.cleverbot.com/", url, 26); - case ChatterBotType.JABBERWACKY: - return new Cleverbot("http://jabberwacky.com", "http://jabberwacky.com/webservicemin", 20); - case ChatterBotType.PANDORABOTS: - if (arg == null) throw new ArgumentException("PANDORABOTS needs a botid arg", nameof(arg)); - return new Pandorabots(arg.ToString()); - } - return null; - } - } -} \ No newline at end of file diff --git a/src/NadekoBot/Services/CleverBotApi/ChatterBotSession.cs b/src/NadekoBot/Services/CleverBotApi/ChatterBotSession.cs deleted file mode 100644 index 0f063571..00000000 --- a/src/NadekoBot/Services/CleverBotApi/ChatterBotSession.cs +++ /dev/null @@ -1,28 +0,0 @@ -/* - ChatterBotAPI - Copyright (C) 2011 pierredavidbelanger@gmail.com - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . -*/ - -using System.Threading.Tasks; - -namespace Services.CleverBotApi -{ - public interface ChatterBotSession - { - Task Think(ChatterBotThought thought); - Task Think(string text); - } -} \ No newline at end of file diff --git a/src/NadekoBot/Services/CleverBotApi/ChatterBotThought.cs b/src/NadekoBot/Services/CleverBotApi/ChatterBotThought.cs deleted file mode 100644 index 1a385642..00000000 --- a/src/NadekoBot/Services/CleverBotApi/ChatterBotThought.cs +++ /dev/null @@ -1,26 +0,0 @@ -/* - ChatterBotAPI - Copyright (C) 2011 pierredavidbelanger@gmail.com - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . -*/ - -namespace Services.CleverBotApi -{ - public class ChatterBotThought - { - public string[] Emotions { get; set; } - public string Text { get; set; } - } -} \ No newline at end of file diff --git a/src/NadekoBot/Services/CleverBotApi/ChatterBotType.cs b/src/NadekoBot/Services/CleverBotApi/ChatterBotType.cs deleted file mode 100644 index e4e8fab8..00000000 --- a/src/NadekoBot/Services/CleverBotApi/ChatterBotType.cs +++ /dev/null @@ -1,27 +0,0 @@ -/* - ChatterBotAPI - Copyright (C) 2011 pierredavidbelanger@gmail.com - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . -*/ - -namespace Services.CleverBotApi -{ - public enum ChatterBotType - { - CLEVERBOT, - JABBERWACKY, - PANDORABOTS - } -} \ No newline at end of file diff --git a/src/NadekoBot/Services/CleverBotApi/Cleverbot.cs b/src/NadekoBot/Services/CleverBotApi/Cleverbot.cs deleted file mode 100644 index 45109863..00000000 --- a/src/NadekoBot/Services/CleverBotApi/Cleverbot.cs +++ /dev/null @@ -1,116 +0,0 @@ -using System.Collections.Generic; -using System.Net; -using System.Threading.Tasks; - -/* - ChatterBotAPI - Copyright (C) 2011 pierredavidbelanger@gmail.com - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . -*/ - -namespace Services.CleverBotApi -{ - public class Cleverbot : ChatterBot - { - private readonly int endIndex; - private readonly string baseUrl; - private readonly string url; - - public Cleverbot(string baseUrl, string url, int endIndex) - { - this.baseUrl = baseUrl; - this.url = url; - this.endIndex = endIndex; - } - - public ChatterBotSession CreateSession() - { - return new CleverbotSession(baseUrl, url, endIndex); - } - } - - public class CleverbotSession : ChatterBotSession - { - private readonly int endIndex; - private readonly string url; - private readonly IDictionary vars; - private readonly CookieCollection cookies; - - public CleverbotSession(string baseUrl, string url, int endIndex) - { - this.url = url; - this.endIndex = endIndex; - vars = new Dictionary(); - //vars["start"] = "y"; - vars["stimulus"] = ""; - vars["islearning"] = "1"; - vars["icognoid"] = "wsf"; - //vars["fno"] = "0"; - //vars["sub"] = "Say"; - //vars["cleanslate"] = "false"; - cookies = Utils.GetCookies(baseUrl); - } - - public async Task Think(ChatterBotThought thought) - { - vars["stimulus"] = thought.Text; - - var formData = Utils.ParametersToWWWFormURLEncoded(vars); - var formDataToDigest = formData.Substring(9, endIndex); - var formDataDigest = Utils.MD5(formDataToDigest); - vars["icognocheck"] = formDataDigest; - - var response = await Utils.Post(url, vars, cookies).ConfigureAwait(false); - - var responseValues = response.Split('\r'); - - //vars[""] = Utils.StringAtIndex(responseValues, 0); ?? - vars["sessionid"] = Utils.StringAtIndex(responseValues, 1); - vars["logurl"] = Utils.StringAtIndex(responseValues, 2); - vars["vText8"] = Utils.StringAtIndex(responseValues, 3); - vars["vText7"] = Utils.StringAtIndex(responseValues, 4); - vars["vText6"] = Utils.StringAtIndex(responseValues, 5); - vars["vText5"] = Utils.StringAtIndex(responseValues, 6); - vars["vText4"] = Utils.StringAtIndex(responseValues, 7); - vars["vText3"] = Utils.StringAtIndex(responseValues, 8); - vars["vText2"] = Utils.StringAtIndex(responseValues, 9); - vars["prevref"] = Utils.StringAtIndex(responseValues, 10); - //vars[""] = Utils.StringAtIndex(responseValues, 11); ?? -// vars["emotionalhistory"] = Utils.StringAtIndex(responseValues, 12); -// vars["ttsLocMP3"] = Utils.StringAtIndex(responseValues, 13); -// vars["ttsLocTXT"] = Utils.StringAtIndex(responseValues, 14); -// vars["ttsLocTXT3"] = Utils.StringAtIndex(responseValues, 15); -// vars["ttsText"] = Utils.StringAtIndex(responseValues, 16); -// vars["lineRef"] = Utils.StringAtIndex(responseValues, 17); -// vars["lineURL"] = Utils.StringAtIndex(responseValues, 18); -// vars["linePOST"] = Utils.StringAtIndex(responseValues, 19); -// vars["lineChoices"] = Utils.StringAtIndex(responseValues, 20); -// vars["lineChoicesAbbrev"] = Utils.StringAtIndex(responseValues, 21); -// vars["typingData"] = Utils.StringAtIndex(responseValues, 22); -// vars["divert"] = Utils.StringAtIndex(responseValues, 23); - - var responseThought = new ChatterBotThought(); - - responseThought.Text = Utils.StringAtIndex(responseValues, 0); - - return responseThought; - } - - public async Task Think(string text) - { - return (await Think(new ChatterBotThought {Text = text}).ConfigureAwait(false)).Text; - } - } -} \ No newline at end of file diff --git a/src/NadekoBot/Services/CleverBotApi/Pandorabots.cs b/src/NadekoBot/Services/CleverBotApi/Pandorabots.cs deleted file mode 100644 index 0d1d8246..00000000 --- a/src/NadekoBot/Services/CleverBotApi/Pandorabots.cs +++ /dev/null @@ -1,68 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; - -/* - ChatterBotAPI - Copyright (C) 2011 pierredavidbelanger@gmail.com - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . -*/ - -namespace Services.CleverBotApi -{ - public class Pandorabots : ChatterBot - { - private readonly string botid; - - public Pandorabots(string botid) - { - this.botid = botid; - } - - public ChatterBotSession CreateSession() - { - return new PandorabotsSession(botid); - } - } - - public class PandorabotsSession : ChatterBotSession - { - private readonly IDictionary vars; - - public PandorabotsSession(string botid) - { - vars = new Dictionary(); - vars["botid"] = botid; - vars["custid"] = Guid.NewGuid().ToString(); - } - - public async Task Think(ChatterBotThought thought) - { - vars["input"] = thought.Text; - - var response = await Utils.Post("http://www.pandorabots.com/pandora/talk-xml", vars, null).ConfigureAwait(false); - - var responseThought = new ChatterBotThought(); - responseThought.Text = Utils.XPathSearch(response, "//result/that/text()"); - - return responseThought; - } - - public async Task Think(string text) - { - return (await Think(new ChatterBotThought {Text = text}).ConfigureAwait(false)).Text; - } - } -} \ No newline at end of file diff --git a/src/NadekoBot/Services/CleverBotApi/Utils.cs b/src/NadekoBot/Services/CleverBotApi/Utils.cs deleted file mode 100644 index 8954afc6..00000000 --- a/src/NadekoBot/Services/CleverBotApi/Utils.cs +++ /dev/null @@ -1,148 +0,0 @@ -using NadekoBot.Extensions; -using System; -using System.Collections.Generic; -using System.IO; -using System.Net; -using System.Net.Http; -using System.Text; -using System.Threading.Tasks; -using System.Xml.XPath; - -/* - ChatterBotAPI - Copyright (C) 2011 pierredavidbelanger@gmail.com - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . -*/ - -namespace Services.CleverBotApi -{ - public static class Utils - { - public static string ParametersToWWWFormURLEncoded(IDictionary parameters) - { - string wwwFormUrlEncoded = null; - foreach (var parameterKey in parameters.Keys) - { - var parameterValue = parameters[parameterKey]; - var parameter = string.Format("{0}={1}", System.Uri.EscapeDataString(parameterKey), System.Uri.EscapeDataString(parameterValue)); - if (wwwFormUrlEncoded == null) - { - wwwFormUrlEncoded = parameter; - } - else - { - wwwFormUrlEncoded = string.Format("{0}&{1}", wwwFormUrlEncoded, parameter); - } - } - return wwwFormUrlEncoded; - } - - public static string MD5(string input) - { - // step 1, calculate MD5 hash from input - var md5 = System.Security.Cryptography.MD5.Create(); - var inputBytes = Encoding.ASCII.GetBytes(input); - var hash = md5.ComputeHash(inputBytes); - - // step 2, convert byte array to hex string - var sb = new StringBuilder(); - for (var i = 0; i < hash.Length; i++) - { - sb.Append(hash[i].ToString("X2")); - } - return sb.ToString(); - - } - - public static CookieCollection GetCookies(string url) - { - CookieContainer container = new CookieContainer(); - - HttpResponseMessage res; - using (var handler = new HttpClientHandler() { CookieContainer = container }) - using (var http = new HttpClient(handler)) - { - http.AddFakeHeaders(); - http.DefaultRequestHeaders.Add("ContentType", "text/html"); - res = http.GetAsync(url).GetAwaiter().GetResult(); - } - var response = res.Content.ReadAsStringAsync().GetAwaiter().GetResult(); - - return container.GetCookies(res.RequestMessage.RequestUri); - } - - public static async Task Post(string url, IDictionary parameters, CookieCollection cookies) - { - var postData = ParametersToWWWFormURLEncoded(parameters); - var postDataBytes = Encoding.ASCII.GetBytes(postData); - - var request = (HttpWebRequest)WebRequest.Create(url); - - if (cookies != null) - { - var container = new CookieContainer(); - container.Add(new Uri(url), cookies); - request.CookieContainer = container; - } - - - request.Method = "POST"; - request.ContentType = "application/x-www-form-urlencoded"; - - using (var outputStream = await request.GetRequestStreamAsync()) - { - outputStream.Write(postDataBytes, 0, postDataBytes.Length); - outputStream.Flush(); - - var response = (HttpWebResponse)await request.GetResponseAsync(); - using (var responseStreamReader = new StreamReader(response.GetResponseStream())) - { - return responseStreamReader.ReadToEnd().Trim(); - } - } - - //HttpClientHandler handler; - //var uri = new Uri(url); - //if (cookies == null) - // handler = new HttpClientHandler(); - //else - //{ - // var cookieContainer = new CookieContainer(); - // cookieContainer.Add(uri, cookies); - // handler = new HttpClientHandler() { CookieContainer = cookieContainer }; - //} - //using (handler) - //using (var http = new HttpClient(handler)) - //{ - // var res = await http.PostAsync(url, new FormUrlEncodedContent(parameters)).ConfigureAwait(false); - // return await res.Content.ReadAsStringAsync().ConfigureAwait(false); - //} - } - - - public static string XPathSearch(string input, string expression) - { - var document = new XPathDocument(new MemoryStream(Encoding.ASCII.GetBytes(input))); - var navigator = document.CreateNavigator(); - return navigator.SelectSingleNode(expression).Value.Trim(); - } - - public static string StringAtIndex(string[] strings, int index) - { - if (index >= strings.Length) return ""; - return strings[index]; - } - } -} \ No newline at end of file diff --git a/src/NadekoBot/Services/CommandHandler.cs b/src/NadekoBot/Services/CommandHandler.cs index 5c4fa19c..8cd840e0 100644 --- a/src/NadekoBot/Services/CommandHandler.cs +++ b/src/NadekoBot/Services/CommandHandler.cs @@ -16,9 +16,7 @@ using NadekoBot.Modules.CustomReactions; using NadekoBot.Modules.Games; using System.Collections.Concurrent; using System.Threading; -using Microsoft.EntityFrameworkCore; using NadekoBot.DataStructures; -using Services.CleverBotApi; namespace NadekoBot.Services { From d07ec11fa371d327b1b1ca3a07d561a34bb7ae10 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 4 Apr 2017 15:51:19 +0200 Subject: [PATCH 418/496] Fixed .clparew usage string --- src/NadekoBot/Resources/CommandStrings.Designer.cs | 2 +- src/NadekoBot/Resources/CommandStrings.resx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Resources/CommandStrings.Designer.cs b/src/NadekoBot/Resources/CommandStrings.Designer.cs index c8f3ed92..d021e161 100644 --- a/src/NadekoBot/Resources/CommandStrings.Designer.cs +++ b/src/NadekoBot/Resources/CommandStrings.Designer.cs @@ -1725,7 +1725,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to `{0}claimpatreonrewards`. + /// Looks up a localized string similar to `{0}clparew`. /// public static string claimpatreonrewards_usage { get { diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx index 1d5479ab..1a943af1 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -3337,7 +3337,7 @@ Claim patreon rewards. If you're subscribed to bot owner's patreon you can user this command to claim your rewards - assuming bot owner did setup has their patreon key. - `{0}claimpatreonrewards` + `{0}clparew` ping From 349f76af851882048f4e971a302afd8da1b69236 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 4 Apr 2017 19:48:33 +0200 Subject: [PATCH 419/496] Fixed permission listing when user(s) in permissions left the server --- src/NadekoBot/Modules/Permissions/PermissionExtensions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Permissions/PermissionExtensions.cs b/src/NadekoBot/Modules/Permissions/PermissionExtensions.cs index db0fdfd6..f48dcd16 100644 --- a/src/NadekoBot/Modules/Permissions/PermissionExtensions.cs +++ b/src/NadekoBot/Modules/Permissions/PermissionExtensions.cs @@ -106,7 +106,7 @@ namespace NadekoBot.Modules.Permissions switch (perm.PrimaryTarget) { case PrimaryPermissionType.User: - com += guild?.GetUser(perm.PrimaryTargetId).ToString() ?? $"<@{perm.PrimaryTargetId}>"; + com += guild?.GetUser(perm.PrimaryTargetId)?.ToString() ?? $"<@{perm.PrimaryTargetId}>"; break; case PrimaryPermissionType.Channel: com += $"<#{perm.PrimaryTargetId}>"; From e3463e1e7066ad1c40ce2ed8e9dc0eb32d355a39 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 5 Apr 2017 12:19:05 +0200 Subject: [PATCH 420/496] Update ResponseStrings.zh-CN.resx (POEditor.com) --- .../Resources/ResponseStrings.zh-CN.resx | 127 +++++++++++++++++- 1 file changed, 126 insertions(+), 1 deletion(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.zh-CN.resx b/src/NadekoBot/Resources/ResponseStrings.zh-CN.resx index e756cf57..ae22319e 100644 --- a/src/NadekoBot/Resources/ResponseStrings.zh-CN.resx +++ b/src/NadekoBot/Resources/ResponseStrings.zh-CN.resx @@ -759,7 +759,8 @@ 软禁（踢出） - PLURAL + PLURAL +Fuzzy {0}将忽略此通道。 @@ -2383,5 +2384,129 @@ Fuzzy 竞争比赛游戏时间。 + + + + + + + + + PLURAL + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 8a860fe978766543bdba82be14900585fc4e51a2 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 5 Apr 2017 12:19:07 +0200 Subject: [PATCH 421/496] Update ResponseStrings.zh-TW.resx (POEditor.com) --- .../Resources/ResponseStrings.zh-TW.resx | 134 +++++++++++++++++- 1 file changed, 129 insertions(+), 5 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx b/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx index 7f3ca400..3af06d17 100644 --- a/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx +++ b/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx @@ -317,7 +317,7 @@ 原因：{1} - 用戶已封鎖 + 成員已封鎖 PLURAL @@ -530,7 +530,7 @@ {0} 已從 {1} 移動至 {2} - #{0} 中删除了讯息 + #{0} 中删除了訊息 #{0} 中更新了訊息 @@ -904,7 +904,7 @@ 花幣大放送開始了! - 送了 {1} 給 {0} + 送了 {0} 給 {1} X has gifted 15 flowers to Y @@ -933,7 +933,7 @@ 卡堆中没有更多的牌。 - 得獎用戶 + 得獎成員 您骰了 {0}。 @@ -1473,7 +1473,7 @@ Paypal <{1}> 我將在此頻道輸出播放、暫停、結束和移除歌曲的訊息。 - 跳至 ‘{0}:{1}’ + 跳至 `{0}:{1}` 隨機播放 @@ -2284,5 +2284,129 @@ Paypal <{1}> 競技時數 + + 頻道 + + + 指令 + + + 踢除 + PLURAL + + + 群管 + + + 第 {0} 頁 + + + 理由 + + + 已新增新的啟動執行命令。 + + + 啟動執行命令已移除。 + + + 找不到啟動執行命令。 + + + 伺服器 + + + 此頁沒有啟動執行命令。 + + + 已清除所有啟動執行命令。 + + + 成員 {0} 已解除封鎖。 + + + 找不到成員。 + + + 已警告成員 {0} 。 + + + 成員 {0} 因警告多次故以 {0} 作為懲罰。 + + + 在 {0} 伺服器上警告 + + + 於 {0} {1}，由 {2} + + + 已清除成員 {0} 上的所有警告。 + + + 此頁沒有警告。 + + + {0} 的警告紀錄 + + + 沒有設定懲處罰則。 + + + 由 {0} 清除 + + + 警告懲處清單 + + + 擁有 {0} 支警告不再觸發懲處。 + + + 我將會用 {0} 懲處擁有 {0} 支警告的成員。 + + + Slowmode 將不再套用於 {0} 身分組。 + + + Slowmode 將套用於 {0} 身分組。 + + + Slowmode 將不再套用於 {0} 成員。 + + + Slowmode 將套用於 {0} 成員。 + + + 因下列因素而無法領獎: + + + 您一個月只能領一次獎勵，除非您的贊助金額有提升。 + + + 獎勵已發送 + + + 您的Discord帳號可能未與Patreon帳戶連結。若您不確定，或不知道如何連結的話，請至您的[Patreon帳戶設定](https://patreon.com/settings/account)並點選'連節至Discord'按鈕。 + + + 尚未連接Discord帳號 + + + 您必須要與Patreon連結您的Discord帳戶才符合領獎資格。您可以使用 {0} 指令來取得連結。 + + + 無法支援 + + + 贊助完畢後需要等待數小時等資訊入系統，還請稍後再嘗試。 + + + 請稍等 + + + 您因贊助了此專案而獲得了{0}! + + + 獎勵可於每月5日之後領取。 + \ No newline at end of file From 494aae95a5dfe8af138d8a5aa1296e60a99cba74 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 5 Apr 2017 12:19:10 +0200 Subject: [PATCH 422/496] Update ResponseStrings.nl-NL.resx (POEditor.com) --- .../Resources/ResponseStrings.nl-NL.resx | 156 +++++++++++++++--- 1 file changed, 134 insertions(+), 22 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.nl-NL.resx b/src/NadekoBot/Resources/ResponseStrings.nl-NL.resx index 3f7ad541..2662c00a 100644 --- a/src/NadekoBot/Resources/ResponseStrings.nl-NL.resx +++ b/src/NadekoBot/Resources/ResponseStrings.nl-NL.resx @@ -140,7 +140,6 @@ De aanvraag van @{0} voor een oorlog tegen {1} is niet meer geldig. - Fuzzy Vijand @@ -153,11 +152,9 @@ Ongeldig oorlogsformaat. - Fuzzy - Lijst van voorlopende oorlogen. - Fuzzy + Lijst van actieve oorlogen Niet veroverd. @@ -169,8 +166,7 @@ @{0} Je doet niet mee aan die oorlog, of die basis is al vernietigd. - Geen voorlopende oorlogen. - Fuzzy + Geen actieve oorlogen Grootte. @@ -209,8 +205,7 @@ Nieuwe Speciale Reacties - Geen speciale reacties gevonden. - Fuzzy + Geen aangepaste reacties gevonden. Geen speciale reacties gevonden met dat ID. @@ -476,7 +471,6 @@ Reden: {1} Lijst van talen {0} - Fuzzy Je server's landinstelling is nu {0} - {1} @@ -533,12 +527,10 @@ Reden: {1} {0} verplaats van {1} naar {2} - Bericht in #{0} verwijdert - Fuzzy + Bericht in #{0} verwijderd Bericht in #{0} bijgewerkt - Fuzzy gemute @@ -749,7 +741,8 @@ Reden: {1} soft-verbannen (gekickt) - PLURAL + PLURAL +Fuzzy {0} zal dit kanaal negeren. @@ -1395,7 +1388,6 @@ Vergeet niet je discord naam en id in het bericht te zetten. Nu aan het spelen - Fuzzy Geen actieve muziek speler. @@ -1731,12 +1723,10 @@ Vergeet niet je discord naam en id in het bericht te zetten. Voorbeeld - Mislukt in het vinden van die chinese tekenfilm - Fuzzy + Kon die animu niet vinden. - Mislukt in het vinden van die - Fuzzy + Kon die mango niet vinden. Genres @@ -2012,8 +2002,7 @@ Vergeet niet je discord naam en id in het bericht te zetten. Index buiten bereik. - Hier is de lijst met gebruikers in die rollen: - Fuzzy + Lijst van gebruikers met rol {0} Om misbruik te voorkomen ben je niet gemachtigd om dit commando te gebruiken op rollen met veel gebruikers. @@ -2102,8 +2091,7 @@ Eigenaar ID: {2} Citaat toegevoegd - Een willekeurig citaat verwijderd - Fuzzy + Citaat #{0} verwijderd. Regio @@ -2293,5 +2281,129 @@ Eigenaar ID: {2} Competitieve speeltijd + + Kanaal + + + Tekst commando + + + Geschopt + PLURAL + + + Toezichthouder + + + Pagina {0} + + + Reden + + + Nieuw startup commando toegevoegd. + + + Startup commando succesvol toegevoegd. + + + Startup commando niet gevonden. + + + Server + + + Geen startup commando's op deze pagina. + + + Verwijder alle startup commando's. + + + Gebruiker {0} is unbanned. + + + Gebruiker niet gevonden. + + + Gebruiker {0} is gewaarschuwd. + + + Gebruiker {0} is gewaarschuwd en {1) straf is uitgevoerd. + + + Gewaarschuwd op {0} server + + + op {0} tussen {1} bij (2} + + + Alle waarschuwingen zijn verwijdert van {0}. + + + Geen waarschuwingen op deze pagina. + + + Waarschuwings logboek van {0} + + + Geen straffen geconfigureerd. + + + Verwijdert door {0} + + + waarschuwing straffen lijst + + + Bij {0} waarschuwingen treed niet langer meer een straf. + + + Ik pas {0} straf toe aan de gebruikers met {1} waarschuwingen. + + + Slowmotion modus word genegeerd voor {0} rol. + + + Slowmotion wordt niet langer genegeerd door {0} rol. + + + Slowmotion modus wordt genegeerd door gebruiker {0}. + + + Slowmotion modus wordt niet langer genegeerd door genegeerde gebruiker {0}. + + + Mislukt om beloningen te claimen door een van de volgende redenen: + + + Misschien heb je al je beloningen gekregen deze maand. Je krijgt beloningen maar een keer per maand tenzij je je + + + Al beloond + + + Jouw discord account is nog niet verbonden met Patreon. Als je onzeker bent wat dit betekend, of niet weet hoe je dit moet doen - ga dan naar [Patreon account settings page](https://patreon.com/settings/account) en click dan op 'Verbind met discord'. + + + Discord account nog niet verbonden + + + Om in aanmerking te komen voor de beloning, moet je eerst een donatie doen voor het project bij patreon. Je kunt (0} commando gebruiken om de link te krijgen. + + + Niet ondersteund + + + Je moet een aantal uren wachten na het plaatsen van je donatie, als je het nog niet hebt gedaan, probeer later dan opnieuw. + + + Wacht nog even + + + Je ontvangt {0} Hartelijk bedankt voor het steunen van het project! + + + Beloningen kunnen worden geclaimd op of na elke 5de van de maand. + \ No newline at end of file From 91880e6ca28dfd984985bea2b712287c11b075f8 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 5 Apr 2017 12:19:12 +0200 Subject: [PATCH 423/496] Update ResponseStrings.en-US.resx (POEditor.com) From 28753b6a22a614d47ed22e017533b25c66b9384e Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 5 Apr 2017 12:19:15 +0200 Subject: [PATCH 424/496] Update ResponseStrings.fr-FR.resx (POEditor.com) --- .../Resources/ResponseStrings.fr-FR.resx | 133 +++++++++++++++++- 1 file changed, 129 insertions(+), 4 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.fr-FR.resx b/src/NadekoBot/Resources/ResponseStrings.fr-FR.resx index 3c3279ff..c2ad5917 100644 --- a/src/NadekoBot/Resources/ResponseStrings.fr-FR.resx +++ b/src/NadekoBot/Resources/ResponseStrings.fr-FR.resx @@ -748,7 +748,8 @@ Raison: {1} expulsés (kick) - PLURAL + PLURAL +Fuzzy {0} ignorera ce Salon. @@ -757,7 +758,7 @@ Raison: {1} {0} n'ignorera plus ce Salon. - Si un utilisateur poste {0} le même message à la suite, je le {1}. + Si un utilisateur poste {0} fois le même message à la suite, je le {1}. __SalonsIgnorés__: {2} @@ -1432,7 +1433,7 @@ La nouvelle valeur de {0} est {1} ! Aucune liste de lecture ne correspond a cet ID. - File d'attente de la liste complétée. + Liste de lecture ajoutée à la file d'attente. Liste de lecture sauvegardée @@ -2291,7 +2292,7 @@ ID du propriétaire: {2} {0} sera maintenant l'alias de {1}. - Liste des alias. + Liste des alias {0} n'a plus d'alias. @@ -2302,5 +2303,129 @@ ID du propriétaire: {2} Temps en jeu compétitif. + + Salon + + + Texte de la commande. + + + Expulsés + PLURAL + + + Modérateur + + + Page {0} + + + Raison + + + Nouvelle commande au démarrage ajoutée + + + Commande au démarrage retirée. + + + Commande au démarrage introuvable. + + + Serveur + + + Aucune commande de démarrage sur cette page. + + + Toutes les commandes au démarrage ont été retirées. + + + L'utilisateur {0} a été débanni. + + + Utilisateur introuvable. + + + L'utilisateur {0} a été averti. + + + L'utilisateur {0} a été averti et {1} punition a été appliquée. + + + Averti sur le serveur {0} + + + Le {0} à {1} par {2} + + + Toutes les avertissements ont étés effacés pour {0}. + + + Pas d'avertissement sur cette page. + + + Log d'avertissement pour {0} + + + Pas de punition définie. + + + Effacé par {0} + + + Liste des avertissements de punitions. + + + Avoir {0} avertissements ne déclenche plus de punition. + + + J'appliquerai seulement la punition {0} aux utilisateurs ayant {1} avertissements. + + + Le mode lent ignorera le rôle {0}. + + + Le mode lent n'ignorera plus le rôle {0}. + + + Le mode lent ignorera l'utilisateur {0}. + + + Le mode lent n'ignorera plus l'utilisateur {0}. + + + Échec de la réclamation des récompenses à cause d'une des raisons suivantes: + + + Vous avez peut-être déjà reçu votre récompense mensuelle. Vous ne pouvez recevoir qu'une récompense mensuelle sauf si vous augmentez votre engagement. + + + Déjà récompensé. + + + Votre compte Discord n'est peut-être pas connecté à Patreon. Si vous n'êtes pas sur de ce que ça veut dire, ou ne savez pas comment le connecter, vous devez aller à la [Page de configurations du compte Patreon](https://patreon.com/settings/account) et cliquer sur 'Connect to discord'. + + + Le compte Discord n'est pas connecté + + + Pour être éligible à la récompense, vous devez supporter le projet sur Patreon. Vous pouvez utiliser la commande {0} afin d'avoir le lien. + + + Ne supporte pas. + + + Vous devez attendre quelques heures après avoir fait votre engagement, si ce n'est pas le cas, réessayez plus tard. + + + Attendez quelque temps + + + Vous avez reçu {0}. Merci de supporter le projet! + + + Les récompenses peuvent être réclamés le 5e du mois ou après. + \ No newline at end of file From 6114df7e12793d01e7197a7bbd0b5fbece9dbfd6 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 5 Apr 2017 12:19:18 +0200 Subject: [PATCH 425/496] Update ResponseStrings.de-DE.resx (POEditor.com) --- .../Resources/ResponseStrings.de-DE.resx | 129 +++++++++++++++++- 1 file changed, 128 insertions(+), 1 deletion(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.de-DE.resx b/src/NadekoBot/Resources/ResponseStrings.de-DE.resx index c568448d..81cde44a 100644 --- a/src/NadekoBot/Resources/ResponseStrings.de-DE.resx +++ b/src/NadekoBot/Resources/ResponseStrings.de-DE.resx @@ -760,7 +760,8 @@ Grund: {1} soft-banned (gekickt) - PLURAL + PLURAL +Fuzzy {0} wird diesen Kanal ignorieren. @@ -2387,5 +2388,131 @@ ID des Besitzers: {2} Kompetetive Spielzeit + + Kanal + + + Befehls Text + + + Kicked + PLURAL + + + Moderator + + + Seite {0} + + + Grund + + + Neuer Startbefehl hinzugefügt. + Fuzzy + + + Startbefehl wurde erfolgreich entfernt. + + + Startbefehl konnte nicht gefunden werden + + + Server + + + Keine Startbefehle auf dieser Seite + + + Alle Startbefehle wurden entfernt. + + + Benutzer {0} wurde entbannt. + + + Benutzer nicht gefunden. + + + Benutzer {0} wurde gewarnt. + + + Benutzer {0} wurde gewarnt und Strafe {1} wurde ausgeführt. + + + Gewarnt auf dem Server {0} + + + Am {0} um {1} von {2} + + + Alle Warnungen wurden bereinigt für {0}. + + + Keine Warnungen auf dieser Seite. + + + + + + Keine Bestrafungen gesetzt. + + + Bereinigt bei {0} + + + Warnungs Straf Liste + + + {0} Warnungen werden nicht mehr eine Bestrafung auslösen. + + + Ich werde die Bestrafung {0} an Benutzern mit {1} Warnungen ausführen. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Keine Unterstützung + + + Sie müssen ein paar Stunden warten nachdem sie ihre Unterstützung zusagenl, falls Sie das nicht getan haben, versuchen Sie es später erneut. + Fuzzy + + + + + + + + + + \ No newline at end of file From 3b446508c7cf81e05f45afdfef660978733c396c Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 5 Apr 2017 12:19:20 +0200 Subject: [PATCH 426/496] Update ResponseStrings.he-IL.resx (POEditor.com) --- .../Resources/ResponseStrings.he-IL.resx | 149 ++++++++++++++++-- 1 file changed, 137 insertions(+), 12 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.he-IL.resx b/src/NadekoBot/Resources/ResponseStrings.he-IL.resx index 7f42401e..cf49c09f 100644 --- a/src/NadekoBot/Resources/ResponseStrings.he-IL.resx +++ b/src/NadekoBot/Resources/ResponseStrings.he-IL.resx @@ -130,13 +130,13 @@ הבסיס #{0} **הושמד** במלחמה נגד {1} - + {0} **שיחרר** את בסיס #{0} במלחמה נגד {2} - + {0} תפס את בסיס #{1} במלחמה נגד {2} - + @{0} אתה כבר תפסת את בסיס #{1}. אינך יכול לתפוס אחד חדש @@ -214,7 +214,7 @@ תגובה - + נתוני תגובות מותאמות @@ -226,7 +226,7 @@ - + אוטוהנטאי הפסיק לא נמצאו תוצאות. @@ -299,10 +299,10 @@ את\ה התעלפת אז את\ה לא יכול לזוז. - + **נתינת תפקיד אוטומטי** כאשר משתמש מתווסף **הופסקה** כעת. - + **נתינת תפקיד אוטומטי** כאשר משתמש מתווסף **התחילה** כעת. קבצים מצורפים @@ -412,10 +412,10 @@ אני אפסיק להעביר את ההודאות הפרטיות מעכשיו. - + מחיקה אוטומטית של הודאות ברכה הופסקה. - + הודאות הודאה פרטית נוכחית: {0} @@ -442,10 +442,10 @@ - + הודאות ברכה בוטלו. - + הודאות ברכה הופעלו עבור ערוץ זה. אתה לא יכול להשתמש בפקודה זו על משתמשים עם תפקיד שווה או גבוהה ממך בדירוג. @@ -740,7 +740,8 @@ הסרה קלה (גורש) - PLURAL + PLURAL +Fuzzy {0} יתעלם מערוץ זה. @@ -2272,5 +2273,129 @@ + + + + + + + + + PLURAL + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From ce26d181607f97c94e80a9edf4f7b0b045a45241 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 5 Apr 2017 12:19:23 +0200 Subject: [PATCH 427/496] Update ResponseStrings.it-IT.resx (POEditor.com) --- .../Resources/ResponseStrings.it-IT.resx | 687 +++++++++++------- 1 file changed, 420 insertions(+), 267 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.it-IT.resx b/src/NadekoBot/Resources/ResponseStrings.it-IT.resx index 5a922057..5247c7a6 100644 --- a/src/NadekoBot/Resources/ResponseStrings.it-IT.resx +++ b/src/NadekoBot/Resources/ResponseStrings.it-IT.resx @@ -118,28 +118,28 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Quella base è già rivendicata o distrutta. + Quella base è già stata rivendicata o distrutta. Quella base è già distrutta. - Quella base non è rivendicata. + Quella base non è stata rivendicata. - **DISTRUTTO** base #{0} in una guerra contro {1} + **DISTRUTTA** base #{0} in una guerra contro {1} - {0} ha **NON RIVENDICATO** base #{1} in una guerra contro {2} + {0} ha **NON RIVENDICATO** la base #{1} in una guerra contro {2} {0} ha rivendicato la base #{1} in una guerra contro {2} - @{0} Hai già rivendicato la base #{1} + @{0} Hai già rivendicato la base #{1}. Non puoi rivendicarne un'altra. - La rivendicazione di @{0} in una guerra contro {1} + La rivendicazione di @{0} in una guerra contro {1} è scaduta. Nemico @@ -157,13 +157,13 @@ Lista delle guerre in corso - non rivendicato + non rivendicata - Non stai partecipando a questa guerra + Non stai partecipando a quella guerra - @{0} Tu non stai partecipando in questa guerra, o questa base è già distrutta. + @{0} Non stai partecipando in quella guerra oppure quella base è già distrutta. Nessuna guerra in corso. @@ -178,22 +178,22 @@ Guerra contro {0} creata. - Guerra contro {0} finita. + Guerra contro {0} conclusa. Questa guerra non esiste. - Guerra contro {0} iniziata! + Guerra contro {0} avviata! - Tutte le reazioni personalizzate approvate. + Tutte le reazioni personalizzate sono state approvate. Reazione personalizzata cancellata - Permessi insufficienti. Richiede l'essere proprietario del bot per le reazioni personalizzate globali, e l'amministratore del server per le reazioni personalizzate. + Permessi insufficienti. Bisogna essere proprietario del Bot per personalizzare le reazioni globali e l'amministratore del server per le personalizzare le reazioni del server. Lista di tutte le reazioni personalizzate @@ -232,39 +232,39 @@ Nessun risultato trovato. - {0} è già svenuto. + {0} è già esausto. {0} ha già gli HP al massimo. - il tuo tipo è già {0} + Il tuo tipo è già {0} - Ha usato {0}{1} su {2}{3} per {4} danni. + ha usato {0}{1} su {2}{3} per {4} danni. Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage. - Non puoi attaccare senza ritorsione! + Non puoi attaccare di nuovo senza subire una rappresaglia! Fuzzy Non puoi attaccare te stesso. - {0} è svenuto! + {0} è esausto! - curato {0} con un {1} + ha curato {0} con un {1} - {0} ha {1} HP rimasto + {0} ha {1} HP rimasti. Non puoi usare {0}. Scrivi `{1}ml` per vedere la lista delle mosse che puoi usare. - Listamosse per tipo {0} + Lista delle mosse per il tipo {0} Non è efficace. @@ -273,22 +273,22 @@ Non hai abbastanza {0} - Hai resuscitato {0} con un {1} + ha resuscitato {0} con un {1} Hai resuscitato te stesso con un {0} - Il tuo tipo è stato cambiato in {0} per un {1} + Il tuo tipo è cambiato in {0} per un {1} - E' lievemente efficace. + È lievemente efficace. - E' superefficace! + È superefficace! - Hai usato troppe mosse in una volta, non puoi muoverti! + Hai usato troppe mosse di fila, quindi ora non puoi muoverti! Tipo di {0} è {1} @@ -300,20 +300,20 @@ Sei svenuto, non sei più in grado di muoverti! - **Auto assegna ruolo** sull'utente ora entrato è ora **disattivato** + **Assegna ruolo automaticamente** ai nuovi utenti è stato **disattivato**. - **Auto assegna ruolo** sull'utente ora entrato è ora **attivato** + **Assegna ruolo automaticamente** ai nuovi utenti è stato **attivato**. Allegato - Avatar Cambiato + Avatar cambiato Sei stato bannato dal {0} server. -Ragione: {1} +Motivo: {1} bannati @@ -323,13 +323,13 @@ Ragione: {1} Utente bannato - Nome bot cambiato in {0} + Nome del bot cambiato in {0} Stato del bot cambiato in {0} - L'eliminazione automatica dei messaggi di arrivederci è stata disabilitata. + la cancellazione automatica dei messaggi di arrivederci è stata disabilitata. I messaggi di arrivederci verranno eliminati dopo {0} secondi. @@ -347,13 +347,13 @@ Ragione: {1} Annunci di arrivederci disattivati. - Annunci di arrivederci attivati in questo canale + Annunci di arrivederci attivati in questo canale. Nome del canale cambiato - Vecchio Nome + Vecchio nome Argomento del canale cambiato @@ -377,7 +377,7 @@ Ragione: {1} Assordato con successo. - Server Eliminato {0} + Server eliminato {0} Fermata con successo l'eliminazione automatica dei comandi di invocazione. @@ -392,25 +392,25 @@ Ragione: {1} Canale vocale {0} eliminato. - MP da + Messaggio diretto da parte di - Aggiunto con successo un nuovo donatore. Totale ammontare donato da questo utente: {0} 👑 + Aggiunto con successo un nuovo donatore. Totale dell'ammonto donato dall'utente: {0} 👑 - Grazie alle persone nella lista qui sotto per aver fatto avverare questo progetto! + Grazie alle persone nella lista qui sotto per aver fatto di questo progetto una realtà! - Inoltrerò MP a tutti i proprietari. + Contatterò in privato tutti i proprietari. - Inoltrerò MP solo al primo proprietario. + Contatterò in privato solo il primo proprietario. - Inoltrerò MP da ora in poi. + Inoltrerò messaggi diretti d'ora in avanti. - Fermerò l'inoltrare degli MP da ora in poi. + Smetterò di inoltrare messaggi diretti d'ora in avanti. L'eliminazione automatica dei messaggi di benvenuto è stata disabilitata @@ -419,43 +419,43 @@ Ragione: {1} I messaggi di benvenuto verranno eliminati dopo {0} secondi. - Attuali MP di benvenuto ricevuti: {0} + Messaggi diretti di benvenuto ricevuti finora: {0} - Abilità MP di benvenuto scrivendoli {0} + Per abilitare i messaggi diretti di benvenuto scrivi {0} - Nuovo MP di bevenuto impostato. + Nuovo messaggio diretto di benvenuto impostato. - MP annunci di bevenenuto disattivato. + Messaggi diretti di benvenuto disabilitati. - MP annunci di bevenuto attivati. + Messaggi diretti di benvenuto abilitati. - + Messaggio di benvenuto attuale: {0} - + Per abilitare i messaggi di benvenuto scrivi {0} Nuovo messaggio di benvenuto impostato. - Annunci di bevenuto disabilitati + Messaggi di benvenuto disabilitati. - Annunci di benvenuto abilitatati in questo canale + Messaggi di benvenuto abilitatati in questo canale. - Non puoi usare questo comando su utenti con un ruolo più alto o uguale al tuo nella gerarchia dei ruoli. + Non puoi usare questo comando su utenti con un ruolo superiore o pari al tuo. Immagine caricata dopo {0} secondi! - + Formato di input invalido. Parametri Invalidi @@ -471,28 +471,28 @@ Ragione: {1} Utente cacciato - Lista dei linguaggi + Lista delle lingue - + La lingua del tuo server è ora {0} - {1} - + La lingua di base del bot è ora {0} - {1} - il linguaggio dei Bot è impostato a {0} - {1} + La lingua del Bot è impostata a {0} - {1} - + Impostazione della lingua del server fallita. Riguarda la guida di questo comando. - Il linguaggio di questo server è impostato a {0} - {1} + La lingua di questo server è impostata a {0} - {1} {0} ha lasciato {1} - Hai lasciato il server {0} + Ha lasciato il server {0} Inserire {0} evento in questo canale. @@ -504,7 +504,7 @@ Fuzzy Fuzzy - Entrata disattivata + Registrazione disattivata Fuzzy @@ -512,42 +512,45 @@ Fuzzy Fuzzy - + La registrazione ignorerá {0} + Fuzzy - + La registrazione non ignorerá {0} + Fuzzy - + Fermata la registrazione dell'evento {0} + Fuzzy {0} ha chiesto una menzione nei seguenti ruoli - Messaggio da {0} `[Proprietario Bot]`: + Messaggio da {0} `[Proprietario del bot]`: Messaggio inviato. - {0} spostato in {1} da {2} + {0} spostato da {1} a {2} Messaggio eliminato in #{0} - + Messaggio aggiornato in #{0} - Gli utenti sono stati mutati + Mutati PLURAL (users have been muted) - Utente mutato + Mutato singular "User muted." - Probabilmente non ho i permessi necessari per questo + Probabilmente non ho i permessi necessari per farlo. Nuovo ruolo di muto impostato. @@ -568,10 +571,10 @@ Fuzzy Soprannome cambiato - Non riesco a trovare questo server + Non riesco a trovare quel server - + Non è stato trovato nessun frammento con quel ID. Messaggio precedente @@ -583,10 +586,10 @@ Fuzzy Discussione precedente - Errore. Probabilmente non ho i permessi sufficienti. + Errore. Probabilmente non dispongo dei permessi necessari. - I permessi per questo server sono resettati + I permessi di questo server sono stati reimpostati. Protezioni attive @@ -598,7 +601,7 @@ Fuzzy {0} Attivato - Errore. Hai bisogno dei permessi di gestione dei ruoli + Errore. Ho bisogno dei permessi di gestione dei ruoli Nessuna protezione attiva. @@ -607,55 +610,57 @@ Fuzzy Gli utenti in ingresso devono essere tra {0} e {1}. - Se {0} o più utenti entrano entro {1} secondi, io li {0} loro. + Se {0} o più utenti entrano entro {1} secondi, li {0}. Il tempo deve essere tra {0} e {1} secondi. - Rimossi con successo tutti i ruoli dall'utente {0} + L'utente {0} è stato sollevato da tutti i suoi ruoli. - Fallito a rimuovere i ruoli. Non ho abbastanza permessi. + Impossibile rimuovere i ruoli. Non dispongo dei permessi necessari. - il colore di {0} è stato cambiato. + il colore del ruolo {0} è stato cambiato. - Questo ruolo non esiste. + Quel ruolo non esiste. - I parametri specificati sono invalidi + I parametri specificati sono invalidi. Si è verificato un errore dovuto a un colore invalido o a permessi insufficienti. - Rimosso con successo ruolo {0} dall'utente {1} + L'utente {1} è stato sollevato dal ruolo di {0} - Fallito a rimuovere ruolo. Non ho abbastanza permessi. + Impossibile rimuovere il ruolo. Non dispongo dei permessi necessari. - Ruolo rinominato + Ruolo rinominato. - Rinomina del ruolo fallita. Non ho abbastanza permessi. + Impossibile rinominare il ruolo. Non dispongo dei permessi necessari. - Non puoi modificare i ruoli più alti del tuo + Non puoi modificare i ruoli più alti del tuo. Rimosso il messaggio di gioco: {0} + Fuzzy - Ruolo {0} è stato aggiunto alla lista. + Il ruolo {0} è stato aggiunto alla lista. - {0} non trovato.Ripulito. + {0} non trovato. Pulizia avvenuta. + Fuzzy - il ruolo {0} è già nella lista + il ruolo {0} è già nella lista. Aggiunto. @@ -667,7 +672,7 @@ Fuzzy Stato di gioco rotativo attivato. - Qui c'è una lista delle condizioni di ruolo rotative: + Ecco una lista delle condizioni di ruolo rotative: {0} Fuzzy @@ -676,10 +681,11 @@ Fuzzy Fuzzy - Tu hai già {0} ruolo + Sei già un {0}. - Tu hai già {0} esclusivi ruoli auto-assegnati. + Hai già {0} esclusivi ruoli auto-assegnati. + Fuzzy I ruoli auto-assegnati sono ora riservati! @@ -691,31 +697,31 @@ Fuzzy Quel ruolo non è auto-assegnabile. - Tu non hai {0} ruolo. + Non sei un {0}. I ruoli auto-assegnati ora non sono più riservati! - Io non sono in grado di assegnarti questo ruolo. `Io non posso assegnare ruoli al proprietario o ad altri ruoli più alti del mio nella gerarchia dei ruoli.` + Non sono in grado di assegnarti quel ruolo. `Non posso assegnare ruoli al proprietario o ad altri utenti con un ruolo superiore al mio.` {0} è stato rimosso dalla lista dei ruoli auto-assegnabili. - Tu non hai più {0} ruolo. + Se non più un {0}. - Tu ora hai {0} ruolo. + Ora sei un {0}. - Aggiunto con successo ruolo {0} all'utente {1} + All'utente {1} è stato assegnato con successo il ruolo di {0}. - Fallito ad aggiungere il ruolo. Non ho i permessi sufficienti. + Impossibile assegnare ruolo. Non dispongo dei permessi necessari. - Nuova immagine impostata! + Nuovo avatar impostato! Nuovo nome del canale impostato. @@ -730,10 +736,12 @@ Fuzzy Nuova discussione del canale impostata. - + Frammento {0} ricollegato. + Fuzzy - + Frammento {0} si sta ricollegando. + Fuzzy Spegnimento @@ -743,13 +751,16 @@ Fuzzy Modalità lenta disattivata + Fuzzy Modalità lenta attivata + Fuzzy Ammonizione (Espulso) - PLURAL + PLURAL +Fuzzy {0} ignorerà questo canale. @@ -808,7 +819,7 @@ __Canaliignorati__: {2} Ruolo utente rimosso - {0} è ora {1} + {0} ora é {1} {0} è stato **smutato** dal canale di testo e vocale. @@ -841,13 +852,13 @@ __Canaliignorati__: {2} Voce + testo abilitati. - + Non ho i permessi **gestire ruoli* e/o **gestire canali*, quindi non posso utilizzare `voce+testo` sul server {0}. - + Stai attivando/disattivando questa opzione e **Io non ho i permessi di AMMINISTRATORE**. Questo potrebbe causare dei problemi, e dopo tu dovrai ripulire il canale di testo. - + Richiedo dei permessi **gestire ruoli** e **gestire canali** per abilitare per questa funzione. (preferibilmente il permesso Amministratore) Utente {0} dalla chat di testo @@ -859,7 +870,8 @@ __Canaliignorati__: {2} Utente {0} dalla chat vocale - + Sei statto cacciato da {0} server. +Motivo : {1} Utente sbannato @@ -896,7 +908,7 @@ __Canaliignorati__: {2} Indovinato! Hai vinto {0} - + Numero specificato non valido. Puoi lanciare da 1 a {0} monete. Aggiungi {0} a questo messaggio per ottenere {1} @@ -905,7 +917,8 @@ __Canaliignorati__: {2} Quest'evento è attivo per le prossime {0} ore - + Evento reazioni iniziato! + Fuzzy ha regalato {0} a {1} @@ -919,7 +932,7 @@ __Canaliignorati__: {2} Testa - + Classifica @@ -937,7 +950,7 @@ __Canaliignorati__: {2} Non ci sono più carte nel mazzo. - + Utente sorteggiato Hai rollato {0} @@ -965,10 +978,10 @@ __Canaliignorati__: {2} Dura {1} secondi. Non dirlo a nessuno. Shhh. - + L'evento SneakyGame è finito. {0} utenti hanno ricevuto la loro ricompensa. - + L'evento SneakyGameStatus è iniziato Croce @@ -978,28 +991,28 @@ Dura {1} secondi. Non dirlo a nessuno. Shhh. Fuzzy - + non sono stata in grado di prendere {0} da{1} perché l'utente non aveva abbastanza {2}! - + Torna al sommario Solo il proprietario del bot. - + Richiede il permesso del canale {0}. Puoi supportare il progetto sul patreon: <{0}> o paypal: <{0}> - + Comandi e alias - + Lista dei comandi rigenerata. - + Scrivi `{0}h NomeDelComando` per consultare la guida per il comando specificato. Ad esempio: `{0}h >8ball` Non riesco a trovare questo comando. Perfavore verifica che questo comando esiste prima di riprovare. @@ -1026,19 +1039,19 @@ Non dimenticarti di firmare con il tuo nome o id di discord. Lista dei moduli - + Scrivi `{0}cmds NomeModulo` per vedere la lista di tutti i comandi in quel modulo. Ad esempio: `{0}cmds giochi` Modulo inesistente. - + Richiede il permesso {0} del server. Tabella dei contenuti - + Uso Autohentai avviato. Ogni {0} secondi verrà postato qualcosa coi seguenti tag: @@ -1048,7 +1061,7 @@ Non dimenticarti di firmare con il tuo nome o id di discord. Tag - + Gara degli animali Impossibile iniziare perché non ci sono abbastanza partecipanti. @@ -1063,8 +1076,7 @@ Non dimenticarti di firmare con il tuo nome o id di discord. {0} è entrato come {1} e ha scommesso {2}! - Scrivi {0}eg per entrare nella gara. - Fuzzy + Scrivi {0}jr per partecipare alla gara. Inizia tra 20 secondi o quando la stanza è piena. @@ -1076,11 +1088,10 @@ Non dimenticarti di firmare con il tuo nome o id di discord. {0} come {1} Ha vinto la gara! - {0} come {2} Ha vinto la gara e {2}! + {0} come {1} Ha vinto la gara e {2}! Numero specificato invalido. Puoi tirare {0}-{1} dadi alla volta. - Fuzzy Ha rollato {0} @@ -1088,9 +1099,8 @@ Non dimenticarti di firmare con il tuo nome o id di discord. Fuzzy - Dado rollato: {0} - Dice Rolled: 5 -Fuzzy + Dadi tirati: {0} + Dice Rolled: 5 Fallito a iniziare la gara. Un'altra gara è probabilmente in corso. @@ -1123,7 +1133,7 @@ Fuzzy Classifica delle waifu - + La tua affinità è già stabilita a quella waifu oppure stai cercando di rimuovere la tua affinità mentre non ne hai una. ha cambiato la sua affinità da {0} a {1}. @@ -1244,17 +1254,17 @@ il nuovo valore di {0} è {1}! Cleverbot è stato abilitato in questo server. - + La generazione di valuta è stata disabilitata in questo canale. - + La generazione di valuta è stata abilitata in questo canale. - + {0} un {1} casuale è apparso! plural - + Un {0} è apparso! Impossibile caricare una domanda. @@ -1270,10 +1280,9 @@ il nuovo valore di {0} è {1}! Impossibile iniziare il gioco dell'impiccato. - Fuzzy - + Lista dei tipi di parole dell' "{0}impiccato": Classifica @@ -1332,7 +1341,9 @@ il nuovo valore di {0} è {1}! {0} ha vinto! - + Tris + The mean of ''matched three'' is that someone won at tic tac toe? +Fuzzy Nessuna mossa rimanente! @@ -1341,13 +1352,13 @@ il nuovo valore di {0} è {1}! Tempo scaduto! - + Tocca a {0} {0} vs {1} - + Cercando di mettere in coda {0} canzoni... Autoplay disabilitato. @@ -1359,19 +1370,20 @@ il nuovo valore di {0} è {1}! Volume di default impostato a {0}% - + Coda della directory completata. + Fuzzy - + gioco corretto Canzone finita - + Gioco corretto disabilitato. - + Gioco corretto abilitato. Dalla posizione @@ -1383,19 +1395,19 @@ il nuovo valore di {0} è {1}! Input non valido - + Il tempo massimo di gioco ora non ha più un limite. - + Il tempo massimo di gioco è stato impostato a {0} secondi. - + La coda massima della musica è stata impostata a illimitata - + La coda massima della musica è stata impostata a {0} brani. - + Bisogna essere in un canale vocale in questo server Nome @@ -1404,16 +1416,16 @@ il nuovo valore di {0} è {1}! In riproduzione - + Nessuna musica in riproduzione. Nessun risultato trovato. - + Riproduzione della musica messa in pausa. - + Coda degli utenti - Pagina {0}/{1} Canzone iniziata @@ -1422,7 +1434,7 @@ il nuovo valore di {0} è {1}! - + Pagina {0} della playlist salvata Playlist cancellata. @@ -1440,7 +1452,7 @@ il nuovo valore di {0} è {1}! Playlist salvata - + limite di {0} secondi Coda @@ -1449,41 +1461,41 @@ il nuovo valore di {0} è {1}! Canzone in coda - + Coda della musica ripulita - + La coda é piena a {0}/{0} Canzone rimossa context: "removed song #5" - + Ripetendo la canzone corrente - + Ripetendo la playlist Traccia ripetuta - + Riproduzione del brano attuale fermata. - + Riproduzione della musica ricominciata. - + Ripeti playlist disabilitato. - + Ripeti playlist abilitato. - + Ora mostrerò i brani in ascolto, finiti, messi in pausa e rimossi in questo canale. - + Saltato a '{0}:{1}' Canzoni mischiate @@ -1534,16 +1546,16 @@ il nuovo valore di {0} è {1}! L'utente {0} può usare TUTTI I MODULI. - + Aggiunto {0} con ID {1} alla lista nera - + Il comando {0} ha adesso {1} secondi di ricarica. - + Il comando {0} non ha più il tempo di ricarica e tutti i tempi di ricarica esistenti sono stati cancellati. - + Nessuna ricarica dei comandi stabilita. Costo dei comandi @@ -1570,22 +1582,22 @@ il nuovo valore di {0} è {1}! Parametro dei secondi non valido.(Deve essere un numero tra {0} e {1}) - + Filtro degli inviti disabilitato in questo canale. - + Filtro degli inviti abilitato su questo canale - + Filtro degli inviti disabilitato su questo canale - + Filtro degli inviti abilitato su questo server - + Spostato il permesso {0} da #{1} a #{2} - + Impossibile trovare il permesso nell'elenco #{0} Nessun costo impostato. @@ -1608,56 +1620,56 @@ il nuovo valore di {0} è {1}! Gli utenti ora devono avere il ruolo di {0} per modificare i permessi. - + Nessun permesso trovato in quell'elenco. - + rimosso il permesso #{0} - {1} - + Disabilitato l'uso di {0} {1} per il ruolo {2}. - + Abilitato l'uso di {0} {1} per il ruolo {2}. - + sec. Short of seconds. - + Disabilitato l'utilizzo di {0} {1} in questo server - + Abilitato l'utilizzo di {0} {1} in questo server - + Rimosso dalla lista nera {0} con l'ID {1} - + non modificabile - + Disabilitato l'uso di {0} {1} per l'utente {2}. - + Abilitato l'uso di {0} {1} per l'utente {2}. - + Non mostreró piú avvisi sui permessi - + Ora mostreró gli avvisi sui permessi. - + Filtro delle parole disabilitato in questo canale. - + Filtro delle parole abilitato in questo canale. - + Filtro delle parole disabilitato in questo server. - + Filtro delle parole abilitato in questo server. Abilità @@ -1672,8 +1684,7 @@ il nuovo valore di {0} è {1}! La tua traduzione automatica dei messaggi è stata rimossa. - La tua auto-traduzione linguaggio è stato impostata a {0}>{0} - Fuzzy + La tua traduzione automatica del linguaggio è stata impostata a {0}>{0} Avviata traduzione automatica dei messaggi in questo canale. @@ -1695,7 +1706,7 @@ il nuovo valore di {0} è {1}! Capitoli - + Fumetto # Competitive perse @@ -1704,7 +1715,7 @@ il nuovo valore di {0} è {1}! Competitive giocate - Rango delle competitive + Rango competitivo Fuzzy @@ -1753,7 +1764,8 @@ il nuovo valore di {0} è {1}! Altezza/Peso - + {0}m/{1}kg + Fuzzy Umidità @@ -1771,14 +1783,13 @@ il nuovo valore di {0} è {1}! Scherzo non caricato. - Latitudine/Lunghezza - Fuzzy + Latitudine/Longitudine Livello - + Lista delle tag {0}place Don't translate {0}place @@ -1788,10 +1799,10 @@ il nuovo valore di {0} è {1}! Oggetto magico non caricato. - + Profilo MAL di {0} - + Il possessore del bot non ha specificato MashapeApiKey, Non puoi usare questa funzione. Minimo/Massimo @@ -1803,23 +1814,23 @@ il nuovo valore di {0} è {1}! Nessun risultato trovato. - + In sospeso Url originale - Fuzzy - + Una chiave API di Osu! é richiesta. - + Recupero della firma di Osu! fallito. + Fuzzy - + Trovate oltre {0} immagini. Piazzandone casualmente {0} - + Utente non trovato! Perfavore controlla la regione e il Battletag prima di riprovare. In programma da guardare @@ -1840,10 +1851,10 @@ il nuovo valore di {0} è {1}! Qualità: - + Gioco veloce - + Vittoria veloce Voto @@ -1885,7 +1896,7 @@ il nuovo valore di {0} è {1}! Non stai seguendo nessuno streaming in questo server. - + Nessun tale stream Questo streaming probabilmente non esiste. @@ -1919,7 +1930,7 @@ il nuovo valore di {0} è {1}! Tipi - + Nessuna definizione trovata per la parola. Url @@ -1932,10 +1943,11 @@ il nuovo valore di {0} è {1}! Fuzzy - + Non sono riuscita a trovare quel termine nella wikia specificata. - + Inserisca una wikia, seguita dalla richiesta di ricerca. + Fuzzy Pagina non trovata. @@ -1947,10 +1959,10 @@ il nuovo valore di {0} è {1}! I campioni più bannati di {0} - + Non sono riuscita a yodificare la tua frase. - + Entrato @@ -1958,7 +1970,7 @@ il nuovo valore di {0} è {1}! `1.` - + Pagina attivitá #{0} {0} utenti in totale. @@ -1970,31 +1982,31 @@ il nuovo valore di {0} è {1}! ID del bot - + Lista di funzioni nel comando {0}calc - + {0} di questo canale è {1} Canale di discussione - + Comandi eseguiti - + {0} {1} è uguale a {2} {3} - + Unità che possono essere usate dal convertitore - + Non posso convertire {0} a {1}: unità non trovate. - + Impossibile convertire {0} in {1}: i tipi di unitá sono diversi - + Creato a @@ -2003,7 +2015,8 @@ il nuovo valore di {0} è {1}! - + Questo é il tuo token CSC + Fuzzy Emoji personalizzati @@ -2019,16 +2032,16 @@ il nuovo valore di {0} è {1}! ID - + Indice fuori dall'intervallo consentito. - + Lista degli utenti con il ruolo {0} - + Non sei autorizzato a usare questo comando con un ruolo comune per prevenirne l'abuso. - + Valore {0} invalido. Invalid months value/ Invalid hours value @@ -2043,10 +2056,10 @@ Membri: {1} ID del proprietario: {2} - + Nessun server trovato su quella pagina. - + Lista dei ripetitori Membri @@ -2076,7 +2089,7 @@ ID del proprietario: {2} Nessun ruolo in questa pagina. - + Nessun frammento in questa pagina. Nessun argomento impostato. @@ -2120,16 +2133,16 @@ ID del proprietario: {2} Registrato il - + Ricorderò {0} a {1} il {2} `({3:d.M.yyyy.} alle {4:HH:mm})` - + Formato data non valido. Controlla la lista dei comandi. - + Nuovo modello di promemoria stabilito. - + Ripetendo {0} ogni {1} giorno(s), {2} ore(s) e {3} minuti(s). Lista dei ripetitori @@ -2151,10 +2164,10 @@ ID del proprietario: {2} Ruoli - + Pagina #{0} di tutti i ruoli in questo server: - + Pagina #{0} dei ruoli di {1} Nessun colore è nel formato giusto. Usa `#00ff00` per esempio. @@ -2167,40 +2180,42 @@ ID del proprietario: {2} Fermata la rotazione dei colori per il {0} ruolo - + {0} di questo server è {1} Info del server - + Frammento - + Statistiche della Shard + Fuzzy - + **Nome:** {0} **Link:** {1} - + Nessuna emoji speciale trovata. - + Avviando {0} canzoni, {1} in coda. Canali di testo - + Qui c'è il link della tua stanza: - + Tempo di funzionamento + Fuzzy - + {0} di questo utente {1} è {2} Id of the user kwoth#1234 is 123123123123 @@ -2213,19 +2228,20 @@ ID del proprietario: {2} Sei già entrato in gara! - + Risultati del sondaggio corrente - + Nessun voto - + C'è già un sondaggio in corso in questo server. - + 📃 {0} ha creato un sondaggio che richiede la tua attenzione: - + '{0}. '{1} con {2} voti. + Fuzzy {0} ha votato. @@ -2244,10 +2260,10 @@ ID del proprietario: {2} {0} voti in totale. - + Prendili scrivendo `{0}prendi` - + Prendilo scrivendo `{0}prendi` Nessun utente trovato. @@ -2262,46 +2278,183 @@ ID del proprietario: {2} Non ci sono ruoli nei canali vocali. - + {0} è stato **mutato* dal canale di testo e vocale per {1} minuti. - + Gli utenti che entrano {0} canale vocale avranno {1} come ruolo. - + Gli utenti che entrano {0} canale vocale non avranno più un ruolo. - + Ruoli del canale vocale - + I messaggi che innescano la reazione personalizzata con id {0} non saranno automaticamente eliminati. - + I messaggi che innescano la reazione personalizzata con id {0} saranno automaticamente eliminati. - + Il messaggio di risposta per la reazione personalizzata con l'id {0} non sarà inviato come MP. - + I messaggi di risposta per la reazione personalizzata id {0} saranno ora mandati come MP. Nessun alias trovato - + Scrivere {0} sarà ora un alias di {1}. - + Lista degli alias - + Innescato {0} non ha più un Alias. + Fuzzy - + Innescato {0} non ha un alias. + Fuzzy - + Tempo di gioco competitivo + + + Canale + + + Testo del comando + + + Espulso + PLURAL + + + Moderatore + + + pagina {0} + + + Ragione + + + Nuovo comando all'avvio aggiunto. + Fuzzy + + + Comando all'avvio rimosso con successo. + Fuzzy + + + Comando all'avvio non trovato. + Fuzzy + + + Server + + + Nessun comando di avvio in questa pagina + Fuzzy + + + Ripuliti tutti i comandi all'avvio. + Fuzzy + + + All'utente {0} é stato rimosso il ban. + + + Utente non trovato. + + + L'utente {0} é stato avvisato. + + + L'utente {0} é stato avvisato e {1} punizioni sono state applicate. + + + Avvisato nel server {0} + + + Il {0} alle {1} da {2} + + + Tutti gli avvisi sono stati cancellati per {0}. + + + Nessun avviso in questa pagina. + + + Lista degli avvisi per {0} + + + Nessuna punizione stabilita. + + + ripulito da {0} + + + Lista degli avvisi. + + + Avere {0} avvisi non porterá piú a una punizione. + + + Applicheró la punizione {0} agli utenti con {1} avvisi. + + + La modalitá lenta ignorerá il ruolo {0}. + Fuzzy + + + La modalitá lenta non ignorerá piú il ruolo {0}. + Fuzzy + + + La modalitá lenta ignorerá l'utente {0}. + Fuzzy + + + La modalitá lenta non ignorerá piú l'utente {0}. + Fuzzy + + + Errore nella richiesta dei premi per le seguenti ragioni: + + + Magari hai giá ricevuto il tuo premio per questo mese, Puoi ricevere premi solo una volta al mese sempre se non aumenti la tua donazione mensile. + + + Giá premiato + + + Il tuo account discord potrebbe non essere connesso con Patreon. Se non sai cosa significa, o non sai come connetterlo - bisogna andare su [la pagina delle impostazioni dell'account Patreon] (https://patreon.com/settings/account) e cliccare su 'Connetti a discord' + + + L'account discord non é connesso + + + Per essere consono a ricevere premi, devi supportare il progetto su patreon. Puoi usare il comando {0} per ricevere il link. + + + Non sta donando + Fuzzy + + + Devi aspettae un po' di ore dopo aver fatto la tua donazione, se non lo hai fatto, prova di nuovo piú tardi + Fuzzy + + + Aspetta un po' di tempo + + + Hai ricevuto {0} ringraziamenti per il supporto del progetto! + + + I premi possono essere richiesti dal 5 di ogni mese \ No newline at end of file From 7fa355af7058583102af5a182c8c7a7a806ff6cd Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 5 Apr 2017 12:19:26 +0200 Subject: [PATCH 428/496] Update ResponseStrings.ja-JP.resx (POEditor.com) --- .../Resources/ResponseStrings.ja-JP.resx | 267 +++++++++++++----- 1 file changed, 204 insertions(+), 63 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.ja-JP.resx b/src/NadekoBot/Resources/ResponseStrings.ja-JP.resx index 6e52fbe0..2b33b3f1 100644 --- a/src/NadekoBot/Resources/ResponseStrings.ja-JP.resx +++ b/src/NadekoBot/Resources/ResponseStrings.ja-JP.resx @@ -905,7 +905,8 @@ Fuzzy ソフトバン（キック） - PLURAL + PLURAL +Fuzzy {0}はこのチャンネルを無視します。 @@ -1388,97 +1389,113 @@ Paypal <{1}> {0}の新しい値は{1}です！ - + waifuは安いです。実際の値がより低い場合でも、waifuを取得するには少なくとも{0}を支払う必要があります。 - + あなたはwaifuを主張するために{0}以上支払う必要があります！ + - + そのwaifuはあなたのものではありません。 + - + あなたは自分自身を主張することはできません。 + - + あなたは最近離婚した。もう離婚するには{0}時間と{1}分待つ必要があります。 + - + 誰も + - + あなたはあなたを好きではない妖精と離婚しました。あなたは{0}戻ってきました。 + エイトボール - + Acrophobia + - + ゲームは提出なしで終了しました。 - + 投票は行われません。ゲームは勝者なしで終了しました。 + - + 頭字語は{0}でした。 - + Acrophobiaゲームは既にこのチャンネルで実行されています。 + - + ゲームが始まった。次の頭文字で{0}の文章を作成します。 - + 投稿には{0}秒かかります。 + - + {0}はその文を提出しました。 （{1}合計） + 数字を入力して投票 - + {0}は投票をしました！ + - + 勝者は{1}点で{0}です。 + - + {0}は投稿した唯一のユーザーであるための勝者です！ 質問 - + それはドローです！どちらも{0} - + {0}が勝った！ {1}が{2}を打つ - + 投稿が閉じられました + - + 動物レースはすでに実行中です。 + - + 合計：{0}平均：{1} + カテゴリー - + このサーバーではCleverbotは使えません。 このサーバーではCleverbotが有効です。 - + このチャンネルでは現在の世代は使えなくなりました。 - + このチャンネルでは現在の世代は使えるようになりました。 @@ -1506,16 +1523,16 @@ Paypal <{1}> - + リーダーボード - + 十分な {0} を持っていません。 - + 結果はありません。 - + {0} をひろった。 Kwoth picked 5* @@ -1523,10 +1540,10 @@ Paypal <{1}> Kwoth planted 5* - + Trivia gameはすでにこのサーバーで動いています。 - + Trivia game @@ -1535,22 +1552,22 @@ Paypal <{1}> - + {0} は {1} ポイント持っています。 - + この質問のあと停止します。 - + 時間切れです。正解は {0} です。 - + あなた自身とはゲームできません。 - + TicTacToe ゲームはすでにこのサーバで動いています。 引き分け @@ -1562,7 +1579,7 @@ Paypal <{1}> {0} の勝ち！ - + 三回戦 @@ -1577,7 +1594,7 @@ Paypal <{1}> - + キューに {0} 曲を適用しています。 オートプレイは無効です。 @@ -1592,26 +1609,26 @@ Paypal <{1}> ディレクトリのキューが完了しました。 - + フェアプレイ 曲が終わった Fuzzy - + フェアプレイは無効です。 - + フェアプレイは有効です。 - + ポジションから - + ID - + 不適切な入力。 最大再生時間は制限ありません。 @@ -1688,56 +1705,56 @@ Paypal <{1}> キュー( {0}/{0} ) はいっぱいです。 - + 削除された曲 context: "removed song #5" - + 繰り返し現在の曲 - + 繰り返しプレイリスト - + 繰り返しトラック - + 現在のトラックの繰り返しを中止しました。 - + 曲の再生を再開しました。 - + プレイリストの繰り返しは無効です。 - + プレイリストの繰り返しは有効です。 - + このチャンネルでは、再生、終了、一時停止、曲の削除ができます。 - + スキップしました。 {0}:{1} - + シャッフルした曲 - + 削除した曲 - + {0}時 {1}分 {2}秒 - + 位置に - + 無制限 - + 音量は0から100の間でなければなりません。 - + 音量を {0}% にセット @@ -2527,5 +2544,129 @@ Paypal <{1}> + + + + + + + + + PLURAL + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From eb4c3c68e7b208177e33fa27faf88a0ea0045fd1 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 5 Apr 2017 12:19:28 +0200 Subject: [PATCH 429/496] Update ResponseStrings.ko-KR.resx (POEditor.com) --- .../Resources/ResponseStrings.ko-KR.resx | 855 ++++++++++-------- 1 file changed, 498 insertions(+), 357 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.ko-KR.resx b/src/NadekoBot/Resources/ResponseStrings.ko-KR.resx index 223b9397..239484e4 100644 --- a/src/NadekoBot/Resources/ResponseStrings.ko-KR.resx +++ b/src/NadekoBot/Resources/ResponseStrings.ko-KR.resx @@ -119,7 +119,6 @@ 기지가 이미 요청되었거나 파괴되었습니다. - Fuzzy 기지가 이미 파괴되었습니다. @@ -129,11 +128,9 @@ {1} 와의 전쟁에서 #{0} 번 기지가 **파괴**되었습니다. - Fuzzy {2} 와의 전쟁에서 {0} 가 #{1} 번 기지를 **요청**하지 못했습니다. - Fuzzy {2} 와의 전쟁에서 #{1} 번 기지를 {0} 가 요청하였습니다. @@ -143,11 +140,9 @@ {1} 와의 전쟁에서 @{0} 의 요청이 만료되었습니다. - Fuzzy 적 - Fuzzy {0} 와의 전쟁에 대한 정보 @@ -175,7 +170,6 @@ 크기 - Fuzzy {0} 에 대한 전쟁이 이미 시작되었습니다. @@ -205,7 +199,7 @@ 모든 커스텀 리액션 목록 - 커스텀 리액션 + 커스텀 리액션 목록 새로운 커스텀 리액션 @@ -339,23 +333,23 @@ Fuzzy 봇의 상태가 {0} 으로 변경되었습니다. - 퇴장 메세지의 자동삭제가 비활성화되었습니다. + 퇴장 메시지의 자동삭제가 비활성화되었습니다. Fuzzy - 퇴장 메세지는 앞으로 {0} 초 후에 삭제됩니다. + 퇴장 메시지는 앞으로 {0} 초 후에 삭제됩니다. Fuzzy - 현재 퇴장 메세지: {0} + 현재 퇴장 메시지: {0} Fuzzy - 퇴장 메세지를 활성화하기 위해서는 {0} 를 입력하십시오. + 퇴장 메시지를 활성화하기 위해서는 {0} 를 입력하십시오. Fuzzy - 새로운 퇴장 메세지가 설정되었습니다. + 새로운 퇴장 메시지가 설정되었습니다. Fuzzy @@ -369,7 +363,6 @@ Fuzzy 이전 이름 - Fuzzy 채널의 주제가 변경되었습니다. @@ -379,7 +372,6 @@ Fuzzy 내용 - Fuzzy {0} 역할을 성공적으로 생성하였습니다. @@ -410,11 +402,11 @@ Fuzzy 음성 채널 {0} 를 삭제했습니다. - 개인 메세지 + 개인 메시지 Fuzzy - 성공적으로 새로운 기부자를 추가했습니다. 이 유저의 총 기부량은 {0} 입니다. + 성공적으로 새로운 기부자를 추가했습니다. 이 유저의 총 기부량은 {0} 👑 입니다. 이 프로젝트를 위해 수고해주신 아래의 사람들에게 감사드립니다! @@ -432,19 +424,19 @@ Fuzzy 지금부터 DM 전달을 중단하겠습니다. - 환영 메세지에 대한 자동삭제가 비활성화되었습니다. + 환영 메시지에 대한 자동삭제가 비활성화되었습니다. - 환영 메세지는 {0} 초 후에 삭제될 것입니다. + 환영 메시지는 {0} 초 후에 삭제될 것입니다. - 현재 DM 환영 메세지: {0} + 현재 DM 환영 메시지: {0} - {0} 을(를) 입력하여서 DM 환영 메세지를 활성화시킵니다. + {0} 을(를) 입력하여서 DM 환영 메시지를 활성화시킵니다. - 새로운 DM 환영 메세지가 설정되었습니다. + 새로운 DM 환영 메시지가 설정되었습니다. DM 환영 알림이 비활성화되었습니다. @@ -454,13 +446,13 @@ Fuzzy DM 환영 알림 활성화 되었습니다. - 현재 환영 메세지: {0} + 현재 환영 메시지: {0} - {0} 를 입력하여서 환영 메세지를 활성화시킵니다. + {0} 를 입력하여서 환영 메시지를 활성화시킵니다. - 새로운 환영 메세지가 설정되었습니다. + 새로운 환영 메시지가 설정되었습니다. 환영 알림이 비활성화되었습니다. @@ -541,20 +533,20 @@ Fuzzy {0} 이(가) 다음 역할에 대한 언급을 요청했습니다. - {0} `[봇의 소유자]` 로부터 메세지: + {0} `[봇의 소유자]` 로부터 메시지: Fuzzy - 메세지가 전송되었습니다. + 메시지가 전송되었습니다. {0} 이(가) {1} 에서 {2} 로 이동했습니다. - #{0} 에서 메세지가 삭제되었습니다. + #{0} 에서 메시지가 삭제되었습니다. - #{0} 에서 메세지가 업데이트되었습니다. + #{0} 에서 메시지가 업데이트되었습니다. 음소거 @@ -576,7 +568,7 @@ Fuzzy 요청하신 것을 처리하기 위해서는**관리자** 권한이 필요합니다. - 새로운 메세지 + 새로운 메시지 새로운 닉네임 @@ -594,7 +586,7 @@ Fuzzy 해당하는 Shard ID가 없습니다. - 이전 메세지 + 이전 메시지 이전 닉네임 @@ -669,7 +661,7 @@ Fuzzy 자신보다 가장 높은 역할보다 높은 사용자의 역할을 수정할 수 없습니다. - 다루고있었든 메세지 치웠습니다: {0} + 다루고있었던 메시지를 치웠습니다: {0} Fuzzy @@ -777,16 +769,17 @@ Fuzzy 소프트 밴 (강제퇴장) - PLURAL + PLURAL +Fuzzy {0} 은(는) 이 채널을 무시할 것입니다. - {0} 은(는) 더이상 이 채널을 무시하지 않을 것입니다. + {0} 은(는) 더 이상 이 채널을 무시하지 않을 것입니다. - 만약 사용자가 {0} 개 이상의 같은 메세지를 보내면 {1} 합니다. + 만약 사용자가 {0} 개 이상의 같은 메시지를 보내면 {1} 합니다. __무시하는 채널들__: {2} @@ -842,16 +835,16 @@ Fuzzy Fuzzy - {0} 은(는) 이제 {1} 입니다. + {0} 님은 상태는 {1} 입니다. {0} 은(는) 텍스트와 음성 채팅으로부터 **차단해제**되었습니다. - {0} 님이 {1} 음성채널에 입장하셨습니다. + {0} 님이 음성채널 {1} 에 입장하셨습니다. - {0} 님이 {1} 음성채널에서 퇴장하셨습니다. + {0} 님이 음성채널 {1} 에서 퇴장하셨습니다. {0}님이 음성채널 {1} 에서 {2} 로 이동되었습니다. @@ -942,7 +935,7 @@ Fuzzy Fuzzy - {1} 을(를) 받으려면 이 메세지에 {0} 리액션을 추가하세요. + {1} 을(를) 받으려면 이 메시지에 {0} 리액션을 추가하세요. Fuzzy @@ -1142,7 +1135,7 @@ Discord 닉네임이나 ID를 메시지에 남겨 두는 것을 잊지 마십시 Fuzzy - {0} 이(가) {1} (으)로 레이스를 이겼고 {2}! + {0} 이(가) {1} (으)로 레이스를 이겼고 {2} 을 획득했습니다! Fuzzy @@ -1194,41 +1187,44 @@ Discord 닉네임이나 ID를 메시지에 남겨 두는 것을 잊지 마십시 최고의 와이프 - + 당신의 친밀감이 이미 그 와이프로 설정 했거나 당신에게 친밀감이 없는 상태의 와이프에게 친밀감 삭제를 시도했습니다. - + 친밀감이 {0} 에서 {1} 으로 변경되었습니다. + +*도덕성이 의심스럽습니다.*🤔 Make sure to get the formatting right, and leave the thinking emoji - + 친밀감을 다시 바꾸기 위해서는 {0} 시간 {1} 분을 기다려야합니다. - + 당신의 친밀감은 초기화되었습니다. 당신이 좋아하는 사람은 더 이상 없습니다. - + 님이 {0}의 와이프가 되고싶어합니다. - + 님이 {1} 에 {0} 님을 와이프로 요구했습니다. - + 당신을 좋아하는 와이프와 이혼했습니다. {0} 님이 보상금으로 {1} 만큼을 받았습니다. - + 자기 자신에게 친밀감을 설정 할 수 없습니다. - + 🎉 그들의 사랑이 성취되었습니다! 🎉 +{0} 의 새로운 가치는 {1} 입니다! - + 그렇게 싼 와이프는 없습니다. 와이프를 얻기 위해서는 실제 가치보다 낮더라도 {0} 만큼을 지불해야합니다. - + 와이프를 요구하기 위해서는 {0} 이상을 지불해야합니다! - + 그 와이프는 당신의 와이프가 아닙니다. 자기자신을 클레임 할 수 없습니다. @@ -1242,7 +1238,7 @@ Discord 닉네임이나 ID를 메시지에 남겨 두는 것을 잊지 마십시 아무도 없음 - + 당신을 좋아하지 않는 와이프와 이혼했습니다. 당신은 {0}을 돌려받았습니다. 8ball @@ -1256,98 +1252,102 @@ Discord 닉네임이나 ID를 메시지에 남겨 두는 것을 잊지 마십시 아무런 제출 없이 게임이 끝났습니다. - + 아무도 투표하지 않았습니다. 승자없이 게임이 종료되었습니다. - 두문자가 {0} 이었슴니다. + 머리글자는 {0} 이었습니다. - + 아크로포비아 게임이 이미 이 채널에서 진행 중입니다. - + 게임이 시작되었습니다. {0} 머리글자를 사용해서 문장 만드십시오. + Fuzzy - + 제출까지 {0} 초 남았습니다. - + {0} 가 그의 문장을 입력했습니다. (합계: {1}) - + 제출번호를 입력해서 투표를 하십시오. - + {0} 가 투표했습니다! - + 우승자는 {1} 포인트를 가진 {0} 입니다. - + {0} 님이 서버에서 유일한 제출자이기 때문에 승리했습니다. - + 문제 + - + 비겼습니다! 둘다 {0} 을(를) 선택했습니다. - + {0} 가 승리했습니다! {1} 은(는) {2} 을(를) 이겼습니다. - + 제출이 마감되었습니다. - + 동물 레이스가 이미 진행 중입니다. - + 총합: {0} 평균: {1} - + 범주 - + 이 서버에서 클레버봇을 비활성화하였습니다. - + 이 서버에서 클레버봇을 활성화하였습니다. - + 이 채널에서 통화 생성이 비활성화되었습니다. - + 이 채널에서 통화 생성이 활성화되었습니다. - - plural + {0} 무작위 {1} 가 등장했습니다! + plural +Fuzzy - + 무작위 {0} 가 등장했습니다! - + 질문 로딩에 실패하였습니다. - + 게임이 시작되었습니다 - + 행맨 게임이 시작되었습니다 - + 행맨 게임이 이미 시작되었습니다 - + 행맨 게임 시작에 오류가 발생하였습니다. - + "{0}hangman" 용어 종류 목록 - + 리더 보드 + Fuzzy - + 당신은 충분한 {0} 이(가) 없습니다. 결과가 없습니다. @@ -1361,246 +1361,252 @@ Discord 닉네임이나 ID를 메시지에 남겨 두는 것을 잊지 마십시 Kwoth planted 5* - + 이미 이 서버에서 트리비아 게임이 진행중입니다. - + 트리비아 게임 - + {0} 님이 맞췄습니다! 답은 {1} 입니다. - + 이 서버에서 진행중인 트리비아 게임이 없습니다. - + {0} 이(가) {1} 포인트를 갖고있습니다. - + 이 질문 후에 중지합니다. - + 시간초과! 정확한 답은 {0} 입니다. + Fuzzy - + {0} 님이 맞춰서 게임을 이겼습니다! 답은 {1} 입니다. + Fuzzy - + 당신을 상대로 플레이 할 수 없습니다. - + 이미 이 채널에서 TicTacToe 게임이 진행중입니다. - + 비겼습니다! - + 님이 TicTacToe 게임을 생성하였습니다. - + {0} 님이 이겼습니다! - + 3개 일치 + Fuzzy - + 더 이상 움직일 수 없습니다! - + 시간이 만료되었습니다! - + {0}의 이동 - + {0} 대 {1} - + {0} 개의 곡을 대기열에 추가하는 중... - + 자동재생이 비활성화되었습니다. - + 자동재생이 활성화되었습니다. - + 기본 음량이 {0}%로 설정되었습니다. - + 디렉토리 대기열 추가가 완료되었습니다. + Fuzzy - + 페어플레이 - + 재생 완료 - + 페어플레이가 비활성화되었습니다. - + 페어플레이가 활성화되었습니다. - + 원레 위치 - + ID - + 유효하지 않은 입력입니다. - + 이제 최대 재생시간에 제한이 없습니다. - + 최대 재생시간이 {0} 초로 설정되었습니다. - + 이제 음악 대기열 크기는 제한이 없습니다. - + 음악 대기열 크기가 {0} 곡으로 변경되었습니다. - + 당신은 이 서버의 음성채널에 있어야 합니다. - + 이름 - + 현재 재생 중 - + 재생중인 곡이 없습니다. - + 검색 결과가 없습니다. - + 음악 재생이 일시정지되었습니다. - + 음악 대기열 - {0}/{1} 페이지 - + 노래 재생 중 - + `#{0}` - {2} 님의 재생목록 **{1}** ({3} 곡) - + 저장된 재생목록의 {0} 번째 페이지 - + 재생목록이 삭제되었습니다. - + 재생목록 삭제에 실패했습니다. 존재하지 않거나, 당신이 재생목록의 저자가 아닙니다. - + 그 ID에 해당하는 재생목록이 존재하지 않습니다. - + 재생목록 대기열 추가 완료. - + 재생목록이 저장되었습니다. - + {0} 초 한계 - + 대기열 - + 대기열에 추가됨 - + 음악 대기열이 초기화되었습니다. - + 대기열이 {0}/{0} 으(로) 가득찼습니다. - + 곡 삭제됨 context: "removed song #5" - + 현재 곡을 반복재생합니다. - + 현재 재생목록을 반복재생합니다. - + 현재 트랙을 반복재생합니다. - + 현재 트랙 반복이 중지되었습니다. - + 음악 재생이 재개되었습니다. - + 재생목록 반복이 비활성화되었습니다. - + 재생목록 반복이 활성화되었습니다. - + 앞으로 재생 중, 완료, 일시정지, 삭제된 곡들을 이 채널에 출력합니다. - + `{0}:{1}`로 이동하였습니다. + Fuzzy - + 곡을 섞었습니다. - + 곡이 이동되었습니다. - + {0}시간 {1}분 {2}초 - + 바뀐 위치 + Fuzzy - + 무제한 - + 음량은 0과 100 사이의 값이여야 합니다. - + 음량이 {0}% 로 설정되었습니다. - + {0} 채널에서 모든 모듈의 사용을 비활성화했습니다. - + {0} 채널에서 모든 모듈의 사용을 활성화했습니다. 허락함 Fuzzy - + {0} 역할에게 모든 모듈의 사용을 비활성화했습니다. - + {0} 역할에게 모든 모듈의 사용을 활성화했습니다. - + 이 서버에서 모든 모듈의 사용을 비활성화했습니다. - + 이 서버에서 모든 모듈의 사용을 활성화했습니다. - + {0} 사용자에 대한 모든 모듈의 사용을 비활성화합니다. - + {0} 사용자에 대한 모든 모듈의 사용을 활성화합니다. {0} (ID {1})님을 블랙리스트했습니다 @@ -1639,28 +1645,28 @@ Discord 닉네임이나 ID를 메시지에 남겨 두는 것을 잊지 마십시 Fuzzy - + 유효하지 않은 두번째 파라미터입니다. ( {0} 와(과) {1} 사이의 숫자여야 합니다.) - + 초대 필터링이 이 채널에서 비활성화되었습니다. - + 초대 필터링이 이 채널에서 활성화되었습니다. - + 초대 필터링이 이 서버에서 비활성화되었습니다. - + 초대 필터링이 이 서버에서 활성화되었습니다. - + {0} 권한을 #{1} 에서 #{2} (으)로 이동했습니다. - + 색인 #{0} 에 대한 권한을 찾을 수 없습니다. - + 아무런 값이 설정되지 않았습니다. 명령어 @@ -1674,137 +1680,140 @@ Discord 닉네임이나 ID를 메시지에 남겨 두는 것을 잊지 마십시 권한 목록 {0} 페이지 - + 현재 권한 역할은 {0} 입니다. - + 이제 사용자가 권한 수정을 위해서는 {0} 권한이 필요합니다. - + 그 색인에 대한 권한을 찾을 수 없습니다. - + #{0} - {1} 권한을 삭제했습니다. - + {2} 역할에 대한 {0} {1} 의 사용을 비활성화했습니다. - + {2} 역할에 대한 {0} {1} 의 사용을 활성화했습니다. 초. Short of seconds. - + 이 서버에서 {0} {1} 의 사용을 비활성화했습니다. - + 이 서버에서 {0} {1} 의 사용을 활성화했습니다. - + {0} (ID {1} ) 님을 블랙리스트에서 해제하였습니다. + Fuzzy - + 수정불가 - + {2} 사용자의 {0} {1} 의 사용을 비활성화했습니다. - + {2} 사용자의 {0} {1} 의 사용을 활성화했습니다. - + 더 이상 권한 경고를 표시하지 않습니다. - + 앞으로 권한 경고를 표시합니다. - + 단어 필터링이 이 채널에서 비활성화되었습니다. - + 단어 필터링이 이 채널에서 활성화되었습니다. - + 단어 필터링이 이 서버에서 비활성화되었습니다. - + 단어 필터링이 이 서버에서 활성화되었습니다. 능력 - + 좋아하는 애니메이션이 없습니다. - + 이 채널 메시지의 자동번역을 시작합니다. 사용자의 메시지는 자동삭제 됩니다. - + 당신의 자동번역 언어가 제거되었습니다. - + 당신의 자동번역 언어가 {0}>{1} 로 설정되었습니다. - + 이 채널의 자동번역을 시작합니다. - + 이 채널의 자동번역을 중지합니다. - + 올바르지 않은 입력 포맷이거나 무언가가 잘못되었습니다. - + 그 카드를 찾을 수 없습니다. - + 사실 - + 챕터 - + 만화 # - + 경쟁전 패배 - + 경쟁전 플레이 - + 경쟁전 랭크 - + 경쟁전 승리 - + 완료 - + 조건 - + 값 - + 날짜 - + 정의: + Fuzzy - + 시청 종료 + Fuzzy - + 에피소드 - + 오류가 발생했습니다. - + 예시 애니메이션 검색에 실패했습니다. @@ -1816,7 +1825,7 @@ Discord 닉네임이나 ID를 메시지에 남겨 두는 것을 잊지 마십시 장르 - + 해당 태그에 대한 정의를 찾지 못했습니다. 키/무게 @@ -1834,339 +1843,353 @@ Discord 닉네임이나 ID를 메시지에 남겨 두는 것을 잊지 마십시 영화 검색에 실패했습니다. - + 유효하지 않은 소스 또는 언어입니다. + Fuzzy - + 농담이 로드되지 않았습니다. - + 위도/경도 - + 레벨 - + {0}place 태그 목록 Don't translate {0}place - + 위치 - + 마법 아이템이 로드되지 않습니다. - + {0}의 MAL 프로필 - + 봇의 소유자가 MashapeApiKey을 설정하지 않아서 이 기능을 사용 할 수 없습니다. - + 최소/최대 - + 채널을 찾을 수 없습니다 - + 결과를 찾을 수 없습니다. - + 보류 - + 원본 Url - + osu! API키가 필요합니다. - + osu! 정보 검색에 실패했습니다. - + {0} 개 이상의 이미지가 발견되었습니다. 무작위로 {0}개를 표시합니다. + Fuzzy - + 사용자를 찾을 수 없습니다! 다시 시도하기 전에 지역과 배틀태그를 확인해주십시오 - + 볼 예정 - + 플랫폼 - + 능력을 찾을 수 없습니다. - + 포케몬을 찾을 수 없습니다. - + 프로필 링크: - + 품질: - + 빠른대전 플레이 시간 - + 빠른대전 승리 - + 레이팅 - + 점수: - + 검색 쿼리: - + Url 단축에 실패했습니다. - + Url 단축 - + 무언가가 잘못되었습니다. - + 검색어를 입력해주세요. + Fuzzy - + 상태 - + 저장된 Url + Fuzzy - + 스트리머 {0} 은(는) 오프라인입니다. - + 스트리머 {0} 은(는) {1} 명의 시청자와 함께 온라인입니다. + Fuzzy - + 당신은 이 서버에서 {0} 개의 스트리밍을 팔로우 중입니다. - + 당신은 이 서버에서 어떠한 스트리밍도 팔로우하지 않았습니다. + Fuzzy - + 스트리밍이 없습니다. - + 스트리밍 속성이 존재하지 않습니다. - + {0}의 스트리밍 ({1})을 알림에서 삭제했습니다. - + 상태가 변경되면 이 채널에 알립니다. - + 일출 - + 일몰 - + 온도 - + 제목: - + 좋아하는 상위 3개 애니: - + 번역 결과: - + 종류 - + 해당 용어에 대한 정의를 찾지 못했습니다. - + Url - + 시청자 - 보고있는것: + 시청중 Fuzzy - + 해당 용어에 대한 특정 Wikia를 찾지 못했습니다. - + 목적 Wikia를 입력하고 검색 쿼리를 입력하십시오. - + 페이지를 찾지 못했습니다. - + 바람의 속도 - + {0} 번째로 많은 밴을 당한 챔피언 - + 당신의 문장을 Yodify하지 못했습니다. - + 입장 - + `{0}.` {1} [{2:F2}/초] - 합계 {3} /s and total need to be localized to fit the context - `1.` - + 활성 페이지 #{0} - + 총 {0} 명의 사용자. - + 저자 - + 봇 ID - + {0}calc 명령어의 기능 목록 - + 이 채널의 {0} 은 {1} 입니다. - + 채널 주제 - + 실행된 명령어 - + {0} {1} 은(는) {2} {3} 와(과) 같습니다. - + 변환기에서 사용할수있는 단위 - + 단위를 찾지 못해서 {0} 을(를) {1} (으)로 변환 할 수 없습니다. + Fuzzy - + 단위의 종류가 같지 않기때문에 {0} 을(를) {1} (으)로 변환 할 수 없습니다. + Fuzzy - + 작성 시간: - + 크로스 서버 채널에 입장했습니다. + Fuzzy - + 크로스 서버 채널에서 퇴장했습니다. - + 이것은 당신의 CSC 토큰입니다. - + 커스텀 이모지 - + 오류 - + 기능 - + 아이디 - + 색인이 범위를 벗어났습니다. + Fuzzy - + {0} 역할의 사용자 목록 - + 악용을 막기위해서 많은 사용자가 있는 역할의 이 명령어 사용이 제한되었습니다. - + 유효하지 않은 {0} 값입니다. Invalid months value/ Invalid hours value - + 디스코드 입장 - + 서버 입장 - + ID: {0} +맴버: {1} +소유자 ID: {2} - + 이 페이지에서 서버를 찾을 수 없습니다. - + 리피터 목록 - + 맴버 - + 메모리 - + 메시지 - + 메시지 리피터 - + 이름 - + 닉네임 - + 아무도 그 게임을 플레이하고 있지 않습니다. - + 활성화된 리피터가 없습니다. - + 이 페이지에 역할이 없습니다. - + 이 페이지에 Shard가 없습니다. - + 주제가 설정되지 않았습니다. - + 소유자 - + 소유자의 ID - + 상태 - + {0} 서버 +{1} 텍스트 채널 +{2} 음성 채널 - + {0} 키워드를 가진 모든 인용구를 삭제했습니다. - + 인용구 페이지 {0} - + 이 페이지에 인용구가 없습니다. - + 삭제 할 수 있는 인용구를 찾지못했습니다. 인용구가 추가되었습니다. @@ -2181,28 +2204,28 @@ Discord 닉네임이나 ID를 메시지에 남겨 두는 것을 잊지 마십시 가입 날짜 - + 제가 {2} `({3:d.M.yyyy.} at {4:HH:mm})`에 {0} 에게 {1}을(를) 상기시킬 것입니다. 유효하지않은 시간 포맷입니다. 명령어 목록을 확인하십시오. - + 새로운 상기 템플릿이 설정되었습니다. - + {0} 을 {1} 일 {2} 시간 {3} 분마다 반복합니다. 반복 메시지 목록 - 이 서버에 반복 메시지 실행하고있지 안습니다. + 이 서버에 반복 메시지가 실행하고있지 않습니다. #{0} 이 정지되었습니다. - + 이 서버에서 반복 메시지를 찾을 수 없습니다. 결과 @@ -2211,25 +2234,26 @@ Discord 닉네임이나 ID를 메시지에 남겨 두는 것을 잊지 마십시 역할 - + 이 서버의 모든 역할 페이지 #{0} : - + {1} 역할에 대한 페이지 #{0} - + 색상 포맷이 정확하지 않습니다. `#00FF00`을 사용해보십시오. - + {0} 역할의 색상 로테이션을 시작했습니다. + Fuzzy - + {0} 역할의 색상 로테이션을 중지했습니다. - + 이 서버의 {0} 은 {1} 입니다. - + 서버 정보 Shard @@ -2245,7 +2269,6 @@ Discord 닉네임이나 ID를 메시지에 남겨 두는 것을 잊지 마십시 특수 이모지를 찾을 수 없습니다. - Fuzzy {0} 개의 곡을 재생중이며, {1} 개의 대기열이 있습니다. @@ -2254,10 +2277,10 @@ Discord 닉네임이나 ID를 메시지에 남겨 두는 것을 잊지 마십시 텍스트 채널 - + 방 링크: - + 작동 시간 {1} 의 {0} 은(는) {2} 입니다. @@ -2265,7 +2288,6 @@ Discord 닉네임이나 ID를 메시지에 남겨 두는 것을 잊지 마십시 사용자 - Fuzzy 음성 채널 @@ -2284,10 +2306,9 @@ Discord 닉네임이나 ID를 메시지에 남겨 두는 것을 잊지 마십시 📃 {0} 님이 투표를 생성하였습니다. - Fuzzy - + `{0}.` {2} 표를 가진 {1}. {0} 님이 투표하였습니다. @@ -2295,25 +2316,21 @@ Discord 닉네임이나 ID를 메시지에 남겨 두는 것을 잊지 마십시 해당 답변 번호와 함께 개인 메시지를 보내십시오. - Fuzzy 해당 답변 번호와 함께 여기에 메시지를 보내십시오. - Fuzzy {0} 님, 투표해주셔서 감사합니다 - {0} 개의 표가 던져졌습니다. - Fuzzy + {0} 개의 표가 투표되었습니다. - + `{0}pick`을 입력해서 획득하십시오. `{0}pick`을 입력해서 획득하십시오. - Fuzzy 사용자를 찾지 못했습니다. @@ -2331,31 +2348,31 @@ Discord 닉네임이나 ID를 메시지에 남겨 두는 것을 잊지 마십시 {0} 은(는) 음성과 텍스트 채팅으로 부터 {1} 분간 **음소거**되었습니다. - {0} 음성채널에 입장하는 사용자는 {1} 역할을 얻게됩니다. + 음성채널 {0} 에 입장하는 사용자는 {1} 역할을 얻게됩니다. - {0} 음성채널에 입장하는 사용자는 더이상 {1} 역할을 얻지 못합니다. + 음성채널 {0} 에 입장하는 사용자는 더이상 {1} 역할을 얻지 못합니다. 음성채널 역할 - + ID {0} 커스텀 리액션을 작동시키는 메시지는 자동삭제되지 않습니다. - + ID {0} 커스텀 리액션을 작동시키는 메시지는 자동삭제됩니다. - + 이제 ID {0} 커스텀 리액션에 대한 반응은 DM으로 전송되지 않습니다. - + ID {0} 커스텀 리액션에 대한 반응은 DM으로 전송됩니다. 가명을 찾지 못했습니다. - {0} 입력은 이제 {1} 의 가명일것이니다. + {0} 을(를) 입력하면 이제 {1} 의 가명입니다. 가명 목록 @@ -2364,10 +2381,134 @@ Discord 닉네임이나 ID를 메시지에 남겨 두는 것을 잊지 마십시 트리거 {0} 의 가명을 삭제했습니다. - 트리거 {0} 은(는) 가명 없었습니다. + 트리거 {0} 은(는) 가명이 없었습니다. - 경기한 시간 + 경쟁전 플레이 시간 + + + 채널 + + + 명령어 텍스트 + + + 강퇴 + PLURAL + + + 관리자 + + + {0} 페이지 + + + 사유 + + + 새로운 시작 명령어가 추가되었습니다. + + + 시작 명렁어가 성공적으로 삭제되었습니다. + + + 시작 명령어를 찾을 수 없습니다. + + + 서버 + + + 이 페이지에는 시작 명령어가 없습니다. + + + 모든 시작 명령어를 삭제했습니다. + + + 사용자 {0} 님이 밴에서 해제되었습니다. + + + 사용자를 찾을 수 없습니다. + + + 사용자 {0} 님이 경고를 받았습니다. + + + 사용자 {0} 님이 경고를 받았고, {1} 처벌이 적용되었습니다. + + + {0} 서버에 경고했습니다. + + + {0} {1} 에 {2} 이(가) + + + {0} 님이 모든 경고를 삭제했습니다. + + + 이 페이지에는 경고가 없습니다. + + + {0} 의 경고 기록 + + + 처벌이 설정되지 않았습니다. + + + {0} 이(가) 제거했습니다. + + + 경고 처벌 목록 + + + {0} 개의 경고를 받은 사용자에 대한 처벌을 하지않습니다. + + + {1} 개의 경고를 받은 사용자에게 {0} 처벌을 내립니다. + + + 이제 슬로우모드는 {0} 역할에게 적용되지 않습니다. + + + 이제 슬로우모드는 {0} 역할에게 적용됩니다. + + + 이제 슬로우모드는 {0} 님에게 적용되지 않습니다. + + + 이제 슬로우모드는 {0} 님에게 적용됩니다. + + + 다음과 같은 이유로 인해서 보상을 요청하지 못했습니다: + + + 당신은 이미 이번달의 보상을 받은 것 같습니다. 당신의 후원금을 올리지 않는 이상 한 달에 한 번만 보상을 받을 수 있습니다. + + + 이미 지급되었습니다. + + + 당신의 디스코드 계정이 Patreon에 연결되지 않았습니다. 이것이 무슨 뜻인지 모르거나, 어떻게 연결하는지 모른다면 - [Patreon 계정 설정 페이지] (https://patreon.com/settings/account) 에 접속해서 'Connect to discord' 버튼을 클릭하십시오. + + + 디스코드 계정이 연결되지 않았습니다. + + + 보상을 받을 수 있는 자격을 얻기 위해서는 Patreon에서 프로젝트를 후원해야 합니다. {0} 명령어를 이용해서 링크를 얻을 수 있습니다. + + + 후원 중이지 않습니다. + + + 다시 시도하지 않았다면, 후원을 한 후에 몇 시간을 기다려야합니다. + + + 잠시만 기다려주십시오. + + + {0} 을 받았습니다. 프로젝트를 후원 해주셔서 감사합니다! + + + 보상은 매 달 5일에 요구 할 수 있습니다. \ No newline at end of file From 2574546c823b87696edbe8b14fdbb53aab0f7b64 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 5 Apr 2017 12:19:31 +0200 Subject: [PATCH 430/496] Update ResponseStrings.nb-NO.resx (POEditor.com) --- .../Resources/ResponseStrings.nb-NO.resx | 128 +++++++++++++++++- 1 file changed, 127 insertions(+), 1 deletion(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.nb-NO.resx b/src/NadekoBot/Resources/ResponseStrings.nb-NO.resx index 08aa81fa..52009361 100644 --- a/src/NadekoBot/Resources/ResponseStrings.nb-NO.resx +++ b/src/NadekoBot/Resources/ResponseStrings.nb-NO.resx @@ -761,7 +761,8 @@ Grunn: {1} soft-banned (sparket) - PLURAL + PLURAL +Fuzzy {0} vil nå ignorere denne kanalen. @@ -2334,5 +2335,130 @@ Eier ID: {2} Kompetitiv spilltid + + Kanal + + + Kommando tekst + + + Sparket + PLURAL + + + Moderator + + + side {0} + + + Grunn + + + Ny oppstartskommando lagt til. + + + Oppstartskommando fjernet. + + + Fant ikke oppstartskommando + + + Server + + + Ingen oppstartskommandoer på denne siden. + + + Fjernet alle oppstartskommandoer + + + Bruker {0} er ikke lenger utestengt + + + Fant ikke bruker. + + + Advarte bruker {0} + + + Bruker {0} ble advart og straffet med {0} + + + Advart på server {0} + + + Den {0} kl. {1} av {2} + On 02.04.2017 at 16:03 by Kwoth + + + Alle advarsler fjernet for {0} + + + Ingen advarsler på denne siden. + + + Advarselslogg for {0} + + + Ingen straff satt. + + + fjernet av {0} + + + Straffliste + + + Å ha {0} advarsler vil ikke lenger gi noen straff. + + + Brukere med {1} advarsler vil bli straffet med {0} + + + Slowmode vil nå ignorere rollen {0}. + + + Slowmode ignorerer ikke lenger rollen {0}. + + + Slowmode vil nå ignorere brukeren {0}. + + + Slowmode vil ikke lenger ignorere brukeren {0} + + + Kunne ikke hevde premie p.g.a. én av følgende grunner: + + + Det er mulig du allerede har mottatt premien din for denne måneden. Du kan bare hevde premien én gang i måneden med mindre du øker summen. + + + Allerede belønnet. + + + Din Discord konto er ikke tilkoblet Patreon. Om du er usikker på hva dette betyr, eller ikke er sikker på hvordan du gjør det, kan du gå til [Patreon kontoinnstillinger](https://patreon.com/settings/account) og klikk på 'Connect to Discord'-knappen. + + + Discord kontoen er ikke tilknyttet. + + + For å være kvalifisert for belønning, må du støtte prosjektet på Patreon. Du kan bruke {0} kommandoen for å få link. + + + Støttes ikke + + + Du må vente noen timer etter du har gitt ditt løfte. Prøv igjen om litt. + + + Vent litt. + + + Du har mottatt {0}. Takk for at du støtter prosjektet! + + + Belønninger kan bare hevdes fra og med den 5. dagen i måneden. + \ No newline at end of file From a4219a89db020d48637517abdf5b551c7d47fa2f Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 5 Apr 2017 12:19:34 +0200 Subject: [PATCH 431/496] Update ResponseStrings.pl-PL.resx (POEditor.com) --- .../Resources/ResponseStrings.pl-PL.resx | 277 +++++++++++++----- 1 file changed, 201 insertions(+), 76 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.pl-PL.resx b/src/NadekoBot/Resources/ResponseStrings.pl-PL.resx index 2d71a47b..01fe013c 100644 --- a/src/NadekoBot/Resources/ResponseStrings.pl-PL.resx +++ b/src/NadekoBot/Resources/ResponseStrings.pl-PL.resx @@ -203,16 +203,16 @@ Lista własnych reakcji - Własne reakcje + Niestandardowe reakcje - Nowe własne reakcje + Nowe niestandardowe reakcje - Własne reakcje nie zostały znalezione. + Niestandardowe reakcje nie zostały znalezione. - Własne reakcje z tym ID nie zostały znalezione. + Niestandardowe reakcje z tym ID nie zostały znalezione. Odpowiedź @@ -221,7 +221,7 @@ Statystyki niestandardowych reakcji - + Statystyki wyczyszczone dla {0} niestandardowych reakcji. @@ -480,7 +480,7 @@ Powód: {1} Fuzzy - + Twojego servra lokal jest teraz {0} - {1} @@ -520,7 +520,7 @@ Powód: {1} Logowanie nie będzie ignorowało {0} - + Logowanie wydarzenia {1} zatrzymane. @@ -755,7 +755,8 @@ Powód: {1} lekko zbanowany (wyrzucony) - PLURAL + PLURAL +Fuzzy {0} będzie ignorował ten kanał. @@ -880,7 +881,7 @@ Powód: {1} Migracja zakończona! - + Błąd podczas migracji, sprawdz konsole bota po więcej informacji. @@ -921,7 +922,7 @@ Powód: {1} Wydarzenie reagowania kwiatkami rozpoczęło się! - dał (0} dla {1} + dał {0} dla {1} X has gifted 15 flowers to Y @@ -979,10 +980,10 @@ Powód: {1} Trwa {0} sekund. Nie nikomu. Ciiii. - + Wydarzenie SneakyGame zakończyło się. {0} użytkowników otrzymało nagrodę. - + Wydarzenie SneakyGameStatus rozpoczęło się. Reszka @@ -1010,10 +1011,10 @@ Trwa {0} sekund. Nie nikomu. Ciiii. Komendy i aliasy - + Lista komend została wygenerowana na nowo. - + Wpisz `{0}h NazwaKomendy` aby otrzymać pomoc dla danej komendy, np. `{0}h >8ball` Nie mogę znaleźć komendy. Proszę sprawdź czy komenda istnieje, zanim jej użyjesz. @@ -1048,7 +1049,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Ten moduł nie istnieje. - + Wymaga {0} uprawnień na serwerze. Spis treści @@ -1094,7 +1095,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś {1} czyli {0} wygrał wyścig i {2}! - Użyty numer jest nie poprawny. Możesz rzucić {0}-{1} kośćmi na raz + Użyty numer jest niepoprawny. Możesz rzucić {0}-{1} kośćmi na raz wyrzucono {0} @@ -1164,7 +1165,8 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + 🎉 To prawdziwa miłość! 🎉 +Nowa wartość {0} to {1}! Żadna waifu nie jest taka tania. Musisz zapłacić co najmniej {0} aby zdobyć waifu, nawet jeśli nie jest tyle warta. @@ -1188,13 +1190,13 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Rozwiodłeś się z waifu, która cię nie lubi. W zamian dostałeś {0}. - Magiczna kula nr 8 + Kula nr. 8 - + Gra zakończona bez żadnych zgłoszeń. Jakies pomysły jak przetlumaczyć Submission by miało sens? @@ -1207,19 +1209,19 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + Gra rozpoczęta. Stwórz zdanie z podanym akronimem: {0}. - + Masz {0} sekund aby coś zgłosić. - + {0} zgłosił swoje zdanie. (łącznie {1}) - + Głosuj, wpisując numer zgłoszenia. - + {0} dał swój głos! Zwycięzcą jest {0} z {1} punktami. @@ -1266,7 +1268,6 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś {0} się pojawiły! - Fuzzy Nie udało się załadować pytania. @@ -1293,7 +1294,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Nie masz wystarczająco {0} - Brak rezultatów + Brak wyników podniósł {0} @@ -1304,7 +1305,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Kwoth planted 5* - Trivia jest aktywna na tym serwerze + Trivia jest aktywna na tym serwerze. Trivia @@ -1313,13 +1314,13 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś {0} zgadł! Odpowiedź to: {1} - Trivia nie jest aktywna na tym serwerze + Trivia nie jest aktywna na tym serwerze. {0} posiada {1} punktów - Koniec po tym pytaniu + Koniec po tym pytaniu. Koniec czasu! Prawidłowa odpowiedź to {0} @@ -1331,7 +1332,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Nie możesz grać przeciwko sobie. - + Gra kółko i krzyżyk jest aktywna na tym serwerze. Remis! @@ -1385,7 +1386,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Fair play włączony. - + Z pozycji ID @@ -1415,7 +1416,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Teraz gra - + Brak aktywnego odtwarzacza muzyki. Brak wyników @@ -1430,7 +1431,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Gra utwór - + `#{0}` - **{1}** przez *{2}* ({3} piosenek) Strona {0} zapisanych playlist @@ -1451,7 +1452,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Playlista zapisana - + Limit {0} Kolejka @@ -1506,7 +1507,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś {0}g {1}m {2}s - + Do pozycji bez limitu @@ -1613,7 +1614,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Strona uprawnień {0} - + Aktualna rola z uprawnieniami to {0}. Użytkownicy wymagają roli {0}, by móc edytować uprawnienia. @@ -1811,7 +1812,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Brak rezultatów. - + Wstrzymane Oryginalny URL @@ -1820,7 +1821,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Klucz osu! API jest wymagany. - + Nie udało się wywołać sygnatury osu!. Znaleziono {0} obrazków. Pokazuję przypadkowe {0} @@ -1835,7 +1836,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Platforma - + Nie znaleziono umięjętności. Pokemon nieznaleziony @@ -1844,13 +1845,13 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Link profilowy: - + Jakość: - + Szybkie wygrane Ocena @@ -1871,7 +1872,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Coś poszło nie tak. - + Proszę o sprecyzowanie kryteriów wyszukiwania. Status @@ -1902,7 +1903,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Usunięto stream użytkownika {0} ({1}) z powiadomień. - + Powiadomię ten kanał kiedy status się zmieni. Wschód słońca @@ -1926,7 +1927,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Typy - + Nie znaleziono definicji dla tego terminu. Url @@ -1938,7 +1939,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Oglądane - + Nie znaleziono tego terminu na konkretnej wikii. @@ -1964,7 +1965,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś `1.` - + Strona aktywności #{0} Łącznie {0} użytkowników. @@ -1979,7 +1980,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + {0} tego kanału to {1} Temat kanału @@ -2009,7 +2010,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + To jest twój token CSC Niestandardowe emotikony @@ -2027,7 +2028,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + Lista użytkowników w roli {0} @@ -2081,7 +2082,7 @@ ID właściciela: {2} Brak roli na tej stronie. - + Brak shard'ów na tej stronie. Brak tematu. @@ -2093,7 +2094,7 @@ ID właściciela: {2} ID właściciela - + Obecność {0} serwerów @@ -2107,10 +2108,10 @@ ID właściciela: {2} {0} strona cytatów - + Brak cytatów ona tej stronie. - + Nie znaleziono żadnych cytatów które możesz usunąć. Dodano cytat @@ -2122,10 +2123,10 @@ ID właściciela: {2} Region - + Zarejestrowany - + Przypomnę {0} dla {2} `({3:d.M.yyyy.} o {4:HH:mm})` @@ -2155,10 +2156,10 @@ ID właściciela: {2} Role - + Strona #{} wszystkich ról na tym serwerze: - + Strona #{0} ról {1} Kolory zostały podane w niepoprawnej formie. Użyj np. `#00ff00` @@ -2170,16 +2171,16 @@ ID właściciela: {2} Zakończono zmienianie kolorów dla roli {0} - + {0} tego serwera to {1} Informacje o serwerze - + Shard - + Statystyki odłamka @@ -2191,7 +2192,7 @@ ID właściciela: {2} Nie znaleziono żadnych specjalnych emotikon - + Teraz leci {0} piosenek; {1} w kolejce Kanały głosowe @@ -2200,7 +2201,7 @@ ID właściciela: {2} Twój link do pokoju: - + Czas działania @@ -2219,13 +2220,13 @@ ID właściciela: {2} - + Nie ma oddanych głosów. - + Ankieta już istnieje na tym serwerze. - + 📃 {0} stworzył ankietę, która wymaga twojej uwagi: `{0}.` {1} z {2} głosami. @@ -2244,25 +2245,25 @@ ID właściciela: {2} Dziękuję za oddany głos, {0} - + {0} oddanych głosów. - + Podnieś je przez napisanie `{0}pick` - + Podnieś to przez napisanie `{0}pick` - + Nie znaleziono użytkownika. - + Strona {0} - Musisz znajdować się w kanale głosowym na tym serwerze. + Musisz znajdować się na kanale głosowym na tym serwerze. - + Niema żadnych ról w kanałach głosowych. {0} został **wyciszony** w kanałach tekstowych oraz głosowych na {1} minut. @@ -2271,7 +2272,7 @@ ID właściciela: {2} Użytkownicy którzy dołączą do kanału głosowego {0} , otrzymają rolę {1}. - + Użytkownicy którzy dołączą do kanału głosowego {0} już nie dostaną roli. Uprawnienia kanału głosowego @@ -2283,10 +2284,10 @@ ID właściciela: {2} - + Odpowiedź na niestandardową reakcję z id {0} będzie wysłana jako wiadomość prywatna. - + Odpowiedź na niestandardową reakcję z id {0} będzie wysłana jako wiadomość prywatna. @@ -2295,7 +2296,7 @@ ID właściciela: {2} - + Lista pseudonimów @@ -2306,5 +2307,129 @@ ID właściciela: {2} + + Kanał + + + + + + Wyrzucony + PLURAL + + + Moderator + + + strona {0} + + + Powód + + + + + + + + + + + + Serwer + + + + + + + + + Użytkownik {0} został odbanowany. + + + Użytkownik nieznaleziony. + + + Użytkownik {0} został ostrzeżony. + + + + + + + + + Dnia {0} o godzinie {1} przez {2} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Otrzymałeś {0}. Dziękujemy, że wspierasz projekt! + + + + \ No newline at end of file From 4995b88fc71baf154688e68a41966e7ab686581f Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 5 Apr 2017 12:19:36 +0200 Subject: [PATCH 432/496] Update ResponseStrings.pt-BR.resx (POEditor.com) --- .../Resources/ResponseStrings.pt-BR.resx | 127 +++++++++++++++++- 1 file changed, 126 insertions(+), 1 deletion(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx b/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx index abbdde18..a416a95e 100644 --- a/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx +++ b/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx @@ -762,7 +762,8 @@ Razão: {1} Banidos temporariamente (kickados) - PLURAL + PLURAL +Fuzzy {0} irá ignorar esse canal. @@ -2383,5 +2384,129 @@ OwnerID: {2} Tempo de jogo competitivo + + Canal + + + Comando de Texto + + + Chutado + PLURAL + + + Moderador + + + página {0} + + + Motivo + + + Novo comando de inicialização adicionado. + + + Comando de inicialização removido com sucesso. + + + Comando de inicialização não encontrado. + + + Servidor + + + Não há comandos de inicialização nesta página. + + + Todos os comandos de inicialização foram removidos. + + + Usuário {0} foi desbanido. + + + Usuário não encontrado. + + + Usuário {0} foi advertido. + + + Usuário {0} foi advertido e {1} punição foi aplicada. + + + Advertiu no server {0} + + + Em {0} às {1} por {2} + + + Todas as advertências foram removidas para {0} + + + Não há advertências nessa página. + + + Log de advertências para {0} + + + Nenhuma punição definida. + + + Limpado por {0} + + + Lista de punições por advertência + + + Possuir {0} advertências não irá mais resultar em punição. + + + Eu irei aplicar punição {0} para usuários com {1} advertências. + + + Modo lento agora irá ignorar o cargo {0}. + + + Modo lento não ira mais ignorar o cargo {0}. + + + Modo lento irá ignorar o usuário {0}. + + + Modo lento não irá mais ignorar o usuário {0}. + + + Falha em reivindicar recompensas devido a uma das seguintes razões: + + + Talvez você já tenha recebido sua recompensa esse mês. Você pode receber recompensas apenas uma vez por mês a não ser que você aumente o seu pagamento. + + + Já recompensado + + + Sua conta do discord pode não estar conectada ao Patreon. Se você não tem certeza do que isso significa, ou não sabe como conectá-la - Você deve ir para [Página de configurações de conta do Patreon)(https://patreon.com/settings/account) e clicar em 'Connect to discord' button. + + + Conta do discord não conectada + + + Para poder receber recompensas, você deve dar suporte ao projeto no patreon. Você pode usar o comando {0} para receber o link. + + + Não suportando + + + Você deve esperar algumas horas depois de realizar seu pagamento. Se não o fez, tente novamente mais tarde. + + + Espere um momento + + + Você recebeu {0} Obrigado por dar suporte ao projeto! + + + Recompensas podem ser reivindicadas no ou a partir do 5° dia de cada mês + \ No newline at end of file From 1a2433bbaf2cb12d13a03b9979cbfdd941c376cf Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 5 Apr 2017 12:19:39 +0200 Subject: [PATCH 433/496] Update ResponseStrings.ru-RU.resx (POEditor.com) --- .../Resources/ResponseStrings.ru-RU.resx | 146 +++++++++++++++++- 1 file changed, 142 insertions(+), 4 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx b/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx index 8edacbe6..0044bbbc 100644 --- a/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx +++ b/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx @@ -743,7 +743,8 @@ Fuzzy выгнаны - PLURAL + PLURAL +Fuzzy {0} будет игнорировать данный канал. @@ -1119,7 +1120,7 @@ Paypal <{1}> сменил свою предрасположенность с {0} на {1}. -*Это сомнительно с моральной точки зрения* :thinking: +*Это сомнительно с моральной точки зрения.*🤔 Make sure to get the formatting right, and leave the thinking emoji @@ -2261,11 +2262,11 @@ ID Владельца: {2} Fuzzy - Сообщение, инициирующее настраеваемую реакцию с номером {0}, будет автоматически удалено. + Сообщение, инициирующее настраиваемую реакцию с номером {0}, будет автоматически удалено. Fuzzy - Ответное сообщение для настраеваемой реакции с номером {0} не будет отправлено в ЛС. + Ответное сообщение для настраиваемой реакции с номером {0} не будет отправлено в ЛС. Fuzzy @@ -2295,5 +2296,142 @@ Fuzzy Время в игре + + Канал + + + Текст команды + + + Выгнаны + PLURAL + + + Модератор + + + страница {0} + + + Причина + + + Новая команда автозапуска добавлена. + Fuzzy + + + Новая команда автозапуска успешно удалена. + Fuzzy + + + Команда автозапуска не найдена. + Fuzzy + + + Сервер + + + Не найдено команд автозапуска на этой странице. + Fuzzy + + + Удалены все команды автозапуска. + Fuzzy + + + Пользователь {0} был разбанен. + + + Пользователь не найден. + + + Пользователь {0} получил предупреждение. + Fuzzy + + + Пользователь {0} получил предупреждение и наказание {1} было применено. + Fuzzy + + + Предупреждение было вынесено на сервере {0} + + + {0} в {1} пользователем {2} + Fuzzy + + + Все предупреждения были удалены для пользователя {0}. + + + На этой странице нет предупреждений. + + + Регистрация предупреждений для пользователя {0} + Fuzzy + + + Наказания не выставлены. + Fuzzy + + + очищен пользователем {0} + + + Список наказаний для предупреждений + Fuzzy + + + Наказание больше не будет применено после {0} предупреждений. + Fuzzy + + + Для пользователей с {1} предупреждениями будет применено наказание {0}. + Fuzzy + + + Медленный режим больше не распространяется на роль {0}. + + + Медленный режим теперь распространяется на роль {0}. + + + Медленный режим больше не распространяется на пользователя {0}. + + + Медленный режим теперь распространяется на пользователя {0}. + + + Не удалось получить награды по одной из следующих причин: + + + Возможно, Вы уже получили Ваши награды за этот месяц. Вы можете получать награды только раз в месяц, если Вы не увеличивали Ваше пожертвование. + + + Уже были получены + + + Ваш аккаунт в Discord, скорее всего, не подключён к Patreon. Если Вы не уверены, что это значит или не знаете, как его подключить, то Вам необходимо перейти на [Страницу настроек аккаунта в Patreon](https://patreon.com/settings/account) и нажать кнопку "Connect to discord." + + + Аккаунт Discord не подключён + + + Для получения наград Вам необходимо поддерживать проект в Patreon. Вы можете воспользоваться командой {0}, чтобы получить ссылку. + + + Вы не поддерживаете проект + + + Вам необходимо подождать несколько часов после Вашего пожертвования, если Вы не делали этого, попробуйте позже. + + + Подождите немного + + + Вы получили {0}. Спасибо за поддержку проекта! + + + Награды могут быть получены только начиная с 5-го числа месяца. + \ No newline at end of file From b04b03495fe29aa92cbd42b0f834ad24488693f5 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 5 Apr 2017 12:19:42 +0200 Subject: [PATCH 434/496] Update ResponseStrings.sr-cyrl-rs.resx (POEditor.com) --- .../Resources/ResponseStrings.sr-cyrl-rs.resx | 127 +++++++++++++++++- 1 file changed, 126 insertions(+), 1 deletion(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx b/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx index 8fe7d18e..31342757 100644 --- a/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx +++ b/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx @@ -752,7 +752,8 @@ Reason: {1} soft-banned (kicked) - PLURAL + PLURAL +Fuzzy {0} will ignore this channel. @@ -2326,5 +2327,129 @@ Lasts {1} seconds. Don't tell anyone. Shhh. + + + + + + + + + PLURAL + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 1dd3bbe312ab466bc85cdc1bd06ca8c7cf98fb3d Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 5 Apr 2017 12:19:44 +0200 Subject: [PATCH 435/496] Update ResponseStrings.es-ES.resx (POEditor.com) --- .../Resources/ResponseStrings.es-ES.resx | 129 +++++++++++++++++- 1 file changed, 127 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.es-ES.resx b/src/NadekoBot/Resources/ResponseStrings.es-ES.resx index 37e12fc6..b5813634 100644 --- a/src/NadekoBot/Resources/ResponseStrings.es-ES.resx +++ b/src/NadekoBot/Resources/ResponseStrings.es-ES.resx @@ -741,8 +741,9 @@ Razón: {1} Modo lento iniciado - advertido (expulsado) - PLURAL + advertidos (expulsado) + PLURAL +Fuzzy {0} ignorará este canal. @@ -2277,5 +2278,129 @@ IDs de dueños: {2} Tiempo de juego en competitivo + + Canal + + + Comando de texto + + + Expulsados + PLURAL + + + Moderador + + + Página {0} + + + Razón + + + Nuevo comando de inicio añadido. + + + Comando de inicio removido satisfactoriamente. + + + Comando de inicio no encontrado. + + + Servidor + + + No hay comandos de inicio en esta página. + + + Reiniciados todos los comandos de inicio. + + + El usuario {0} ha sido desbloqueado. + + + No encuentro tal usuario. + + + El usuario {0} ha sido advertido. + + + El usuario {0} ha sido advertido y el castigo {0} ha sido aplicado. + + + Advertido en el servidor {0} + + + El {0} a las {1} por {2} + + + Todas las advertencias han sido reiniciadas por {0}. + + + No hay advertencias en esta página. + + + Registro de advertencias para {0} + + + No hay castigos configurados. + + + Reiniciados por {0} + + + Lista de castigos de advertencia + + + Tener {0} advertencias ya no ejecutará un castigo. + + + Aplicaré el castigo {0} a los usuarios con {1} advertecias. + + + El modo lento ahora ignorará el rol {0}. + + + El modo lento ya no ignorará el rol {0}. + + + El modo lento ignorará al usuario {0}. + + + El modo lento ya no ignorará al usuario {0}. + + + Imposible reclamar recompensas debido a una de las siguientes razones: + + + Tal vez ya has recibido tu recompensa de este mes. Puedes recibir recompensa solo una vez cada mes a menos que incrementes el monto. + + + Ya recompensado + + + Puede que tu cuenta de Discord no esté conectada a Patreon. Si no estás seguro de lo que significa, o no sabes cómo conectarla, tienes que ir a la página de configuración de Patreon (https://patreon.com/settings/account) y presionar el botón de 'conectar a Discord'. + + + Cuenta de Discord no conectada. + + + Para elegir una recompensa, debes apoyar el proyecto en Patreon. Puedes usar el comando {0} para obtener el enlace. + + + No apoyando + + + Tienes que esperar algunas horas después de hacer tu colaboración, sino, trata otra vez. + + + Espera un tiempo + + + Has recibido {0} ¡Gracias por apoyar el proyecto! + + + Las recompensas pueden ser reclamadas el día 5 de cada mes. + \ No newline at end of file From a0e855d2d0956aeddefc6eb636274d4bcc6c9f7a Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 5 Apr 2017 12:19:47 +0200 Subject: [PATCH 436/496] Update ResponseStrings.sv-SE.resx (POEditor.com) --- .../Resources/ResponseStrings.sv-SE.resx | 138 +++++++++++++++++- 1 file changed, 131 insertions(+), 7 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.sv-SE.resx b/src/NadekoBot/Resources/ResponseStrings.sv-SE.resx index 6ee45f0f..8d392491 100644 --- a/src/NadekoBot/Resources/ResponseStrings.sv-SE.resx +++ b/src/NadekoBot/Resources/ResponseStrings.sv-SE.resx @@ -256,8 +256,7 @@ du kan inte attackera dig själv - -{0} har svimmat! + {0} har svimmat! helade {0} med en {1} @@ -765,7 +764,8 @@ Anledning: {1} mjukt-bannad (kickad) - PLURAL + PLURAL +Fuzzy {0} kommer ignorera denna kanal. @@ -2330,7 +2330,7 @@ Medlemmar: {1} Användare som går in i röstkanalen {0} får rollen {1}. - Användare som går + Användare som går med {0} röstkanalen kommer inte längre få en roll. Röstkanalsroller @@ -2342,11 +2342,10 @@ Medlemmar: {1} Meddelandet som triggrar den egengjorda reaktion med id {0} kommer bli - Svar meddelande för custom reaktion med id {0} kommer inte att skickas som ett DM. + Svar meddelande för den egengjorda reaktion med id {0} kommer inte att skickas som ett DM. - - + Svar meddelande för den egengjoda reaktion med id {0} kommer att skickas som ett DM. Ingen alias hittad @@ -2366,5 +2365,130 @@ Medlemmar: {1} Kompetitiv speltid + + Kanal + + + Kommando Text + + + Sparkad + PLURAL + + + Moderator + + + Sida {0} + + + Anledning + + + Ny uppstart kommando tillagd. + + + Uppstart kommando har blivit avtagen. + + + Uppstart kommando hittas inte. + + + Server + + + Ingen uppstart kommando har hittats på denna sidan. + + + Rensat alla uppstart kommando. + + + Användaren {0} har blivit icke avstängd. + + + Användaren hittades inte. + + + Användaren {0} har blivit varnad. + + + Användaren {0} har blivit varnad och {1} straff har blivit tillämpat. + + + Varning på {0} server + + + På {0} i {1} av {2} + + + Alla varningar har blivit rensad. + + + Inga varningar på denna sidan. + + + Varning log för {0} + + + Ingen straff ställt. + + + rensad av {0} + + + Varning straff lista + + + Har {0} varningar kommer inte längre aktivera ett straff. + + + Jag kommer att tillägga {0} straff till användare med {1} varningar. + + + Långsam läge kommer nu att bli ignorerad {0} roll. + + + Långsam läge kommer inte längre att bli ignorerad {0} roll. + + + Långsam läge kommer nu ignorera användaren {0} + + + Långsam läge kommer inte längre ignorera användaren {0} + + + Misslyckad anpråk av pris på grund av följande anledningar: + + + Du har kanske redan mottagit din pris för denna månaden. Du kan bara motta priser en gång per månad om inte du ökar din pledge. + + + Redan belönat + + + Din discord konto är kanske inte ansluten till Patreon. Om du inte är säker om vad det betyder, eller inte vet hur du skall ansluta det - du måse då gå till [Patreon account settings page] +(https://patreon.com/settings/account) och klicka på 'Connect to discord' knappen. + + + Discord konto är icke ansluten. + + + För att vara berättigad till priset så måste du stödja projektet på patreon. Du kan använda {0} kommandot för att få länken. + + + Ingen stöd + + + Du måste vänta några timmer efter din pledge, om du inte har gjort det, prova igen senare. + + + Vänta en stund + + + Du har mottagit {0} Tack för att du har stödjat projektet! + + + Pris kan bli hävdad på eller efter femte av varje månad. + \ No newline at end of file From 74d747279f084f8699eacd0ac6cdb2b07fc198d2 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 5 Apr 2017 12:19:49 +0200 Subject: [PATCH 437/496] Update ResponseStrings.tr-TR.resx (POEditor.com) --- .../Resources/ResponseStrings.tr-TR.resx | 127 +++++++++++++++++- 1 file changed, 126 insertions(+), 1 deletion(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.tr-TR.resx b/src/NadekoBot/Resources/ResponseStrings.tr-TR.resx index b63550e8..182ad0d4 100644 --- a/src/NadekoBot/Resources/ResponseStrings.tr-TR.resx +++ b/src/NadekoBot/Resources/ResponseStrings.tr-TR.resx @@ -741,7 +741,8 @@ Sebep: {1} Hafif bir şekilde yasaklandılar (atıldılar) - PLURAL + PLURAL +Fuzzy {0} bu kanalı yoksayacak. @@ -2281,5 +2282,129 @@ Kurucu Kimliği: {2} Rekabetçi oyun süresi + + Kanal + + + Kanal Mesajı + + + Atıldı + PLURAL + + + Moderatör + + + sayfa {0} + + + Sebep + + + Yeni başlangıç komutu eklendi. + + + Başlangıç komutu başarıyla kaldırıldı. + + + Başlangıç komutu bulunamadı. + + + Sunucu + + + Bu sayfada başlangıç komutları bulunmuyor. + + + Tüm başlangıç komutları temizlendi. + + + {0} kullanıcısının yasağı kaldırıldı. + + + Kullanıcı bulunamadı. + + + {0} kullanıcısı uyarıldı. + + + {0} kullanıcısı uyarıldı ve {1} cezası uygulandı. + + + {0} sunucusunda uyarıldı. + + + {0} - {1} tarihinde {2} tarafından + + + {0} için tüm uyarılar silindi. + + + Bu sayfada uyarı bulunamadı. + + + {0} için Uyarı Kayıtları + + + Hiç ceza belirlenmedi. + + + {0} tarafından temizlendi. + + + Uyarı ceza listesi + + + {0} uyarılarına sahip olmak artık cezayı tetiklemeyecektir. + + + {1} uyarılarıyla {0} cezasını kullanıcılara uygulayacağım. + + + Yavaş mod, artık {0} rolünü görmezden gelecektir. + + + Yavaş mod, artık {0} rolünü görmezden gelmeyecek. + + + Yavaş mod, artık {0} kullanıcısını yoksayacak. + + + Yavaş mod, {0} kullanıcısını artık görmezden gelmeyecek. + + + Aşağıdaki nedenlerden biriyle ödül talebinde bulunamadı: + + + Belki de bu ay için ödülünüzü zaten almışsınızdır. Bağış miktarınızı artırmadıkça, yalnızca ayda bir kez ödül alabilirsiniz. + + + Zaten ödüllendirildi + + + Discord hesabınız Patreon'a bağlı olmayabilir. Bunun ne anlama geldiğinden emin değilseniz veya nasıl bağlanacağınızı bilmiyorsanız - [Patreon hesap ayarları sayfasına] (https://patreon.com/settings/account) adresine gidin ve 'Bağlantı' butonuna tıklayın. + + + Discord hesabı bağlı değil + + + Ödül için uygun olabilmeniz için, projeyi patreon'da bağış yapmanız gerek. Bağlantıyı almak için {0} komutunu kullanabilirsiniz. + + + Desteklemiyor + + + Bağış yaptıktan sonra birkaç saat beklemek zorundasınız, yapmadıysanız, daha sonra tekrar deneyin. + + + Biraz bekleyin + + + {0} Projeyi desteklediğiniz için teşekkürlerimizi aldınız! + + + Ödüller, her ayın 5'inde veya sonrasında talep edilebilir. + \ No newline at end of file From 8927f9c1bee2d7dfa089dbacece37652448a36be Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 5 Apr 2017 12:19:52 +0200 Subject: [PATCH 438/496] Update ResponseStrings.id-ID.resx (POEditor.com) --- .../Resources/ResponseStrings.id-ID.resx | 362 ++++++++++++------ 1 file changed, 244 insertions(+), 118 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.id-ID.resx b/src/NadekoBot/Resources/ResponseStrings.id-ID.resx index d2f4e2d2..f6cad4b4 100644 --- a/src/NadekoBot/Resources/ResponseStrings.id-ID.resx +++ b/src/NadekoBot/Resources/ResponseStrings.id-ID.resx @@ -1,121 +1,121 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Markas itu telah diklaim atau dihancurkan. @@ -742,7 +742,8 @@ Alasan: {1} Ban halus (Dikeluarkan) - PLURAL + PLURAL +Fuzzy {0} akan mengabaikan channel ini. @@ -2281,5 +2282,130 @@ ID Pemilik: {2} Waktu bermain kompetitif + + Saluran + + + Teks perintah + + + Ditendang + PLURAL + + + Moderator + + + Halaman {0} + + + Alasan + + + Perintah startup ditambahkan. + + + Penghilangan perintah startup sukses. + + + Perintah startup tidak ditemukan. + + + Server + + + Tidak ada perintah startup dihalaman ini. + + + Membersihkan semua perintah startup. + + + Pengguna {0} telah dinonlarangkan. + + + Pengguna tidak ditemukan + + + Pengguna {0} telah diperingatkan. + + + Pengguna {0} telah diperingatkan dan hukuman {1} diberikan. + + + Diperingatkan di server {0} + + + Di {0} saat {1} oleh {2} + + + Semua peringatan telah dibersihkan untuk {0}. + + + Tidak ada peringatan dihalaman ini. + + + Berkas peringatan untuk {0} + + + Tidak ada hukuman ditetapkan. + + + Dibersihkan oleh {0} + + + Daftar peringatan hukum + + + Mempunyai {0} peringatan tidak akan memulai hukuman. + + + Saya akan menambahkan hukuman {0} untuk pengguna dengan {1} peringatan. + + + Slowmode akan mengabaikan peran {0}. + + + Slowmode tidak akan lagi mengabaikan peran {0} + + + Slowmode akan mengabaikan pengguna {0} + Fuzzy + + + Slowmode tidak akan lagi mengabaikan pengguna {0}. + + + Gagal untuk mengambil hadiah karena salah satu dari alasan ini: + + + Mungkin anda telah mendapatkan hadiah anda untuk bulan ini. Anda hanya bisa mendapatkan hadiah sekali sebulan kecuali anda menambahkan jumlah janji anda. + + + Telah dihadiahkan + + + Akun DIscord anda mungkin tidak terkoneksi ke Patreon. Jika anda tidak yakin artinya, atau tidak tahu cara menghubungkannya ` anda harus pergi ke [Halaman pengaturan akun Patreon] (https://patreon.com/settings/account) dan menekan tombol 'Connect to Discord'. + + + Akun Discord tidak terhubung + + + Untuk berhak mendapatkan hadiah, anda harus mendukung proyek di Patreon. + + + Tidak mendukung. + + + Anda harus menunggu beberapa jam setelah memohon, jika anda tidak, cobalah nanti lagi. + + + Tunggulah sebentar. + + + Anda telah menerima {0}. Terima kasih untuk mendukung proyek ini! + + + Hadiah bisa diambil saat atau setelah tanggal 5 dari setiap bulan. + \ No newline at end of file From 2869a60d6c9702b215450964a2f0d4bbf9e4636a Mon Sep 17 00:00:00 2001 From: snippet Date: Wed, 5 Apr 2017 23:04:37 +1000 Subject: [PATCH 439/496] Adds .rolehoist command --- docs/Commands List.md | 1 + .../Modules/Administration/Administration.cs | 12 +++++++++ .../Resources/CommandStrings.Designer.cs | 27 +++++++++++++++++++ src/NadekoBot/Resources/CommandStrings.resx | 9 +++++++ 4 files changed, 49 insertions(+) diff --git a/docs/Commands List.md b/docs/Commands List.md index 715df776..da4d922c 100644 --- a/docs/Commands List.md +++ b/docs/Commands List.md @@ -26,6 +26,7 @@ Commands and aliases | Description | Usage `.removeallroles` `.rar` | Removes all roles from a mentioned user. **Requires ManageRoles server permission.** | `.rar @User` `.createrole` `.cr` | Creates a role with a given name. **Requires ManageRoles server permission.** | `.cr Awesome Role` `.rolecolor` `.rc` | Set a role's color to the hex or 0-255 rgb color value provided. **Requires ManageRoles server permission.** | `.rc Admin 255 200 100` or `.rc Admin ffba55` +`.rolehoist` `.rh` | Set whether the role should be displayed separately in the sidebar **Requires ManageRoles server permission.** | `.rh Guests true` or `.rolehoist "Space Wizards" true` `.deafen` `.deaf` | Deafens mentioned user or users. **Requires DeafenMembers server permission.** | `.deaf "@Someguy"` or `.deaf "@Someguy" "@Someguy"` `.undeafen` `.undef` | Undeafens mentioned user or users. **Requires DeafenMembers server permission.** | `.undef "@Someguy"` or `.undef "@Someguy" "@Someguy"` `.delvoichanl` `.dvch` | Deletes a voice channel with a given name. **Requires ManageChannels server permission.** | `.dvch VoiceChannelName` diff --git a/src/NadekoBot/Modules/Administration/Administration.cs b/src/NadekoBot/Modules/Administration/Administration.cs index 6ecefe10..5b0adfaa 100644 --- a/src/NadekoBot/Modules/Administration/Administration.cs +++ b/src/NadekoBot/Modules/Administration/Administration.cs @@ -196,6 +196,18 @@ namespace NadekoBot.Modules.Administration await ReplyConfirmLocalized("cr", Format.Bold(r.Name)).ConfigureAwait(false); } + [NadekoCommand, Usage, Description, Aliases] + [RequireContext(ContextType.Guild)] + [RequireUserPermission(GuildPermission.ManageRoles)] + [RequireBotPermission(GuildPermission.ManageRoles)] + public async Task RoleHoist(string roleSearchName, bool targetState) + { + var roleName = roleSearchName.ToUpperInvariant(); + var role = Context.Guild.Roles.FirstOrDefault(r => r.Name.ToUpperInvariant() == roleName); + + await role.ModifyAsync(r => r.Hoist = targetState).ConfigureAwait(false); + } + [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] [RequireUserPermission(GuildPermission.ManageRoles)] diff --git a/src/NadekoBot/Resources/CommandStrings.Designer.cs b/src/NadekoBot/Resources/CommandStrings.Designer.cs index d021e161..ef52ebd4 100644 --- a/src/NadekoBot/Resources/CommandStrings.Designer.cs +++ b/src/NadekoBot/Resources/CommandStrings.Designer.cs @@ -6593,6 +6593,33 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to rolehoist rh. + /// + public static string rolehoist_cmd { + get { + return ResourceManager.GetString("rolehoist_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Toggles if this role is displayed in the sidebar or not. + /// + public static string rolehoist_desc { + get { + return ResourceManager.GetString("rolehoist_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}rh Guests true` or `{0}rh "Space Wizards" true. + /// + public static string rolehoist_usage { + get { + return ResourceManager.GetString("rolehoist_usage", resourceCulture); + } + } + /// /// Looks up a localized string similar to rolemdl rm. /// diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx index 1a943af1..859f0043 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -3366,4 +3366,13 @@ `{0}time London, UK` + + rolehoist rh + + + Toggles if this role is displayed in the sidebar or not + + + `{0}rh Guests true` or `{0}rh "Space Wizards" true + \ No newline at end of file From 80cb6e86c45ead7552002c49bbc967223833966e Mon Sep 17 00:00:00 2001 From: snippet Date: Wed, 5 Apr 2017 23:30:29 +1000 Subject: [PATCH 440/496] Adds response to .rh / .rolehoist Also swaps to PermissionAction from bool --- src/NadekoBot/Modules/Administration/Administration.cs | 6 ++++-- src/NadekoBot/Resources/ResponseStrings.Designer.cs | 9 +++++++++ src/NadekoBot/Resources/ResponseStrings.resx | 3 +++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Modules/Administration/Administration.cs b/src/NadekoBot/Modules/Administration/Administration.cs index 5b0adfaa..fffac1f7 100644 --- a/src/NadekoBot/Modules/Administration/Administration.cs +++ b/src/NadekoBot/Modules/Administration/Administration.cs @@ -12,6 +12,7 @@ using NadekoBot.Services.Database.Models; using static NadekoBot.Modules.Permissions.Permissions; using System.Collections.Concurrent; using NLog; +using NadekoBot.Modules.Permissions; namespace NadekoBot.Modules.Administration { @@ -200,12 +201,13 @@ namespace NadekoBot.Modules.Administration [RequireContext(ContextType.Guild)] [RequireUserPermission(GuildPermission.ManageRoles)] [RequireBotPermission(GuildPermission.ManageRoles)] - public async Task RoleHoist(string roleSearchName, bool targetState) + public async Task RoleHoist(string roleSearchName, PermissionAction targetState) { var roleName = roleSearchName.ToUpperInvariant(); var role = Context.Guild.Roles.FirstOrDefault(r => r.Name.ToUpperInvariant() == roleName); - await role.ModifyAsync(r => r.Hoist = targetState).ConfigureAwait(false); + await role.ModifyAsync(r => r.Hoist = targetState.Value).ConfigureAwait(false); + await ReplyConfirmLocalized("rh", Format.Bold(role.Name), Format.Bold(targetState.Value.ToString())).ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index f4171166..1836004a 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -1168,6 +1168,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Set the display of guild role {0} to {1}.. + /// + public static string administration_rh { + get { + return ResourceManager.GetString("administration_rh", resourceCulture); + } + } + /// /// Looks up a localized string similar to Role {0} as been added to the list.. /// diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index 2a1d1e7f..e3de1903 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -2406,4 +2406,7 @@ Owner ID: {2} Time in {0} is {1} - {2} Time in London, UK is 15:30 - Time Zone Name + + Set the display of guild role {0} to {1}. + \ No newline at end of file From b09cd7ea434ed52c19e92fbaa649323ea6265d3d Mon Sep 17 00:00:00 2001 From: Kwoth Date: Thu, 6 Apr 2017 19:48:21 +0200 Subject: [PATCH 441/496] patreon error fix --- src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs b/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs index 303774f4..924c720f 100644 --- a/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs +++ b/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs @@ -13,6 +13,7 @@ using NadekoBot.Services; using NadekoBot.Services.Database.Models; using NadekoBot.Extensions; using Discord; +using NLog; namespace NadekoBot.Modules.Utility { @@ -74,11 +75,13 @@ namespace NadekoBot.Modules.Utility private readonly Timer update; private readonly SemaphoreSlim claimLockJustInCase = new SemaphoreSlim(1, 1); + private readonly Logger _log; private PatreonThingy() { if (string.IsNullOrWhiteSpace(NadekoBot.Credentials.PatreonAccessToken)) return; + _log = LogManager.GetCurrentClassLogger(); update = new Timer(async (_) => await LoadPledges(), null, TimeSpan.Zero, TimeSpan.FromHours(3)); } @@ -119,6 +122,10 @@ namespace NadekoBot.Modules.Utility Reward = x, }).ToImmutableArray(); } + catch (Exception ex) + { + _log.Warn(ex); + } finally { var _ = Task.Run(async () => From 6efd78ca215656e040ff9db526ec47a841d20b70 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Thu, 6 Apr 2017 20:59:07 +0200 Subject: [PATCH 442/496] Patreon stuff improved --- .../Utility/Commands/PatreonCommands.cs | 20 ++++++++- src/NadekoBot/Resources/CommandStrings.resx | 41 +++++++++++++++++-- 2 files changed, 55 insertions(+), 6 deletions(-) diff --git a/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs b/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs index 924c720f..583b1f5b 100644 --- a/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs +++ b/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs @@ -28,6 +28,16 @@ namespace NadekoBot.Modules.Utility { patreon = PatreonThingy.Instance; } + + [NadekoCommand, Usage, Description, Aliases] + [OwnerOnly] + public async Task PatreonRewardsReload() + { + await patreon.LoadPledges().ConfigureAwait(false); + + await Context.Channel.SendConfirmAsync("👌").ConfigureAwait(false); + } + [NadekoCommand, Usage, Description, Aliases] public async Task ClaimPatreonRewards() { @@ -53,13 +63,15 @@ namespace NadekoBot.Modules.Utility await ReplyConfirmLocalized("clpa_success", amount + NadekoBot.BotConfig.CurrencySign).ConfigureAwait(false); return; } + var rem = (patreon.Interval - (DateTime.UtcNow - patreon.LastUpdate)); var helpcmd = Format.Code(NadekoBot.ModulePrefixes[typeof(Help.Help).Name] + "donate"); await Context.Channel.EmbedAsync(new EmbedBuilder().WithOkColor() .WithDescription(GetText("clpa_fail")) .AddField(efb => efb.WithName(GetText("clpa_fail_already_title")).WithValue(GetText("clpa_fail_already"))) .AddField(efb => efb.WithName(GetText("clpa_fail_wait_title")).WithValue(GetText("clpa_fail_wait"))) .AddField(efb => efb.WithName(GetText("clpa_fail_conn_title")).WithValue(GetText("clpa_fail_conn"))) - .AddField(efb => efb.WithName(GetText("clpa_fail_sup_title")).WithValue(GetText("clpa_fail_sup", helpcmd)))) + .AddField(efb => efb.WithName(GetText("clpa_fail_sup_title")).WithValue(GetText("clpa_fail_sup", helpcmd))) + .WithFooter(efb => efb.WithText(GetText("clpa_next_update", rem)))) .ConfigureAwait(false); } } @@ -72,21 +84,25 @@ namespace NadekoBot.Modules.Utility private readonly SemaphoreSlim getPledgesLocker = new SemaphoreSlim(1, 1); public ImmutableArray Pledges { get; private set; } + public DateTime LastUpdate { get; private set; } = DateTime.UtcNow; private readonly Timer update; private readonly SemaphoreSlim claimLockJustInCase = new SemaphoreSlim(1, 1); private readonly Logger _log; + public readonly TimeSpan Interval = TimeSpan.FromHours(1); + private PatreonThingy() { if (string.IsNullOrWhiteSpace(NadekoBot.Credentials.PatreonAccessToken)) return; _log = LogManager.GetCurrentClassLogger(); - update = new Timer(async (_) => await LoadPledges(), null, TimeSpan.Zero, TimeSpan.FromHours(3)); + update = new Timer(async (_) => await LoadPledges(), null, TimeSpan.Zero, Interval); } public async Task LoadPledges() { + LastUpdate = DateTime.UtcNow; await getPledgesLocker.WaitAsync(1000).ConfigureAwait(false); try { diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx index 1a943af1..cb6958bb 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -2596,10 +2596,10 @@ listquotes liqu - `{0}liqu` or `{0}liqu 3` + Lists all quotes on the server ordered alphabetically. 15 Per page. - Lists all quotes on the server ordered alphabetically. 15 Per page. + `{0}liqu` or `{0}liqu 3` typedel @@ -3211,7 +3211,7 @@ Toggles whether the response message of the custom reaction will be sent as a direct message. - `{0}crad 44` + `{0}crdm 44` aliaslist cmdmaplist aliases @@ -3334,7 +3334,7 @@ clparew - Claim patreon rewards. If you're subscribed to bot owner's patreon you can user this command to claim your rewards - assuming bot owner did setup has their patreon key. + Claim patreon rewards. If you're subscribed to bot owner's patreon you can use this command to claim your rewards - assuming bot owner did setup has their patreon key. `{0}clparew` @@ -3366,4 +3366,37 @@ `{0}time London, UK` + + parewrel + + + Forces the update of the list of patrons who are eligible for the reward. + + + `{0}parewrel` + + + shopadd + + + Adds an item to the shop by specifying type price and name. + + + `{0}shopadd role 1000 Rich` + + + shoprem shoprm + + + Removes an item from the shop by its color. + + + shop + + + Lists this server's administrators' shop. Paginated. + + + `{0}shop` or `{0}shop 2` + \ No newline at end of file From 936ba264c97942c339f86b9f8a41ae3660e2254d Mon Sep 17 00:00:00 2001 From: Kwoth Date: Thu, 6 Apr 2017 21:00:46 +0200 Subject: [PATCH 443/496] A lot of work on flower shop --- .../DataStructures/IndexedCollection.cs | 128 ++ .../DataStructures/PermissionsCollection.cs | 103 +- .../20170405161814_flower-shop.Designer.cs | 1518 +++++++++++++++++ .../Migrations/20170405161814_flower-shop.cs | 79 + .../NadekoSqliteContextModelSnapshot.cs | 62 + .../Modules/Gambling/Commands/FlowerShop.cs | 170 ++ .../Resources/CommandStrings.Designer.cs | 107 +- .../Resources/ResponseStrings.Designer.cs | 63 + src/NadekoBot/Resources/ResponseStrings.resx | 22 + .../Services/Database/Models/GuildConfig.cs | 2 + .../Services/Database/Models/ShopEntry.cs | 41 + 11 files changed, 2207 insertions(+), 88 deletions(-) create mode 100644 src/NadekoBot/DataStructures/IndexedCollection.cs create mode 100644 src/NadekoBot/Migrations/20170405161814_flower-shop.Designer.cs create mode 100644 src/NadekoBot/Migrations/20170405161814_flower-shop.cs create mode 100644 src/NadekoBot/Modules/Gambling/Commands/FlowerShop.cs create mode 100644 src/NadekoBot/Services/Database/Models/ShopEntry.cs diff --git a/src/NadekoBot/DataStructures/IndexedCollection.cs b/src/NadekoBot/DataStructures/IndexedCollection.cs new file mode 100644 index 00000000..72b4f343 --- /dev/null +++ b/src/NadekoBot/DataStructures/IndexedCollection.cs @@ -0,0 +1,128 @@ +using NadekoBot.Services.Database.Models; +using System.Collections; +using System.Collections.Generic; +using System.Linq; + +namespace NadekoBot.DataStructures +{ + public class IndexedCollection : IList where T : IIndexed + { + public List Source { get; } + private readonly object _locker = new object(); + + public IndexedCollection(IEnumerable source) + { + lock (_locker) + { + Source = source.OrderBy(x => x.Index).ToList(); + for (var i = 0; i < Source.Count; i++) + { + if (Source[i].Index != i) + Source[i].Index = i; + } + } + } + + public static implicit operator List(IndexedCollection x) => + x.Source; + + public IEnumerator GetEnumerator() => + Source.GetEnumerator(); + + IEnumerator IEnumerable.GetEnumerator() => + Source.GetEnumerator(); + + public void Add(T item) + { + lock (_locker) + { + item.Index = Source.Count; + Source.Add(item); + } + } + + public virtual void Clear() + { + lock (_locker) + { + Source.Clear(); + } + } + + public bool Contains(T item) + { + lock (_locker) + { + return Source.Contains(item); + } + } + + public void CopyTo(T[] array, int arrayIndex) + { + lock (_locker) + { + Source.CopyTo(array, arrayIndex); + } + } + + public virtual bool Remove(T item) + { + bool removed; + lock (_locker) + { + if (removed = Source.Remove(item)) + { + for (int i = 0; i < Source.Count; i++) + { + // hm, no idea how ef works, so I don't want to set if it's not changed, + // maybe it will try to update db? + // But most likely it just compares old to new values, meh. + if (Source[i].Index != i) + Source[i].Index = i; + } + } + } + return removed; + } + + public int Count => Source.Count; + public bool IsReadOnly => false; + public int IndexOf(T item) => item.Index; + + public virtual void Insert(int index, T item) + { + lock (_locker) + { + Source.Insert(index, item); + for (int i = index; i < Source.Count; i++) + { + Source[i].Index = i; + } + } + } + + public virtual void RemoveAt(int index) + { + lock (_locker) + { + Source.RemoveAt(index); + for (int i = index; i < Source.Count; i++) + { + Source[i].Index = i; + } + } + } + + public virtual T this[int index] { + get { return Source[index]; } + set { + lock (_locker) + { + value.Index = index; + Source[index] = value; + } + } + } + } + +} diff --git a/src/NadekoBot/DataStructures/PermissionsCollection.cs b/src/NadekoBot/DataStructures/PermissionsCollection.cs index e7963e64..484c4f9d 100644 --- a/src/NadekoBot/DataStructures/PermissionsCollection.cs +++ b/src/NadekoBot/DataStructures/PermissionsCollection.cs @@ -6,132 +6,67 @@ using NadekoBot.Services.Database.Models; namespace NadekoBot.DataStructures { - public class PermissionsCollection : IList where T : IIndexed + public class PermissionsCollection : IndexedCollection where T : IIndexed { - public List Source { get; } - private readonly object _locker = new object(); - - public PermissionsCollection(IEnumerable source) + private readonly object _localLocker = new object(); + public PermissionsCollection(IEnumerable source) : base(source) { - lock (_locker) - { - Source = source.OrderBy(x => x.Index).ToList(); - for (var i = 0; i < Source.Count; i++) - { - if(Source[i].Index != i) - Source[i].Index = i; - } - } } public static implicit operator List(PermissionsCollection x) => x.Source; - public IEnumerator GetEnumerator() => - Source.GetEnumerator(); - - IEnumerator IEnumerable.GetEnumerator() => - Source.GetEnumerator(); - - public void Add(T item) + public override void Clear() { - lock (_locker) - { - item.Index = Source.Count; - Source.Add(item); - } - } - - public void Clear() - { - lock (_locker) + lock (_localLocker) { var first = Source[0]; - Source.Clear(); + base.Clear(); Source[0] = first; } } - public bool Contains(T item) - { - lock (_locker) - { - return Source.Contains(item); - } - } - - public void CopyTo(T[] array, int arrayIndex) - { - lock (_locker) - { - Source.CopyTo(array, arrayIndex); - } - } - - public bool Remove(T item) + public override bool Remove(T item) { bool removed; - lock (_locker) + lock (_localLocker) { if(Source.IndexOf(item) == 0) throw new ArgumentException("You can't remove first permsission (allow all)"); - if (removed = Source.Remove(item)) - { - for (int i = 0; i < Source.Count; i++) - { - // hm, no idea how ef works, so I don't want to set if it's not changed, - // maybe it will try to update db? - // But most likely it just compares old to new values, meh. - if (Source[i].Index != i) - Source[i].Index = i; - } - } + removed = base.Remove(item); } return removed; } - public int Count => Source.Count; - public bool IsReadOnly => false; - public int IndexOf(T item) => item.Index; - - public void Insert(int index, T item) + public override void Insert(int index, T item) { - lock (_locker) + lock (_localLocker) { if(index == 0) // can't insert on first place. Last item is always allow all. throw new IndexOutOfRangeException(nameof(index)); - Source.Insert(index, item); - for (int i = index; i < Source.Count; i++) - { - Source[i].Index = i; - } + base.Insert(index, item); } } - public void RemoveAt(int index) + public override void RemoveAt(int index) { - lock (_locker) + lock (_localLocker) { if(index == 0) // you can't remove first permission (allow all) - throw new IndexOutOfRangeException(nameof(index)); + throw new IndexOutOfRangeException(nameof(index)); - Source.RemoveAt(index); - for (int i = index; i < Source.Count; i++) - { - Source[i].Index = i; - } + base.RemoveAt(index); } } - public T this[int index] { + public override T this[int index] { get { return Source[index]; } set { - lock (_locker) + lock (_localLocker) { if(index == 0) // can't set first element. It's always allow all throw new IndexOutOfRangeException(nameof(index)); - value.Index = index; - Source[index] = value; + base[index] = value; } } } diff --git a/src/NadekoBot/Migrations/20170405161814_flower-shop.Designer.cs b/src/NadekoBot/Migrations/20170405161814_flower-shop.Designer.cs new file mode 100644 index 00000000..5acf9f8e --- /dev/null +++ b/src/NadekoBot/Migrations/20170405161814_flower-shop.Designer.cs @@ -0,0 +1,1518 @@ +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using NadekoBot.Services.Database; +using NadekoBot.Services.Database.Models; +using NadekoBot.Modules.Music.Classes; + +namespace NadekoBot.Migrations +{ + [DbContext(typeof(NadekoContext))] + [Migration("20170405161814_flower-shop")] + partial class flowershop + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { + modelBuilder + .HasAnnotation("ProductVersion", "1.1.0-rtm-22752"); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Action"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Seconds"); + + b.Property("UserThreshold"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId") + .IsUnique(); + + b.ToTable("AntiRaidSetting"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AntiSpamSettingId"); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.HasKey("Id"); + + b.HasIndex("AntiSpamSettingId"); + + b.ToTable("AntiSpamIgnore"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Action"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("MessageThreshold"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId") + .IsUnique(); + + b.ToTable("AntiSpamSetting"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("ItemId"); + + b.Property("Type"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("BlacklistItem"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BetflipMultiplier"); + + b.Property("Betroll100Multiplier"); + + b.Property("Betroll67Multiplier"); + + b.Property("Betroll91Multiplier"); + + b.Property("BufferSize"); + + b.Property("CurrencyDropAmount"); + + b.Property("CurrencyGenerationChance"); + + b.Property("CurrencyGenerationCooldown"); + + b.Property("CurrencyName"); + + b.Property("CurrencyPluralName"); + + b.Property("CurrencySign"); + + b.Property("DMHelpString"); + + b.Property("DateAdded"); + + b.Property("ErrorColor"); + + b.Property("ForwardMessages"); + + b.Property("ForwardToAllOwners"); + + b.Property("HelpString"); + + b.Property("Locale"); + + b.Property("MigrationVersion"); + + b.Property("MinimumBetAmount"); + + b.Property("OkColor"); + + b.Property("RemindMessageFormat"); + + b.Property("RotatingStatuses"); + + b.Property("TriviaCurrencyReward"); + + b.HasKey("Id"); + + b.ToTable("BotConfig"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BaseDestroyed"); + + b.Property("CallUser"); + + b.Property("ClashWarId"); + + b.Property("DateAdded"); + + b.Property("SequenceNumber"); + + b.Property("Stars"); + + b.Property("TimeAdded"); + + b.HasKey("Id"); + + b.HasIndex("ClashWarId"); + + b.ToTable("ClashCallers"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("EnemyClan"); + + b.Property("GuildId"); + + b.Property("Size"); + + b.Property("StartedAt"); + + b.Property("WarState"); + + b.HasKey("Id"); + + b.ToTable("ClashOfClans"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Mapping"); + + b.Property("Trigger"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("CommandAlias"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("CommandName"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Seconds"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("CommandCooldown"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("CommandName"); + + b.Property("DateAdded"); + + b.Property("Price"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.HasIndex("Price") + .IsUnique(); + + b.ToTable("CommandPrice"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("InternalTrigger"); + + b.Property("Modifier"); + + b.Property("UnitType"); + + b.HasKey("Id"); + + b.ToTable("ConversionUnits"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Amount"); + + b.Property("DateAdded"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("Currency"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Amount"); + + b.Property("DateAdded"); + + b.Property("Reason"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.ToTable("CurrencyTransactions"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AutoDeleteTrigger"); + + b.Property("DateAdded"); + + b.Property("DmResponse"); + + b.Property("GuildId"); + + b.Property("IsRegex"); + + b.Property("OwnerOnly"); + + b.Property("Response"); + + b.Property("Trigger"); + + b.HasKey("Id"); + + b.ToTable("CustomReactions"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AvatarId"); + + b.Property("DateAdded"); + + b.Property("Discriminator"); + + b.Property("UserId"); + + b.Property("Username"); + + b.HasKey("Id"); + + b.HasAlternateKey("UserId"); + + b.ToTable("DiscordUser"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Amount"); + + b.Property("DateAdded"); + + b.Property("Name"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("Donators"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("Text"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("EightBallResponses"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("GuildConfigId1"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.HasIndex("GuildConfigId1"); + + b.ToTable("FilterChannelId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Word"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("FilteredWord"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("GuildId"); + + b.Property("Type"); + + b.Property("Username"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("FollowedStream"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("GCChannelId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AutoAssignRoleId"); + + b.Property("AutoDeleteByeMessages"); + + b.Property("AutoDeleteByeMessagesTimer"); + + b.Property("AutoDeleteGreetMessages"); + + b.Property("AutoDeleteGreetMessagesTimer"); + + b.Property("AutoDeleteSelfAssignedRoleMessages"); + + b.Property("ByeMessageChannelId"); + + b.Property("ChannelByeMessageText"); + + b.Property("ChannelGreetMessageText"); + + b.Property("CleverbotEnabled"); + + b.Property("DateAdded"); + + b.Property("DefaultMusicVolume"); + + b.Property("DeleteMessageOnCommand"); + + b.Property("DmGreetMessageText"); + + b.Property("ExclusiveSelfAssignedRoles"); + + b.Property("FilterInvites"); + + b.Property("FilterWords"); + + b.Property("GreetMessageChannelId"); + + b.Property("GuildId"); + + b.Property("Locale"); + + b.Property("LogSettingId"); + + b.Property("MuteRoleName"); + + b.Property("PermissionRole"); + + b.Property("RootPermissionId"); + + b.Property("SendChannelByeMessage"); + + b.Property("SendChannelGreetMessage"); + + b.Property("SendDmGreetMessage"); + + b.Property("TimeZoneId"); + + b.Property("VerbosePermissions"); + + b.Property("VoicePlusTextEnabled"); + + b.Property("WarningsInitialized"); + + b.HasKey("Id"); + + b.HasIndex("GuildId") + .IsUnique(); + + b.HasIndex("LogSettingId"); + + b.HasIndex("RootPermissionId"); + + b.ToTable("GuildConfigs"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("GuildId"); + + b.Property("Interval"); + + b.Property("Message"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("GuildRepeater"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("LogSettingId"); + + b.HasKey("Id"); + + b.HasIndex("LogSettingId"); + + b.ToTable("IgnoredLogChannels"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("LogSettingId"); + + b.HasKey("Id"); + + b.HasIndex("LogSettingId"); + + b.ToTable("IgnoredVoicePresenceCHannels"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelCreated"); + + b.Property("ChannelCreatedId"); + + b.Property("ChannelDestroyed"); + + b.Property("ChannelDestroyedId"); + + b.Property("ChannelId"); + + b.Property("ChannelUpdated"); + + b.Property("ChannelUpdatedId"); + + b.Property("DateAdded"); + + b.Property("IsLogging"); + + b.Property("LogOtherId"); + + b.Property("LogUserPresence"); + + b.Property("LogUserPresenceId"); + + b.Property("LogVoicePresence"); + + b.Property("LogVoicePresenceId"); + + b.Property("LogVoicePresenceTTSId"); + + b.Property("MessageDeleted"); + + b.Property("MessageDeletedId"); + + b.Property("MessageUpdated"); + + b.Property("MessageUpdatedId"); + + b.Property("UserBanned"); + + b.Property("UserBannedId"); + + b.Property("UserJoined"); + + b.Property("UserJoinedId"); + + b.Property("UserLeft"); + + b.Property("UserLeftId"); + + b.Property("UserMutedId"); + + b.Property("UserPresenceChannelId"); + + b.Property("UserUnbanned"); + + b.Property("UserUnbannedId"); + + b.Property("UserUpdated"); + + b.Property("UserUpdatedId"); + + b.Property("VoicePresenceChannelId"); + + b.HasKey("Id"); + + b.ToTable("LogSettings"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("ModuleName"); + + b.Property("Prefix"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("ModulePrefixes"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Author"); + + b.Property("AuthorId"); + + b.Property("DateAdded"); + + b.Property("Name"); + + b.HasKey("Id"); + + b.ToTable("MusicPlaylists"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("MutedUserId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("NextId"); + + b.Property("PrimaryTarget"); + + b.Property("PrimaryTargetId"); + + b.Property("SecondaryTarget"); + + b.Property("SecondaryTargetName"); + + b.Property("State"); + + b.HasKey("Id"); + + b.HasIndex("NextId") + .IsUnique(); + + b.ToTable("Permission"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Index"); + + b.Property("PrimaryTarget"); + + b.Property("PrimaryTargetId"); + + b.Property("SecondaryTarget"); + + b.Property("SecondaryTargetName"); + + b.Property("State"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("Permissionv2"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("Status"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("PlayingStatus"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("MusicPlaylistId"); + + b.Property("Provider"); + + b.Property("ProviderType"); + + b.Property("Query"); + + b.Property("Title"); + + b.Property("Uri"); + + b.HasKey("Id"); + + b.HasIndex("MusicPlaylistId"); + + b.ToTable("PlaylistSong"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AuthorId"); + + b.Property("AuthorName") + .IsRequired(); + + b.Property("DateAdded"); + + b.Property("GuildId"); + + b.Property("Keyword") + .IsRequired(); + + b.Property("Text") + .IsRequired(); + + b.HasKey("Id"); + + b.ToTable("Quotes"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("Icon"); + + b.Property("Name"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("RaceAnimals"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("IsPrivate"); + + b.Property("Message"); + + b.Property("ServerId"); + + b.Property("UserId"); + + b.Property("When"); + + b.HasKey("Id"); + + b.ToTable("Reminders"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.RewardedUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AmountRewardedThisMonth"); + + b.Property("DateAdded"); + + b.Property("LastReward"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("RewardedUsers"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildId"); + + b.Property("RoleId"); + + b.HasKey("Id"); + + b.HasIndex("GuildId", "RoleId") + .IsUnique(); + + b.ToTable("SelfAssignableRoles"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AuthorId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Index"); + + b.Property("Name"); + + b.Property("Price"); + + b.Property("RoleId"); + + b.Property("RoleName"); + + b.Property("Type"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("ShopEntry"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("ShopEntryId"); + + b.Property("Text"); + + b.HasKey("Id"); + + b.HasIndex("ShopEntryId"); + + b.ToTable("ShopEntryItem"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("RoleId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("SlowmodeIgnoredRole"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("SlowmodeIgnoredUser"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("ChannelId"); + + b.Property("ChannelName"); + + b.Property("CommandText"); + + b.Property("DateAdded"); + + b.Property("GuildId"); + + b.Property("GuildName"); + + b.Property("Index"); + + b.Property("VoiceChannelId"); + + b.Property("VoiceChannelName"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("StartupCommand"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("UnmuteAt"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("UnmuteTimer"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("UserId"); + + b.Property("type"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("PokeGame"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("RoleId"); + + b.Property("VoiceChannelId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("VcRoleInfo"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AffinityId"); + + b.Property("ClaimerId"); + + b.Property("DateAdded"); + + b.Property("Price"); + + b.Property("WaifuId"); + + b.HasKey("Id"); + + b.HasIndex("AffinityId"); + + b.HasIndex("ClaimerId"); + + b.HasIndex("WaifuId") + .IsUnique(); + + b.ToTable("WaifuInfo"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("NewId"); + + b.Property("OldId"); + + b.Property("UpdateType"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("NewId"); + + b.HasIndex("OldId"); + + b.HasIndex("UserId"); + + b.ToTable("WaifuUpdates"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("Forgiven"); + + b.Property("ForgivenBy"); + + b.Property("GuildId"); + + b.Property("Moderator"); + + b.Property("Reason"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.ToTable("Warnings"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Count"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Punishment"); + + b.Property("Time"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("WarningPunishment"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig") + .WithOne("AntiRaidSetting") + .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b => + { + b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting") + .WithMany("IgnoredChannels") + .HasForeignKey("AntiSpamSettingId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig") + .WithOne("AntiSpamSetting") + .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("Blacklist") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b => + { + b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar") + .WithMany("Bases") + .HasForeignKey("ClashWarId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("CommandAliases") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("CommandCooldowns") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("CommandPrices") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("EightBallResponses") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FilterInvitesChannelIds") + .HasForeignKey("GuildConfigId"); + + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FilterWordsChannelIds") + .HasForeignKey("GuildConfigId1"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FilteredWords") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FollowedStreams") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("GenerateCurrencyChannelIds") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b => + { + b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting") + .WithMany() + .HasForeignKey("LogSettingId"); + + b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission") + .WithMany() + .HasForeignKey("RootPermissionId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("GuildRepeaters") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b => + { + b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting") + .WithMany("IgnoredChannels") + .HasForeignKey("LogSettingId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b => + { + b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting") + .WithMany("IgnoredVoicePresenceChannelIds") + .HasForeignKey("LogSettingId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("ModulePrefixes") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("MutedUsers") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b => + { + b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next") + .WithOne("Previous") + .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("Permissions") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("RotatingStatusMessages") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b => + { + b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist") + .WithMany("Songs") + .HasForeignKey("MusicPlaylistId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("RaceAnimals") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("ShopEntries") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b => + { + b.HasOne("NadekoBot.Services.Database.Models.ShopEntry") + .WithMany("Items") + .HasForeignKey("ShopEntryId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("SlowmodeIgnoredRoles") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("SlowmodeIgnoredUsers") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("StartupCommands") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("UnmuteTimers") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("VcRoleInfos") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => + { + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity") + .WithMany() + .HasForeignKey("AffinityId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer") + .WithMany() + .HasForeignKey("ClaimerId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu") + .WithOne() + .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => + { + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New") + .WithMany() + .HasForeignKey("NewId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old") + .WithMany() + .HasForeignKey("OldId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("WarnPunishments") + .HasForeignKey("GuildConfigId"); + }); + } + } +} diff --git a/src/NadekoBot/Migrations/20170405161814_flower-shop.cs b/src/NadekoBot/Migrations/20170405161814_flower-shop.cs new file mode 100644 index 00000000..7d0cde56 --- /dev/null +++ b/src/NadekoBot/Migrations/20170405161814_flower-shop.cs @@ -0,0 +1,79 @@ +using System; +using System.Collections.Generic; +using Microsoft.EntityFrameworkCore.Migrations; + +namespace NadekoBot.Migrations +{ + public partial class flowershop : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "ShopEntry", + columns: table => new + { + Id = table.Column(nullable: false) + .Annotation("Sqlite:Autoincrement", true), + AuthorId = table.Column(nullable: false), + DateAdded = table.Column(nullable: true), + GuildConfigId = table.Column(nullable: true), + Index = table.Column(nullable: false), + Name = table.Column(nullable: true), + Price = table.Column(nullable: false), + RoleId = table.Column(nullable: false), + RoleName = table.Column(nullable: true), + Type = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_ShopEntry", x => x.Id); + table.ForeignKey( + name: "FK_ShopEntry_GuildConfigs_GuildConfigId", + column: x => x.GuildConfigId, + principalTable: "GuildConfigs", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + }); + + migrationBuilder.CreateTable( + name: "ShopEntryItem", + columns: table => new + { + Id = table.Column(nullable: false) + .Annotation("Sqlite:Autoincrement", true), + DateAdded = table.Column(nullable: true), + ShopEntryId = table.Column(nullable: true), + Text = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_ShopEntryItem", x => x.Id); + table.ForeignKey( + name: "FK_ShopEntryItem_ShopEntry_ShopEntryId", + column: x => x.ShopEntryId, + principalTable: "ShopEntry", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + }); + + migrationBuilder.CreateIndex( + name: "IX_ShopEntry_GuildConfigId", + table: "ShopEntry", + column: "GuildConfigId"); + + migrationBuilder.CreateIndex( + name: "IX_ShopEntryItem_ShopEntryId", + table: "ShopEntryItem", + column: "ShopEntryId"); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "ShopEntryItem"); + + migrationBuilder.DropTable( + name: "ShopEntry"); + } + } +} diff --git a/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs b/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs index 303783e4..c255ba79 100644 --- a/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs +++ b/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs @@ -971,6 +971,54 @@ namespace NadekoBot.Migrations b.ToTable("SelfAssignableRoles"); }); + modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AuthorId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Index"); + + b.Property("Name"); + + b.Property("Price"); + + b.Property("RoleId"); + + b.Property("RoleName"); + + b.Property("Type"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("ShopEntry"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("ShopEntryId"); + + b.Property("Text"); + + b.HasKey("Id"); + + b.HasIndex("ShopEntryId"); + + b.ToTable("ShopEntryItem"); + }); + modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b => { b.Property("Id") @@ -1377,6 +1425,20 @@ namespace NadekoBot.Migrations .HasForeignKey("BotConfigId"); }); + modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("ShopEntries") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b => + { + b.HasOne("NadekoBot.Services.Database.Models.ShopEntry") + .WithMany("Items") + .HasForeignKey("ShopEntryId"); + }); + modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b => { b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") diff --git a/src/NadekoBot/Modules/Gambling/Commands/FlowerShop.cs b/src/NadekoBot/Modules/Gambling/Commands/FlowerShop.cs new file mode 100644 index 00000000..56be01ff --- /dev/null +++ b/src/NadekoBot/Modules/Gambling/Commands/FlowerShop.cs @@ -0,0 +1,170 @@ +using Discord; +using Discord.Commands; +using Microsoft.EntityFrameworkCore; +using NadekoBot.Attributes; +using NadekoBot.DataStructures; +using NadekoBot.Extensions; +using NadekoBot.Services; +using NadekoBot.Services.Database; +using NadekoBot.Services.Database.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace NadekoBot.Modules.Gambling +{ + public partial class Gambling + { + [Group] + public class FlowerShop : NadekoSubmodule + { + public enum Role { + Role + } + + [NadekoCommand, Usage, Description, Aliases] + [RequireContext(ContextType.Guild)] + public async Task Shop(int page = 1) + { + if (page <= 0) + return; + page -= 1; + List entries; + using (var uow = DbHandler.UnitOfWork()) + { + entries = new IndexedCollection(uow.GuildConfigs.For(Context.Guild.Id, set => set.Include(x => x.ShopEntries)).ShopEntries); + } + + await Context.Channel.SendPaginatedConfirmAsync(page + 1, (curPage) => + { + var theseEntries = entries.Skip((curPage - 1) * 9).Take(9); + + if (!theseEntries.Any()) + return new EmbedBuilder().WithErrorColor() + .WithDescription(GetText("shop_none")); + var embed = new EmbedBuilder().WithOkColor() + .WithTitle(GetText("shop", NadekoBot.BotConfig.CurrencySign)); + + for (int i = 0; i < entries.Count; i++) + { + var entry = entries[i]; + embed.AddField(efb => efb.WithName($"#{i + 1} - {entry.Price}{NadekoBot.BotConfig.CurrencySign}").WithValue(EntryToString(entry)).WithIsInline(true)); + } + return embed; + }, entries.Count / 9, true); + } + + [NadekoCommand, Usage, Description, Aliases] + [RequireContext(ContextType.Guild)] + public async Task Buy(int entryNumber) + { + var channel = (ITextChannel)Context.Channel; + + } + + [NadekoCommand, Usage, Description, Aliases] + [RequireContext(ContextType.Guild)] + [RequireUserPermission(GuildPermission.Administrator)] + public async Task ShopAdd(ShopEntryType type, int price, string name) + { + var entry = new ShopEntry() + { + Name = name, + Price = price, + Type = type, + AuthorId = Context.User.Id, + }; + using (var uow = DbHandler.UnitOfWork()) + { + var entries = new IndexedCollection(uow.GuildConfigs.For(Context.Guild.Id, set => set.Include(x => x.ShopEntries)).ShopEntries); + entries.Add(entry); + uow.GuildConfigs.For(Context.Guild.Id, set => set).ShopEntries = entries; + uow.Complete(); + } + await Context.Channel.EmbedAsync(new EmbedBuilder().WithOkColor() + .WithTitle(GetText("shop_item_add")) + .AddField(efb => efb.WithName(GetText("name")).WithValue(name).WithIsInline(true)) + .AddField(efb => efb.WithName(GetText("price")).WithValue(price.ToString()).WithIsInline(true)) + .AddField(efb => efb.WithName(GetText("type")).WithValue(type.ToString()).WithIsInline(true))); + } + + [NadekoCommand, Usage, Description, Aliases] + [RequireContext(ContextType.Guild)] + [RequireUserPermission(GuildPermission.Administrator)] + public async Task ShopAdd(Role _, int price, [Remainder] IRole role) + { + var entry = new ShopEntry() + { + Name = "-", + Price = price, + Type = ShopEntryType.Role, + AuthorId = Context.User.Id, + RoleId = role.Id, + RoleName = role.Name + }; + using (var uow = DbHandler.UnitOfWork()) + { + var entries = new IndexedCollection(uow.GuildConfigs.For(Context.Guild.Id, set => set.Include(x => x.ShopEntries)).ShopEntries); + entries.Add(entry); + uow.GuildConfigs.For(Context.Guild.Id, set => set).ShopEntries = entries; + uow.Complete(); + } + await Context.Channel.EmbedAsync(new EmbedBuilder().WithOkColor() + .WithTitle(GetText("shop_item_add")) + .AddField(efb => efb.WithName(GetText("name")).WithValue(GetText("shop_role", Format.Bold(entry.RoleName))).WithIsInline(true)) + .AddField(efb => efb.WithName(GetText("price")).WithValue(price.ToString()).WithIsInline(true)) + .AddField(efb => efb.WithName(GetText("type")).WithValue("Role").WithIsInline(true))); + } + + [NadekoCommand, Usage, Description, Aliases] + [RequireContext(ContextType.Guild)] + public async Task ShopRemove(int index) + { + if (index < 0) + return; + ShopEntry removed; + using (var uow = DbHandler.UnitOfWork()) + { + var config = uow.GuildConfigs.For(Context.Guild.Id, set => set.Include(x => x.ShopEntries)); + var entries = new IndexedCollection(config.ShopEntries); + removed = entries.ElementAtOrDefault(index); + if (removed != null) + { + entries.Remove(removed); + + config.ShopEntries = entries; + uow.Complete(); + } + } + + if(removed == null) + await ReplyErrorLocalized("shop_rem_fail").ConfigureAwait(false); + else + await Context.Channel.EmbedAsync(new EmbedBuilder().WithOkColor() + .WithTitle(GetText("shop_item_add")) + .AddField(efb => efb.WithName(GetText("name")).WithValue(GetText("shop_role", Format.Bold(removed.RoleName))).WithIsInline(true)) + .AddField(efb => efb.WithName(GetText("price")).WithValue(removed.Price.ToString()).WithIsInline(true)) + .AddField(efb => efb.WithName(GetText("type")).WithValue(removed.Type.ToString()).WithIsInline(true))); + } + + public string EntryToString(ShopEntry entry) + { + if (entry.Type == ShopEntryType.Role) + { + return Format.Bold(entry.Name) + "\n" + GetText("shop_role", Format.Bold(entry.RoleName)); + } + else if (entry.Type == ShopEntryType.List) + { + + } + else if (entry.Type == ShopEntryType.Infinite_List) + { + + } + return ""; + } + } + } +} diff --git a/src/NadekoBot/Resources/CommandStrings.Designer.cs b/src/NadekoBot/Resources/CommandStrings.Designer.cs index d021e161..5729c282 100644 --- a/src/NadekoBot/Resources/CommandStrings.Designer.cs +++ b/src/NadekoBot/Resources/CommandStrings.Designer.cs @@ -1716,7 +1716,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Claim patreon rewards. If you're subscribed to bot owner's patreon you can user this command to claim your rewards - assuming bot owner did setup has their patreon key.. + /// Looks up a localized string similar to Claim patreon rewards. If you're subscribed to bot owner's patreon you can use this command to claim your rewards - assuming bot owner did setup has their patreon key.. /// public static string claimpatreonrewards_desc { get { @@ -2103,7 +2103,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to `{0}crad 44`. + /// Looks up a localized string similar to `{0}crdm 44`. /// public static string crdm_usage { get { @@ -4173,7 +4173,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to `{0}liqu` or `{0}liqu 3`. + /// Looks up a localized string similar to Lists all quotes on the server ordered alphabetically. 15 Per page.. /// public static string listquotes_desc { get { @@ -4182,7 +4182,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Lists all quotes on the server ordered alphabetically. 15 Per page.. + /// Looks up a localized string similar to `{0}liqu` or `{0}liqu 3`. /// public static string listquotes_usage { get { @@ -5297,6 +5297,33 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to parewrel. + /// + public static string patreonrewardsreload_cmd { + get { + return ResourceManager.GetString("patreonrewardsreload_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Forces the update of the list of patrons who are eligible for the reward.. + /// + public static string patreonrewardsreload_desc { + get { + return ResourceManager.GetString("patreonrewardsreload_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}parewrel`. + /// + public static string patreonrewardsreload_usage { + get { + return ResourceManager.GetString("patreonrewardsreload_usage", resourceCulture); + } + } + /// /// Looks up a localized string similar to pause p. /// @@ -7484,6 +7511,78 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to shop. + /// + public static string shop_cmd { + get { + return ResourceManager.GetString("shop_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Lists this server's administrators' shop. Paginated.. + /// + public static string shop_desc { + get { + return ResourceManager.GetString("shop_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}shop` or `{0}shop 2`. + /// + public static string shop_usage { + get { + return ResourceManager.GetString("shop_usage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to shopadd. + /// + public static string shopadd_cmd { + get { + return ResourceManager.GetString("shopadd_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Adds an item to the shop by specifying type price and name.. + /// + public static string shopadd_desc { + get { + return ResourceManager.GetString("shopadd_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}shopadd role 1000 Rich`. + /// + public static string shopadd_usage { + get { + return ResourceManager.GetString("shopadd_usage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to shoprem shoprm. + /// + public static string shopremove_cmd { + get { + return ResourceManager.GetString("shopremove_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Removes an item from the shop by its color.. + /// + public static string shopremove_desc { + get { + return ResourceManager.GetString("shopremove_desc", resourceCulture); + } + } + /// /// Looks up a localized string similar to shorten. /// diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index f4171166..c174661e 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -2755,6 +2755,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Name. + /// + public static string gambling_name { + get { + return ResourceManager.GetString("gambling_name", resourceCulture); + } + } + /// /// Looks up a localized string similar to No more cards in the deck.. /// @@ -2854,6 +2863,42 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Shop. + /// + public static string gambling_shop { + get { + return ResourceManager.GetString("gambling_shop", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Shop item added. + /// + public static string gambling_shop_item_add { + get { + return ResourceManager.GetString("gambling_shop_item_add", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No shop items found on this page.. + /// + public static string gambling_shop_none { + get { + return ResourceManager.GetString("gambling_shop_none", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to You will get {0} role.. + /// + public static string gambling_shop_role { + get { + return ResourceManager.GetString("gambling_shop_role", resourceCulture); + } + } + /// /// Looks up a localized string similar to Bet. /// @@ -2972,6 +3017,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Type. + /// + public static string gambling_type { + get { + return ResourceManager.GetString("gambling_type", resourceCulture); + } + } + /// /// Looks up a localized string similar to your affinity is already set to that waifu or you're trying to remove your affinity while not having one.. /// @@ -6115,6 +6169,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Next update in {0}. + /// + public static string utility_clpa_next_update { + get { + return ResourceManager.GetString("utility_clpa_next_update", resourceCulture); + } + } + /// /// Looks up a localized string similar to You've received {0} Thanks for supporting the project!. /// diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index 2a1d1e7f..b87bfe8d 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -2406,4 +2406,26 @@ Owner ID: {2} Time in {0} is {1} - {2} Time in London, UK is 15:30 - Time Zone Name + + Name + + + Shop + + + Shop item added + + + No shop items found on this page. + + + You will get {0} role. + + + Type + + + Next update in {0} + Next update in 05:30 + \ No newline at end of file diff --git a/src/NadekoBot/Services/Database/Models/GuildConfig.cs b/src/NadekoBot/Services/Database/Models/GuildConfig.cs index aaf7addf..e5a2c8b6 100644 --- a/src/NadekoBot/Services/Database/Models/GuildConfig.cs +++ b/src/NadekoBot/Services/Database/Models/GuildConfig.cs @@ -76,6 +76,8 @@ namespace NadekoBot.Services.Database.Models public HashSet SlowmodeIgnoredUsers { get; set; } public HashSet SlowmodeIgnoredRoles { get; set; } + public List ShopEntries { get; set; } + //public List ProtectionIgnoredChannels { get; set; } = new List(); } diff --git a/src/NadekoBot/Services/Database/Models/ShopEntry.cs b/src/NadekoBot/Services/Database/Models/ShopEntry.cs new file mode 100644 index 00000000..ad46fc9c --- /dev/null +++ b/src/NadekoBot/Services/Database/Models/ShopEntry.cs @@ -0,0 +1,41 @@ +using System.Collections.Generic; + +namespace NadekoBot.Services.Database.Models +{ + public enum ShopEntryType + { + Role, + List, + Infinite_List, + } + + public class ShopEntry : DbEntity, IIndexed + { + public int Index { get; set; } + public int Price { get; set; } + public string Name { get; set; } + public ulong AuthorId { get; set; } + + public ShopEntryType Type { get; set; } + public string RoleName { get; set; } + public ulong RoleId { get; set; } + public List Items { get; set; } + } + + public class ShopEntryItem : DbEntity + { + public string Text { get; set; } + + public override bool Equals(object obj) + { + if (obj == null || GetType() != obj.GetType()) + { + return false; + } + return ((ShopEntryItem)obj).Text == Text; + } + + public override int GetHashCode() => + Text.GetHashCode(); + } +} From b3f6b4473b8eb156b12f4e242b2639db754e32ae Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 8 Apr 2017 17:47:32 +0200 Subject: [PATCH 444/496] Woops, shop item purchase fix --- src/NadekoBot/Modules/Gambling/Commands/FlowerShop.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Gambling/Commands/FlowerShop.cs b/src/NadekoBot/Modules/Gambling/Commands/FlowerShop.cs index dbb268d8..57a05e10 100644 --- a/src/NadekoBot/Modules/Gambling/Commands/FlowerShop.cs +++ b/src/NadekoBot/Modules/Gambling/Commands/FlowerShop.cs @@ -151,7 +151,7 @@ namespace NadekoBot.Modules.Gambling .AddField(efb => efb.WithName(GetText("name")).WithValue(entry.Name).WithIsInline(true))) .ConfigureAwait(false); - await CurrencyHandler.AddCurrencyAsync(Context.User.Id, + await CurrencyHandler.AddCurrencyAsync(entry.AuthorId, $"Shop error refund - {entry.Name}", GetProfitAmount(entry.Price)).ConfigureAwait(false); } From 57e9c62b11a50b3547caa9cdaa1ccf7c4322df60 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 8 Apr 2017 17:48:54 +0200 Subject: [PATCH 445/496] transaction Name fix --- src/NadekoBot/Modules/Gambling/Commands/FlowerShop.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Gambling/Commands/FlowerShop.cs b/src/NadekoBot/Modules/Gambling/Commands/FlowerShop.cs index 57a05e10..f04e7c65 100644 --- a/src/NadekoBot/Modules/Gambling/Commands/FlowerShop.cs +++ b/src/NadekoBot/Modules/Gambling/Commands/FlowerShop.cs @@ -152,7 +152,7 @@ namespace NadekoBot.Modules.Gambling .ConfigureAwait(false); await CurrencyHandler.AddCurrencyAsync(entry.AuthorId, - $"Shop error refund - {entry.Name}", + $"Shop sell item - {entry.Name}", GetProfitAmount(entry.Price)).ConfigureAwait(false); } catch From a89d00ff317cbcc01297f86eccd560f7adc20ed2 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 8 Apr 2017 21:03:07 +0200 Subject: [PATCH 446/496] .gvc added --- ...70408162851_game-voice-channel.Designer.cs | 1520 +++++++++++++++++ .../20170408162851_game-voice-channel.cs | 24 + .../NadekoSqliteContextModelSnapshot.cs | 2 + .../Commands/GameChannelCommands.cs | 131 ++ .../Modules/Gambling/Commands/FlowerShop.cs | 1 - src/NadekoBot/Modules/Music/Music.cs | 2 +- .../Resources/CommandStrings.Designer.cs | 29 +- src/NadekoBot/Resources/CommandStrings.resx | 11 +- .../Resources/ResponseStrings.Designer.cs | 27 + src/NadekoBot/Resources/ResponseStrings.resx | 9 + .../Services/Database/Models/GuildConfig.cs | 1 + 11 files changed, 1753 insertions(+), 4 deletions(-) create mode 100644 src/NadekoBot/Migrations/20170408162851_game-voice-channel.Designer.cs create mode 100644 src/NadekoBot/Migrations/20170408162851_game-voice-channel.cs create mode 100644 src/NadekoBot/Modules/Administration/Commands/GameChannelCommands.cs diff --git a/src/NadekoBot/Migrations/20170408162851_game-voice-channel.Designer.cs b/src/NadekoBot/Migrations/20170408162851_game-voice-channel.Designer.cs new file mode 100644 index 00000000..fa371c1d --- /dev/null +++ b/src/NadekoBot/Migrations/20170408162851_game-voice-channel.Designer.cs @@ -0,0 +1,1520 @@ +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using NadekoBot.Services.Database; +using NadekoBot.Services.Database.Models; +using NadekoBot.Modules.Music.Classes; + +namespace NadekoBot.Migrations +{ + [DbContext(typeof(NadekoContext))] + [Migration("20170408162851_game-voice-channel")] + partial class gamevoicechannel + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { + modelBuilder + .HasAnnotation("ProductVersion", "1.1.0-rtm-22752"); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Action"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Seconds"); + + b.Property("UserThreshold"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId") + .IsUnique(); + + b.ToTable("AntiRaidSetting"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AntiSpamSettingId"); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.HasKey("Id"); + + b.HasIndex("AntiSpamSettingId"); + + b.ToTable("AntiSpamIgnore"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Action"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("MessageThreshold"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId") + .IsUnique(); + + b.ToTable("AntiSpamSetting"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("ItemId"); + + b.Property("Type"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("BlacklistItem"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BetflipMultiplier"); + + b.Property("Betroll100Multiplier"); + + b.Property("Betroll67Multiplier"); + + b.Property("Betroll91Multiplier"); + + b.Property("BufferSize"); + + b.Property("CurrencyDropAmount"); + + b.Property("CurrencyGenerationChance"); + + b.Property("CurrencyGenerationCooldown"); + + b.Property("CurrencyName"); + + b.Property("CurrencyPluralName"); + + b.Property("CurrencySign"); + + b.Property("DMHelpString"); + + b.Property("DateAdded"); + + b.Property("ErrorColor"); + + b.Property("ForwardMessages"); + + b.Property("ForwardToAllOwners"); + + b.Property("HelpString"); + + b.Property("Locale"); + + b.Property("MigrationVersion"); + + b.Property("MinimumBetAmount"); + + b.Property("OkColor"); + + b.Property("RemindMessageFormat"); + + b.Property("RotatingStatuses"); + + b.Property("TriviaCurrencyReward"); + + b.HasKey("Id"); + + b.ToTable("BotConfig"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BaseDestroyed"); + + b.Property("CallUser"); + + b.Property("ClashWarId"); + + b.Property("DateAdded"); + + b.Property("SequenceNumber"); + + b.Property("Stars"); + + b.Property("TimeAdded"); + + b.HasKey("Id"); + + b.HasIndex("ClashWarId"); + + b.ToTable("ClashCallers"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("EnemyClan"); + + b.Property("GuildId"); + + b.Property("Size"); + + b.Property("StartedAt"); + + b.Property("WarState"); + + b.HasKey("Id"); + + b.ToTable("ClashOfClans"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Mapping"); + + b.Property("Trigger"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("CommandAlias"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("CommandName"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Seconds"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("CommandCooldown"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("CommandName"); + + b.Property("DateAdded"); + + b.Property("Price"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.HasIndex("Price") + .IsUnique(); + + b.ToTable("CommandPrice"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("InternalTrigger"); + + b.Property("Modifier"); + + b.Property("UnitType"); + + b.HasKey("Id"); + + b.ToTable("ConversionUnits"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Amount"); + + b.Property("DateAdded"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("Currency"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Amount"); + + b.Property("DateAdded"); + + b.Property("Reason"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.ToTable("CurrencyTransactions"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AutoDeleteTrigger"); + + b.Property("DateAdded"); + + b.Property("DmResponse"); + + b.Property("GuildId"); + + b.Property("IsRegex"); + + b.Property("OwnerOnly"); + + b.Property("Response"); + + b.Property("Trigger"); + + b.HasKey("Id"); + + b.ToTable("CustomReactions"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AvatarId"); + + b.Property("DateAdded"); + + b.Property("Discriminator"); + + b.Property("UserId"); + + b.Property("Username"); + + b.HasKey("Id"); + + b.HasAlternateKey("UserId"); + + b.ToTable("DiscordUser"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Amount"); + + b.Property("DateAdded"); + + b.Property("Name"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("Donators"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("Text"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("EightBallResponses"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("GuildConfigId1"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.HasIndex("GuildConfigId1"); + + b.ToTable("FilterChannelId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Word"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("FilteredWord"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("GuildId"); + + b.Property("Type"); + + b.Property("Username"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("FollowedStream"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("GCChannelId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AutoAssignRoleId"); + + b.Property("AutoDeleteByeMessages"); + + b.Property("AutoDeleteByeMessagesTimer"); + + b.Property("AutoDeleteGreetMessages"); + + b.Property("AutoDeleteGreetMessagesTimer"); + + b.Property("AutoDeleteSelfAssignedRoleMessages"); + + b.Property("ByeMessageChannelId"); + + b.Property("ChannelByeMessageText"); + + b.Property("ChannelGreetMessageText"); + + b.Property("CleverbotEnabled"); + + b.Property("DateAdded"); + + b.Property("DefaultMusicVolume"); + + b.Property("DeleteMessageOnCommand"); + + b.Property("DmGreetMessageText"); + + b.Property("ExclusiveSelfAssignedRoles"); + + b.Property("FilterInvites"); + + b.Property("FilterWords"); + + b.Property("GameVoiceChannel"); + + b.Property("GreetMessageChannelId"); + + b.Property("GuildId"); + + b.Property("Locale"); + + b.Property("LogSettingId"); + + b.Property("MuteRoleName"); + + b.Property("PermissionRole"); + + b.Property("RootPermissionId"); + + b.Property("SendChannelByeMessage"); + + b.Property("SendChannelGreetMessage"); + + b.Property("SendDmGreetMessage"); + + b.Property("TimeZoneId"); + + b.Property("VerbosePermissions"); + + b.Property("VoicePlusTextEnabled"); + + b.Property("WarningsInitialized"); + + b.HasKey("Id"); + + b.HasIndex("GuildId") + .IsUnique(); + + b.HasIndex("LogSettingId"); + + b.HasIndex("RootPermissionId"); + + b.ToTable("GuildConfigs"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("GuildId"); + + b.Property("Interval"); + + b.Property("Message"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("GuildRepeater"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("LogSettingId"); + + b.HasKey("Id"); + + b.HasIndex("LogSettingId"); + + b.ToTable("IgnoredLogChannels"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("LogSettingId"); + + b.HasKey("Id"); + + b.HasIndex("LogSettingId"); + + b.ToTable("IgnoredVoicePresenceCHannels"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelCreated"); + + b.Property("ChannelCreatedId"); + + b.Property("ChannelDestroyed"); + + b.Property("ChannelDestroyedId"); + + b.Property("ChannelId"); + + b.Property("ChannelUpdated"); + + b.Property("ChannelUpdatedId"); + + b.Property("DateAdded"); + + b.Property("IsLogging"); + + b.Property("LogOtherId"); + + b.Property("LogUserPresence"); + + b.Property("LogUserPresenceId"); + + b.Property("LogVoicePresence"); + + b.Property("LogVoicePresenceId"); + + b.Property("LogVoicePresenceTTSId"); + + b.Property("MessageDeleted"); + + b.Property("MessageDeletedId"); + + b.Property("MessageUpdated"); + + b.Property("MessageUpdatedId"); + + b.Property("UserBanned"); + + b.Property("UserBannedId"); + + b.Property("UserJoined"); + + b.Property("UserJoinedId"); + + b.Property("UserLeft"); + + b.Property("UserLeftId"); + + b.Property("UserMutedId"); + + b.Property("UserPresenceChannelId"); + + b.Property("UserUnbanned"); + + b.Property("UserUnbannedId"); + + b.Property("UserUpdated"); + + b.Property("UserUpdatedId"); + + b.Property("VoicePresenceChannelId"); + + b.HasKey("Id"); + + b.ToTable("LogSettings"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("ModuleName"); + + b.Property("Prefix"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("ModulePrefixes"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Author"); + + b.Property("AuthorId"); + + b.Property("DateAdded"); + + b.Property("Name"); + + b.HasKey("Id"); + + b.ToTable("MusicPlaylists"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("MutedUserId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("NextId"); + + b.Property("PrimaryTarget"); + + b.Property("PrimaryTargetId"); + + b.Property("SecondaryTarget"); + + b.Property("SecondaryTargetName"); + + b.Property("State"); + + b.HasKey("Id"); + + b.HasIndex("NextId") + .IsUnique(); + + b.ToTable("Permission"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Index"); + + b.Property("PrimaryTarget"); + + b.Property("PrimaryTargetId"); + + b.Property("SecondaryTarget"); + + b.Property("SecondaryTargetName"); + + b.Property("State"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("Permissionv2"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("Status"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("PlayingStatus"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("MusicPlaylistId"); + + b.Property("Provider"); + + b.Property("ProviderType"); + + b.Property("Query"); + + b.Property("Title"); + + b.Property("Uri"); + + b.HasKey("Id"); + + b.HasIndex("MusicPlaylistId"); + + b.ToTable("PlaylistSong"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AuthorId"); + + b.Property("AuthorName") + .IsRequired(); + + b.Property("DateAdded"); + + b.Property("GuildId"); + + b.Property("Keyword") + .IsRequired(); + + b.Property("Text") + .IsRequired(); + + b.HasKey("Id"); + + b.ToTable("Quotes"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("Icon"); + + b.Property("Name"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("RaceAnimals"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("IsPrivate"); + + b.Property("Message"); + + b.Property("ServerId"); + + b.Property("UserId"); + + b.Property("When"); + + b.HasKey("Id"); + + b.ToTable("Reminders"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.RewardedUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AmountRewardedThisMonth"); + + b.Property("DateAdded"); + + b.Property("LastReward"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("RewardedUsers"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildId"); + + b.Property("RoleId"); + + b.HasKey("Id"); + + b.HasIndex("GuildId", "RoleId") + .IsUnique(); + + b.ToTable("SelfAssignableRoles"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AuthorId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Index"); + + b.Property("Name"); + + b.Property("Price"); + + b.Property("RoleId"); + + b.Property("RoleName"); + + b.Property("Type"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("ShopEntry"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("ShopEntryId"); + + b.Property("Text"); + + b.HasKey("Id"); + + b.HasIndex("ShopEntryId"); + + b.ToTable("ShopEntryItem"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("RoleId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("SlowmodeIgnoredRole"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("SlowmodeIgnoredUser"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("ChannelId"); + + b.Property("ChannelName"); + + b.Property("CommandText"); + + b.Property("DateAdded"); + + b.Property("GuildId"); + + b.Property("GuildName"); + + b.Property("Index"); + + b.Property("VoiceChannelId"); + + b.Property("VoiceChannelName"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("StartupCommand"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("UnmuteAt"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("UnmuteTimer"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("UserId"); + + b.Property("type"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("PokeGame"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("RoleId"); + + b.Property("VoiceChannelId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("VcRoleInfo"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AffinityId"); + + b.Property("ClaimerId"); + + b.Property("DateAdded"); + + b.Property("Price"); + + b.Property("WaifuId"); + + b.HasKey("Id"); + + b.HasIndex("AffinityId"); + + b.HasIndex("ClaimerId"); + + b.HasIndex("WaifuId") + .IsUnique(); + + b.ToTable("WaifuInfo"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("NewId"); + + b.Property("OldId"); + + b.Property("UpdateType"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("NewId"); + + b.HasIndex("OldId"); + + b.HasIndex("UserId"); + + b.ToTable("WaifuUpdates"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("Forgiven"); + + b.Property("ForgivenBy"); + + b.Property("GuildId"); + + b.Property("Moderator"); + + b.Property("Reason"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.ToTable("Warnings"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Count"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Punishment"); + + b.Property("Time"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("WarningPunishment"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig") + .WithOne("AntiRaidSetting") + .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b => + { + b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting") + .WithMany("IgnoredChannels") + .HasForeignKey("AntiSpamSettingId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig") + .WithOne("AntiSpamSetting") + .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("Blacklist") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b => + { + b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar") + .WithMany("Bases") + .HasForeignKey("ClashWarId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("CommandAliases") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("CommandCooldowns") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("CommandPrices") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("EightBallResponses") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FilterInvitesChannelIds") + .HasForeignKey("GuildConfigId"); + + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FilterWordsChannelIds") + .HasForeignKey("GuildConfigId1"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FilteredWords") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FollowedStreams") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("GenerateCurrencyChannelIds") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b => + { + b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting") + .WithMany() + .HasForeignKey("LogSettingId"); + + b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission") + .WithMany() + .HasForeignKey("RootPermissionId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("GuildRepeaters") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b => + { + b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting") + .WithMany("IgnoredChannels") + .HasForeignKey("LogSettingId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b => + { + b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting") + .WithMany("IgnoredVoicePresenceChannelIds") + .HasForeignKey("LogSettingId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("ModulePrefixes") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("MutedUsers") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b => + { + b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next") + .WithOne("Previous") + .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("Permissions") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("RotatingStatusMessages") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b => + { + b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist") + .WithMany("Songs") + .HasForeignKey("MusicPlaylistId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("RaceAnimals") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("ShopEntries") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b => + { + b.HasOne("NadekoBot.Services.Database.Models.ShopEntry") + .WithMany("Items") + .HasForeignKey("ShopEntryId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("SlowmodeIgnoredRoles") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("SlowmodeIgnoredUsers") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("StartupCommands") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("UnmuteTimers") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("VcRoleInfos") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => + { + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity") + .WithMany() + .HasForeignKey("AffinityId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer") + .WithMany() + .HasForeignKey("ClaimerId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu") + .WithOne() + .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => + { + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New") + .WithMany() + .HasForeignKey("NewId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old") + .WithMany() + .HasForeignKey("OldId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("WarnPunishments") + .HasForeignKey("GuildConfigId"); + }); + } + } +} diff --git a/src/NadekoBot/Migrations/20170408162851_game-voice-channel.cs b/src/NadekoBot/Migrations/20170408162851_game-voice-channel.cs new file mode 100644 index 00000000..3b9cb6c6 --- /dev/null +++ b/src/NadekoBot/Migrations/20170408162851_game-voice-channel.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using Microsoft.EntityFrameworkCore.Migrations; + +namespace NadekoBot.Migrations +{ + public partial class gamevoicechannel : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "GameVoiceChannel", + table: "GuildConfigs", + nullable: true); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "GameVoiceChannel", + table: "GuildConfigs"); + } + } +} diff --git a/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs b/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs index c255ba79..a8e43d26 100644 --- a/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs +++ b/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs @@ -533,6 +533,8 @@ namespace NadekoBot.Migrations b.Property("FilterWords"); + b.Property("GameVoiceChannel"); + b.Property("GreetMessageChannelId"); b.Property("GuildId"); diff --git a/src/NadekoBot/Modules/Administration/Commands/GameChannelCommands.cs b/src/NadekoBot/Modules/Administration/Commands/GameChannelCommands.cs new file mode 100644 index 00000000..f2e5fb6c --- /dev/null +++ b/src/NadekoBot/Modules/Administration/Commands/GameChannelCommands.cs @@ -0,0 +1,131 @@ +using Discord; +using Discord.Commands; +using Microsoft.EntityFrameworkCore; +using NadekoBot.Attributes; +using NadekoBot.Services; +using NadekoBot.Services.Database; +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using Discord.WebSocket; +using NLog; +using NadekoBot.Extensions; + +namespace NadekoBot.Modules.Administration +{ + public partial class Administration + { + [Group] + public class GameChannelCommands : NadekoSubmodule + { + private static readonly Timer _t; + + private static readonly ConcurrentHashSet gameVoiceChannels = new ConcurrentHashSet(); + + private static new readonly Logger _log; + + static GameChannelCommands() + { + //_t = new Timer(_ => { + + //}, null, ); + + _log = LogManager.GetCurrentClassLogger(); + + gameVoiceChannels = new ConcurrentHashSet( + NadekoBot.AllGuildConfigs.Where(gc => gc.GameVoiceChannel != null) + .Select(gc => gc.GameVoiceChannel.Value)); + + NadekoBot.Client.UserVoiceStateUpdated += Client_UserVoiceStateUpdated; + + } + + private static Task Client_UserVoiceStateUpdated(SocketUser usr, SocketVoiceState oldState, SocketVoiceState newState) + { + var _ = Task.Run(async () => + { + try + { + var gUser = usr as SocketGuildUser; + if (gUser == null) + return; + + var game = gUser.Game?.Name.TrimTo(50).ToLowerInvariant(); + + if (oldState.VoiceChannel == newState.VoiceChannel || + newState.VoiceChannel == null) + return; + + if (!gameVoiceChannels.Contains(newState.VoiceChannel.Id) || + string.IsNullOrWhiteSpace(game)) + return; + + var vch = gUser.Guild.VoiceChannels + .FirstOrDefault(x => x.Name.ToLowerInvariant() == game); + + if (vch == null) + return; + + await Task.Delay(1000).ConfigureAwait(false); + await gUser.ModifyAsync(gu => gu.Channel = vch).ConfigureAwait(false); + } + catch (Exception ex) + { + _log.Warn(ex); + } + }); + + return Task.CompletedTask; + } + + [NadekoCommand, Usage, Description, Aliases] + [RequireContext(ContextType.Guild)] + [RequireUserPermission(GuildPermission.Administrator)] + [RequireBotPermission(GuildPermission.MoveMembers)] + public async Task GameVoiceChannel() + { + var vch = ((IGuildUser)Context.User).VoiceChannel; + + if (vch == null) + { + await ReplyErrorLocalized("not_in_voice").ConfigureAwait(false); + return; + } + ulong? id; + using (var uow = DbHandler.UnitOfWork()) + { + var gc = uow.GuildConfigs.For(Context.Guild.Id, set => set); + + if (gc.GameVoiceChannel == vch.Id) + { + gameVoiceChannels.TryRemove(vch.Id); + id = gc.GameVoiceChannel = null; + } + else + { + if(gc.GameVoiceChannel != null) + gameVoiceChannels.TryRemove(gc.GameVoiceChannel.Value); + gameVoiceChannels.Add(vch.Id); + id = gc.GameVoiceChannel = vch.Id; + } + + uow.Complete(); + } + + if (id == null) + { + await ReplyConfirmLocalized("gvc_disabled").ConfigureAwait(false); + } + else + { + gameVoiceChannels.Add(vch.Id); + await ReplyConfirmLocalized("gvc_enabled", Format.Bold(vch.Name)).ConfigureAwait(false); + } + } + } + } +} diff --git a/src/NadekoBot/Modules/Gambling/Commands/FlowerShop.cs b/src/NadekoBot/Modules/Gambling/Commands/FlowerShop.cs index f04e7c65..4fab3906 100644 --- a/src/NadekoBot/Modules/Gambling/Commands/FlowerShop.cs +++ b/src/NadekoBot/Modules/Gambling/Commands/FlowerShop.cs @@ -140,7 +140,6 @@ namespace NadekoBot.Modules.Gambling removed = uow.Complete(); } - _log.Warn($"Removed {removed} items"); try { await (await Context.User.CreateDMChannelAsync()) diff --git a/src/NadekoBot/Modules/Music/Music.cs b/src/NadekoBot/Modules/Music/Music.cs index 315ddb52..d6484011 100644 --- a/src/NadekoBot/Modules/Music/Music.cs +++ b/src/NadekoBot/Modules/Music/Music.cs @@ -20,7 +20,7 @@ namespace NadekoBot.Modules.Music { [NadekoModule("Music", "!!")] [DontAutoLoad] - public class Music : NadekoTopLevelModule + public class Music : NadekoTopLevelModule { public static ConcurrentDictionary MusicPlayers { get; } = new ConcurrentDictionary(); diff --git a/src/NadekoBot/Resources/CommandStrings.Designer.cs b/src/NadekoBot/Resources/CommandStrings.Designer.cs index ff0aa011..256ff9fe 100644 --- a/src/NadekoBot/Resources/CommandStrings.Designer.cs +++ b/src/NadekoBot/Resources/CommandStrings.Designer.cs @@ -3002,6 +3002,33 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to gvc. + /// + public static string gamevoicechannel_cmd { + get { + return ResourceManager.GetString("gamevoicechannel_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Toggles game voice channel feature in the voice channel you're currently in. Users who join the game voice channel will get automatically redirected to the voice channel with the name of their current game if it exists. Can't move users to channels that the bot has no connect permission for. One per server.. + /// + public static string gamevoicechannel_desc { + get { + return ResourceManager.GetString("gamevoicechannel_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}gvc`. + /// + public static string gamevoicechannel_usage { + get { + return ResourceManager.GetString("gamevoicechannel_usage", resourceCulture); + } + } + /// /// Looks up a localized string similar to gelbooru. /// @@ -7629,7 +7656,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Adds an item to the list of items for sale in the shop entry given the index.. + /// Looks up a localized string similar to Adds an item to the list of items for sale in the shop entry given the index. You usually want to run this command in the secret channel, so that the unique items are not leaked.. /// public static string shoplistadd_desc { get { diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx index 363b09af..a0a397a6 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -3417,11 +3417,20 @@ `{0}buy 2` + + gvc + + + Toggles game voice channel feature in the voice channel you're currently in. Users who join the game voice channel will get automatically redirected to the voice channel with the name of their current game if it exists. Can't move users to channels that the bot has no connect permission for. One per server. + + + `{0}gvc` + shoplistadd - Adds an item to the list of items for sale in the shop entry given the index. + Adds an item to the list of items for sale in the shop entry given the index. You usually want to run this command in the secret channel, so that the unique items are not leaked. `{0}shoplistadd 1 Uni-que-Steam-Key` diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index 52a31610..1d0d3075 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -519,6 +519,24 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Game Voice Channel feature has been disabled on this server.. + /// + public static string administration_gvc_disabled { + get { + return ResourceManager.GetString("administration_gvc_disabled", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0} is a Game Voice Channel now.. + /// + public static string administration_gvc_enabled { + get { + return ResourceManager.GetString("administration_gvc_enabled", resourceCulture); + } + } + /// /// Looks up a localized string similar to You can't use this command on users with a role higher or equal to yours in the role hierarchy.. /// @@ -916,6 +934,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to You are not in voice channel on this server.. + /// + public static string administration_not_in_voice { + get { + return ResourceManager.GetString("administration_not_in_voice", resourceCulture); + } + } + /// /// Looks up a localized string similar to Old message. /// diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index 8b8ed781..4831a40f 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -2431,6 +2431,15 @@ Owner ID: {2} Next update in {0} Next update in 05:30 + + Game Voice Channel feature has been disabled on this server. + + + {0} is a Game Voice Channel now. + + + You are not in voice channel on this server. + Item diff --git a/src/NadekoBot/Services/Database/Models/GuildConfig.cs b/src/NadekoBot/Services/Database/Models/GuildConfig.cs index e5a2c8b6..7d0ef6d2 100644 --- a/src/NadekoBot/Services/Database/Models/GuildConfig.cs +++ b/src/NadekoBot/Services/Database/Models/GuildConfig.cs @@ -77,6 +77,7 @@ namespace NadekoBot.Services.Database.Models public HashSet SlowmodeIgnoredRoles { get; set; } public List ShopEntries { get; set; } + public ulong? GameVoiceChannel { get; set; } = null; //public List ProtectionIgnoredChannels { get; set; } = new List(); } From 98c330d6a62fc3a9b2bb4d45b655150db46b404c Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sun, 9 Apr 2017 22:28:42 +0200 Subject: [PATCH 447/496] ;gmod, ;cmd, ;lgp and .resetglobalperms added. Bot owner can disable modules or commands bot-wide. --- .../20170409193757_gmod-and-cmod.Designer.cs | 1553 +++++++++++++++++ .../20170409193757_gmod-and-cmod.cs | 56 + .../NadekoSqliteContextModelSnapshot.cs | 33 + .../Modules/Administration/Administration.cs | 17 + .../Commands/GameChannelCommands.cs | 2 +- .../Commands/GlobalPermissionCommands.cs | 118 ++ .../Utility/Commands/CommandMapCommands.cs | 6 +- .../Commands/CrossServerTextChannel.cs | 68 +- .../Utility/Commands/MessageRepeater.cs | 21 +- .../Utility/Commands/PatreonCommands.cs | 9 +- .../Modules/Utility/Commands/Remind.cs | 19 +- .../Utility/Commands/UnitConversion.cs | 9 +- src/NadekoBot/Modules/Utility/Utility.cs | 9 +- .../Resources/CommandStrings.Designer.cs | 110 +- src/NadekoBot/Resources/CommandStrings.resx | 38 +- .../Resources/ResponseStrings.Designer.cs | 72 + src/NadekoBot/Resources/ResponseStrings.resx | 24 + src/NadekoBot/Services/CommandHandler.cs | 25 +- .../Services/Database/Models/BotConfig.cs | 19 + .../Repositories/Impl/BotConfigRepository.cs | 2 + 20 files changed, 2157 insertions(+), 53 deletions(-) create mode 100644 src/NadekoBot/Migrations/20170409193757_gmod-and-cmod.Designer.cs create mode 100644 src/NadekoBot/Migrations/20170409193757_gmod-and-cmod.cs create mode 100644 src/NadekoBot/Modules/Permissions/Commands/GlobalPermissionCommands.cs diff --git a/src/NadekoBot/Migrations/20170409193757_gmod-and-cmod.Designer.cs b/src/NadekoBot/Migrations/20170409193757_gmod-and-cmod.Designer.cs new file mode 100644 index 00000000..fe9da269 --- /dev/null +++ b/src/NadekoBot/Migrations/20170409193757_gmod-and-cmod.Designer.cs @@ -0,0 +1,1553 @@ +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using NadekoBot.Services.Database; +using NadekoBot.Services.Database.Models; +using NadekoBot.Modules.Music.Classes; + +namespace NadekoBot.Migrations +{ + [DbContext(typeof(NadekoContext))] + [Migration("20170409193757_gmod-and-cmod")] + partial class gmodandcmod + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { + modelBuilder + .HasAnnotation("ProductVersion", "1.1.0-rtm-22752"); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Action"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Seconds"); + + b.Property("UserThreshold"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId") + .IsUnique(); + + b.ToTable("AntiRaidSetting"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AntiSpamSettingId"); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.HasKey("Id"); + + b.HasIndex("AntiSpamSettingId"); + + b.ToTable("AntiSpamIgnore"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Action"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("MessageThreshold"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId") + .IsUnique(); + + b.ToTable("AntiSpamSetting"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("ItemId"); + + b.Property("Type"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("BlacklistItem"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("BotConfigId1"); + + b.Property("DateAdded"); + + b.Property("Name"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.HasIndex("BotConfigId1"); + + b.ToTable("BlockedCmdOrMdl"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BetflipMultiplier"); + + b.Property("Betroll100Multiplier"); + + b.Property("Betroll67Multiplier"); + + b.Property("Betroll91Multiplier"); + + b.Property("BufferSize"); + + b.Property("CurrencyDropAmount"); + + b.Property("CurrencyGenerationChance"); + + b.Property("CurrencyGenerationCooldown"); + + b.Property("CurrencyName"); + + b.Property("CurrencyPluralName"); + + b.Property("CurrencySign"); + + b.Property("DMHelpString"); + + b.Property("DateAdded"); + + b.Property("ErrorColor"); + + b.Property("ForwardMessages"); + + b.Property("ForwardToAllOwners"); + + b.Property("HelpString"); + + b.Property("Locale"); + + b.Property("MigrationVersion"); + + b.Property("MinimumBetAmount"); + + b.Property("OkColor"); + + b.Property("RemindMessageFormat"); + + b.Property("RotatingStatuses"); + + b.Property("TriviaCurrencyReward"); + + b.HasKey("Id"); + + b.ToTable("BotConfig"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BaseDestroyed"); + + b.Property("CallUser"); + + b.Property("ClashWarId"); + + b.Property("DateAdded"); + + b.Property("SequenceNumber"); + + b.Property("Stars"); + + b.Property("TimeAdded"); + + b.HasKey("Id"); + + b.HasIndex("ClashWarId"); + + b.ToTable("ClashCallers"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashWar", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("EnemyClan"); + + b.Property("GuildId"); + + b.Property("Size"); + + b.Property("StartedAt"); + + b.Property("WarState"); + + b.HasKey("Id"); + + b.ToTable("ClashOfClans"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Mapping"); + + b.Property("Trigger"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("CommandAlias"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("CommandName"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Seconds"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("CommandCooldown"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("CommandName"); + + b.Property("DateAdded"); + + b.Property("Price"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.HasIndex("Price") + .IsUnique(); + + b.ToTable("CommandPrice"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ConvertUnit", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("InternalTrigger"); + + b.Property("Modifier"); + + b.Property("UnitType"); + + b.HasKey("Id"); + + b.ToTable("ConversionUnits"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Currency", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Amount"); + + b.Property("DateAdded"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("Currency"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Amount"); + + b.Property("DateAdded"); + + b.Property("Reason"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.ToTable("CurrencyTransactions"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CustomReaction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AutoDeleteTrigger"); + + b.Property("DateAdded"); + + b.Property("DmResponse"); + + b.Property("GuildId"); + + b.Property("IsRegex"); + + b.Property("OwnerOnly"); + + b.Property("Response"); + + b.Property("Trigger"); + + b.HasKey("Id"); + + b.ToTable("CustomReactions"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AvatarId"); + + b.Property("DateAdded"); + + b.Property("Discriminator"); + + b.Property("UserId"); + + b.Property("Username"); + + b.HasKey("Id"); + + b.HasAlternateKey("UserId"); + + b.ToTable("DiscordUser"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Donator", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Amount"); + + b.Property("DateAdded"); + + b.Property("Name"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("Donators"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("Text"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("EightBallResponses"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("GuildConfigId1"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.HasIndex("GuildConfigId1"); + + b.ToTable("FilterChannelId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Word"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("FilteredWord"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("GuildId"); + + b.Property("Type"); + + b.Property("Username"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("FollowedStream"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("GCChannelId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AutoAssignRoleId"); + + b.Property("AutoDeleteByeMessages"); + + b.Property("AutoDeleteByeMessagesTimer"); + + b.Property("AutoDeleteGreetMessages"); + + b.Property("AutoDeleteGreetMessagesTimer"); + + b.Property("AutoDeleteSelfAssignedRoleMessages"); + + b.Property("ByeMessageChannelId"); + + b.Property("ChannelByeMessageText"); + + b.Property("ChannelGreetMessageText"); + + b.Property("CleverbotEnabled"); + + b.Property("DateAdded"); + + b.Property("DefaultMusicVolume"); + + b.Property("DeleteMessageOnCommand"); + + b.Property("DmGreetMessageText"); + + b.Property("ExclusiveSelfAssignedRoles"); + + b.Property("FilterInvites"); + + b.Property("FilterWords"); + + b.Property("GameVoiceChannel"); + + b.Property("GreetMessageChannelId"); + + b.Property("GuildId"); + + b.Property("Locale"); + + b.Property("LogSettingId"); + + b.Property("MuteRoleName"); + + b.Property("PermissionRole"); + + b.Property("RootPermissionId"); + + b.Property("SendChannelByeMessage"); + + b.Property("SendChannelGreetMessage"); + + b.Property("SendDmGreetMessage"); + + b.Property("TimeZoneId"); + + b.Property("VerbosePermissions"); + + b.Property("VoicePlusTextEnabled"); + + b.Property("WarningsInitialized"); + + b.HasKey("Id"); + + b.HasIndex("GuildId") + .IsUnique(); + + b.HasIndex("LogSettingId"); + + b.HasIndex("RootPermissionId"); + + b.ToTable("GuildConfigs"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("GuildId"); + + b.Property("Interval"); + + b.Property("Message"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("GuildRepeater"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("LogSettingId"); + + b.HasKey("Id"); + + b.HasIndex("LogSettingId"); + + b.ToTable("IgnoredLogChannels"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("LogSettingId"); + + b.HasKey("Id"); + + b.HasIndex("LogSettingId"); + + b.ToTable("IgnoredVoicePresenceCHannels"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelCreated"); + + b.Property("ChannelCreatedId"); + + b.Property("ChannelDestroyed"); + + b.Property("ChannelDestroyedId"); + + b.Property("ChannelId"); + + b.Property("ChannelUpdated"); + + b.Property("ChannelUpdatedId"); + + b.Property("DateAdded"); + + b.Property("IsLogging"); + + b.Property("LogOtherId"); + + b.Property("LogUserPresence"); + + b.Property("LogUserPresenceId"); + + b.Property("LogVoicePresence"); + + b.Property("LogVoicePresenceId"); + + b.Property("LogVoicePresenceTTSId"); + + b.Property("MessageDeleted"); + + b.Property("MessageDeletedId"); + + b.Property("MessageUpdated"); + + b.Property("MessageUpdatedId"); + + b.Property("UserBanned"); + + b.Property("UserBannedId"); + + b.Property("UserJoined"); + + b.Property("UserJoinedId"); + + b.Property("UserLeft"); + + b.Property("UserLeftId"); + + b.Property("UserMutedId"); + + b.Property("UserPresenceChannelId"); + + b.Property("UserUnbanned"); + + b.Property("UserUnbannedId"); + + b.Property("UserUpdated"); + + b.Property("UserUpdatedId"); + + b.Property("VoicePresenceChannelId"); + + b.HasKey("Id"); + + b.ToTable("LogSettings"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("ModuleName"); + + b.Property("Prefix"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("ModulePrefixes"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Author"); + + b.Property("AuthorId"); + + b.Property("DateAdded"); + + b.Property("Name"); + + b.HasKey("Id"); + + b.ToTable("MusicPlaylists"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("MutedUserId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("NextId"); + + b.Property("PrimaryTarget"); + + b.Property("PrimaryTargetId"); + + b.Property("SecondaryTarget"); + + b.Property("SecondaryTargetName"); + + b.Property("State"); + + b.HasKey("Id"); + + b.HasIndex("NextId") + .IsUnique(); + + b.ToTable("Permission"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Index"); + + b.Property("PrimaryTarget"); + + b.Property("PrimaryTargetId"); + + b.Property("SecondaryTarget"); + + b.Property("SecondaryTargetName"); + + b.Property("State"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("Permissionv2"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("Status"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("PlayingStatus"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("MusicPlaylistId"); + + b.Property("Provider"); + + b.Property("ProviderType"); + + b.Property("Query"); + + b.Property("Title"); + + b.Property("Uri"); + + b.HasKey("Id"); + + b.HasIndex("MusicPlaylistId"); + + b.ToTable("PlaylistSong"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AuthorId"); + + b.Property("AuthorName") + .IsRequired(); + + b.Property("DateAdded"); + + b.Property("GuildId"); + + b.Property("Keyword") + .IsRequired(); + + b.Property("Text") + .IsRequired(); + + b.HasKey("Id"); + + b.ToTable("Quotes"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("DateAdded"); + + b.Property("Icon"); + + b.Property("Name"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("RaceAnimals"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ChannelId"); + + b.Property("DateAdded"); + + b.Property("IsPrivate"); + + b.Property("Message"); + + b.Property("ServerId"); + + b.Property("UserId"); + + b.Property("When"); + + b.HasKey("Id"); + + b.ToTable("Reminders"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.RewardedUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AmountRewardedThisMonth"); + + b.Property("DateAdded"); + + b.Property("LastReward"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("RewardedUsers"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildId"); + + b.Property("RoleId"); + + b.HasKey("Id"); + + b.HasIndex("GuildId", "RoleId") + .IsUnique(); + + b.ToTable("SelfAssignableRoles"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AuthorId"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Index"); + + b.Property("Name"); + + b.Property("Price"); + + b.Property("RoleId"); + + b.Property("RoleName"); + + b.Property("Type"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("ShopEntry"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("ShopEntryId"); + + b.Property("Text"); + + b.HasKey("Id"); + + b.HasIndex("ShopEntryId"); + + b.ToTable("ShopEntryItem"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("RoleId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("SlowmodeIgnoredRole"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("SlowmodeIgnoredUser"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("ChannelId"); + + b.Property("ChannelName"); + + b.Property("CommandText"); + + b.Property("DateAdded"); + + b.Property("GuildId"); + + b.Property("GuildName"); + + b.Property("Index"); + + b.Property("VoiceChannelId"); + + b.Property("VoiceChannelName"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.ToTable("StartupCommand"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("UnmuteAt"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("UnmuteTimer"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.UserPokeTypes", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("UserId"); + + b.Property("type"); + + b.HasKey("Id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("PokeGame"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("RoleId"); + + b.Property("VoiceChannelId"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("VcRoleInfo"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("AffinityId"); + + b.Property("ClaimerId"); + + b.Property("DateAdded"); + + b.Property("Price"); + + b.Property("WaifuId"); + + b.HasKey("Id"); + + b.HasIndex("AffinityId"); + + b.HasIndex("ClaimerId"); + + b.HasIndex("WaifuId") + .IsUnique(); + + b.ToTable("WaifuInfo"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("NewId"); + + b.Property("OldId"); + + b.Property("UpdateType"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.HasIndex("NewId"); + + b.HasIndex("OldId"); + + b.HasIndex("UserId"); + + b.ToTable("WaifuUpdates"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("DateAdded"); + + b.Property("Forgiven"); + + b.Property("ForgivenBy"); + + b.Property("GuildId"); + + b.Property("Moderator"); + + b.Property("Reason"); + + b.Property("UserId"); + + b.HasKey("Id"); + + b.ToTable("Warnings"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("Count"); + + b.Property("DateAdded"); + + b.Property("GuildConfigId"); + + b.Property("Punishment"); + + b.Property("Time"); + + b.HasKey("Id"); + + b.HasIndex("GuildConfigId"); + + b.ToTable("WarningPunishment"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig") + .WithOne("AntiRaidSetting") + .HasForeignKey("NadekoBot.Services.Database.Models.AntiRaidSetting", "GuildConfigId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b => + { + b.HasOne("NadekoBot.Services.Database.Models.AntiSpamSetting") + .WithMany("IgnoredChannels") + .HasForeignKey("AntiSpamSettingId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig", "GuildConfig") + .WithOne("AntiSpamSetting") + .HasForeignKey("NadekoBot.Services.Database.Models.AntiSpamSetting", "GuildConfigId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistItem", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("Blacklist") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("BlockedCommands") + .HasForeignKey("BotConfigId"); + + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("BlockedModules") + .HasForeignKey("BotConfigId1"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b => + { + b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar") + .WithMany("Bases") + .HasForeignKey("ClashWarId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("CommandAliases") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("CommandCooldowns") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandPrice", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("CommandPrices") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.EightBallResponse", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("EightBallResponses") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FilterInvitesChannelIds") + .HasForeignKey("GuildConfigId"); + + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FilterWordsChannelIds") + .HasForeignKey("GuildConfigId1"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FilteredWords") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.FollowedStream", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("FollowedStreams") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("GenerateCurrencyChannelIds") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b => + { + b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting") + .WithMany() + .HasForeignKey("LogSettingId"); + + b.HasOne("NadekoBot.Services.Database.Models.Permission", "RootPermission") + .WithMany() + .HasForeignKey("RootPermissionId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildRepeater", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("GuildRepeaters") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogChannel", b => + { + b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting") + .WithMany("IgnoredChannels") + .HasForeignKey("LogSettingId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b => + { + b.HasOne("NadekoBot.Services.Database.Models.LogSetting", "LogSetting") + .WithMany("IgnoredVoicePresenceChannelIds") + .HasForeignKey("LogSettingId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ModulePrefix", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("ModulePrefixes") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("MutedUsers") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permission", b => + { + b.HasOne("NadekoBot.Services.Database.Models.Permission", "Next") + .WithOne("Previous") + .HasForeignKey("NadekoBot.Services.Database.Models.Permission", "NextId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("Permissions") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlayingStatus", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("RotatingStatusMessages") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b => + { + b.HasOne("NadekoBot.Services.Database.Models.MusicPlaylist") + .WithMany("Songs") + .HasForeignKey("MusicPlaylistId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.RaceAnimal", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("RaceAnimals") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("ShopEntries") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b => + { + b.HasOne("NadekoBot.Services.Database.Models.ShopEntry") + .WithMany("Items") + .HasForeignKey("ShopEntryId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("SlowmodeIgnoredRoles") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("SlowmodeIgnoredUsers") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.StartupCommand", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("StartupCommands") + .HasForeignKey("BotConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("UnmuteTimers") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("VcRoleInfos") + .HasForeignKey("GuildConfigId"); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b => + { + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Affinity") + .WithMany() + .HasForeignKey("AffinityId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Claimer") + .WithMany() + .HasForeignKey("ClaimerId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Waifu") + .WithOne() + .HasForeignKey("NadekoBot.Services.Database.Models.WaifuInfo", "WaifuId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b => + { + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "New") + .WithMany() + .HasForeignKey("NewId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "Old") + .WithMany() + .HasForeignKey("OldId"); + + b.HasOne("NadekoBot.Services.Database.Models.DiscordUser", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b => + { + b.HasOne("NadekoBot.Services.Database.Models.GuildConfig") + .WithMany("WarnPunishments") + .HasForeignKey("GuildConfigId"); + }); + } + } +} diff --git a/src/NadekoBot/Migrations/20170409193757_gmod-and-cmod.cs b/src/NadekoBot/Migrations/20170409193757_gmod-and-cmod.cs new file mode 100644 index 00000000..5cef1a06 --- /dev/null +++ b/src/NadekoBot/Migrations/20170409193757_gmod-and-cmod.cs @@ -0,0 +1,56 @@ +using System; +using System.Collections.Generic; +using Microsoft.EntityFrameworkCore.Migrations; + +namespace NadekoBot.Migrations +{ + public partial class gmodandcmod : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "BlockedCmdOrMdl", + columns: table => new + { + Id = table.Column(nullable: false) + .Annotation("Sqlite:Autoincrement", true), + BotConfigId = table.Column(nullable: true), + BotConfigId1 = table.Column(nullable: true), + DateAdded = table.Column(nullable: true), + Name = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_BlockedCmdOrMdl", x => x.Id); + table.ForeignKey( + name: "FK_BlockedCmdOrMdl_BotConfig_BotConfigId", + column: x => x.BotConfigId, + principalTable: "BotConfig", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + table.ForeignKey( + name: "FK_BlockedCmdOrMdl_BotConfig_BotConfigId1", + column: x => x.BotConfigId1, + principalTable: "BotConfig", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + }); + + migrationBuilder.CreateIndex( + name: "IX_BlockedCmdOrMdl_BotConfigId", + table: "BlockedCmdOrMdl", + column: "BotConfigId"); + + migrationBuilder.CreateIndex( + name: "IX_BlockedCmdOrMdl_BotConfigId1", + table: "BlockedCmdOrMdl", + column: "BotConfigId1"); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "BlockedCmdOrMdl"); + } + } +} diff --git a/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs b/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs index a8e43d26..2e1fd50c 100644 --- a/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs +++ b/src/NadekoBot/Migrations/NadekoSqliteContextModelSnapshot.cs @@ -99,6 +99,28 @@ namespace NadekoBot.Migrations b.ToTable("BlacklistItem"); }); + modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("BotConfigId"); + + b.Property("BotConfigId1"); + + b.Property("DateAdded"); + + b.Property("Name"); + + b.HasKey("Id"); + + b.HasIndex("BotConfigId"); + + b.HasIndex("BotConfigId1"); + + b.ToTable("BlockedCmdOrMdl"); + }); + modelBuilder.Entity("NadekoBot.Services.Database.Models.BotConfig", b => { b.Property("Id") @@ -1277,6 +1299,17 @@ namespace NadekoBot.Migrations .HasForeignKey("BotConfigId"); }); + modelBuilder.Entity("NadekoBot.Services.Database.Models.BlockedCmdOrMdl", b => + { + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("BlockedCommands") + .HasForeignKey("BotConfigId"); + + b.HasOne("NadekoBot.Services.Database.Models.BotConfig") + .WithMany("BlockedModules") + .HasForeignKey("BotConfigId1"); + }); + modelBuilder.Entity("NadekoBot.Services.Database.Models.ClashCaller", b => { b.HasOne("NadekoBot.Services.Database.Models.ClashWar", "ClashWar") diff --git a/src/NadekoBot/Modules/Administration/Administration.cs b/src/NadekoBot/Modules/Administration/Administration.cs index fffac1f7..71f20464 100644 --- a/src/NadekoBot/Modules/Administration/Administration.cs +++ b/src/NadekoBot/Modules/Administration/Administration.cs @@ -67,6 +67,23 @@ namespace NadekoBot.Modules.Administration await ReplyConfirmLocalized("perms_reset").ConfigureAwait(false); } + [NadekoCommand, Usage, Description, Aliases] + [OwnerOnly] + public async Task ResetGlobalPermissions() + { + using (var uow = DbHandler.UnitOfWork()) + { + var gc = uow.BotConfig.GetOrCreate(); + gc.BlockedCommands.Clear(); + gc.BlockedModules.Clear(); + + GlobalPermissionCommands.BlockedCommands.Clear(); + GlobalPermissionCommands.BlockedModules.Clear(); + await uow.CompleteAsync(); + } + await ReplyConfirmLocalized("global_perms_reset").ConfigureAwait(false); + } + [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] [RequireUserPermission(GuildPermission.Administrator)] diff --git a/src/NadekoBot/Modules/Administration/Commands/GameChannelCommands.cs b/src/NadekoBot/Modules/Administration/Commands/GameChannelCommands.cs index f2e5fb6c..0e557b40 100644 --- a/src/NadekoBot/Modules/Administration/Commands/GameChannelCommands.cs +++ b/src/NadekoBot/Modules/Administration/Commands/GameChannelCommands.cs @@ -22,7 +22,7 @@ namespace NadekoBot.Modules.Administration [Group] public class GameChannelCommands : NadekoSubmodule { - private static readonly Timer _t; + //private static readonly Timer _t; private static readonly ConcurrentHashSet gameVoiceChannels = new ConcurrentHashSet(); diff --git a/src/NadekoBot/Modules/Permissions/Commands/GlobalPermissionCommands.cs b/src/NadekoBot/Modules/Permissions/Commands/GlobalPermissionCommands.cs new file mode 100644 index 00000000..41ba61b3 --- /dev/null +++ b/src/NadekoBot/Modules/Permissions/Commands/GlobalPermissionCommands.cs @@ -0,0 +1,118 @@ +using Discord; +using Discord.Commands; +using NadekoBot.Attributes; +using NadekoBot.DataStructures; +using NadekoBot.Extensions; +using NadekoBot.Services; +using NadekoBot.Services.Database; +using NadekoBot.TypeReaders; +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace NadekoBot.Modules.Permissions +{ + public partial class Permissions + { + [Group] + public class GlobalPermissionCommands : NadekoSubmodule + { + public static readonly ConcurrentHashSet BlockedModules; + public static readonly ConcurrentHashSet BlockedCommands; + + static GlobalPermissionCommands() + { + BlockedModules = new ConcurrentHashSet(NadekoBot.BotConfig.BlockedModules.Select(x => x.Name)); + BlockedCommands = new ConcurrentHashSet(NadekoBot.BotConfig.BlockedCommands.Select(x => x.Name)); + } + + [NadekoCommand, Usage, Description, Aliases] + [OwnerOnly] + public async Task Lgp() + { + if (!BlockedModules.Any() && !BlockedCommands.Any()) + { + await ReplyErrorLocalized("lgp_none").ConfigureAwait(false); + return; + } + + var embed = new EmbedBuilder().WithOkColor(); + + if (BlockedModules.Any()) + embed.AddField(efb => efb.WithName(GetText("blocked_modules")).WithValue(string.Join("\n", BlockedModules)).WithIsInline(false)); + + if (BlockedCommands.Any()) + embed.AddField(efb => efb.WithName(GetText("blocked_commands")).WithValue(string.Join("\n", BlockedCommands)).WithIsInline(false)); + + await Context.Channel.EmbedAsync(embed).ConfigureAwait(false); + } + + [NadekoCommand, Usage, Description, Aliases] + [OwnerOnly] + public async Task Gmod(ModuleInfo module) + { + var moduleName = module.Name.ToLowerInvariant(); + if (BlockedModules.Add(moduleName)) + { + using (var uow = DbHandler.UnitOfWork()) + { + var bc = uow.BotConfig.GetOrCreate(); + bc.BlockedModules.Add(new Services.Database.Models.BlockedCmdOrMdl + { + Name = moduleName, + }); + uow.Complete(); + } + await ReplyConfirmLocalized("gmod_add", Format.Bold(module.Name)).ConfigureAwait(false); + return; + } + else if (BlockedModules.TryRemove(moduleName)) + { + using (var uow = DbHandler.UnitOfWork()) + { + var bc = uow.BotConfig.GetOrCreate(); + bc.BlockedModules.RemoveWhere(x => x.Name == moduleName); + uow.Complete(); + } + await ReplyConfirmLocalized("gmod_remove", Format.Bold(module.Name)).ConfigureAwait(false); + return; + } + } + + [NadekoCommand, Usage, Description, Aliases] + [OwnerOnly] + public async Task Gcmd(CommandOrCrInfo cmd) + { + var commandName = cmd.Name.ToLowerInvariant(); + if (BlockedCommands.Add(commandName)) + { + using (var uow = DbHandler.UnitOfWork()) + { + var bc = uow.BotConfig.GetOrCreate(); + bc.BlockedCommands.Add(new Services.Database.Models.BlockedCmdOrMdl + { + Name = commandName, + }); + uow.Complete(); + } + await ReplyConfirmLocalized("gcmd_add", Format.Bold(cmd.Name)).ConfigureAwait(false); + return; + } + else if (BlockedCommands.TryRemove(commandName)) + { + using (var uow = DbHandler.UnitOfWork()) + { + var bc = uow.BotConfig.GetOrCreate(); + bc.BlockedCommands.RemoveWhere(x => x.Name == commandName); + uow.Complete(); + } + await ReplyConfirmLocalized("gcmd_remove", Format.Bold(cmd.Name)).ConfigureAwait(false); + return; + } + } + } + } +} diff --git a/src/NadekoBot/Modules/Utility/Commands/CommandMapCommands.cs b/src/NadekoBot/Modules/Utility/Commands/CommandMapCommands.cs index 51fa03d1..11eb5017 100644 --- a/src/NadekoBot/Modules/Utility/Commands/CommandMapCommands.cs +++ b/src/NadekoBot/Modules/Utility/Commands/CommandMapCommands.cs @@ -16,7 +16,6 @@ namespace NadekoBot.Modules.Utility { public partial class Utility { - public class CommandAliasEqualityComparer : IEqualityComparer { public bool Equals(CommandAlias x, CommandAlias y) => x.Trigger == y.Trigger; @@ -41,6 +40,11 @@ namespace NadekoBot.Modules.Utility .ToDictionary(ca => ca.Trigger, ca => ca.Mapping)))); } + public static void Unload() + { + AliasMaps.Clear(); + } + [NadekoCommand, Usage, Description, Aliases] [RequireUserPermission(GuildPermission.Administrator)] [RequireContext(ContextType.Guild)] diff --git a/src/NadekoBot/Modules/Utility/Commands/CrossServerTextChannel.cs b/src/NadekoBot/Modules/Utility/Commands/CrossServerTextChannel.cs index 45318177..0f1a78b5 100644 --- a/src/NadekoBot/Modules/Utility/Commands/CrossServerTextChannel.cs +++ b/src/NadekoBot/Modules/Utility/Commands/CrossServerTextChannel.cs @@ -3,6 +3,7 @@ using Discord.Commands; using NadekoBot.Attributes; using NadekoBot.Extensions; using NadekoBot.Services; +using System; using System.Collections.Concurrent; using System.Linq; using System.Threading.Tasks; @@ -16,43 +17,50 @@ namespace NadekoBot.Modules.Utility { static CrossServerTextChannel() { - NadekoBot.Client.MessageReceived += async imsg => + NadekoBot.Client.MessageReceived += Client_MessageReceived; + } + + public static void Unload() + { + NadekoBot.Client.MessageReceived -= Client_MessageReceived; + } + + private static async Task Client_MessageReceived(Discord.WebSocket.SocketMessage imsg) + { + try { - try + if (imsg.Author.IsBot) + return; + var msg = imsg as IUserMessage; + if (msg == null) + return; + var channel = imsg.Channel as ITextChannel; + if (channel == null) + return; + if (msg.Author.Id == NadekoBot.Client.CurrentUser.Id) return; + foreach (var subscriber in Subscribers) { - if (imsg.Author.IsBot) - return; - var msg = imsg as IUserMessage; - if (msg == null) - return; - var channel = imsg.Channel as ITextChannel; - if (channel == null) - return; - if (msg.Author.Id == NadekoBot.Client.CurrentUser.Id) return; - foreach (var subscriber in Subscribers) + var set = subscriber.Value; + if (!set.Contains(channel)) + continue; + foreach (var chan in set.Except(new[] { channel })) { - var set = subscriber.Value; - if (!set.Contains(channel)) - continue; - foreach (var chan in set.Except(new[] {channel})) + try { - try - { - await chan.SendMessageAsync(GetMessage(channel, (IGuildUser) msg.Author, - msg)).ConfigureAwait(false); - } - catch - { - // ignored - } + await chan.SendMessageAsync(GetMessage(channel, (IGuildUser)msg.Author, + msg)).ConfigureAwait(false); + } + catch + { + // ignored } } } - catch - { - // ignored - } - }; + } + catch + { + // ignored + } } private static string GetMessage(ITextChannel channel, IGuildUser user, IUserMessage message) => diff --git a/src/NadekoBot/Modules/Utility/Commands/MessageRepeater.cs b/src/NadekoBot/Modules/Utility/Commands/MessageRepeater.cs index 58752c28..4b40b98b 100644 --- a/src/NadekoBot/Modules/Utility/Commands/MessageRepeater.cs +++ b/src/NadekoBot/Modules/Utility/Commands/MessageRepeater.cs @@ -48,7 +48,6 @@ namespace NadekoBot.Modules.Utility Task.Run(Run); } - private async Task Run() { source = new CancellationTokenSource(); @@ -124,7 +123,12 @@ namespace NadekoBot.Modules.Utility { var _ = Task.Run(async () => { +#if !GLOBAL_NADEKO await Task.Delay(5000).ConfigureAwait(false); +#else + await Task.Delay(30000).ConfigureAwait(false); +#endif + //todo this is pretty terrible Repeaters = new ConcurrentDictionary>(NadekoBot.AllGuildConfigs .ToDictionary(gc => gc.GuildId, gc => new ConcurrentQueue(gc.GuildRepeaters @@ -134,6 +138,21 @@ namespace NadekoBot.Modules.Utility }); } + public static void Unload() + { + _ready = false; + foreach (var kvp in Repeaters) + { + RepeatRunner r; + while (kvp.Value.TryDequeue(out r)) + { + r.Stop(); + } + } + + Repeaters.Clear(); + } + [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] [RequireUserPermission(GuildPermission.ManageMessages)] diff --git a/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs b/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs index 583b1f5b..618fb588 100644 --- a/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs +++ b/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs @@ -29,6 +29,11 @@ namespace NadekoBot.Modules.Utility patreon = PatreonThingy.Instance; } + public static void Unload() + { + patreon.Updater.Change(Timeout.Infinite, Timeout.Infinite); + } + [NadekoCommand, Usage, Description, Aliases] [OwnerOnly] public async Task PatreonRewardsReload() @@ -86,7 +91,7 @@ namespace NadekoBot.Modules.Utility public ImmutableArray Pledges { get; private set; } public DateTime LastUpdate { get; private set; } = DateTime.UtcNow; - private readonly Timer update; + public readonly Timer Updater; private readonly SemaphoreSlim claimLockJustInCase = new SemaphoreSlim(1, 1); private readonly Logger _log; @@ -97,7 +102,7 @@ namespace NadekoBot.Modules.Utility if (string.IsNullOrWhiteSpace(NadekoBot.Credentials.PatreonAccessToken)) return; _log = LogManager.GetCurrentClassLogger(); - update = new Timer(async (_) => await LoadPledges(), null, TimeSpan.Zero, Interval); + Updater = new Timer(async (_) => await LoadPledges(), null, TimeSpan.Zero, Interval); } public async Task LoadPledges() diff --git a/src/NadekoBot/Modules/Utility/Commands/Remind.cs b/src/NadekoBot/Modules/Utility/Commands/Remind.cs index 8d490563..8da05b89 100644 --- a/src/NadekoBot/Modules/Utility/Commands/Remind.cs +++ b/src/NadekoBot/Modules/Utility/Commands/Remind.cs @@ -32,10 +32,15 @@ namespace NadekoBot.Modules.Utility }; private new static readonly Logger _log; + private static readonly CancellationTokenSource cancelSource; + private static readonly CancellationToken cancelAllToken; static RemindCommands() { _log = LogManager.GetCurrentClassLogger(); + + cancelSource = new CancellationTokenSource(); + cancelAllToken = cancelSource.Token; List reminders; using (var uow = DbHandler.UnitOfWork()) { @@ -45,11 +50,17 @@ namespace NadekoBot.Modules.Utility foreach (var r in reminders) { - Task.Run(() => StartReminder(r)); + Task.Run(() => StartReminder(r, cancelAllToken)); } } - private static async Task StartReminder(Reminder r) + public static void Unload() + { + if (!cancelSource.IsCancellationRequested) + cancelSource.Cancel(); + } + + private static async Task StartReminder(Reminder r, CancellationToken t) { var now = DateTime.Now; @@ -58,7 +69,7 @@ namespace NadekoBot.Modules.Utility if (time.TotalMilliseconds > int.MaxValue) return; - await Task.Delay(time).ConfigureAwait(false); + await Task.Delay(time, t).ConfigureAwait(false); try { IMessageChannel ch; @@ -188,7 +199,7 @@ namespace NadekoBot.Modules.Utility { // ignored } - await StartReminder(rem); + await StartReminder(rem, cancelAllToken); } [NadekoCommand, Usage, Description, Aliases] diff --git a/src/NadekoBot/Modules/Utility/Commands/UnitConversion.cs b/src/NadekoBot/Modules/Utility/Commands/UnitConversion.cs index 4046627b..87283de3 100644 --- a/src/NadekoBot/Modules/Utility/Commands/UnitConversion.cs +++ b/src/NadekoBot/Modules/Utility/Commands/UnitConversion.cs @@ -49,14 +49,19 @@ namespace NadekoBot.Modules.Utility } Units = data.ToList(); } - catch (Exception e) + catch (Exception ex) { - _log.Warn("Could not load units: " + e.Message); + _log.Warn("Could not load units: " + ex.Message); } _timer = new Timer(async (obj) => await UpdateCurrency(), null, _updateInterval, _updateInterval); } + public static void Unload() + { + _timer.Change(Timeout.Infinite, Timeout.Infinite); + } + public static async Task UpdateCurrency() { try diff --git a/src/NadekoBot/Modules/Utility/Utility.cs b/src/NadekoBot/Modules/Utility/Utility.cs index 1ac77e73..0e2eba1b 100644 --- a/src/NadekoBot/Modules/Utility/Utility.cs +++ b/src/NadekoBot/Modules/Utility/Utility.cs @@ -25,6 +25,12 @@ namespace NadekoBot.Modules.Utility { private static ConcurrentDictionary _rotatingRoleColors = new ConcurrentDictionary(); + public static void Unload() + { + _rotatingRoleColors.ForEach(x => x.Value?.Change(Timeout.Infinite, Timeout.Infinite)); + _rotatingRoleColors.Clear(); + } + //[NadekoCommand, Usage, Description, Aliases] //[RequireContext(ContextType.Guild)] //public async Task Midorina([Remainder] string arg) @@ -49,7 +55,7 @@ namespace NadekoBot.Modules.Utility // var roleStrings = roles // .Select(x => $"{reactions[j++]} -> {x.Name}"); - + // var msg = await Context.Channel.SendConfirmAsync("Pick a Role", // string.Join("\n", roleStrings)).ConfigureAwait(false); @@ -100,6 +106,7 @@ namespace NadekoBot.Modules.Utility // } // })); //} + [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] diff --git a/src/NadekoBot/Resources/CommandStrings.Designer.cs b/src/NadekoBot/Resources/CommandStrings.Designer.cs index 256ff9fe..0a128d7f 100644 --- a/src/NadekoBot/Resources/CommandStrings.Designer.cs +++ b/src/NadekoBot/Resources/CommandStrings.Designer.cs @@ -3012,7 +3012,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Toggles game voice channel feature in the voice channel you're currently in. Users who join the game voice channel will get automatically redirected to the voice channel with the name of their current game if it exists. Can't move users to channels that the bot has no connect permission for. One per server.. + /// Looks up a localized string similar to Toggles game voice channel feature in the voice channel you're currently in. Users who join the game voice channel will get automatically redirected to the voice channel with the name of their current game, if it exists. Can't move users to channels that the bot has no connect permission for. One per server.. /// public static string gamevoicechannel_desc { get { @@ -3029,6 +3029,33 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to globalcommand gcmd. + /// + public static string gcmd_cmd { + get { + return ResourceManager.GetString("gcmd_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Enables or disables a command from use on all servers.. + /// + public static string gcmd_desc { + get { + return ResourceManager.GetString("gcmd_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}gcmd `. + /// + public static string gcmd_usage { + get { + return ResourceManager.GetString("gcmd_usage", resourceCulture); + } + } + /// /// Looks up a localized string similar to gelbooru. /// @@ -3110,6 +3137,33 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to globalmodule gmod. + /// + public static string gmod_cmd { + get { + return ResourceManager.GetString("gmod_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Enable or disable a module from use on all servers.. + /// + public static string gmod_desc { + get { + return ResourceManager.GetString("gmod_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}gmod nsfw disable`. + /// + public static string gmod_usage { + get { + return ResourceManager.GetString("gmod_usage", resourceCulture); + } + } + /// /// Looks up a localized string similar to google g. /// @@ -4055,6 +4109,33 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to listglobalperms lgp. + /// + public static string lgp_cmd { + get { + return ResourceManager.GetString("lgp_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Lists global permissions set by the bot owner.. + /// + public static string lgp_desc { + get { + return ResourceManager.GetString("lgp_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}lgp`. + /// + public static string lgp_usage { + get { + return ResourceManager.GetString("lgp_usage", resourceCulture); + } + } + /// /// Looks up a localized string similar to linux. /// @@ -6512,6 +6593,33 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to resetglobalperms. + /// + public static string resetglobalpermissions_cmd { + get { + return ResourceManager.GetString("resetglobalpermissions_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Resets global permissions set by bot owner.. + /// + public static string resetglobalpermissions_desc { + get { + return ResourceManager.GetString("resetglobalpermissions_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}resetglobalperms`. + /// + public static string resetglobalpermissions_usage { + get { + return ResourceManager.GetString("resetglobalpermissions_usage", resourceCulture); + } + } + /// /// Looks up a localized string similar to resetperms. /// diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx index a0a397a6..715ae1ba 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -3421,7 +3421,7 @@ gvc - Toggles game voice channel feature in the voice channel you're currently in. Users who join the game voice channel will get automatically redirected to the voice channel with the name of their current game if it exists. Can't move users to channels that the bot has no connect permission for. One per server. + Toggles game voice channel feature in the voice channel you're currently in. Users who join the game voice channel will get automatically redirected to the voice channel with the name of their current game, if it exists. Can't move users to channels that the bot has no connect permission for. One per server. `{0}gvc` @@ -3438,4 +3438,40 @@ `{0}shoprm 1` + + globalcommand gcmd + + + Enables or disables a command from use on all servers. + + + `{0}gcmd ` + + + globalmodule gmod + + + Enable or disable a module from use on all servers. + + + `{0}gmod nsfw disable` + + + listglobalperms lgp + + + Lists global permissions set by the bot owner. + + + `{0}lgp` + + + resetglobalperms + + + Resets global permissions set by bot owner. + + + `{0}resetglobalperms` + \ No newline at end of file diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index 1d0d3075..67942c21 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -411,6 +411,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Global permissions have been reset.. + /// + public static string administration_global_perms_reset { + get { + return ResourceManager.GetString("administration_global_perms_reset", resourceCulture); + } + } + /// /// Looks up a localized string similar to Greet announcements disabled.. /// @@ -4711,6 +4720,24 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Blocked Commands. + /// + public static string permissions_blocked_commands { + get { + return ResourceManager.GetString("permissions_blocked_commands", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Blocked Modules. + /// + public static string permissions_blocked_modules { + get { + return ResourceManager.GetString("permissions_blocked_modules", resourceCulture); + } + } + /// /// Looks up a localized string similar to Command {0} now has a {1}s cooldown.. /// @@ -4801,6 +4828,42 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to Command {0} has been disabled on all servers.. + /// + public static string permissions_gcmd_add { + get { + return ResourceManager.GetString("permissions_gcmd_add", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Command {0} has been enabled on all servers.. + /// + public static string permissions_gcmd_remove { + get { + return ResourceManager.GetString("permissions_gcmd_remove", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Module {0} has been disabled on all servers.. + /// + public static string permissions_gmod_add { + get { + return ResourceManager.GetString("permissions_gmod_add", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Module {0} has been enabled on all servers.. + /// + public static string permissions_gmod_remove { + get { + return ResourceManager.GetString("permissions_gmod_remove", resourceCulture); + } + } + /// /// Looks up a localized string similar to Invalid second parameter.(Must be a number between {0} and {1}). /// @@ -4846,6 +4909,15 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to No blocked commands or modules.. + /// + public static string permissions_lgp_none { + get { + return ResourceManager.GetString("permissions_lgp_none", resourceCulture); + } + } + /// /// Looks up a localized string similar to Moved permission {0} from #{1} to #{2}. /// diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index 4831a40f..e3c2ffa4 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -2431,6 +2431,9 @@ Owner ID: {2} Next update in {0} Next update in 05:30 + + Global permissions have been reset. + Game Voice Channel feature has been disabled on this server. @@ -2485,4 +2488,25 @@ Owner ID: {2} {0} unique items left. + + Blocked Commands + + + Blocked Modules + + + Command {0} has been disabled on all servers. + + + Command {0} has been enabled on all servers. + + + Module {0} has been disabled on all servers. + + + Module {0} has been enabled on all servers. + + + No blocked commands or modules. + \ No newline at end of file diff --git a/src/NadekoBot/Services/CommandHandler.cs b/src/NadekoBot/Services/CommandHandler.cs index 8cd840e0..06b447b1 100644 --- a/src/NadekoBot/Services/CommandHandler.cs +++ b/src/NadekoBot/Services/CommandHandler.cs @@ -486,15 +486,22 @@ namespace NadekoBot.Services } } - int price; - if (Permissions.CommandCostCommands.CommandCosts.TryGetValue(cmd.Aliases.First().Trim().ToLowerInvariant(), out price) && price > 0) - { - var success = await CurrencyHandler.RemoveCurrencyAsync(context.User.Id, $"Running {cmd.Name} command.", price).ConfigureAwait(false); - if (!success) - { - return new ExecuteCommandResult(cmd, pc, SearchResult.FromError(CommandError.Exception, $"Insufficient funds. You need {price}{NadekoBot.BotConfig.CurrencySign} to run this command.")); - } - } + //int price; + //if (Permissions.CommandCostCommands.CommandCosts.TryGetValue(cmd.Aliases.First().Trim().ToLowerInvariant(), out price) && price > 0) + //{ + // var success = await CurrencyHandler.RemoveCurrencyAsync(context.User.Id, $"Running {cmd.Name} command.", price).ConfigureAwait(false); + // if (!success) + // { + // return new ExecuteCommandResult(cmd, pc, SearchResult.FromError(CommandError.Exception, $"Insufficient funds. You need {price}{NadekoBot.BotConfig.CurrencySign} to run this command.")); + // } + //} + } + + if (cmd.Name != "resetglobalperms" && + (GlobalPermissionCommands.BlockedCommands.Contains(cmd.Aliases.First().ToLowerInvariant()) || + GlobalPermissionCommands.BlockedModules.Contains(module.Name.ToLowerInvariant()))) + { + return new ExecuteCommandResult(cmd, null, SearchResult.FromError(CommandError.Exception, $"Command or module is blocked globally by the bot owner.")); } // Bot will ignore commands which are ran more often than what specified by diff --git a/src/NadekoBot/Services/Database/Models/BotConfig.cs b/src/NadekoBot/Services/Database/Models/BotConfig.cs index b25dc744..81bbb87f 100644 --- a/src/NadekoBot/Services/Database/Models/BotConfig.cs +++ b/src/NadekoBot/Services/Database/Models/BotConfig.cs @@ -62,6 +62,25 @@ Nadeko Support Server: https://discord.gg/nadekobot"; public string ErrorColor { get; set; } = "ee281f"; public string Locale { get; set; } = null; public List StartupCommands { get; set; } + public HashSet BlockedCommands { get; set; } + public HashSet BlockedModules { get; set; } + } + + public class BlockedCmdOrMdl : DbEntity + { + public string Name { get; set; } + + public override bool Equals(object obj) + { + if (obj == null || GetType() != obj.GetType()) + { + return false; + } + + return ((BlockedCmdOrMdl)obj).Name.ToLowerInvariant() == Name.ToLowerInvariant(); + } + + public override int GetHashCode() => Name.GetHashCode(); } public class StartupCommand : DbEntity, IIndexed diff --git a/src/NadekoBot/Services/Database/Repositories/Impl/BotConfigRepository.cs b/src/NadekoBot/Services/Database/Repositories/Impl/BotConfigRepository.cs index 1e40f86c..c9b7ad7d 100644 --- a/src/NadekoBot/Services/Database/Repositories/Impl/BotConfigRepository.cs +++ b/src/NadekoBot/Services/Database/Repositories/Impl/BotConfigRepository.cs @@ -22,6 +22,8 @@ namespace NadekoBot.Services.Database.Repositories.Impl .Include(bc => bc.EightBallResponses) .Include(bc => bc.ModulePrefixes) .Include(bc => bc.StartupCommands) + .Include(bc => bc.BlockedCommands) + .Include(bc => bc.BlockedModules) //.Include(bc => bc.CommandCosts) .FirstOrDefault(); else From 19160c6bbcf8a8c81913b215d4bf5aee4e453b04 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sun, 9 Apr 2017 23:22:06 +0200 Subject: [PATCH 448/496] closes #431, if gmod or gcmd is active on some module or command, they won't show up on -mdls or -cmds respectively --- src/NadekoBot/Modules/Help/Help.cs | 2 ++ src/NadekoBot/Modules/Searches/Searches.cs | 2 +- src/NadekoBot/Resources/CommandStrings.Designer.cs | 2 +- src/NadekoBot/Resources/CommandStrings.resx | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/NadekoBot/Modules/Help/Help.cs b/src/NadekoBot/Modules/Help/Help.cs index 4ca96023..1208260b 100644 --- a/src/NadekoBot/Modules/Help/Help.cs +++ b/src/NadekoBot/Modules/Help/Help.cs @@ -31,6 +31,7 @@ namespace NadekoBot.Modules.Help .WithTitle(GetText("list_of_modules")) .WithDescription(string.Join("\n", NadekoBot.CommandService.Modules.GroupBy(m => m.GetTopLevelModule()) + .Where(m => !Permissions.Permissions.GlobalPermissionCommands.BlockedModules.Contains(m.Key.Name.ToLowerInvariant())) .Select(m => "• " + m.Key.Name) .OrderBy(s => s))); await Context.Channel.EmbedAsync(embed).ConfigureAwait(false); @@ -45,6 +46,7 @@ namespace NadekoBot.Modules.Help if (string.IsNullOrWhiteSpace(module)) return; var cmds = NadekoBot.CommandService.Commands.Where(c => c.Module.GetTopLevelModule().Name.ToUpperInvariant().StartsWith(module)) + .Where(c => !Permissions.Permissions.GlobalPermissionCommands.BlockedCommands.Contains(c.Aliases.First().ToLowerInvariant())) .OrderBy(c => c.Aliases.First()) .Distinct(new CommandTextEqualityComparer()) .AsEnumerable(); diff --git a/src/NadekoBot/Modules/Searches/Searches.cs b/src/NadekoBot/Modules/Searches/Searches.cs index 3e6aa1bc..b25bf15e 100644 --- a/src/NadekoBot/Modules/Searches/Searches.cs +++ b/src/NadekoBot/Modules/Searches/Searches.cs @@ -585,7 +585,7 @@ namespace NadekoBot.Modules.Searches { if (usr == null) usr = Context.User; - await Context.Channel.SendConfirmAsync($"https://images.google.com/searchbyimage?image_url={usr.AvatarUrl}").ConfigureAwait(false); + await Context.Channel.SendConfirmAsync($"https://images.google.com/searchbyimage?image_url={usr.RealAvatarUrl()}").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] diff --git a/src/NadekoBot/Resources/CommandStrings.Designer.cs b/src/NadekoBot/Resources/CommandStrings.Designer.cs index 0a128d7f..48192ab6 100644 --- a/src/NadekoBot/Resources/CommandStrings.Designer.cs +++ b/src/NadekoBot/Resources/CommandStrings.Designer.cs @@ -5037,7 +5037,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Mentions every person from the provided role or roles (separated by a ',') on this server. Requires you to have the mention everyone permission.. + /// Looks up a localized string similar to Mentions every person from the provided role or roles (separated by a ',') on this server.. /// public static string mentionrole_desc { get { diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx index 715ae1ba..1b5cff49 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -733,7 +733,7 @@ mentionrole menro - Mentions every person from the provided role or roles (separated by a ',') on this server. Requires you to have the mention everyone permission. + Mentions every person from the provided role or roles (separated by a ',') on this server. `{0}menro RoleName` From c9937a4fbe29f0d212df0a1ed9388aea7a6b222d Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sun, 9 Apr 2017 23:23:19 +0200 Subject: [PATCH 449/496] version upped to 1.3 --- src/NadekoBot/Services/Impl/StatsService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Services/Impl/StatsService.cs b/src/NadekoBot/Services/Impl/StatsService.cs index f18845ad..570c44ff 100644 --- a/src/NadekoBot/Services/Impl/StatsService.cs +++ b/src/NadekoBot/Services/Impl/StatsService.cs @@ -16,7 +16,7 @@ namespace NadekoBot.Services.Impl private readonly DiscordShardedClient _client; private readonly DateTime _started; - public const string BotVersion = "1.26a"; + public const string BotVersion = "1.3"; public string Author => "Kwoth#2560"; public string Library => "Discord.Net"; From 4badd92b5a3f8c92d2203afdf32f46c71e1815e4 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sun, 9 Apr 2017 23:29:08 +0200 Subject: [PATCH 450/496] updated commandlist --- docs/Commands List.md | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/docs/Commands List.md b/docs/Commands List.md index da4d922c..dc705b8e 100644 --- a/docs/Commands List.md +++ b/docs/Commands List.md @@ -19,14 +19,15 @@ You can support the project on patreon: or paypa Commands and aliases | Description | Usage ----------------|--------------|------- `.resetperms` | Resets the bot's permissions module on this server to the default value. **Requires Administrator server permission.** | `.resetperms` +`.resetglobalperms` | Resets global permissions set by bot owner. **Bot owner only** | `.resetglobalperms` `.delmsgoncmd` | Toggles the automatic deletion of the user's successful command message to prevent chat flood. **Requires Administrator server permission.** | `.delmsgoncmd` `.setrole` `.sr` | Sets a role for a given user. **Requires ManageRoles server permission.** | `.sr @User Guest` `.removerole` `.rr` | Removes a role from a given user. **Requires ManageRoles server permission.** | `.rr @User Admin` `.renamerole` `.renr` | Renames a role. The role you are renaming must be lower than bot's highest role. **Requires ManageRoles server permission.** | `.renr "First role" SecondRole` `.removeallroles` `.rar` | Removes all roles from a mentioned user. **Requires ManageRoles server permission.** | `.rar @User` `.createrole` `.cr` | Creates a role with a given name. **Requires ManageRoles server permission.** | `.cr Awesome Role` +`.rolehoist` `.rh` | Toggles if this role is displayed in the sidebar or not **Requires ManageRoles server permission.** | `.rh Guests true` or `.rh "Space Wizards" true `.rolecolor` `.rc` | Set a role's color to the hex or 0-255 rgb color value provided. **Requires ManageRoles server permission.** | `.rc Admin 255 200 100` or `.rc Admin ffba55` -`.rolehoist` `.rh` | Set whether the role should be displayed separately in the sidebar **Requires ManageRoles server permission.** | `.rh Guests true` or `.rolehoist "Space Wizards" true` `.deafen` `.deaf` | Deafens mentioned user or users. **Requires DeafenMembers server permission.** | `.deaf "@Someguy"` or `.deaf "@Someguy" "@Someguy"` `.undeafen` `.undef` | Undeafens mentioned user or users. **Requires DeafenMembers server permission.** | `.undef "@Someguy"` or `.undef "@Someguy" "@Someguy"` `.delvoichanl` `.dvch` | Deletes a voice channel with a given name. **Requires ManageChannels server permission.** | `.dvch VoiceChannelName` @@ -36,10 +37,11 @@ Commands and aliases | Description | Usage `.settopic` `.st` | Sets a topic on the current channel. **Requires ManageChannels server permission.** | `.st My new topic` `.setchanlname` `.schn` | Changes the name of the current channel. **Requires ManageChannels server permission.** | `.schn NewName` `.prune` `.clr` | `.prune` removes all Nadeko's messages in the last 100 messages. `.prune X` removes last `X` number of messages from the channel (up to 100). `.prune @Someone` removes all Someone's messages in the last 100 messages. `.prune @Someone X` removes last `X` number of 'Someone's' messages in the channel. | `.prune` or `.prune 5` or `.prune @Someone` or `.prune @Someone X` -`.mentionrole` `.menro` | Mentions every person from the provided role or roles (separated by a ',') on this server. Requires you to have the mention everyone permission. **Requires MentionEveryone server permission.** | `.menro RoleName` +`.mentionrole` `.menro` | Mentions every person from the provided role or roles (separated by a ',') on this server. **Requires MentionEveryone server permission.** | `.menro RoleName` `.donators` | List of the lovely people who donated to keep this project alive. | `.donators` `.donadd` | Add a donator to the database. **Bot owner only** | `.donadd Donate Amount` `.autoassignrole` `.aar` | Automaticaly assigns a specified role to every user who joins the server. **Requires ManageRoles server permission.** | `.aar` to disable, `.aar Role Name` to enable +`.gvc` | Toggles game voice channel feature in the voice channel you're currently in. Users who join the game voice channel will get automatically redirected to the voice channel with the name of their current game, if it exists. Can't move users to channels that the bot has no connect permission for. One per server. **Requires Administrator server permission.** | `.gvc` `.languageset` `.langset` | 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. | `.langset de-DE ` or `.langset default` `.langsetdefault` `.langsetd` | 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. | `.langsetd en-US` or `.langsetd default` `.languageslist` `.langli` | List of languages for which translation (or part of it) exist atm. | `.langli` @@ -64,6 +66,7 @@ Commands and aliases | Description | Usage `.antispamignore` | Toggles whether antispam ignores current channel. Antispam must be enabled. | `.antispamignore` `.antilist` `.antilst` | Shows currently enabled protection features. | `.antilist` `.slowmode` | Toggles slowmode. Disable by specifying no parameters. To enable, specify a number of messages each user can send, and an interval in seconds. For example 1 message every 5 seconds. **Requires ManageMessages server permission.** | `.slowmode 1 5` or `.slowmode` +`.slowmodewl` | Ignores a role or a user from the slowmode feature. **Requires ManageMessages server permission.** | `.slowmodewl SomeRole` or `.slowmodewl AdminDude` `.adsarm` | Toggles the automatic deletion of confirmations for `.iam` and `.iamn` commands. **Requires ManageMessages server permission.** | `.adsarm` `.asar` | Adds a role to the list of self-assignable roles. **Requires ManageRoles server permission.** | `.asar Gamer` `.rsar` | Removes a specified role from the list of self-assignable roles. **Requires ManageRoles server permission.** | `.rsar` @@ -136,7 +139,7 @@ Commands and aliases | Description | Usage `.listcustreactg` `.lcrg` | Lists global or server custom reactions (20 commands per page) grouped by trigger, and show a number of responses for each. Running the command in DM will list global custom reactions, while running it in server will list that server's custom reactions. | `.lcrg 1` `.showcustreact` `.scr` | Shows a custom reaction's response on a given ID. | `.scr 1` `.delcustreact` `.dcr` | Deletes a custom reaction on a specific index. If ran in DM, it is bot owner only and deletes a global custom reaction. If ran in a server, it requires Administration privileges and removes server custom reaction. | `.dcr 5` -`.crdm` | Toggles whether the response message of the custom reaction will be sent as a direct message. | `.crad 44` +`.crdm` | Toggles whether the response message of the custom reaction will be sent as a direct message. | `.crdm 44` `.crad` | Toggles whether the message triggering the custom reaction will be automatically deleted. | `.crad 59` `.crstatsclear` | Resets the counters on `.crstats`. You can specify a trigger to clear stats only for that trigger. **Bot owner only** | `.crstatsclear` or `.crstatsclear rng` `.crstats` | Shows a list of custom reactions and the number of times they have been executed. Paginated with 10 per page. Use `.crstatsclear` to reset the counters. | `.crstats` or `.crstats 3` @@ -163,6 +166,11 @@ Commands and aliases | Description | Usage `$shuffle` `$sh` | Reshuffles all cards back into the deck. | `$sh` `$flip` | Flips coin(s) - heads or tails, and shows an image. | `$flip` or `$flip 3` `$betflip` `$bf` | Bet to guess will the result be heads or tails. Guessing awards you 1.95x the currency you've bet (rounded up). Multiplier can be changed by the bot owner. | `$bf 5 heads` or `$bf 3 t` +`$shop` | Lists this server's administrators' shop. Paginated. | `$shop` or `$shop 2` +`$buy` | Buys an item from the shop on a given index. If buying items, make sure that the bot can DM you. | `$buy 2` +`$shopadd` | Adds an item to the shop by specifying type price and name. Available types are role and list. **Requires Administrator server permission.** | `$shopadd role 1000 Rich` +`$shoplistadd` | Adds an item to the list of items for sale in the shop entry given the index. You usually want to run this command in the secret channel, so that the unique items are not leaked. **Requires Administrator server permission.** | `$shoplistadd 1 Uni-que-Steam-Key` +`$shoprem` `$shoprm` | Removes an item from the shop by its color. **Requires Administrator server permission.** | `$shoprm 1` `$slotstats` | Shows the total stats of the slot command for this bot's session. **Bot owner only** | `$slotstats` `$slottest` | Tests to see how much slots payout for X number of plays. **Bot owner only** | `$slottest 1000` `$slot` | Play Nadeko slots. Max bet is 999. 3 seconds cooldown per user. | `$slot 5` @@ -303,6 +311,9 @@ Commands and aliases | Description | Usage `;chnlfilterwords` `;cfw` | Toggles automatic deletion of messages containing filtered words on the channel. Does not negate the `;srvrfilterwords` enabled setting. Does not affect the Bot Owner. | `;cfw` `;fw` | Adds or removes (if it exists) a word from the list of filtered words. Use`;sfw` or `;cfw` to toggle filtering. | `;fw poop` `;lstfilterwords` `;lfw` | Shows a list of filtered words. | `;lfw` +`;listglobalperms` `;lgp` | Lists global permissions set by the bot owner. **Bot owner only** | `;lgp` +`;globalmodule` `;gmod` | Enable or disable a module from use on all servers. **Bot owner only** | `;gmod nsfw disable` +`;globalcommand` `;gcmd` | Enables or disables a command from use on all servers. **Bot owner only** | `;gcmd ` ###### [Back to ToC](#table-of-contents) @@ -321,6 +332,7 @@ Commands and aliases | Description | Usage Commands and aliases | Description | Usage ----------------|--------------|------- `~weather` `~we` | Shows weather data for a specified city. You can also specify a country after a comma. | `~we Moscow, RU` +`~time` | Shows the current time and timezone in the specified location. | `~time London, UK` `~youtube` `~yt` | Searches youtubes and shows the first result | `~yt query` `~imdb` `~omdb` | Queries omdb for movies or series, show first result. | `~imdb Batman vs Superman` `~randomcat` `~meow` | Shows a random cat image. | `~meow` @@ -398,6 +410,7 @@ Commands and aliases | Description | Usage `.showemojis` `.se` | Shows a name and a link to every SPECIAL emoji in the message. | `.se A message full of SPECIAL emojis` `.listservers` | Lists servers the bot is on with some basic info. 15 per page. **Bot owner only** | `.listservers 3` `.savechat` | Saves a number of messages to a text file and sends it to you. **Bot owner only** | `.savechat 150` +`.ping` | Ping the bot to see if there are latency issues. | `.ping` `.activity` | Checks for spammers. **Bot owner only** | `.activity` `.calculate` `.calc` | Evaluate a mathematical expression. | `.calc 1+1` `.calcops` | Shows all available operations in the `.calc` command | `.calcops` @@ -413,9 +426,12 @@ Commands and aliases | Description | Usage `.repeatremove` `.reprm` | Removes a repeating message on a specified index. Use `.repeatlist` to see indexes. **Requires ManageMessages server permission.** | `.reprm 2` `.repeat` | Repeat a message every `X` minutes in the current channel. You can have up to 5 repeating messages on the server in total. **Requires ManageMessages server permission.** | `.repeat 5 Hello there` `.repeatlist` `.replst` | Shows currently repeating messages and their indexes. **Requires ManageMessages server permission.** | `.repeatlist` -`.listquotes` `.liqu` | `.liqu` or `.liqu 3` | Lists all quotes on the server ordered alphabetically. 15 Per page. +`.parewrel` | Forces the update of the list of patrons who are eligible for the reward. **Bot owner only** | `.parewrel` +`.clparew` | Claim patreon rewards. If you're subscribed to bot owner's patreon you can use this command to claim your rewards - assuming bot owner did setup has their patreon key. | `.clparew` +`.listquotes` `.liqu` | Lists all quotes on the server ordered alphabetically. 15 Per page. | `.liqu` or `.liqu 3` `...` | Shows a random quote with a specified name. | `... abc` `.qsearch` | Shows a random quote for a keyword that contains any text specified in the search. | `.qsearch keyword text` +`.quoteid` `.qid` | Displays the quote with the specified ID number. Quote ID numbers can be found by typing `.liqu [num]` where `[num]` is a number of a page which contains 15 quotes. | `.qid 123456` `..` | Adds a new quote with the specified name and message. | `.. sayhi Hi` `.deletequote` `.delq` | Deletes a quote with the specified ID. You have to be either server Administrator or the creator of the quote to delete it. | `.delq 123456` `.delallq` `.daq` | Deletes all quotes on a specified keyword. **Requires Administrator server permission.** | `.delallq kek` From e5131e0416f3ae3ff42b1820185482dd94e5a299 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sun, 9 Apr 2017 23:31:16 +0200 Subject: [PATCH 451/496] now shows that you can specify a reason --- src/NadekoBot/Resources/CommandStrings.Designer.cs | 2 +- src/NadekoBot/Resources/CommandStrings.resx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Resources/CommandStrings.Designer.cs b/src/NadekoBot/Resources/CommandStrings.Designer.cs index 48192ab6..c135ff21 100644 --- a/src/NadekoBot/Resources/CommandStrings.Designer.cs +++ b/src/NadekoBot/Resources/CommandStrings.Designer.cs @@ -9744,7 +9744,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to `{0}warn @b1nzy`. + /// Looks up a localized string similar to `{0}warn @b1nzy Very rude person`. /// public static string warn_usage { get { diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx index 1b5cff49..6c67e584 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -3247,7 +3247,7 @@ Warns a user. - `{0}warn @b1nzy` + `{0}warn @b1nzy Very rude person` scadd From a0e363ff660637e53442acdb7853a905f8ae3f77 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 10 Apr 2017 02:29:33 +0200 Subject: [PATCH 452/496] mute role will be applied to newly created channels now too --- .../Administration/Commands/MuteCommands.cs | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/src/NadekoBot/Modules/Administration/Commands/MuteCommands.cs b/src/NadekoBot/Modules/Administration/Commands/MuteCommands.cs index 0a130383..9399fc90 100644 --- a/src/NadekoBot/Modules/Administration/Commands/MuteCommands.cs +++ b/src/NadekoBot/Modules/Administration/Commands/MuteCommands.cs @@ -1,5 +1,6 @@ using Discord; using Discord.Commands; +using Discord.WebSocket; using Microsoft.EntityFrameworkCore; using NadekoBot.Attributes; using NadekoBot.Services; @@ -32,6 +33,9 @@ namespace NadekoBot.Modules.Administration Chat, All } + private static readonly OverwritePermissions denyOverwrite = new OverwritePermissions(sendMessages: PermValue.Deny, attachFiles: PermValue.Deny); + + private static readonly new Logger _log = LogManager.GetCurrentClassLogger(); static MuteCommands() { @@ -152,21 +156,26 @@ namespace NadekoBot.Modules.Administration muteRole = guild.Roles.FirstOrDefault(r => r.Name == muteRoleName) ?? await guild.CreateRoleAsync(defaultMuteRoleName, GuildPermissions.None).ConfigureAwait(false); } + } - foreach (var toOverwrite in (await guild.GetTextChannelsAsync())) + foreach (var toOverwrite in (await guild.GetTextChannelsAsync())) + { + try { - try + if (!toOverwrite.PermissionOverwrites.Select(x => x.Permissions).Contains(denyOverwrite)) { - await toOverwrite.AddPermissionOverwriteAsync(muteRole, new OverwritePermissions(sendMessages: PermValue.Deny, attachFiles: PermValue.Deny)) + await toOverwrite.AddPermissionOverwriteAsync(muteRole, denyOverwrite) .ConfigureAwait(false); + + await Task.Delay(200).ConfigureAwait(false); } - catch - { - // ignored - } - await Task.Delay(200).ConfigureAwait(false); + } + catch + { + // ignored } } + return muteRole; } From bece18dffc09678d543d3cdb9767d01299c8d18f Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 10 Apr 2017 02:53:36 +0200 Subject: [PATCH 453/496] .repinv now posts in the channel repeater originates from, not current one --- .../Utility/Commands/MessageRepeater.cs | 84 ++++++++++--------- 1 file changed, 45 insertions(+), 39 deletions(-) diff --git a/src/NadekoBot/Modules/Utility/Commands/MessageRepeater.cs b/src/NadekoBot/Modules/Utility/Commands/MessageRepeater.cs index 4b40b98b..4bc2f2f5 100644 --- a/src/NadekoBot/Modules/Utility/Commands/MessageRepeater.cs +++ b/src/NadekoBot/Modules/Utility/Commands/MessageRepeater.cs @@ -36,6 +36,7 @@ namespace NadekoBot.Modules.Utility public Repeater Repeater { get; } public SocketGuild Guild { get; } public ITextChannel Channel { get; private set; } + private IUserMessage oldMsg = null; public RepeatRunner(Repeater repeater, ITextChannel channel = null) { @@ -52,49 +53,13 @@ namespace NadekoBot.Modules.Utility { source = new CancellationTokenSource(); token = source.Token; - IUserMessage oldMsg = null; try { while (!token.IsCancellationRequested) { - var toSend = "🔄 " + Repeater.Message; await Task.Delay(Repeater.Interval, token).ConfigureAwait(false); - //var lastMsgInChannel = (await Channel.GetMessagesAsync(2)).FirstOrDefault(); - // if (lastMsgInChannel.Id == oldMsg?.Id) //don't send if it's the same message in the channel - // continue; - - if (oldMsg != null) - try - { - await oldMsg.DeleteAsync(); - } - catch - { - // ignored - } - try - { - if (Channel == null) - Channel = Guild.GetTextChannel(Repeater.ChannelId); - - if (Channel != null) - oldMsg = await Channel.SendMessageAsync(toSend).ConfigureAwait(false); - } - catch (HttpException ex) when (ex.HttpCode == System.Net.HttpStatusCode.Forbidden) - { - _log.Warn("Missing permissions. Repeater stopped. ChannelId : {0}", Channel?.Id); - return; - } - catch (HttpException ex) when (ex.HttpCode == System.Net.HttpStatusCode.NotFound) - { - _log.Warn("Channel not found. Repeater stopped. ChannelId : {0}", Channel?.Id); - return; - } - catch (Exception ex) - { - _log.Warn(ex); - } + await Trigger().ConfigureAwait(false); } } catch (OperationCanceledException) @@ -102,6 +67,46 @@ namespace NadekoBot.Modules.Utility } } + public async Task Trigger() + { + var toSend = "🔄 " + Repeater.Message; + //var lastMsgInChannel = (await Channel.GetMessagesAsync(2)).FirstOrDefault(); + // if (lastMsgInChannel.Id == oldMsg?.Id) //don't send if it's the same message in the channel + // continue; + + if (oldMsg != null) + try + { + await oldMsg.DeleteAsync(); + } + catch + { + // ignored + } + try + { + if (Channel == null) + Channel = Guild.GetTextChannel(Repeater.ChannelId); + + if (Channel != null) + oldMsg = await Channel.SendMessageAsync(toSend).ConfigureAwait(false); + } + catch (HttpException ex) when (ex.HttpCode == System.Net.HttpStatusCode.Forbidden) + { + _log.Warn("Missing permissions. Repeater stopped. ChannelId : {0}", Channel?.Id); + return; + } + catch (HttpException ex) when (ex.HttpCode == System.Net.HttpStatusCode.NotFound) + { + _log.Warn("Channel not found. Repeater stopped. ChannelId : {0}", Channel?.Id); + return; + } + catch (Exception ex) + { + _log.Warn(ex); + } + } + public void Reset() { source.Cancel(); @@ -176,9 +181,10 @@ namespace NadekoBot.Modules.Utility return; } var repeater = repList[index].Repeater; - repList[index].Reset(); - await Context.Channel.SendMessageAsync("🔄 " + repeater.Message).ConfigureAwait(false); + await repList[index].Trigger(); + + await Context.Channel.SendMessageAsync("🔄").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] From 81d2272a9a5f24b8d0c46c60be3fa9d2a4d446a2 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 10 Apr 2017 03:00:17 +0200 Subject: [PATCH 454/496] fixed missing here and everyone mention removals from custom reactions, repeaters and others --- src/NadekoBot/Modules/CustomReactions/CustomReactions.cs | 2 +- src/NadekoBot/Modules/CustomReactions/Extensions.cs | 2 +- src/NadekoBot/Modules/Utility/Commands/MessageRepeater.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs b/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs index ac6fd4c9..b250c510 100644 --- a/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs +++ b/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs @@ -28,7 +28,7 @@ namespace NadekoBot.Modules.CustomReactions { return await channel.EmbedAsync(crembed.ToEmbed(), crembed.PlainText ?? ""); } - return await channel.SendMessageAsync(cr.ResponseWithContext(context)); + return await channel.SendMessageAsync(cr.ResponseWithContext(context).SanitizeMentions()); } } diff --git a/src/NadekoBot/Modules/CustomReactions/Extensions.cs b/src/NadekoBot/Modules/CustomReactions/Extensions.cs index a0b91962..b40e3fa8 100644 --- a/src/NadekoBot/Modules/CustomReactions/Extensions.cs +++ b/src/NadekoBot/Modules/CustomReactions/Extensions.cs @@ -15,7 +15,7 @@ namespace NadekoBot.Modules.CustomReactions { public static Dictionary> responsePlaceholders = new Dictionary>() { - {"%target%", (ctx, trigger) => { return ctx.Content.Substring(trigger.Length).Trim(); } } + {"%target%", (ctx, trigger) => { return ctx.Content.Substring(trigger.Length).Trim().SanitizeMentions(); } } }; public static Dictionary> placeholders = new Dictionary>() diff --git a/src/NadekoBot/Modules/Utility/Commands/MessageRepeater.cs b/src/NadekoBot/Modules/Utility/Commands/MessageRepeater.cs index 4bc2f2f5..4b05391d 100644 --- a/src/NadekoBot/Modules/Utility/Commands/MessageRepeater.cs +++ b/src/NadekoBot/Modules/Utility/Commands/MessageRepeater.cs @@ -89,7 +89,7 @@ namespace NadekoBot.Modules.Utility Channel = Guild.GetTextChannel(Repeater.ChannelId); if (Channel != null) - oldMsg = await Channel.SendMessageAsync(toSend).ConfigureAwait(false); + oldMsg = await Channel.SendMessageAsync(toSend.SanitizeMentions()).ConfigureAwait(false); } catch (HttpException ex) when (ex.HttpCode == System.Net.HttpStatusCode.Forbidden) { From 4a3bb0f57eb3dd9a278f98ae062d040dd9396e20 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 10 Apr 2017 03:02:46 +0200 Subject: [PATCH 455/496] sanitized mentions in quote commands --- src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs b/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs index b8819255..a11ad7c9 100644 --- a/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs +++ b/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs @@ -34,7 +34,7 @@ namespace NadekoBot.Modules.Utility if (quotes.Any()) await Context.Channel.SendConfirmAsync(GetText("quotes_page", page + 1), - string.Join("\n", quotes.Select(q => $"`#{q.Id}` {Format.Bold(q.Keyword),-20} by {q.AuthorName}"))) + string.Join("\n", quotes.Select(q => $"`#{q.Id}` {Format.Bold(q.Keyword.SanitizeMentions()),-20} by {q.AuthorName.SanitizeMentions()}"))) .ConfigureAwait(false); else await ReplyErrorLocalized("quotes_page_none").ConfigureAwait(false); @@ -132,7 +132,7 @@ namespace NadekoBot.Modules.Utility return; } - else { await Context.Channel.SendMessageAsync($"`#{qfromid.Id}` 🗯️ " + qfromid.Keyword.ToLowerInvariant() + ": " + + else { await Context.Channel.SendMessageAsync($"`#{qfromid.Id}` 🗯️ " + qfromid.Keyword.ToLowerInvariant().SanitizeMentions() + ": " + qfromid.Text.SanitizeMentions()); } } } @@ -208,7 +208,7 @@ namespace NadekoBot.Modules.Utility await uow.CompleteAsync(); } - await ReplyConfirmLocalized("quotes_deleted", Format.Bold(keyword)).ConfigureAwait(false); + await ReplyConfirmLocalized("quotes_deleted", Format.Bold(keyword.SanitizeMentions())).ConfigureAwait(false); } } } From a3bd89460b72569e48aa04faf4388d8128b1f0c9 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 10 Apr 2017 03:14:52 +0200 Subject: [PATCH 456/496] ;fwmsgs should ocne again dm the first bot owner, not a random one --- src/NadekoBot/Services/CommandHandler.cs | 3 ++- src/NadekoBot/Services/IBotCredentials.cs | 2 +- src/NadekoBot/Services/Impl/BotCredentials.cs | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/NadekoBot/Services/CommandHandler.cs b/src/NadekoBot/Services/CommandHandler.cs index 06b447b1..0febdb9d 100644 --- a/src/NadekoBot/Services/CommandHandler.cs +++ b/src/NadekoBot/Services/CommandHandler.cs @@ -75,12 +75,13 @@ namespace NadekoBot.Services } }))) .Where(ch => ch != null) + .OrderBy(x => NadekoBot.Credentials.OwnerIds.IndexOf(x.Id)) .ToList(); if (!ownerChannels.Any()) _log.Warn("No owner channels created! Make sure you've specified correct OwnerId in the credentials.json file."); else - _log.Info($"Created {ownerChannels.Count} out of {NadekoBot.Credentials.OwnerIds.Count} owner message channels."); + _log.Info($"Created {ownerChannels.Count} out of {NadekoBot.Credentials.OwnerIds.Length} owner message channels."); }); _client.MessageReceived += MessageReceivedHandler; diff --git a/src/NadekoBot/Services/IBotCredentials.cs b/src/NadekoBot/Services/IBotCredentials.cs index 63bea8b8..0a89b471 100644 --- a/src/NadekoBot/Services/IBotCredentials.cs +++ b/src/NadekoBot/Services/IBotCredentials.cs @@ -10,7 +10,7 @@ namespace NadekoBot.Services string Token { get; } string GoogleApiKey { get; } - ImmutableHashSet OwnerIds { get; } + ImmutableArray OwnerIds { get; } string MashapeKey { get; } string LoLApiKey { get; } string PatreonAccessToken { get; } diff --git a/src/NadekoBot/Services/Impl/BotCredentials.cs b/src/NadekoBot/Services/Impl/BotCredentials.cs index a0220778..27ea4090 100644 --- a/src/NadekoBot/Services/Impl/BotCredentials.cs +++ b/src/NadekoBot/Services/Impl/BotCredentials.cs @@ -21,7 +21,7 @@ namespace NadekoBot.Services.Impl public string Token { get; } - public ImmutableHashSet OwnerIds { get; } + public ImmutableArray OwnerIds { get; } public string LoLApiKey { get; } public string OsuApiKey { get; } @@ -62,7 +62,7 @@ namespace NadekoBot.Services.Impl Token = data[nameof(Token)]; if (string.IsNullOrWhiteSpace(Token)) throw new ArgumentNullException(nameof(Token), "Token is missing from credentials.json or Environment varibles."); - OwnerIds = data.GetSection("OwnerIds").GetChildren().Select(c => ulong.Parse(c.Value)).ToImmutableHashSet(); + OwnerIds = data.GetSection("OwnerIds").GetChildren().Select(c => ulong.Parse(c.Value)).ToImmutableArray(); LoLApiKey = data[nameof(LoLApiKey)]; GoogleApiKey = data[nameof(GoogleApiKey)]; MashapeKey = data[nameof(MashapeKey)]; From 06ca1c5f8f96ce2f2f18e200f4004600f32746d1 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 10 Apr 2017 19:56:10 +0200 Subject: [PATCH 457/496] You can now use actualcustomreactions as a module name to enable/disable actual custom reactions, as opposed to commands to manage them which are in CustomReactions module --- .../Games/Commands/PlantAndPickCommands.cs | 3 ++- .../Commands/GlobalPermissionCommands.cs | 2 +- .../Modules/Permissions/Permissions.cs | 8 +++---- src/NadekoBot/NadekoBot.cs | 1 + src/NadekoBot/TypeReaders/ModuleTypeReader.cs | 21 +++++++++++++++++++ 5 files changed, 29 insertions(+), 6 deletions(-) diff --git a/src/NadekoBot/Modules/Games/Commands/PlantAndPickCommands.cs b/src/NadekoBot/Modules/Games/Commands/PlantAndPickCommands.cs index 7c081289..44eb474a 100644 --- a/src/NadekoBot/Modules/Games/Commands/PlantAndPickCommands.cs +++ b/src/NadekoBot/Modules/Games/Commands/PlantAndPickCommands.cs @@ -181,7 +181,7 @@ namespace NadekoBot.Modules.Games return old; }); } - +#if !GLOBAL_NADEKO [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] [RequireUserPermission(GuildPermission.ManageMessages)] @@ -218,6 +218,7 @@ namespace NadekoBot.Modules.Games await ReplyConfirmLocalized("curgen_disabled").ConfigureAwait(false); } } +#endif private static KeyValuePair> GetRandomCurrencyImage() { diff --git a/src/NadekoBot/Modules/Permissions/Commands/GlobalPermissionCommands.cs b/src/NadekoBot/Modules/Permissions/Commands/GlobalPermissionCommands.cs index 41ba61b3..e493f03d 100644 --- a/src/NadekoBot/Modules/Permissions/Commands/GlobalPermissionCommands.cs +++ b/src/NadekoBot/Modules/Permissions/Commands/GlobalPermissionCommands.cs @@ -52,7 +52,7 @@ namespace NadekoBot.Modules.Permissions [NadekoCommand, Usage, Description, Aliases] [OwnerOnly] - public async Task Gmod(ModuleInfo module) + public async Task Gmod(ModuleOrCrInfo module) { var moduleName = module.Name.ToLowerInvariant(); if (BlockedModules.Add(moduleName)) diff --git a/src/NadekoBot/Modules/Permissions/Permissions.cs b/src/NadekoBot/Modules/Permissions/Permissions.cs index a942fd7e..e9f92c66 100644 --- a/src/NadekoBot/Modules/Permissions/Permissions.cs +++ b/src/NadekoBot/Modules/Permissions/Permissions.cs @@ -363,7 +363,7 @@ namespace NadekoBot.Modules.Permissions [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] - public async Task SrvrMdl(ModuleInfo module, PermissionAction action) + public async Task SrvrMdl(ModuleOrCrInfo module, PermissionAction action) { await AddPermissions(Context.Guild.Id, new Permissionv2 { @@ -419,7 +419,7 @@ namespace NadekoBot.Modules.Permissions [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] - public async Task UsrMdl(ModuleInfo module, PermissionAction action, [Remainder] IGuildUser user) + public async Task UsrMdl(ModuleOrCrInfo module, PermissionAction action, [Remainder] IGuildUser user) { await AddPermissions(Context.Guild.Id, new Permissionv2 { @@ -480,7 +480,7 @@ namespace NadekoBot.Modules.Permissions [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] - public async Task RoleMdl(ModuleInfo module, PermissionAction action, [Remainder] IRole role) + public async Task RoleMdl(ModuleOrCrInfo module, PermissionAction action, [Remainder] IRole role) { if (role == role.Guild.EveryoneRole) return; @@ -542,7 +542,7 @@ namespace NadekoBot.Modules.Permissions [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] - public async Task ChnlMdl(ModuleInfo module, PermissionAction action, [Remainder] ITextChannel chnl) + public async Task ChnlMdl(ModuleOrCrInfo module, PermissionAction action, [Remainder] ITextChannel chnl) { await AddPermissions(Context.Guild.Id, new Permissionv2 { diff --git a/src/NadekoBot/NadekoBot.cs b/src/NadekoBot/NadekoBot.cs index 6673cacb..075c12e8 100644 --- a/src/NadekoBot/NadekoBot.cs +++ b/src/NadekoBot/NadekoBot.cs @@ -112,6 +112,7 @@ namespace NadekoBot CommandService.AddTypeReader(new CommandTypeReader()); CommandService.AddTypeReader(new CommandOrCrTypeReader()); CommandService.AddTypeReader(new ModuleTypeReader()); + CommandService.AddTypeReader(new ModuleOrCrTypeReader()); CommandService.AddTypeReader(new GuildTypeReader()); diff --git a/src/NadekoBot/TypeReaders/ModuleTypeReader.cs b/src/NadekoBot/TypeReaders/ModuleTypeReader.cs index ae93576e..10278060 100644 --- a/src/NadekoBot/TypeReaders/ModuleTypeReader.cs +++ b/src/NadekoBot/TypeReaders/ModuleTypeReader.cs @@ -17,4 +17,25 @@ namespace NadekoBot.TypeReaders return Task.FromResult(TypeReaderResult.FromSuccess(module)); } } + + public class ModuleOrCrTypeReader : TypeReader + { + public override Task Read(ICommandContext context, string input) + { + input = input.ToLowerInvariant(); + var module = NadekoBot.CommandService.Modules.GroupBy(m => m.GetTopLevelModule()).FirstOrDefault(m => m.Key.Name.ToLowerInvariant() == input)?.Key; + if (module == null && input != "actualcustomreactions") + return Task.FromResult(TypeReaderResult.FromError(CommandError.ParseFailed, "No such module found.")); + + return Task.FromResult(TypeReaderResult.FromSuccess(new ModuleOrCrInfo + { + Name = input, + })); + } + } + + public class ModuleOrCrInfo + { + public string Name { get; set; } + } } From ade2b69a86347097c84e4a96584618b2ace2f74f Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 10 Apr 2017 20:02:18 +0200 Subject: [PATCH 458/496] help updated, commandlist regenerated --- src/NadekoBot/Resources/CommandStrings.Designer.cs | 2 +- src/NadekoBot/Resources/CommandStrings.resx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Resources/CommandStrings.Designer.cs b/src/NadekoBot/Resources/CommandStrings.Designer.cs index c135ff21..ec6654e3 100644 --- a/src/NadekoBot/Resources/CommandStrings.Designer.cs +++ b/src/NadekoBot/Resources/CommandStrings.Designer.cs @@ -7980,7 +7980,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Play Nadeko slots. Max bet is 999. 3 seconds cooldown per user.. + /// Looks up a localized string similar to Play Nadeko slots. Max bet is 9999. 1.5 second cooldown per user.. /// public static string slot_desc { get { diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx index 6c67e584..a46b89e8 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -2992,7 +2992,7 @@ slot - Play Nadeko slots. Max bet is 999. 3 seconds cooldown per user. + Play Nadeko slots. Max bet is 9999. 1.5 second cooldown per user. `{0}slot 5` From a0d93c93c2a475d52cedc3a788473df6f25d3ab0 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 10 Apr 2017 20:03:33 +0200 Subject: [PATCH 459/496] Version upped to 1.3a --- docs/Commands List.md | 4 ++-- src/NadekoBot/Services/Impl/StatsService.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/Commands List.md b/docs/Commands List.md index dc705b8e..6c47c7ed 100644 --- a/docs/Commands List.md +++ b/docs/Commands List.md @@ -100,7 +100,7 @@ Commands and aliases | Description | Usage `.bye` | Toggles anouncements on the current channel when someone leaves the server. **Requires ManageServer server permission.** | `.bye` `.byemsg` | Sets a new leave announcement message. Type `%user%` if you want to show the name the user who left. Type `%id%` to show id. Using this command with no message will show the current bye message. You can use embed json from instead of a regular text, if you want the message to be embedded. **Requires ManageServer server permission.** | `.byemsg %user% has left.` `.byedel` | Sets the time it takes (in seconds) for bye messages to be auto-deleted. Set it to `0` to disable automatic deletion. **Requires ManageServer server permission.** | `.byedel 0` or `.byedel 30` -`.warn` | Warns a user. **Requires BanMembers server permission.** | `.warn @b1nzy` +`.warn` | Warns a user. **Requires BanMembers server permission.** | `.warn @b1nzy Very rude person` `.warnlog` | See a list of warnings of a certain user. **Requires BanMembers server permission.** | `.warnlog @b1nzy` `.warnclear` `.warnc` | Clears all warnings from a certain user. **Requires BanMembers server permission.** | `.warnclear @PoorDude` `.warnpunish` `.warnp` | Sets a punishment for a certain number of warnings. Provide no punishment to remove. **Requires BanMembers server permission.** | `.warnpunish 5 Ban` or `.warnpunish 3` @@ -173,7 +173,7 @@ Commands and aliases | Description | Usage `$shoprem` `$shoprm` | Removes an item from the shop by its color. **Requires Administrator server permission.** | `$shoprm 1` `$slotstats` | Shows the total stats of the slot command for this bot's session. **Bot owner only** | `$slotstats` `$slottest` | Tests to see how much slots payout for X number of plays. **Bot owner only** | `$slottest 1000` -`$slot` | Play Nadeko slots. Max bet is 999. 3 seconds cooldown per user. | `$slot 5` +`$slot` | Play Nadeko slots. Max bet is 9999. 1.5 second cooldown per user. | `$slot 5` `$claimwaifu` `$claim` | Claim a waifu for yourself by spending currency. You must spend at least 10% more than her current value unless she set `$affinity` towards you. | `$claim 50 @Himesama` `$divorce` | Releases your claim on a specific waifu. You will get some of the money you've spent back unless that waifu has an affinity towards you. 6 hours cooldown. | `$divorce @CheatingSloot` `$affinity` | Sets your affinity towards someone you want to be claimed by. Setting affinity will reduce their `$claim` on you by 20%. You can leave second argument empty to clear your affinity. 30 minutes cooldown. | `$affinity @MyHusband` or `$affinity` diff --git a/src/NadekoBot/Services/Impl/StatsService.cs b/src/NadekoBot/Services/Impl/StatsService.cs index 570c44ff..b567a72b 100644 --- a/src/NadekoBot/Services/Impl/StatsService.cs +++ b/src/NadekoBot/Services/Impl/StatsService.cs @@ -16,7 +16,7 @@ namespace NadekoBot.Services.Impl private readonly DiscordShardedClient _client; private readonly DateTime _started; - public const string BotVersion = "1.3"; + public const string BotVersion = "1.3a"; public string Author => "Kwoth#2560"; public string Library => "Discord.Net"; From 763bfc08bcc036d8ee464d254ba9e4ce5376f008 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 11 Apr 2017 00:46:02 +0200 Subject: [PATCH 460/496] prune bugfixes --- src/NadekoBot/Modules/Administration/Administration.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Administration/Administration.cs b/src/NadekoBot/Modules/Administration/Administration.cs index 71f20464..0e175083 100644 --- a/src/NadekoBot/Modules/Administration/Administration.cs +++ b/src/NadekoBot/Modules/Administration/Administration.cs @@ -392,13 +392,18 @@ namespace NadekoBot.Modules.Administration [RequireContext(ContextType.Guild)] [RequireUserPermission(ChannelPermission.ManageMessages)] [RequireBotPermission(GuildPermission.ManageMessages)] + [Priority(0)] public async Task Prune(int count) { if (count < 1) return; await Context.Message.DeleteAsync().ConfigureAwait(false); - int limit = (count < 100) ? count : 100; + int limit = (count < 100) ? count + 1 : 100; var enumerable = (await Context.Channel.GetMessagesAsync(limit: limit).Flatten().ConfigureAwait(false)); + if (enumerable.FirstOrDefault()?.Id == Context.Message.Id) + enumerable = enumerable.Skip(1).ToArray(); + else + enumerable = enumerable.Take(count); await Context.Channel.DeleteMessagesAsync(enumerable).ConfigureAwait(false); } @@ -407,6 +412,7 @@ namespace NadekoBot.Modules.Administration [RequireContext(ContextType.Guild)] [RequireUserPermission(ChannelPermission.ManageMessages)] [RequireBotPermission(GuildPermission.ManageMessages)] + [Priority(1)] public async Task Prune(IGuildUser user, int count = 100) { if (count < 1) From daee24af237836d58f644f055beaeeef04c2a381 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 11 Apr 2017 00:56:22 +0200 Subject: [PATCH 461/496] Update ResponseStrings.zh-CN.resx (POEditor.com) --- .../Resources/ResponseStrings.zh-CN.resx | 82 +++++++++---------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.zh-CN.resx b/src/NadekoBot/Resources/ResponseStrings.zh-CN.resx index ae22319e..b120f601 100644 --- a/src/NadekoBot/Resources/ResponseStrings.zh-CN.resx +++ b/src/NadekoBot/Resources/ResponseStrings.zh-CN.resx @@ -2385,128 +2385,128 @@ Fuzzy 竞争比赛游戏时间。 - + 频道 - + 指令 - + 已被踢出 PLURAL - + 群管 - + 第{0}页 - + 原因 - + 新启动执行命令已加 - + 启动执行命令已删 - + 启动执行命令未找到 - + 服务器 - + 该页并无启动执行命令 - + 清除所有启动执行命令 - + 用户 {0} 已被解禁 - + 该用户未找到 - + 用户{0}已被警告 - + 用户 {0} 已被警告，惩罚已执行。 - + 在 {0} 服务器上被警告 - + 在 {0} {1} 被 {2} - + {0} 的所有警告已清除。 - + 该页并无警告。 - + {0} 的警告记录。 - + 没有设定任何惩罚 - + 被{0} 清除 - + 警告惩罚记录 - + 拥有{0} 个警告已不会触动惩罚。 - + 我会给拥有 {1} 个警告的用户执行{0} 惩罚。 - + Slowmode 现在会无视 {0} 身份组。 - + Slowmode不会无视 {0} 身份组。 - + Slowmode 现在会无视用户 {0} 。 - + Slowmode 现在不会无视用户 {0} 。 - + 因下列原因无法领取奖励： - + 你可能已领取这个月的奖励。除非你的赞助金额增加，你只能领取奖励一个月一次。 - + 已被奖励 - + 你的discord账户可能未与Patreon连接。如果你并不明白或不知如何连接 - 你需要去 [Patreon account settings page] (https://patreon.com/settings/account) 然后点击'Connect to discord' 的按钮。 - + Discord账号没有连接 - + 你必须要在patreon赞助该项目才有资格领取奖励。你可以使用命令 {0} 取得网址。 - + 无法支援 - + 你需要在赞助了之后等几个小时。如果你没有，请稍后再试。 - + 稍等片刻 - + 您已领取 {0} 。感谢您支持该项目！ - + 奖励只能在每月五号或五号后才能领取。 \ No newline at end of file From 2c30ad9bd94485e5d4874ee004bc4e9327f5bdfa Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 11 Apr 2017 00:56:25 +0200 Subject: [PATCH 462/496] Update ResponseStrings.zh-TW.resx (POEditor.com) From 8a902ad212131fc1aa88cf025b6eb5b2ec016096 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 11 Apr 2017 00:56:27 +0200 Subject: [PATCH 463/496] Update ResponseStrings.nl-NL.resx (POEditor.com) From b07d48400176f0815f7430ac1858ef1a1c7549d4 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 11 Apr 2017 00:56:30 +0200 Subject: [PATCH 464/496] Update ResponseStrings.en-US.resx (POEditor.com) From a97ee7c0e90305dd1e983c25fee1fbb773add6d9 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 11 Apr 2017 00:56:33 +0200 Subject: [PATCH 465/496] Update ResponseStrings.fr-FR.resx (POEditor.com) --- src/NadekoBot/Resources/ResponseStrings.fr-FR.resx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.fr-FR.resx b/src/NadekoBot/Resources/ResponseStrings.fr-FR.resx index c2ad5917..8e46bc14 100644 --- a/src/NadekoBot/Resources/ResponseStrings.fr-FR.resx +++ b/src/NadekoBot/Resources/ResponseStrings.fr-FR.resx @@ -2323,7 +2323,7 @@ ID du propriétaire: {2} Raison - Nouvelle commande au démarrage ajoutée + Nouvelle commande au démarrage ajoutée. Commande au démarrage retirée. @@ -2350,7 +2350,7 @@ ID du propriétaire: {2} L'utilisateur {0} a été averti. - L'utilisateur {0} a été averti et {1} punition a été appliquée. + L'utilisateur {0} a été averti et la punition {1} a été appliquée. Averti sur le serveur {0} @@ -2359,13 +2359,14 @@ ID du propriétaire: {2} Le {0} à {1} par {2} - Toutes les avertissements ont étés effacés pour {0}. + Tous les avertissements ont été effacés pour {0}. Pas d'avertissement sur cette page. Log d'avertissement pour {0} + Log ou historique ? Pas de punition définie. @@ -2404,7 +2405,7 @@ ID du propriétaire: {2} Déjà récompensé. - Votre compte Discord n'est peut-être pas connecté à Patreon. Si vous n'êtes pas sur de ce que ça veut dire, ou ne savez pas comment le connecter, vous devez aller à la [Page de configurations du compte Patreon](https://patreon.com/settings/account) et cliquer sur 'Connect to discord'. + Votre compte Discord n'est peut-être pas connecté à Patreon. Si vous n'êtes pas sur de ce que ça veut dire, ou ne savez pas comment le connecter, vous devez aller à la [Page de configuration du compte Patreon](https://patreon.com/settings/account) et cliquer sur 'Connect to discord'. Le compte Discord n'est pas connecté From 836a91107a17e12bb7f87da95c8110d1ac76cbc5 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 11 Apr 2017 00:56:36 +0200 Subject: [PATCH 466/496] Update ResponseStrings.de-DE.resx (POEditor.com) --- .../Resources/ResponseStrings.de-DE.resx | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.de-DE.resx b/src/NadekoBot/Resources/ResponseStrings.de-DE.resx index 81cde44a..6b6a53c3 100644 --- a/src/NadekoBot/Resources/ResponseStrings.de-DE.resx +++ b/src/NadekoBot/Resources/ResponseStrings.de-DE.resx @@ -2451,7 +2451,7 @@ ID des Besitzers: {2} Keine Warnungen auf dieser Seite. - + Warnlog für {0} Keine Bestrafungen gesetzt. @@ -2469,34 +2469,34 @@ ID des Besitzers: {2} Ich werde die Bestrafung {0} an Benutzern mit {1} Warnungen ausführen. - + Slow mode wird jetzt die Rolle {0} ignorieren. - + Slow mode wird nicht mehr die Rolle {0} ignorieren. - + Slow mod witrd jetzt den Benutzer {0} ignorieren. - + Slow mod witrd nicht mehr Benutzer {0} ignorieren. - + Belohnungen konnten nicht beansprucht werden wegen einer dieser Gründe: - + Eventuell haben Sie ihre Belohnung für diesen Monat schon bekommen. Sie können Belohnungen nur einmal pro Monat beanspruchen, außer sie erhören ihre Unterstützung. - + Belohnung schon beansprucht - + Ihr Discord Account ist eventuell nicht mit Patreon verbunden. Wenn Sie unsicher sind was dies bedeutet, oder nicht wissen wie man es verbinded - Sie müssen zu der [Patreon Account Einstellungs Seite](https://patreon.com/settings/account) gehen und den 'Zu Discord verbinden' Knopf betätigen. - + Discord Account nicht verbunden - + Um berechtigt für die Belohnung zu sein, müssen Sie das Projekt auf Patreon unterstützen. Sie können den Befehl {0} benutzen um den Link zu kriegen. Keine Unterstützung @@ -2506,13 +2506,13 @@ ID des Besitzers: {2} Fuzzy - + Bitte warten Sie eine weile - + Sie haben {0} erhalten. Danke für das unterstützen des Projektes! - + Belohnungen können am or nach dem fünften tag jedes Monats beansprucht werden. \ No newline at end of file From d970603317e7c8612d0a76dd3c5572e9d2551021 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 11 Apr 2017 00:56:39 +0200 Subject: [PATCH 467/496] Update ResponseStrings.he-IL.resx (POEditor.com) From 95012a5e462b5051e25da693b4425ef775483f64 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 11 Apr 2017 00:56:41 +0200 Subject: [PATCH 468/496] Update ResponseStrings.id-ID.resx (POEditor.com) From e87633b3dd811b76aa7dfd52bdc654e974d728c7 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 11 Apr 2017 00:56:44 +0200 Subject: [PATCH 469/496] Update ResponseStrings.it-IT.resx (POEditor.com) --- .../Resources/ResponseStrings.it-IT.resx | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.it-IT.resx b/src/NadekoBot/Resources/ResponseStrings.it-IT.resx index 5247c7a6..b675d6a7 100644 --- a/src/NadekoBot/Resources/ResponseStrings.it-IT.resx +++ b/src/NadekoBot/Resources/ResponseStrings.it-IT.resx @@ -751,11 +751,9 @@ Fuzzy Modalità lenta disattivata - Fuzzy Modalità lenta attivata - Fuzzy Ammonizione (Espulso) @@ -883,7 +881,8 @@ Motivo : {1} Errore durante il trasferimento, guarda la console del bot per più informazioni. - + Aggiornamenti sulla presenza + Fuzzy Utente ammonito @@ -935,7 +934,7 @@ Motivo : {1} Classifica - + Premiati con {0} {1} utenti con il ruolo {2}. Non puoi puntare più di {0} @@ -1431,7 +1430,8 @@ Fuzzy Canzone iniziata - + `#{0}` - **{1}** da *{2}* ({3} canzoni) + Fuzzy Pagina {0} della playlist salvata @@ -1614,7 +1614,8 @@ Fuzzy Pagina dei comandi {0} - + Attualmente i permessi del ruolo sono {0}. + Fuzzy Gli utenti ora devono avere il ruolo di {0} per modificare i permessi. @@ -1716,7 +1717,6 @@ Fuzzy Rango competitivo - Fuzzy Competitive Vinte. @@ -1777,7 +1777,8 @@ Fuzzy Fallito a trovare questo film. - + Fonte o lingua non valida. + Fuzzy Scherzo non caricato. @@ -1965,9 +1966,10 @@ Fuzzy Entrato - + `{0}.` {1} [{2:F2}/s] - {3} totali /s and total need to be localized to fit the context - -`1.` +`1.` +Fuzzy Pagina attivitá #{0} @@ -2009,10 +2011,12 @@ Fuzzy Creato a - + Entrato nel canale tra server. + Fuzzy - + Uscito dal canale tra server. + Fuzzy Questo é il tuo token CSC @@ -2193,7 +2197,8 @@ ID del proprietario: {2} Fuzzy - + Il frammento **#{0}** é nello stato {1} con {2} server + Fuzzy **Nome:** {0} **Link:** {1} @@ -2407,19 +2412,15 @@ ID del proprietario: {2} La modalitá lenta ignorerá il ruolo {0}. - Fuzzy La modalitá lenta non ignorerá piú il ruolo {0}. - Fuzzy La modalitá lenta ignorerá l'utente {0}. - Fuzzy La modalitá lenta non ignorerá piú l'utente {0}. - Fuzzy Errore nella richiesta dei premi per le seguenti ragioni: @@ -2444,8 +2445,7 @@ ID del proprietario: {2} Fuzzy - Devi aspettae un po' di ore dopo aver fatto la tua donazione, se non lo hai fatto, prova di nuovo piú tardi - Fuzzy + Devi aspettare un po' di ore dopo aver donato, se non lo hai fatto, prova di nuovo piú tardi. Aspetta un po' di tempo From 5eb725bc288fe9c63ee0c540996765283cad8f99 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 11 Apr 2017 00:56:47 +0200 Subject: [PATCH 470/496] Update ResponseStrings.ja-JP.resx (POEditor.com) From 295fb6f4c17700b8bf59f1bf32fb0071ef8c3b2a Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 11 Apr 2017 00:56:49 +0200 Subject: [PATCH 471/496] Update ResponseStrings.ko-KR.resx (POEditor.com) --- .../Resources/ResponseStrings.ko-KR.resx | 587 ++++++++---------- 1 file changed, 245 insertions(+), 342 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.ko-KR.resx b/src/NadekoBot/Resources/ResponseStrings.ko-KR.resx index 239484e4..de5bb4e7 100644 --- a/src/NadekoBot/Resources/ResponseStrings.ko-KR.resx +++ b/src/NadekoBot/Resources/ResponseStrings.ko-KR.resx @@ -127,25 +127,25 @@ 기지가 요청당하지 않았습니다. - {1} 와의 전쟁에서 #{0} 번 기지가 **파괴**되었습니다. + {1}와의 전쟁에서 #{0}번 기지가 **파괴**되었습니다. - {2} 와의 전쟁에서 {0} 가 #{1} 번 기지를 **요청**하지 못했습니다. + {2}와의 전쟁에서 {0}가 #{1}번 기지를 **요청**하지 못했습니다. - {2} 와의 전쟁에서 #{1} 번 기지를 {0} 가 요청하였습니다. + {2}와의 전쟁에서 #{1}번 기지를 {0}가 요청하였습니다. - @{0} 이미 #{1} 번 기지를 요청했습니다. 새로운 기지를 요청 할 수 없습니다. + @{0} 이미 #{1}번 기지를 요청했습니다. 새로운 기지를 요청 할 수 없습니다. - {1} 와의 전쟁에서 @{0} 의 요청이 만료되었습니다. + {1}와의 전쟁에서 @{0}의 요청이 만료되었습니다. 적 - {0} 와의 전쟁에 대한 정보 + {0}와의 전쟁에 대한 정보 유효하지 않은 기지 숫자입니다. @@ -172,13 +172,13 @@ 크기 - {0} 에 대한 전쟁이 이미 시작되었습니다. + {0}에 대한 전쟁이 이미 시작되었습니다. - {0} 에 대한 전쟁이 생성되었습니다. + {0}에 대한 전쟁이 생성되었습니다. - {0} 와의 전쟁이 종료되었습니다. + {0}와의 전쟁이 종료되었습니다. 전쟁이 존재하지않습니다. @@ -212,20 +212,18 @@ 반응 - Fuzzy 커스텀 리액션 통계 - {0} 에 대한 커스텀 리액션 통계가 삭제되었습니다. + {0}에 대한 커스텀 리액션 통계가 삭제되었습니다. 해당 트리거에 대한 통계를 찾지 못했으며, 아무런 행동도 취하지 않았습니다. 트리거 - Fuzzy Autohentai 기능이 정지되었습니다. @@ -234,16 +232,16 @@ 결과를 찾지 못했습니다. - {0} 이(가) 이미 기절했습니다. + {0}이(가) 이미 기절했습니다. - {0} 은(는) 이미 최대 체력입니다. + {0}은(는) 이미 최대 체력입니다. 당신은 이미 {0} 타입 입니다. - 님이 {2}{3} 에게 {0}{1} 을(를) 사용하여서 {4} 의 피해를 입혔습니다. + 님이 {2}{3}에게 {0}{1}을(를) 사용하여서 {4}의 피해를 입혔습니다. Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage. @@ -253,35 +251,34 @@ 자신을 공격 할 수 없습니다. - {0} 이(가) 기절했습니다! + {0}이(가) 기절했습니다! - {1} 을(를) 사용하여서 {0} 을(를) 치료했습니다. + {1}을(를) 사용하여서 {0}을(를) 치료했습니다. - {0} 의 HP가 {1} 남아 있습니다. + {0}의 HP가 {1} 남아 있습니다. - {0} 을(를) 사용 할 수 없습니다. `{1}ml` 을(를) 입력해서 사용할 수 있는 움직임들의 리스트를 확인하세요. + {0}을(를) 사용 할 수 없습니다. `{1}ml`을(를) 입력해서 사용할 수 있는 움직임들의 리스트를 확인하세요. - {0} 종류 의 공격표 - Fuzzy + {0}의 종류 공격표 효과적이지 않았다. - 당신은 충분한 {0} 가 없습니다. + 당신은 충분한 {0}가 없습니다. - {1} 을(를) 사용하여서 {0} 을(를) 소생했습니다. + {1}을(를) 사용하여서 {0}을(를) 소생했습니다. - {0} 을(를) 사용해서 자기자신을 소생시켰습니다. + {0}을(를) 사용해서 자기자신을 소생시켰습니다. - 당신의 타입이 {0} 에서 {1} 으로 변경되었습니다. + 당신의 타입이 {0}에서 {1}으로 변경되었습니다. 어느정도 효과가 있었다. @@ -293,7 +290,7 @@ 너무 많은 공격을 연속해서 사용했으므로 이동할 수 없습니다! - {0} 의 종류는 {1} 입니다. + {0}의 종류는 {1}입니다. 사용자를 찾을 수 없습니다. @@ -319,38 +316,31 @@ 밴 - PLURAL -Fuzzy + PLURAL 사용자 밴 - Fuzzy - 봇의 이름이 {0} 으로 변경되었습니다. + 봇의 이름이 {0}으로 변경되었습니다. - 봇의 상태가 {0} 으로 변경되었습니다. + 봇의 상태가 {0}으로 변경되었습니다. 퇴장 메시지의 자동삭제가 비활성화되었습니다. - Fuzzy - 퇴장 메시지는 앞으로 {0} 초 후에 삭제됩니다. - Fuzzy + 퇴장 메시지는 앞으로 {0}초 후에 삭제됩니다. 현재 퇴장 메시지: {0} - Fuzzy - 퇴장 메시지를 활성화하기 위해서는 {0} 를 입력하십시오. - Fuzzy + 퇴장 메시지를 활성화하기 위해서는 {0}를 입력하세요. 새로운 퇴장 메시지가 설정되었습니다. - Fuzzy 퇴장 알림이 비활성화되었습니다. @@ -377,10 +367,10 @@ Fuzzy {0} 역할을 성공적으로 생성하였습니다. - 텍스트 채널 {0} 이(가) 생성되었습니다. + 텍스트 채널 {0}이(가) 생성되었습니다. - 음성 채널 {0} 이(가) 생성되었습니다. + 음성 채널 {0}이(가) 생성되었습니다. 음소거되었습니다. @@ -396,14 +386,13 @@ Fuzzy 이제 성공적으로 처리된 명령어를 자동삭제합니다. - 텍스트 채널 {0} 를 삭제했습니다. + 텍스트 채널 {0}을(를) 삭제했습니다. - 음성 채널 {0} 를 삭제했습니다. + 음성 채널 {0}을(를) 삭제했습니다. 개인 메시지 - Fuzzy 성공적으로 새로운 기부자를 추가했습니다. 이 유저의 총 기부량은 {0} 👑 입니다. @@ -427,13 +416,13 @@ Fuzzy 환영 메시지에 대한 자동삭제가 비활성화되었습니다. - 환영 메시지는 {0} 초 후에 삭제될 것입니다. + 환영 메시지는 {0}초 후에 삭제될 것입니다. 현재 DM 환영 메시지: {0} - {0} 을(를) 입력하여서 DM 환영 메시지를 활성화시킵니다. + {0}을(를) 입력해서 DM 환영 메시지를 활성화시킵니다. 새로운 DM 환영 메시지가 설정되었습니다. @@ -449,7 +438,7 @@ Fuzzy 현재 환영 메시지: {0} - {0} 를 입력하여서 환영 메시지를 활성화시킵니다. + {0}을(를) 입력해서 환영 메시지를 활성화시킵니다. 새로운 환영 메시지가 설정되었습니다. @@ -464,8 +453,7 @@ Fuzzy 당신은 이 명령어를 당신보다 상위나 동등한 권한관계를 가진 사람에게 쓸 수 없습니다. - 이미지가 {0} 초 후에 생성되었습니다! - Fuzzy + 이미지가 {0}초 후에 생성되었습니다! 유효하지않은 입력 포맷입니다. @@ -474,7 +462,7 @@ Fuzzy 유효하지않은 파라미터입니다. - {0} 님이 {1} 에 입장하였습니다. + {0}님이 {1}에 입장하였습니다. 당신은 {0} 서버에서 퇴장당했습니다. @@ -482,28 +470,27 @@ Fuzzy 사용자 강제퇴장 - Fuzzy 언어 목록 - 서버의 지역이 {0} - {1} 로 변경되었습니다. + 서버의 지역이 {0} - {1}로 변경되었습니다. - 봇의 기본 지역이 {0} - {1} 로 변경되었습니다. + 봇의 기본 지역이 {0} - {1}로 변경되었습니다. - 봇의 언어가 {0} - {1} 로 설정되었습니다. + 봇의 언어가 {0} - {1}로 설정되었습니다. - 지역 설정에 실패했습니다. 이 명령어의 도움말을 참고하십시오. + 지역 설정에 실패했습니다. 이 명령어의 도움말을 참고하십세요. - 이 서버의 언어가 {0} - {1} 로 변경되었습니다. + 이 서버의 언어가 {0} - {1}로 변경되었습니다. - {0} 님이 {1} 에서 퇴장하셨습니다. + {0}님이 {1}에서 퇴장하셨습니다. {0} 서버에서 퇴장하였습니다. @@ -521,42 +508,39 @@ Fuzzy 구독 할 수 있는 로그 이벤트 : - 로그는 앞으로 {0} 을(를) 무시합니다. + 로그는 앞으로 {0}을(를) 무시합니다. - 로그는 {0} 을(를) 더 이상 무시하지 않습니다. + 로그는 {0}을(를) 더 이상 무시하지 않습니다. {0} 이벤트에 대한 로그를 중지하였습니다. - {0} 이(가) 다음 역할에 대한 언급을 요청했습니다. + {0}이(가) 다음 역할에 대한 언급을 요청했습니다. {0} `[봇의 소유자]` 로부터 메시지: - Fuzzy 메시지가 전송되었습니다. - {0} 이(가) {1} 에서 {2} 로 이동했습니다. + {0}이(가) {1}에서 {2}로 이동했습니다. - #{0} 에서 메시지가 삭제되었습니다. + #{0}에서 메시지가 삭제되었습니다. - #{0} 에서 메시지가 업데이트되었습니다. + #{0}에서 메시지가 업데이트되었습니다. 음소거 - PLURAL (users have been muted) -Fuzzy + PLURAL (users have been muted) 음소거 - singular "User muted." -Fuzzy + singular "User muted." 명령어를 수행하기 위한 권한이 부족합니다. @@ -604,10 +588,10 @@ Fuzzy 보호기능 활성화 - {0} 은(는) 이 서버에서 **비활성화**되었습니다. + {0}은(는) 이 서버에서 **비활성화**되었습니다. - {0} 가 활성화되었습니다. + {0}이(가) 활성화되었습니다. 오류. 관리자 권한이 필요합니다. @@ -616,18 +600,16 @@ Fuzzy 활성화된 보호기능이 없습니다. - 사용자의 값은 반드시 {0} 과 {1} 사이의 값이여야 합니다. - Fuzzy + 사용자의 값은 반드시 {0}와(과) {1}사이의 값이여야 합니다. - 만약 {0} 명 이상의 사용자가 {1} 초안에 접속한다면 {2} 합니다. - Fuzzy + 만약 {0}명 이상의 사용자가 {1}초안에 접속한다면 {2} 합니다. - 시간은 {0} 초와 {1} 초 사이의 값이여야 합니다. + 시간은 {0}초와 {1}초 사이의 값이여야 합니다. - {0} 유저의 모든 역할을 성공적으로 삭제했습니다. + {0}의 모든 역할을 성공적으로 삭제했습니다. 역할 삭제에 실패했습니다. 권한이 부족합니다. @@ -642,11 +624,10 @@ Fuzzy 지정된 파라미터가 유효하지 않습니다. - 유효하지 않은 색이거나 권한이 부족하여서 오류가 발생했습니다. - Fuzzy + 유효하지 않은 색이거나 권한이 부족해서 오류가 발생했습니다. - {1} 사용자에 대한 {0} 역할을 성공적으로 제거했습니다. + {1}의 {0} 역할을 성공적으로 제거했습니다. 역할 제거에 실패했습니다. 권한이 부족합니다. @@ -662,14 +643,12 @@ Fuzzy 다루고있었던 메시지를 치웠습니다: {0} - Fuzzy {0} 역할을 리스트에 추가했습니다. - {0} 을(를) 찾을 수 없기때문에 삭제했습니다. - Fuzzy + {0}을(를) 찾을 수 없기때문에 삭제했습니다. {0} 역할은 이미 리스트에 추가된 상태입니다. @@ -694,16 +673,13 @@ Fuzzy 당신은 이미 {0} 역할이 있습니다. - 당신은 이미 독점 자가 배정 역할 {0} 가 있습니다. - Fuzzy + 당신은 이미 독점 자가 배정 역할 {0}이(가) 있습니다. 자가 배정 역할은 이제 하나만 선택 할 수 있습니다! - Fuzzy - {0} 개의 자가 배정 역할이 있습니다. - Fuzzy + {0}개의 자가 배정 역할이 있습니다. 그 역할은 자신이 적용 할 수 없습니다. @@ -713,13 +689,12 @@ Fuzzy 자가 배정 역할은 이제 복수 선택 할 수 있습니다! - Fuzzy 그 역할을 당신에게 추가 할 수 없습니다. `당신보다 상위나 동등한 권한관계를 가진 사람에게 역할을 추가 할 수 없습니다.` - {0} 은(는) 자신이 적용 할 수 있는 역할 목록에서 삭제되었습니다. + {0}은(는) 자신이 적용 할 수 있는 역할 목록에서 삭제되었습니다. 당신은 더 이상 {0} 역할이 아닙니다. @@ -728,7 +703,7 @@ Fuzzy 당신은 이제 {0} 역할입니다. - {1} 유저에게 {0} 역할을 성공적으로 추가했습니다. + {1}님에게 {0} 역할을 성공적으로 추가했습니다. 역할 추가에 실패했습니다. 권한이 부족합니다. @@ -747,19 +722,18 @@ Fuzzy 새로운 채널 주제를 설정했습니다. - Fuzzy - Shard {0} 가 다시 연결되었습니다. + Shard {0}이(가) 다시 연결되었습니다. - Shard {0} 를 다시 연결 중입니다. + Shard {0}을(를) 다시 연결 중입니다. 종료 중... - 사용자는 {1} 초마다 {0} 개 이상의 메시지를 보낼 수 없습니다. + 사용자는 {1}초마다 {0}개 이상의 메시지를 보낼 수 없습니다. 슬로우 모드가 비활성화되었습니다. @@ -769,17 +743,16 @@ Fuzzy 소프트 밴 (강제퇴장) - PLURAL -Fuzzy + PLURAL - {0} 은(는) 이 채널을 무시할 것입니다. + {0}은(는) 이 채널을 무시할 것입니다. - {0} 은(는) 더 이상 이 채널을 무시하지 않을 것입니다. + {0}은(는) 더 이상 이 채널을 무시하지 않을 것입니다. - 만약 사용자가 {0} 개 이상의 같은 메시지를 보내면 {1} 합니다. + 만약 사용자가 {0}개 이상의 같은 메시지를 보내면 {1} 합니다. __무시하는 채널들__: {2} @@ -805,17 +778,15 @@ Fuzzy 사용자 - Fuzzy 사용자 밴 - Fuzzy - {0} 님이 채팅으로부터 **음소거**되었습니다. + {0}님이 채팅으로부터 **음소거**되었습니다. - {0} 님이 채팅으로부터 **음소거 해제**되었습니다. + {0}님이 채팅으로부터 **음소거 해제**되었습니다. 사용자 입장 @@ -824,36 +795,34 @@ Fuzzy 사용자 퇴장 - {0} 은(는) 텍스트와 음성 채팅으로부터 **차단**되었습니다. + {0}님이 텍스트와 음성 채팅으로부터 **차단**되었습니다. 사용자의 역할이 추가되었습니다. - Fuzzy 사용자의 역할이 제거되었습니다. - Fuzzy - {0} 님은 상태는 {1} 입니다. + {0}님의 상태는 {1} 입니다. - {0} 은(는) 텍스트와 음성 채팅으로부터 **차단해제**되었습니다. + {0}님이 텍스트와 음성 채팅으로부터 **차단해제**되었습니다. - {0} 님이 음성채널 {1} 에 입장하셨습니다. + {0}님이 음성채널 {1}에 입장하셨습니다. - {0} 님이 음성채널 {1} 에서 퇴장하셨습니다. + {0}님이 음성채널 {1}에서 퇴장하셨습니다. - {0}님이 음성채널 {1} 에서 {2} 로 이동되었습니다. + {0}님이 음성채널 {1}에서 {2}로 이동되었습니다. - {0} 님이 **음성 음소거**되었습니다. + {0}님이 **음성 음소거**되었습니다. - {0} 님이 **음성 음소거 해제**되었습니다. + {0}님이 **음성 음소거 해제**되었습니다. 음성 채널이 생성되었습니다. @@ -871,36 +840,32 @@ Fuzzy **관리 역할** 혹은 **채널 관리 권한**이 부족해서 {0} 서버에서 `음성 + 텍스트` 기능을 실행 할 수 없습니다. - 당신은 **봇이 관리자 권한이 없음에도** 이 기능을 활성화/비활성화 하고 있습니다. 이로 인해서 문제가 발생 할 수 있으며 이후에 직접 텍스트 채널을 정리해야합니다. + 당신은 **봇이 관리자 권한이 없음에도** 이 기능을 활성화/비활성화 하려고 하고 있습니다. 이로 인해서 문제가 발생 할 수 있으며 이후에 직접 텍스트 채널을 정리해야합니다. 이 기능을 활성화시키기 위해서는 **역할 관리**과 **채널 관리** 권한이 필요합니다. - Fuzzy - 사용자가 텍스트 채팅으로부터 {0} 됐습니다. + 사용자가 텍스트 채팅으로부터 {0} 되었습니다. - 사용자가 텍스트와 음성 채팅으로부터 {0} 됐습니다. + 사용자가 텍스트와 음성 채팅으로부터 {0} 되었습니다. - 사용자가 음성 채팅으로부터 {0} 됐습니다. + 사용자가 음성 채팅으로부터 {0} 되었습니다. - 당신은 {0} 서버에서 soft-밴을 당했습니다. + 당신은 {0} 서버에서 소프트밴을 당했습니다. 사유: {1} - Fuzzy 사용자 밴 해제 - Fuzzy 이전 완료! - Fuzzy - 이전 과정에서 오류가 발생했습니다. 자세한 정보는 봇의 콘솔을 통해서 확인하십시오. + 이전 과정에서 오류가 발생했습니다. 자세한 정보는 봇의 콘솔을 통해서 확인하세요. 현재 상태 업데이트 @@ -909,67 +874,61 @@ Fuzzy 사용자 소프트 밴 - 님이 {1} 에게 {0} 개를 지급했습니다. + 님이 {1}에게 {0}개를 지급했습니다. 다음 기회에 ^_^ - 축하합니다! 당신은 {1} 이상을 굴려서 {0} 을 획득했습니다. - Fuzzy + 축하합니다! 당신은 {1}이상을 굴려서 {0}을(를) 획득했습니다. 덱이 섞였습니다. - Fuzzy - 동전뒤집기의 결과는 {0}. - User flipped tails. -Fuzzy + 동전뒤집기의 결과는 {0} 입니다. + User flipped tails. - 맞췄습니다! 당신은 {0} 을(를) 획득했습니다. + 맞췄습니다! 당신은 {0}을(를) 획득했습니다. - 유효하지 않은 숫자입니다. 당신은 1개부터 {0} 개까지만 동전을 뒤집을 수 있습니다. - Fuzzy + 유효하지 않은 숫자입니다. 당신은 1개부터 {0}개까지만 동전을 뒤집을 수 있습니다. - {1} 을(를) 받으려면 이 메시지에 {0} 리액션을 추가하세요. - Fuzzy + {1}을(를) 받으려면 이 메시지에 {0} 리액션을 추가하세요. - 이 이벤트는 최대 {0} 시간 동안 활성화됩니다. + 이 이벤트는 최대 {0}시간 동안 활성화됩니다. 플라워 리액션 이벤트가 시작되었습니다. - 님이 {1} 에게 {0} 개를 선물하셨습니다. + 님이 {1}에게 {0}개를 선물하셨습니다. X has gifted 15 flowers to Y - {0} 님은 {1} 개를 보유중입니다. + {0}님은 {1}개를 보유중입니다. X has Y flowers - 앞 + 앞면 리더보드 - {2} 역할의 {1} 명의 사용자에게 {0} 를 보상하였습니다. - Fuzzy + {2} 역할의 {1}명의 사용자에게 {0}을(를) 보상하였습니다. - {0} 보다 더 배팅 할 수 없습니다. + {0}보다 더 배팅 할 수 없습니다. - {0} 보다 적게 배팅 할 수 없습니다. + {0}보다 적게 배팅 할 수 없습니다. - 당신은 충분한 {0} 이(가) 없습니다. + 당신은 충분한 {0}이(가) 없습니다. 덱에 더 이상 카드가 없습니다. @@ -983,47 +942,42 @@ Fuzzy 배팅 - Fuzzy 대박!!! 축하합니다!!! x{0} - 한 {0}, x{1} - Fuzzy + {0} 한 개를 맞추셨네요! x{1} - 와! 운이 좋습니다! 같은 종류의 세개! x{0} - Fuzzy + 와! 운이 좋습니다! 트리플입니다! x{0} - 잘 했습니다! {0} 두게 - x{1} + 잘했습니다! {0} 두 개를 맞추셨습니다! - x{1} Fuzzy 얻은 액수 - Fuzzy - 사용자는 반드시 {0} 를 얻기 위해서 비밀 코드를 입력해야합니다. + 사용자는 {0}을(를) 얻기 위해서 비밀 코드를 입력해야합니다. +{1}초 동안 유효합니다. 아무에게도 알려주지 마세요. - SneakyGame 이벤트가 종료되었습니다. {0} 명의 사용자들이 보상을 받았습니다. + SneakyGame 이벤트가 종료되었습니다. {0}명의 사용자들이 보상을 받았습니다. SneakyGameStatus 이벤트가 시작되었습니다. - Fuzzy 뒷면 - {1} 에게서 {0} 을(를) 성공적으로 빼앗았습니다 + {1}에게서 {0}을(를) 성공적으로 빼앗았습니다. - {1} 님이 {2} 만큼을 가지고있지 않기 때문에 {0} 을(를) 회수 할 수 없습니다. - Fuzzy + {1}님이 {2}만큼을 가지고있지 않기 때문에 {0}을(를) 회수 할 수 없습니다. 목차로 돌아가기 @@ -1036,11 +990,9 @@ Fuzzy Patreon( <0> )이나 Paypal( <1> )을 통해서 프로젝트를 후원 할 수 있습니다. - Fuzzy 명령어와 가명 - Fuzzy 명령어 목록이 재생성되었습니다. @@ -1050,17 +1002,16 @@ Fuzzy 예시 : `{0}h >8ball` - 입력하신 명령어를 찾을 수 없습니다. 입력하시기 전에 유효한 명령어인지 확인해주십시오. + 입력하신 명령어를 찾을 수 없습니다. 입력하시기 전에 유효한 명령어인지 확인해주세요. 설명 - Fuzzy - Patreon <{0}> 이나 -Paypal <{1}> 에서 + Patreon <{0}>이나 +Paypal <{1}>에서 NadekoBot 프로젝트를 지원할 수 있습니다. -Discord 닉네임이나 ID를 메시지에 남겨 두는 것을 잊지 마십시오. +Discord 닉네임이나 ID를 메시지에 남겨 두는 것을 잊지 마세요. **감사합니다** ♥️ @@ -1082,68 +1033,56 @@ Discord 닉네임이나 ID를 메시지에 남겨 두는 것을 잊지 마십시 그 모듈은 존재하지 않습니다. - {0} 서버의 권한이 필요합니다. + 서버의 {0} 권한이 필요합니다. 목차 사용법 - Fuzzy - Autohentai 기능이 활성화되었습니다. 다음의 태그와 함께 {0} 초마다 사진이 올라옵니다. -태그 : -{1} - Fuzzy + Autohentai 기능이 활성화되었습니다. 다음의 태그와 함께 {0}초마다 사진이 올라옵니다. +태그 : {1} 태그 - Fuzzy - 동물 경주 - Fuzzy + 동물 레이스 참가자가 충분히 없어서 시작하지 못했습니다. 참가자가 모두 모였습니다! 즉시 시작하겠습니다. - Fuzzy - {0} 이(가) {1} (으)로 참가했습니다. - Fuzzy + {0}이(가) {1}(으)로 참가했습니다. - {0} 님이 {1} 으로써 참가하였고, {2} 을(를) 걸었습니다! - Fuzzy + {0}님이 {1}(으)로 참가하였고, {2}을(를) 걸었습니다! - {0}jr 를 입력해서 레이스에 참가합니다. + {0}jr을 입력해서 레이스에 참가합니다. 20초 동안 기다리거나, 방이 가득 차면 시작됩니다. - Fuzzy - {0} 명의 참가자와 함께 시작합니다. + {0}명의 참가자와 함께 시작합니다. - {0} 이(가) {1} (으)로 레이스를 이겼습니다! - Fuzzy + {0}이(가) {1}(으)로 레이스를 이겼습니다! - {0} 이(가) {1} (으)로 레이스를 이겼고 {2} 을 획득했습니다! - Fuzzy + {0}이(가) {1}(으)로 레이스를 이겼고 {2}을(를) 획득했습니다! - 유효하지 않은 숫자입니다. 한번에 {0}-{1} 의 주사위를 던질 수 있습니다. - Fuzzy + 유효하지 않은 숫자입니다. 한번에 {0}-{1}개의 주사위를 던질 수 있습니다. - 님이 {0} 를 굴렸습니다. + 님이 {0}을(를) 굴렸습니다. Someone rolled 35 @@ -1152,51 +1091,45 @@ Discord 닉네임이나 ID를 메시지에 남겨 두는 것을 잊지 마십시 레이스 시작에 실패했습니다. 다른 레이스가 진행중입니다. - Fuzzy 이 서버에 레이스가 존재하지 않습니다. 두번째 숫자는 첫번째 숫자보다 큰 숫자여야 합니다. - Fuzzy 마음의 변화 - Fuzzy 요구한 사람 - Fuzzy 이혼 좋아하는 사람 - Fuzzy 값 - 아무 와이프도 클레임되지 않았습니다. - Fuzzy + 아무 와이프도 요청되지 않았습니다. 최고의 와이프 - 당신의 친밀감이 이미 그 와이프로 설정 했거나 당신에게 친밀감이 없는 상태의 와이프에게 친밀감 삭제를 시도했습니다. + 당신의 친밀감이 이미 그 와이프로 설정 되었거나 당신에게 친밀감이 없는 상태의 와이프에게 친밀감 삭제를 시도했습니다. - 친밀감이 {0} 에서 {1} 으로 변경되었습니다. + 친밀감이 {0}에서 {1}(으)로 변경되었습니다. *도덕성이 의심스럽습니다.*🤔 Make sure to get the formatting right, and leave the thinking emoji - 친밀감을 다시 바꾸기 위해서는 {0} 시간 {1} 분을 기다려야합니다. + 친밀감을 다시 바꾸기 위해서는 {0}시간 {1}분을 기다려야합니다. 당신의 친밀감은 초기화되었습니다. 당신이 좋아하는 사람은 더 이상 없습니다. @@ -1205,17 +1138,17 @@ Discord 닉네임이나 ID를 메시지에 남겨 두는 것을 잊지 마십시 님이 {0}의 와이프가 되고싶어합니다. - 님이 {1} 에 {0} 님을 와이프로 요구했습니다. + 님이 {1}에 {0}님을 와이프로 요구했습니다. - 당신을 좋아하는 와이프와 이혼했습니다. {0} 님이 보상금으로 {1} 만큼을 받았습니다. + 당신을 좋아하는 와이프와 이혼했습니다. {0}님이 보상금으로 {1}을(를) 받았습니다. 자기 자신에게 친밀감을 설정 할 수 없습니다. 🎉 그들의 사랑이 성취되었습니다! 🎉 -{0} 의 새로운 가치는 {1} 입니다! +{0}의 새로운 가치는 {1} 입니다! 그렇게 싼 와이프는 없습니다. 와이프를 얻기 위해서는 실제 가치보다 낮더라도 {0} 만큼을 지불해야합니다. @@ -1228,11 +1161,9 @@ Discord 닉네임이나 ID를 메시지에 남겨 두는 것을 잊지 마십시 자기자신을 클레임 할 수 없습니다. - Fuzzy 당신은 최근에 이혼하셨습니다. 다시 이혼하려면 {0} 시간 {1} 분을 기다려야 합니다. - Fuzzy 아무도 없음 @@ -1241,12 +1172,10 @@ Discord 닉네임이나 ID를 메시지에 남겨 두는 것을 잊지 마십시 당신을 좋아하지 않는 와이프와 이혼했습니다. 당신은 {0}을 돌려받았습니다. - 8ball - Fuzzy + 답 아크로포비아 - Fuzzy 아무런 제출 없이 게임이 끝났습니다. @@ -1261,36 +1190,35 @@ Discord 닉네임이나 ID를 메시지에 남겨 두는 것을 잊지 마십시 아크로포비아 게임이 이미 이 채널에서 진행 중입니다. - 게임이 시작되었습니다. {0} 머리글자를 사용해서 문장 만드십시오. - Fuzzy + 게임이 시작되었습니다. {0} 머리글자를 사용해서 문장 만드세요. - 제출까지 {0} 초 남았습니다. + 제출까지 {0}초 남았습니다. - {0} 가 그의 문장을 입력했습니다. (합계: {1}) + {0}이(가) 그의 문장을 입력했습니다. (합계: {1}) - 제출번호를 입력해서 투표를 하십시오. + 제출하고자 하는 번호를 입력해서 투표를 하세요. - {0} 가 투표했습니다! + {0}이(가) 투표했습니다! - 우승자는 {1} 포인트를 가진 {0} 입니다. + 우승자는 {1}포인트를 가진 {0} 입니다. - {0} 님이 서버에서 유일한 제출자이기 때문에 승리했습니다. + {0}님이 서버에서 유일한 제출자이기 때문에 승리했습니다. - 문제 + 질문 - 비겼습니다! 둘다 {0} 을(를) 선택했습니다. + 비겼습니다! 둘다 {0}을(를) 선택했습니다. - {0} 가 승리했습니다! {1} 은(는) {2} 을(를) 이겼습니다. + {0}이(가) 승리했습니다! {1}은(는) {2}을(를) 이겼습니다. 제출이 마감되었습니다. @@ -1317,12 +1245,11 @@ Discord 닉네임이나 ID를 메시지에 남겨 두는 것을 잊지 마십시 이 채널에서 통화 생성이 활성화되었습니다. - {0} 무작위 {1} 가 등장했습니다! - plural -Fuzzy + {0} 무작위 {1}이(가) 등장했습니다! + plural - 무작위 {0} 가 등장했습니다! + 무작위 {0}이(가) 등장했습니다! 질문 로딩에 실패하였습니다. @@ -1344,20 +1271,19 @@ Fuzzy 리더 보드 - Fuzzy - 당신은 충분한 {0} 이(가) 없습니다. + 당신은 충분한 {0}이(가) 없습니다. 결과가 없습니다. - 이(가) {0} 을(를) 뽑았습니다. + 이(가) {0}을(를) 뽑았습니다. Kwoth picked 5* - {0} 이(가) {1} 을(를) 설치했습니다. + {0}이(가) {1}을(를) 심었습니다. Kwoth planted 5* @@ -1367,24 +1293,22 @@ Fuzzy 트리비아 게임 - {0} 님이 맞췄습니다! 답은 {1} 입니다. + {0}님이 맞췄습니다! 답은 {1} 입니다. 이 서버에서 진행중인 트리비아 게임이 없습니다. - {0} 이(가) {1} 포인트를 갖고있습니다. + {0}이(가) {1}포인트를 갖고있습니다. 이 질문 후에 중지합니다. 시간초과! 정확한 답은 {0} 입니다. - Fuzzy - {0} 님이 맞춰서 게임을 이겼습니다! 답은 {1} 입니다. - Fuzzy + {0}님이 맞춰서 게임을 이겼습니다! 답은 {1} 입니다. 당신을 상대로 플레이 할 수 없습니다. @@ -1399,7 +1323,7 @@ Fuzzy 님이 TicTacToe 게임을 생성하였습니다. - {0} 님이 이겼습니다! + {0}님이 이겼습니다! 3개 일치 @@ -1418,7 +1342,7 @@ Fuzzy {0} 대 {1} - {0} 개의 곡을 대기열에 추가하는 중... + {0}개의 곡을 대기열에 추가하는 중... 자동재생이 비활성화되었습니다. @@ -1431,7 +1355,6 @@ Fuzzy 디렉토리 대기열 추가가 완료되었습니다. - Fuzzy 페어플레이 @@ -1458,13 +1381,13 @@ Fuzzy 이제 최대 재생시간에 제한이 없습니다. - 최대 재생시간이 {0} 초로 설정되었습니다. + 최대 재생시간이 {0}초로 설정되었습니다. 이제 음악 대기열 크기는 제한이 없습니다. - 음악 대기열 크기가 {0} 곡으로 변경되었습니다. + 음악 대기열 크기가 {0}곡으로 변경되었습니다. 당신은 이 서버의 음성채널에 있어야 합니다. @@ -1491,10 +1414,10 @@ Fuzzy 노래 재생 중 - `#{0}` - {2} 님의 재생목록 **{1}** ({3} 곡) + `#{0}` - {2}님의 재생목록 **{1}** ({3} 곡) - 저장된 재생목록의 {0} 번째 페이지 + 저장된 재생목록의 {0}번째 페이지 재생목록이 삭제되었습니다. @@ -1512,7 +1435,7 @@ Fuzzy 재생목록이 저장되었습니다. - {0} 초 한계 + {0}초 한계 대기열 @@ -1524,7 +1447,7 @@ Fuzzy 음악 대기열이 초기화되었습니다. - 대기열이 {0}/{0} 으(로) 가득찼습니다. + 대기열이 {0}/{0}으(로) 가득찼습니다. 곡 삭제됨 @@ -1556,7 +1479,6 @@ Fuzzy `{0}:{1}`로 이동하였습니다. - Fuzzy 곡을 섞었습니다. @@ -1569,7 +1491,6 @@ Fuzzy 바뀐 위치 - Fuzzy 무제한 @@ -1588,7 +1509,6 @@ Fuzzy 허락함 - Fuzzy {0} 역할에게 모든 모듈의 사용을 비활성화했습니다. @@ -1612,10 +1532,10 @@ Fuzzy {0} (ID {1})님을 블랙리스트했습니다 - 명령어 {0} 은(는) 이제 {1}초 재사용 대기시간이 있습니다. + 명령어 {0}은(는) 이제 {1}초 재사용 대기시간이 있습니다. - 이제 명령어 {0} 이 재사용 대기시간이 없고 기존의 모든 재사용 대기시간이 삭제되었습니다. + 이제 명령어 {0}이(가) 재사용 대기시간이 없고 기존의 모든 재사용 대기시간이 삭제되었습니다. 명령어 재사용 대기시간이 설정되지 않았습니다. @@ -1624,28 +1544,25 @@ Fuzzy 명령어 값 - 채널 {2} 에서 {0} {1} 의 사용을 비활성화시켰습니다. + 채널 {2}에서 {0} {1}의 사용을 비활성화시켰습니다. - 채널 {2} 에서 {0} {1} 의 사용을 활성화시켰습니다. + 채널 {2}에서 {0} {1}의 사용을 활성화시켰습니다. 거절함 - Fuzzy - 필터링 된 단어 목록에 {0} 을 추가했습니다. - Fuzzy + 필터링 된 단어 목록에 {0}을(를) 추가했습니다. 필터링 된 단어 목록 - 필터링 된 단어 목록에서 {0} 을 삭제했습니다. - Fuzzy + 필터링 된 단어 목록에서 {0}을(를) 삭제했습니다. - 유효하지 않은 두번째 파라미터입니다. ( {0} 와(과) {1} 사이의 숫자여야 합니다.) + 유효하지 않은 두번째 파라미터입니다. ({0}와(과) {1}사이의 숫자여야 합니다.) 초대 필터링이 이 채널에서 비활성화되었습니다. @@ -1660,10 +1577,10 @@ Fuzzy 초대 필터링이 이 서버에서 활성화되었습니다. - {0} 권한을 #{1} 에서 #{2} (으)로 이동했습니다. + {0} 권한을 #{1}에서 #{2}(으)로 이동했습니다. - 색인 #{0} 에 대한 권한을 찾을 수 없습니다. + 색인 #{0}에 대한 권한을 찾을 수 없습니다. 아무런 값이 설정되지 않았습니다. @@ -1692,33 +1609,32 @@ Fuzzy #{0} - {1} 권한을 삭제했습니다. - {2} 역할에 대한 {0} {1} 의 사용을 비활성화했습니다. + {2} 역할에 대한 {0} {1}의 사용을 비활성화했습니다. - {2} 역할에 대한 {0} {1} 의 사용을 활성화했습니다. + {2} 역할에 대한 {0} {1}의 사용을 활성화했습니다. 초. Short of seconds. - 이 서버에서 {0} {1} 의 사용을 비활성화했습니다. + 이 서버에서 {0} {1}의 사용을 비활성화했습니다. - 이 서버에서 {0} {1} 의 사용을 활성화했습니다. + 이 서버에서 {0} {1}의 사용을 활성화했습니다. - {0} (ID {1} ) 님을 블랙리스트에서 해제하였습니다. - Fuzzy + {0} (ID {1} )님을 블랙리스트에서 해제하였습니다. 수정불가 - {2} 사용자의 {0} {1} 의 사용을 비활성화했습니다. + {2} 사용자의 {0} {1}의 사용을 비활성화했습니다. - {2} 사용자의 {0} {1} 의 사용을 활성화했습니다. + {2} 사용자의 {0} {1}의 사용을 활성화했습니다. 더 이상 권한 경고를 표시하지 않습니다. @@ -1751,7 +1667,7 @@ Fuzzy 당신의 자동번역 언어가 제거되었습니다. - 당신의 자동번역 언어가 {0}>{1} 로 설정되었습니다. + 당신의 자동번역 언어가 {0}>{1}으(로) 설정되었습니다. 이 채널의 자동번역을 시작합니다. @@ -1800,11 +1716,9 @@ Fuzzy 정의: - Fuzzy 시청 종료 - Fuzzy 에피소드 @@ -1844,7 +1758,6 @@ Fuzzy 유효하지 않은 소스 또는 언어입니다. - Fuzzy 농담이 로드되지 않았습니다. @@ -1869,7 +1782,7 @@ Fuzzy {0}의 MAL 프로필 - 봇의 소유자가 MashapeApiKey을 설정하지 않아서 이 기능을 사용 할 수 없습니다. + 봇의 소유자가 MashapeApiKey를 설정하지 않아서 이 기능을 사용 할 수 없습니다. 최소/최대 @@ -1893,11 +1806,10 @@ Fuzzy osu! 정보 검색에 실패했습니다. - {0} 개 이상의 이미지가 발견되었습니다. 무작위로 {0}개를 표시합니다. - Fuzzy + {0}개 이상의 이미지가 발견되었습니다. 무작위로 {0}개를 표시합니다. - 사용자를 찾을 수 없습니다! 다시 시도하기 전에 지역과 배틀태그를 확인해주십시오 + 사용자를 찾을 수 없습니다! 다시 시도하기 전에 지역과 배틀태그를 확인해주세요. 볼 예정 @@ -1943,28 +1855,24 @@ Fuzzy 검색어를 입력해주세요. - Fuzzy 상태 - 저장된 Url - Fuzzy + 상점 url - 스트리머 {0} 은(는) 오프라인입니다. + 스트리머 {0}은(는) 오프라인입니다. - 스트리머 {0} 은(는) {1} 명의 시청자와 함께 온라인입니다. - Fuzzy + 스트리머 {0}은(는) {1}명의 시청자와 함께 온라인입니다. - 당신은 이 서버에서 {0} 개의 스트리밍을 팔로우 중입니다. + 당신은 이 서버에서 {0}개의 스트리밍을 팔로우 중입니다. 당신은 이 서버에서 어떠한 스트리밍도 팔로우하지 않았습니다. - Fuzzy 스트리밍이 없습니다. @@ -2010,13 +1918,12 @@ Fuzzy 시청중 - Fuzzy 해당 용어에 대한 특정 Wikia를 찾지 못했습니다. - 목적 Wikia를 입력하고 검색 쿼리를 입력하십시오. + 목적 Wikia를 입력하고 검색 쿼리를 입력하세요. 페이지를 찾지 못했습니다. @@ -2025,7 +1932,7 @@ Fuzzy 바람의 속도 - {0} 번째로 많은 밴을 당한 챔피언 + {0}번째로 많은 밴을 당한 챔피언 당신의 문장을 Yodify하지 못했습니다. @@ -2042,7 +1949,7 @@ Fuzzy 활성 페이지 #{0} - 총 {0} 명의 사용자. + 총 {0}명의 사용자. 저자 @@ -2054,7 +1961,7 @@ Fuzzy {0}calc 명령어의 기능 목록 - 이 채널의 {0} 은 {1} 입니다. + 이 채널의 {0}은(는) {1} 입니다. 채널 주제 @@ -2063,31 +1970,28 @@ Fuzzy 실행된 명령어 - {0} {1} 은(는) {2} {3} 와(과) 같습니다. + {0} {1}은(는) {2} {3}와(과) 같습니다. 변환기에서 사용할수있는 단위 - 단위를 찾지 못해서 {0} 을(를) {1} (으)로 변환 할 수 없습니다. - Fuzzy + 단위를 찾지 못해서 {0}을(를) {1}(으)로 변환 할 수 없습니다. - 단위의 종류가 같지 않기때문에 {0} 을(를) {1} (으)로 변환 할 수 없습니다. - Fuzzy + 단위의 종류가 같지 않기때문에 {0}을(를) {1}(으)로 변환 할 수 없습니다. - 작성 시간: + 작성 시간 크로스 서버 채널에 입장했습니다. - Fuzzy 크로스 서버 채널에서 퇴장했습니다. - 이것은 당신의 CSC 토큰입니다. + 이것이 당신의 CSC 토큰입니다. 커스텀 이모지 @@ -2103,7 +2007,6 @@ Fuzzy 색인이 범위를 벗어났습니다. - Fuzzy {0} 역할의 사용자 목록 @@ -2116,10 +2019,10 @@ Fuzzy Invalid months value/ Invalid hours value - 디스코드 입장 + 디스코드 가입일 - 서버 입장 + 서버 가입일 ID: {0} @@ -2130,7 +2033,7 @@ Fuzzy 이 페이지에서 서버를 찾을 수 없습니다. - 리피터 목록 + 메시지 반복 목록 맴버 @@ -2142,7 +2045,7 @@ Fuzzy 메시지 - 메시지 리피터 + 메시지 반복 이름 @@ -2195,7 +2098,7 @@ Fuzzy 인용구가 추가되었습니다. - 인용구 #{0} 가 삭제되었습니다. + 인용구 #{0}이(가) 삭제되었습니다. 지역 @@ -2204,16 +2107,16 @@ Fuzzy 가입 날짜 - 제가 {2} `({3:d.M.yyyy.} at {4:HH:mm})`에 {0} 에게 {1}을(를) 상기시킬 것입니다. + {2}마다 {0}에게 {1}을(를) 상기시킵니다. `({3:d.M.yyyy.} {4:HH:mm})` - 유효하지않은 시간 포맷입니다. 명령어 목록을 확인하십시오. + 유효하지 않은 시간 포맷입니다. 명령어 목록을 확인하세요. 새로운 상기 템플릿이 설정되었습니다. - {0} 을 {1} 일 {2} 시간 {3} 분마다 반복합니다. + {0}을(를) {1}일 {2}시간 {3}분마다 반복합니다. 반복 메시지 목록 @@ -2222,7 +2125,7 @@ Fuzzy 이 서버에 반복 메시지가 실행하고있지 않습니다. - #{0} 이 정지되었습니다. + #{0}이(가) 정지되었습니다. 이 서버에서 반복 메시지를 찾을 수 없습니다. @@ -2240,17 +2143,16 @@ Fuzzy {1} 역할에 대한 페이지 #{0} - 색상 포맷이 정확하지 않습니다. `#00FF00`을 사용해보십시오. + 색상 포맷이 정확하지 않습니다. 예를들어 `#00FF00`을 사용해보세요. {0} 역할의 색상 로테이션을 시작했습니다. - Fuzzy {0} 역할의 색상 로테이션을 중지했습니다. - 이 서버의 {0} 은 {1} 입니다. + 이 서버의 {0}은(는) {1} 입니다. 서버 정보 @@ -2262,7 +2164,7 @@ Fuzzy Shard 통계 - Shard **#{0}** 이 {1} 상태이고 {2} 서버에 있습니다. + Shard **#{0}**이 {1} 상태이고 {2} 서버에 있습니다. **이름:** {0} **링크:** {1} @@ -2271,7 +2173,7 @@ Fuzzy 특수 이모지를 찾을 수 없습니다. - {0} 개의 곡을 재생중이며, {1} 개의 대기열이 있습니다. + {0}개의 곡을 재생중이며, {1}개의 대기열이 있습니다. 텍스트 채널 @@ -2283,7 +2185,7 @@ Fuzzy 작동 시간 - {1} 의 {0} 은(는) {2} 입니다. + {1}의 {0}은(는) {2} 입니다. Id of the user kwoth#1234 is 123123123123 @@ -2305,38 +2207,38 @@ Fuzzy 이 서버에서 이미 투표가 진행되고있습니다. - 📃 {0} 님이 투표를 생성하였습니다. + 📃 {0}님이 투표를 생성하였습니다. - `{0}.` {2} 표를 가진 {1}. + `{0}.` {2}표를 획득한 {1}이(가) 되었습니다. - {0} 님이 투표하였습니다. + {0}님이 투표하였습니다. Kwoth voted. - 해당 답변 번호와 함께 개인 메시지를 보내십시오. + 해당 답변 번호와 함께 개인 메시지를 보내세요. - 해당 답변 번호와 함께 여기에 메시지를 보내십시오. + 해당 답변 번호와 함께 여기에 메시지를 보내세요. - {0} 님, 투표해주셔서 감사합니다 + {0}님, 투표해주셔서 감사합니다 - {0} 개의 표가 투표되었습니다. + {0}개의 표가 투표되었습니다. - `{0}pick`을 입력해서 획득하십시오. + `{0}pick`을 입력해서 획득하세요. - `{0}pick`을 입력해서 획득하십시오. + `{0}pick`을 입력해서 획득하세요. 사용자를 찾지 못했습니다. - {0} 페이지 + {0}페이지 이 서버의 음성 채널에 있어야합니다. @@ -2345,13 +2247,13 @@ Fuzzy 음성채널 역할이 없습니다. - {0} 은(는) 음성과 텍스트 채팅으로 부터 {1} 분간 **음소거**되었습니다. + {0}은(는) 음성과 텍스트 채팅으로 부터 {1} 분간 **음소거**되었습니다. - 음성채널 {0} 에 입장하는 사용자는 {1} 역할을 얻게됩니다. + 음성채널 {0}에 입장하는 사용자는 {1} 역할을 얻게됩니다. - 음성채널 {0} 에 입장하는 사용자는 더이상 {1} 역할을 얻지 못합니다. + 음성채널 {0}에 입장하는 사용자는 더이상 {1} 역할을 얻지 못합니다. 음성채널 역할 @@ -2372,16 +2274,16 @@ Fuzzy 가명을 찾지 못했습니다. - {0} 을(를) 입력하면 이제 {1} 의 가명입니다. + {0}을(를) 입력하면 이제 {1}이(가) 입력됩니다. 가명 목록 - 트리거 {0} 의 가명을 삭제했습니다. + 트리거 {0}의 가명을 삭제했습니다. - 트리거 {0} 은(는) 가명이 없었습니다. + 트리거 {0}은(는) 가명이 없었습니다. 경쟁전 플레이 시간 @@ -2400,7 +2302,7 @@ Fuzzy 관리자 - {0} 페이지 + {0}페이지 사유 @@ -2424,46 +2326,46 @@ Fuzzy 모든 시작 명령어를 삭제했습니다. - 사용자 {0} 님이 밴에서 해제되었습니다. + 사용자 {0}님이 밴에서 해제되었습니다. 사용자를 찾을 수 없습니다. - 사용자 {0} 님이 경고를 받았습니다. + 사용자 {0}님이 경고를 받았습니다. - 사용자 {0} 님이 경고를 받았고, {1} 처벌이 적용되었습니다. + 사용자 {0}님이 경고를 받았고, {1} 처벌이 적용되었습니다. {0} 서버에 경고했습니다. - {0} {1} 에 {2} 이(가) + {0} {1}에 {2}이(가) - {0} 님이 모든 경고를 삭제했습니다. + {0}님이 모든 경고를 삭제했습니다. 이 페이지에는 경고가 없습니다. - {0} 의 경고 기록 + {0}의 경고 기록 처벌이 설정되지 않았습니다. - {0} 이(가) 제거했습니다. + {0}님이 초기화했습니다. 경고 처벌 목록 - {0} 개의 경고를 받은 사용자에 대한 처벌을 하지않습니다. + {0}개의 경고를 받은 사용자에 대한 처벌을 하지않습니다. - {1} 개의 경고를 받은 사용자에게 {0} 처벌을 내립니다. + {1}개의 경고를 받은 사용자에게 {0} 처벌을 내립니다. 이제 슬로우모드는 {0} 역할에게 적용되지 않습니다. @@ -2472,40 +2374,41 @@ Fuzzy 이제 슬로우모드는 {0} 역할에게 적용됩니다. - 이제 슬로우모드는 {0} 님에게 적용되지 않습니다. + 이제 슬로우모드는 {0}님에게 적용되지 않습니다. - 이제 슬로우모드는 {0} 님에게 적용됩니다. + 이제 슬로우모드는 {0}님에게 적용됩니다. - 다음과 같은 이유로 인해서 보상을 요청하지 못했습니다: + 다음과 같은 이유로 인해서 보상을 요청하지 못했습니다. 당신은 이미 이번달의 보상을 받은 것 같습니다. 당신의 후원금을 올리지 않는 이상 한 달에 한 번만 보상을 받을 수 있습니다. - 이미 지급되었습니다. + 이미 지급되었습니다 - 당신의 디스코드 계정이 Patreon에 연결되지 않았습니다. 이것이 무슨 뜻인지 모르거나, 어떻게 연결하는지 모른다면 - [Patreon 계정 설정 페이지] (https://patreon.com/settings/account) 에 접속해서 'Connect to discord' 버튼을 클릭하십시오. + 당신의 디스코드 계정이 Patreon에 연결되지 않았습니다. 이것이 무슨 뜻인지 모르거나, 어떻게 연결하는지 모른다면, +[Patreon 계정 설정 페이지] (https://patreon.com/settings/account)에 접속해서 'Connect to discord' 버튼을 클릭하세요. - 디스코드 계정이 연결되지 않았습니다. + 디스코드 계정이 연결되지 않았습니다 보상을 받을 수 있는 자격을 얻기 위해서는 Patreon에서 프로젝트를 후원해야 합니다. {0} 명령어를 이용해서 링크를 얻을 수 있습니다. - 후원 중이지 않습니다. + 후원 중이지 않습니다 - 다시 시도하지 않았다면, 후원을 한 후에 몇 시간을 기다려야합니다. + 후원을 한 후에 몇 시간을 기다려야합니다, 그렇지 않다면 나중에 다시 시도해주세요. - 잠시만 기다려주십시오. + 잠시만 기다려주세요 - {0} 을 받았습니다. 프로젝트를 후원 해주셔서 감사합니다! + {0}을(를) 받았습니다. 프로젝트를 후원 해주셔서 감사합니다! 보상은 매 달 5일에 요구 할 수 있습니다. From bad80381bd6456ffe9ee6f9f978462dae5a22de1 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 11 Apr 2017 00:56:52 +0200 Subject: [PATCH 472/496] Update ResponseStrings.nb-NO.resx (POEditor.com) From 373753b40fe646de1779469e6937beb0ae2c7e89 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 11 Apr 2017 00:56:55 +0200 Subject: [PATCH 473/496] Update ResponseStrings.pl-PL.resx (POEditor.com) From 2ed450944165a7007ab7031871ffbf2b0386ce86 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 11 Apr 2017 00:56:58 +0200 Subject: [PATCH 474/496] Update ResponseStrings.pt-BR.resx (POEditor.com) --- src/NadekoBot/Resources/ResponseStrings.pt-BR.resx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx b/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx index a416a95e..f5819b5a 100644 --- a/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx +++ b/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx @@ -2391,7 +2391,7 @@ OwnerID: {2} Comando de Texto - Chutado + Kickados PLURAL @@ -2485,7 +2485,7 @@ OwnerID: {2} Já recompensado - Sua conta do discord pode não estar conectada ao Patreon. Se você não tem certeza do que isso significa, ou não sabe como conectá-la - Você deve ir para [Página de configurações de conta do Patreon)(https://patreon.com/settings/account) e clicar em 'Connect to discord' button. + Sua conta do discord pode não estar conectada ao Patreon. Se você não tem certeza do que isso significa, ou não sabe como conectá-la - Você deve ir para [Página de configurações de conta do Patreon](https://patreon.com/settings/account) e clicar no botão 'Connect to discord'. Conta do discord não conectada From d2d10f2c9d889d3d2fad3bb0362ded04a84c62d7 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 11 Apr 2017 00:57:00 +0200 Subject: [PATCH 475/496] Update ResponseStrings.ru-RU.resx (POEditor.com) From 48ab3150ef7bbcd42ccfd1953967b1f946c60b9c Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 11 Apr 2017 00:57:03 +0200 Subject: [PATCH 476/496] Update ResponseStrings.sr-cyrl-rs.resx (POEditor.com) From 6ffc2a041d54b7546f7131882d8e3ccd1bd8e39a Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 11 Apr 2017 00:57:06 +0200 Subject: [PATCH 477/496] Update ResponseStrings.es-ES.resx (POEditor.com) --- src/NadekoBot/Resources/ResponseStrings.es-ES.resx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.es-ES.resx b/src/NadekoBot/Resources/ResponseStrings.es-ES.resx index b5813634..a57dff77 100644 --- a/src/NadekoBot/Resources/ResponseStrings.es-ES.resx +++ b/src/NadekoBot/Resources/ResponseStrings.es-ES.resx @@ -2391,7 +2391,7 @@ IDs de dueños: {2} No apoyando - Tienes que esperar algunas horas después de hacer tu colaboración, sino, trata otra vez. + Tienes que esperar algunas horas después de hacer tu colaboración, sino, trata otra vez más tarde. Espera un tiempo From a4d09dc31f9079dfa76d77a0923c47e2797eaebb Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 11 Apr 2017 00:57:08 +0200 Subject: [PATCH 478/496] Update ResponseStrings.sv-SE.resx (POEditor.com) From de65173fd00c92eaf53e8f88ba0a08f7fc9912d2 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Tue, 11 Apr 2017 00:57:11 +0200 Subject: [PATCH 479/496] Update ResponseStrings.tr-TR.resx (POEditor.com) From a283c3d73f40535e07ef4214f3558ae828f00cb7 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 11 Apr 2017 01:55:19 +0200 Subject: [PATCH 480/496] Arabic is added but not working properly, waiting for translators to fix --- .../Commands/LocalizationCommands.cs | 1 + .../Resources/ResponseStrings.ar.resx | 2424 +++++++++++++++++ 2 files changed, 2425 insertions(+) create mode 100644 src/NadekoBot/Resources/ResponseStrings.ar.resx diff --git a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs index 2eb70e4c..c3de5bd8 100644 --- a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs +++ b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs @@ -20,6 +20,7 @@ namespace NadekoBot.Modules.Administration //Bahasa Indonesia, Indonesia private ImmutableDictionary supportedLocales { get; } = new Dictionary() { + //{"ar", "العربية" }, {"zh-TW", "繁體中文, 台灣" }, {"zh-CN", "简体中文, 中华人民共和国"}, {"nl-NL", "Nederlands, Nederland"}, diff --git a/src/NadekoBot/Resources/ResponseStrings.ar.resx b/src/NadekoBot/Resources/ResponseStrings.ar.resx new file mode 100644 index 00000000..ffb1ba85 --- /dev/null +++ b/src/NadekoBot/Resources/ResponseStrings.ar.resx @@ -0,0 +1,2424 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + تم الاسنيلاء على القاعدة ,او مدمرة + + + القاعدة مدمرة + + + تلك القاعدة غير محتلة + + + ** تدمير** القاعدة #{0} في الحرب ضد {1} + + + {0}**قد تنازل**عن قاعدة #{1} في الحرب ضد {2} + + + {0} استولى على قاعدة #{1} في الحرب ضد {2} + + + @{0} أنت استوليت بالفعل قاعدة # {1}. لا يمكنك المطالبة بوحدة جديدة. + + + الاستولى من @{0} في الحرب ضد {1} قد انته. + + + عدو + + + معلومات عن الحرب ضد {0} + + + رقم القاعدة خطأ. + + + غير متاح حجم الحرب. + + + قائمة الحرب القائمة + + + غير محتلة + + + انت لست مدرج في هذه الحرب + + + @{0} لست مشارك في الحرب , او ان القاعدة قد تدمرت + + + لا توجد حروب ناشطة + + + حجم + + + الحرب ضد {0} قد بدأت + + + أنشئت حرب ضد {0}. + + + الحرب ضد {0} قد انتهت + + + هذه الحرب لا توجد + + + الحرب ضد {0} قد بدأت + + + كل خصائص الرموز التعبيرية المخصصى خالية + + + تم محي الرمز التعبيري المخصص + + + أذونات غير كافية. البوت بحاجة الى تصريح المالك لتعديل الرد التفاعلي , وايضا المدير لتخصيص الرد التفاعلي + + + فائمة الرموز التعبيرية المخصصة + + + الرموز التعبيرية المخصصة + + + رمز تعبيري مخصص جديد + + + لم يوجد هذا الرمز + + + الرمز التعبيري المخصص ليس موجود حسب المدخل + + + الإستجاب + + + احصائيات الرموز التعبيرية مخصصة + + + الخصائص خالية (0) للترميز التفاعلي + + + لا يوجد خصائص مفعلة متاحة , لم يتم اتخاذ اي اجراء. + + + تفعيل + + + Autohentai توقف + Fuzzy + + + لا توجد نتائج. + + + {0} قد اغمي عليه + + + (0) عنده من قبل HP كامل + Fuzzy + + + لديك النوع التالي (0). + + + استخدام (0)(1) على (2)(3) لضرر (4). + Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage. + + + لا يمكنك الهجوم مرة أخرى دون انتقام! + + + لا يمكنك الهجوم على نفسك. + + + (0) اغمى عليه. + + + عالج (0) باستخدام واحد (1) . + + + (0) لديه (1) HP متبقي. + + + لا يمكنك استخدام (0). اكتب "(1)ml" لروئية لائحة التحريكات التي يمكنك استخدمها. + + + حرك القائمة الى (0) نوع . + + + غير فعالة. + + + لاتملك ما يكفي (0) . + + + أحيا (0) باستخدام (1) . + + + لقد احبيبت تقسك باستخدام واحد (0). + + + لقد تم تغير النوع الى (0) مقابل (1) . + + + انها فعالة إلى حد ما. + + + انها فعالة جدا . + + + لقد استخدمت اكثر من حركة في صف . لا تستطيع التحرك . + + + نوع (0) هو (1) . + + + المستخدم غير متاح . + + + لقد اغمى عليك , لا تيستطيع التحرك ! + + + **تعين دور ** على ضخول مستخدم**تم تعطيله **. + + + **تعين دور ** على ضخول مستخدم**تم تشغيله **. + + + مرفق . + + + تغير المظهر . + + + تم طردك من السيرفر (0) . +السبب : (1) . + + + تم طردك . + PLURAL + + + المستخدم مطرود . + + + تغير اسم البوت الى (0) . + + + خصائص البوت غيرت الى (0). + + + تم تعطيل الحذف الالي لرسالة الوداع. + + + سيتم حذف رسالة الوداع بعد {0} ثواني . + + + رسالة الوداع حاليا : (0) . + + + تفعيل رسالة الوداع بكتابة (0) . + + + وضع رسالة وداع جديدة . + + + اعلان رسالة الوداع غير مفعلة . + + + اعلان رسالة الوداع مفعلة في هذه القناة . + + + تم تغير اسم القناة . + + + الاسم القديم . + + + تم تغير موضوع القناة. + + + تم تنظيف المحتوى . + + + المحتوى . + + + تم انشاء دور (0). + + + تم انشاء قناة رسائل (0) . + + + تم أنشاء قناة الصوت {0}. + + + تم الطرش بنجاح . + + + حذف السيرفر {0}. + + + تم وقف الحذف الالي لأوامر الاستدعاء الناجحة. + + + سيتم الغاء الامر تلقائيا بعد التنفيذ . + + + تم حذف قناة الرسائل {0}. + + + قناة الصوت {0} قد أحذفت. + + + رسالة خاصة من + + + تم اضافة متبرع جديد بنجاح . اجمالي تبرعات هذا المستخدم (0) 👑 + + + شكرا للجميع في القائمة التالية على مساهمتهم في تحقيق هذا المشروع! + + + سوف ارسل الرسائل الخاصة الى جميع المالكين. + + + سوف ارسل الرسائل الخاصة الى المالك الأول فقط. + + + من الان فصاعدا سوف أرسل الرسائل الخاصة. + + + من الان فصاعدا سوف أتوقف عن أرسال الرسائل الخاصة. + + + تم تعطيل الحذف الالي لرسائل التحية. + + + سوف يتم حذف رسائل التحية بعد {0} ثانية. + + + الرسالة الخاصة الحالية للتحية : {0} + + + تمكين DM رسائل التحية عن طريق كتابة {0} + + + تم تثبيت رسالة التحية عبر رسالة خاصة. + + + تم تعطيل الإعلان عن التحية عبر الرسائل الخاصة. + + + تم تفعيل الإعلان عن التحية عبر الرسائل الخاصة. + + + رسالة التحية الحالية : {0} + + + يتم تفعيل رسائل التحية بكتابة {0} + + + وضع رسالة تحية جديدة. + + + اعلان التحية غير مفعل . + + + اعلان التحية مفعل في هذه القناة . + + + ليس باستطاعتك ان تستخدم هذا الأمر على المستخدمين بدور اعلى من دورك او مساوا له في سلم الأدوار. + + + تحميل الصور بعد {0} ثواني! + + + ادخال خاطئ . + + + معلمات غير صالحة. + + + + انضم {0} الى {1} + + + لقد تم طردك من {0} السيرفر. +السبب: {1} + + + تم طرد المستخدم . + + + قائمة اللغات . + + + لغة سيرفرك الان {0}-{1} + + + لغة الألي إفتراضياً الآن {0} - {1} + Fuzzy + + + تم ضبط لغة البوت الى (0) - (1) . + + + فشل الضبط المحلي . قم بزيارة قائمة مساعدة الاوامر . + + + لغة السيرفر مضبوطة الى (0) - (1) . + + + {0} ترك {1} + + + خرج من السيرفر (0) + + + تسجيل هذا الحدث في القناة (0) . + + + تسجيل جميع الاحداث في هذه القناة . + + + تم تعطيل التسجيل. + + + قائمة الاحداث التي يمكنك التسجيل بها . + + + التسجيل سيتجاهل {0} + + + التسجيل لن يتجاهل {0} + + + تم ايقاف تسجيل الحدث (0). + + + (0) قد استند إلى ذكر الأدوار التالية + + + رسالة من (0) '[ مالك البوت ]' . + + + تم ارسال الرسالة . + + + (0) تم تحريك من (1) الى (2) . + + + تم حذف الرسالة في {0}# + + + تم تحديث الرسالة في {0}# + + + صامتة . + PLURAL (users have been muted) + + + صامتة . + singular "User muted." + + + ليس لدي الأذن الازم لذلك على ما يبدو. + + + ضبط اسكات لدور جديد . + + + أحتاج الى الأذن "Administrator" للقيام بذلك. + + + رسالة جديدة . + + + لقب جديد . + + + موضوع جديد . + + + تغير اللقب . + + + لم أجد هذا السيرجر + + + لم يوجد مشاركة مع صاحب ID + + + رسائل قديمة . + + + لقب قديم . + + + موضوع قديم . + + + خطأ . على الاغلب لا امتلك الصلاحيات الكافية . + + + جميع الأذون في السيرفر أعاد تعيينهم. + + + الحماية فعالة . + + + تم تعطيل {0} على هذا السيرفر. + + + {0} مفعل + + + خطأ. أحتاج الى الأذن ManageRoles + + + لس هنالك حماية فغالة. + + + يجب أن يكون المستخدم عتبة بين {0} و {1}. + + + إذا {0} أو أكثر من المستخدمين الانضمام في {1} ثواني، سوف {2} لهم. + + + يجب أن يكون الوقت بين {0} و {1} ثواني. + + + تم حذف جميع الادوار من هذا المستخدم (0) . + + + فشل حذف الدور . لا امتلك الصلاحيات الكافية . + + + تم تغيير لون الدور{0} . + + + الدور غير موجود. + + + المعلمات المحددة غير صالحة. + + + حدث خطأ بسبب لون غير صالح أو أذونات غير كافية. + + + تم ازالة دور {0} من المستخدم {1} + + + فشل حذف الدور. لا امتلك الصلاحيات الكافية . + + + تغير اسم الدور . + + + فشل تغير الاسم . لا امتلك الصلاحيات الكافية . + + + لا يمكنك تعديل أدوار أعلى من أعلى دورك + + + إزالة رسالة اللعب: {0} + + + دور {0} تم أضيفت إلى القائمة. + + + {0} لم يتم العثور.تم تنظيفه + + + دور {0} موجود بالفعل في القائمة. + + + اضافة . + + + تعطيل دوار وضع اللعب + + + تشغيل دوار وضع اللعب + + + هذه قائمة من الحالات الدورية:(0) + + + لم يتعين اوضاع اللعب الدوري. + + + لديك بالفعل الدور{0}. + + + لديك بالفعل دور{0} الحصري المعين لك. + + + الادوار المخصصة للتعين الذاتي الان اصبحت خاصة! + + + هنالك (0) ادور مخصصة للتعين الذاتي . + + + الدور غير مخصص للتعين الذاتي . + + + ليس لديك دور {0}. + + + الادوار المخصصة للتعين الذاتي الان اصبحت غير خاصة! + + + لا أست + + + {0} تمت إزالته من قائمة الأدوار الذاتية التعيين. + + + انت لا تملك هذا الدور (0) بعد الان. + + + لقد اصبحت تملك هذا الدور (0) . + + + تم اضافة الدور (0) بنجاح الى مستخدم (1). + + + فشل اضافة الدور . لا امتلك الاذن الكافي . + + + مظهر جديد ضبط . + + + ضبط اسم قناة جديد. + + + تم اضافة لعبة جديدة ! + + + تم اضافة بث جديد ! + + + اسند موضوع جديد للقناة. + + + شارد {0} اعيدت أتصالها. + + + شارد {0} يعادة الاتصال. + + + جاري الأغلاق. + + + لا يمكن للمستخدمين إرسال أكثر من {0} رسائل كل {1} ثواني. + + + الوضع البطيئ تم ايقافه . + + + الوضع البطيئ تم تفعيله . + + + حظر ناعم (رفض) + PLURAL +Fuzzy + + + {0} سيتجاهل هذه القناة. + + + {0} لم يعد يتجاهل هذه القناة. + + + + + + قناة كتبه صنعت + + + تدمير قناة المراسلة . + + + ازالة عدم السماع بنجاح . + + + إلغاء الصامت + singular + + + اسم المستخدم + + + اسم المستخدم تغير + + + المستخدمين . + + + المستخدم مطرود . + + + {0} تم **صامتة** من الدردشة. + + + {0} تم **إلغاء صامتة** من الدردشة. + + + تم اضافة مستخدم . + + + المستخدم غادر + + + {0} تم **صامتة** من الدردشة والدردشة الصوتية. + + + أضافة دور المستخدم + + + إزالة دور المستخدم + + + (0) اصبح الان (1) + + + (0) اصبح ** صامت ** في المراسلة والمحادثة . + + + (0) اشترك ب (1) قناة الصوت . + + + (0) خرج من (1) قناة الصوت . + + + {0} تغير من {1} الى {2} قناة الصوتية. + + + (0) تم **اسكات الصوت** + + + (0) تم ازالة **اسكات الصوت** + + + انشاء قناة صوت + + + تدمير قناة الصوت + + + ايقاف خصائص الصوت والكتابة + + + تفعيل خصائص الصوت والكتابة + + + + + + + + + + + + المستخدم (0) من كتابة الرسائل + + + المستخدم (0) من الكتابة ومحادثة الصوت + + + المستخدم (0) من محادثة الصوت + + + لقد تم حظرك من {0} مزود. +السبب: {1} + Fuzzy + + + ازالة الطرد عن المستخدم + + + تمت الهجرة ! + + + حدث خطأ أثناء الترحيل، راجع وحدة تحكم بوت للحصول على مزيد من المعلومات. + + + التحديث الحالي + + + المستخدم طرد-مخفض + + + تم منح (0) الى (1) + + + حظا اوفر المرة القادمة ^_^ + + + مبارك لقد فزت (0) دحرجة فوق (1) + + + خلط ورق اللعب مرة ثانية + + + قلب (0) + User flipped tails. + + + لقد خمنتها ! فزت (0) + + + رقم خطأ غير مخصص . بأمكانك قلب 1 الى (0) عملة نقدية + + + اضف الى (0) للحصول على الرمز التفاعلي ل(1) + + + الحدث مستمر لغاية (0) ساعة + + + وردة الرمز التفاعلي بدأت ! + + + لقد اهدا (0) الى (1) + X has gifted 15 flowers to Y + + + (0) يملك (1) + X has Y flowers + + + رأس + + + قائمة المتصدرين + + + تم مكافئة {0} الى {1} المستخدم من دور {2}. + + + لايمكنك المزايدة اكثر من (0) + + + لا يمكنك المزايدة اقل من (0) + + + انت لا تملك ما يكفي (0) + + + لا مزيد للورق على الطاولة + + + بيع المستخدم يانصيب + + + لقد دحرجت (0) + + + المزايدة + + + WOAAHHHHHH!!! مبارك !!! * (0) + + + اشارة (0) , *(1) + + + واو ! محظوظ! ثلاثة من نوع ! * (0) + + + عمل جيد ! اثنين (0) - مزايدة *(1) + + + فزت + + + + + + + + + + + + ذيل + + + بنجاح اخذت (0) من (1) + + + لم استطع اخذ (0) من (1) بسبب المستخدم لا يملك ما يكفي من (2)! + + + العودة الى TOC + Fuzzy + + + فقط مالك البوت + + + مطلوب (0) للسماح بالقناة + + + يمكنك بدعم المشروع في <{patreon: <{0 او في <{1}> :paypal + + + الأوامر والأسماء المستعارة + + + قائمة الأوامر مجددة. + + + + + + لا استطيع ان اجد الامر . الرجاء تأكد من وجود الامر قبل المحاولة التالية + + + وصف + + + يمكنكم الدعم مشروع NadekoBot في <{Patreon <{0 او في <{1}> PayPal +لا تنسى تترك اسمك في ديسكورد او الID في علبة الرسالة. + +** شكراً لكم **♥️ + + + + + + قاىمة الأوامر + + + قائمة الوحدات + + + + + + تلك الوحدة غير موجودة. + + + يتطلب (0) أذن من السيرفر + + + جدول المحتويات + + + الأستعمال + + + + + + ربط + + + سباق الحيوانات + + + فشل في البدء لعدم وجود مشاركين كفاية + + + امتلئ السباق ! البدء فورا. + + + (0) انضم بصفة (1) + + + (0) انضم بصفة (1) و راهن (2)! + + + اكتب {0}jr للانضمام إلى السباق. + Not sure whether to use the actual Arabic letters here to just use the English ones. + + + البدء خلال 20 ثانية او عند اكتمال العدد في الغرفة + + + البدء مع (0) مشتركين. + + + (0) بصفة (1) فاز بالسباق! + + + (0) بصفة (1) فاز بالسباق وايضا (2)! + + + + + + دحرج (0) + Someone rolled 35 + + + دحرج النرد : (0) + Dice Rolled: 5 + + + فشل بداية السباق. ربما سباق آخر في طور الحدوت. + + + لا يوجد سباق على هذا الموزع + + + الرقم الثانيي يجب ان يكون اكبر من الرقم الاول. + + + تغير بالخاطر + + + المطالبة + + + طلاق + + + اعجاب + + + ثمن + + + لم يتم المطلبة بأي waifus بعد. + + + + + + + + + تغير إنجذابهم من {0} الى {1} +*هذا مشكوك فيه أدبياً.*🤔 + Make sure to get the formatting right, and leave the thinking emoji + + + يجب ان تنتظر {0} ساعات و {1} دقائق إذا اردت تغيير انجذابك مرة أخرى. + + + تم إعادته إنجذابك. ليس لديك أي شخص تحبه. + + + يريد ان يكون {0} وايفو. كيوووت 3> + + + + + + + + + لا يمكنك تعيين تقارب لنفسك، انت إغومانياك. + + + 🎉 يتم الوفاء بحبهم! 🎉 +قيمة (0) الجديدة (1)! + + + + + + + + + هذه ليست زوجنك + + + لا يمكنك المطالبة بنفسك. + + + + + + لا أحد + + + + + + 8 كرة + + + رهاب الأجسام. + + + اللعبة انتهت بدون اي اخضاع. + + + لم يحتسب الاصوات . اللعبة انتهت بدون فائز. + + + كان الاختصار (0) + + + + + + بدأت اللعبة. إنشاء جملة مع الاختصار التالي : (0). + + + لديك (0) ثانية لعمل اخضاع. + + + (0) اعتمد حكمهم .((1) الاجمالي) + + + تصويت بكتابة رقم من الاخضاع. + + + (0) وضعوا اصواتهم ! + + + الفائز هو (0) مع (1) من النقاط. + + + + + + سؤال + + + انها التعادل! اختار كلاهما {0}. + + + {0} فاز! {1} هزم على {2}. + + + اغلاق الاخضاع + + + سباق الحيوانات جاهز للركض. + + + المجموع: {0} المعدل: {1} + + + قوائم + + + ايقاف البوت الذكي في هذا السيرفر + + + تفعيل البوت الذكي في هذا السيرفر + + + + + + + + + + plural + + + + + + فشل في تحميل السؤال + + + بدأت اللعبة + + + بدأت لعبة Hangman + + + + + + + + + + + + قائمة المتصدرين + + + انت لا تملك ما يكفي من(0) + + + لا يوجد ناتج + + + حمل (0) + Kwoth picked 5* + + + (0) زرع (1) + Kwoth planted 5* + + + لعبة Trivia تعمل على هذا السيرفر. + + + لعبة Trivia + + + (0) لقد حزرها ! الجواب كان :(1) + + + Trivia لا تعمل على هذا السيرفر. + + + (0) لديه (1) نقطة + + + التوقف بعد هذا السؤال + + + انتهى الوقت ! الاجابة الصحيحة كانت (0) + + + (0) حزر الاجابة وفاز باللعبة ! الاجابة كانت : (1) + + + لا يمكنك اللعب ضد نفسك. + + + + + + تعادل ! + + + تم انتاج لعبة TicTacToe. + + + (0) لقد فاز! + + + تطابق ثلاث + + + لا تحركات متبقية! + + + نفذ الوقت ! + + + حركة {0}. + + + (0) ضد (1) + + + + + + تم تعطيل التشغيل التلقائي. + + + تم تفعيلل التشغيل التلقائي. + + + + + + + + + اللعب العادل + + + انتهت الاغنية + + + تم تعطيل اللعب العادل. + + + تم تفعيل اللعب العادل. + + + من الوضع + + + + + + مدخل غير صالح. + + + + + + + + + + + + + + + + + + اسم الاغنية + + + الان تسمع اغنية + + + لايوجد موسيقى + + + لم يتم ايجاد البحث + + + + + + + + + تشغيل الاغنية + + + + + + + + + تم حذف قائمة التشغيل. + + + + + + + + + + + + حفظ قائمة التشغيل + + + (0) ث الحد + + + + + + + + + تم حذف قائمة انتظار الموسيقى. + + + + + + ازالة الاغنية + context: "removed song #5" + + + اعادة تشغيل الاغنية الحالية + + + تكرار قائمة التشغيل + + + تكرار المسار للموسيقى + + + توقيف تكرار المسار الحالي + + + تم استئناف تشغيل الموسيقى. + + + تم تعطيل قائمة التشغيل المتكررة. + + + تم تمكين قائمة التشغيل المتكرر. + + + + + + تخطي الى '(0):(1)' + + + خلط الاغاني + + + تحريك الاغنية + + + (0 س (1)د (2)ث + + + الى مكان + + + غير محدود + + + يجب أن يكون درجة الصوت بين 0 و 100 + + + ضبط درجة الصوت الى (0)% + + + + + + + + + السماح + + + + + + + + + + + + + + + + + + + + + + + + الامر (0) الان لديه (1)ث ليصبح جاهز. + + + + + + لم يتم تعيين أي تهدئة الأوامر. + + + تكلفة الامر + + + ايقاف الاستخدام في (0) (1) على قناة (2). + + + تفعيل الاستخدام في (0) (1) على قناة (2). + + + رفض + + + تم اضافة الكلمة (0) الى قائمة الكلمات المصفاة. + + + قائمة الكلمات المصفاة. + + + ازالة الكلمة (0) من لائحة الكلمات المصفاة . + + + + + + الدعوات المصفاة تم ايقافها في هذه القناة. + + + الدعوات المصفاة مفعلة في هذه القناة. + + + الدعوات المصفاة تم ايقافها في هذا السيرفر. + + + الدعوات المصفاة مفعلة في هذا السيرفر. + + + تحريك الاذن (0) من #(1) الى #(2) + + + لا استطيع ايجاد الاذن في الدليل + + + لم يوضع تكلفة. + + + الامر + Gen (of command) + + + وحدة + Gen. (of module) + + + صفحة السماحات (0) + + + وضع السماح للدور هو (0) + + + المستخدم يتطلب (0) دور للتمكن من تعديل الاذونات. + + + لم اجد الاذن في القائمة. + + + ازالة الاذن #(0) - (1) + + + ايقاف الاستخدام (0) (1) للدور (2) + + + تفعيل الاستخدام (0) (1) للدور (2) + + + ثواني. + Short of seconds. +Fuzzy + + + ايقاف استخدام (0) (1) في هذا السيرفر + + + تفعيل استخدام (0) (1) في هذا السيرفر + + + + + + لا يتعدل + + + ايقاف الاستخدام (0) (1) للمستخدم (2) + + + تفعيل الاستخدام (0) (1) للمستخدم (2) + + + لن اقوم بأظهار اي تحذير للاذونات. + + + سوف اظهر تحذير الاذونات. + + + ايقاف تصفية الكلمات في هذه القناة. + + + تفعيل تصفية الكلمات في هذه القناة. + + + ايقاف تصفية الكلمات في هذا السيرفر. + + + تفعيل تصفية الكلمات في هذا السيرفر. + + + قدرات + + + لا يوجد انمي مفضل بعد + + + البدء بالترجمة الفورية للمسجات في هذه القناة . رسائل المستخدم سيتم الغائها تلقائيا. + + + تمت إزالة لغة الترجمة التلقائية. + + + تم تعيين لغة الترجمة التلقائية إلى (0)>(1) + + + بدء الترجمة التلقائية للرسائل على هذه القناة. + + + تم إيقاف الترجمة التلقائية للرسائل على هذه القناة. + + + ادخال خطأ للصيغة, او شيء ما حدث بالخطأ. + + + لم استطع ايجاد هذه البطاقة. + + + واقعية + + + فصول + + + رسوم متحركة # + + + خسائر تنافسية + + + لعب تنافسي + + + مرتبة تنافسية + + + فوز تنافسي + + + منتهي + + + شرط + + + تكلفة + + + موعد + + + تحديد: + + + اسقاط + + + حلقة + + + حدث خطأ + + + مثال + + + فشل ايجاد ذلك الانمي + + + فشل ايجاد ذلك المانجا + + + الانواع + + + فشل العثور على تعريف لهذه العلامة. + + + طول/وزن + + + (0) م / (1) كجم + + + رطوبة + + + بحث الصورة في: + + + فشل ايجاد ذلك الفيلم. + + + لغة المصدر أو الهدف غير صالحة + + + النكت غير محملة + + + خط العرض/طول + + + مستوى + + + قائمة (0) الامان المعلمة + Don't translate {0}place + + + المكان + + + + + + + + + + + + ادنى/ اعلى + + + القناة غير موجودة + + + لا توجد نتائج. + + + على- الانتظار + + + الرابط الاصلي + + + + + + فشل استرداد أوسو! التوقيع. + Fuzzy + + + تم ايجاد اكثر من (0) صورة . عرض عشوائي(0). + + + + + + خطط للمشاهدة + + + منصة + Fuzzy + + + لم يتم العثور على أي قدرة. + + + لم اجد اليوكمون. + + + رابط الملف الشخصي: + + + الجودة: + + + وقت اللعب السريع + + + الفوز السريع + + + الترتيب + + + مجموع النقاط: + + + البحث عن: + + + فشل تقصير الربط + + + عنوان الرابط قصير + Fuzzy + + + هناك خطأ ما. + + + يرجى تحديد معلمات البحث. + + + الحالة + + + حفظ الرابط + + + ستريمر {0} غير متواجد حاليا. + Fuzzy + + + ستريمر (0) على الإنترنت مع (1) من المشاهدين. + Fuzzy + + + انت تتابع (0) بث على هذا السيرفر + + + انت لا تتابع اي بث على هذا السيرفر + Fuzzy + + + لا يوجد مثل هذا البث. + + + البث على الاغلب غير موجود. + + + + + + سوف اعلم هذه القناة عند تغير الحالة. + + + شروق الشمس + + + غروب الشمس + + + درجة الحرارة + + + عنوان: + + + اعلى 3 أنيمي مفضلة: + + + ترجمة: + + + الأنواع + + + فشل العثور على تعريف لهذا المصطلح. + + + رابط + + + متابعين + + + مشاهدة + + + فشل العثور على هذا المصطلح على wikia المحدد. + + + الرجاء إدخال وتحديد wikia ، يليه طلب البحث. + + + الصفحة غير موجودة. + + + سرعة الرياح + + + معظم الأبطال المحظورة (0) + + + أخفق تعديل الجملة. + Fuzzy + + + انضم + + + {0} .` {1} [{2: F2} / s] - {3} ألمجموع + /s and total need to be localized to fit the context - +`1.` + + + صفحة النشاط #(0) + + + {0} مجموع المستخدمين. + + + مؤلف + + + بوت ID + + + قائمة الوظائف في الأمر (0) كلك + Fuzzy + + + (0) من هذه القناة هو (1) + + + موضوع القناة + + + تم تشغيل الأوامر + + + {0} {1} يساوي {2} {3} + + + الوحدات التي يمكن استخدامها من قبل المحول + + + لا يمكنني تحويل (0) الى (1): الوحة غير موجودة + + + لا يمكن تحويل (0) إلى (1): أنواع الوحدات غير متساوية + + + أنشئت في + + + انضممت الى قناة تقاطع السيرفارات + Fuzzy + + + مغادرة قناة تقاطع السيرفارات + + + هذا csc قطعة + Fuzzy + + + الرمز التعبيري المخصص + In Arabic, we do have instances where we add "AL" (the) to a sentence since at times it might not make sense without it. It really depends on the sentence wording. + + + خطأ + + + الميزات + + + + الهوية + + + + القائمة خارج النطاق. + + + قائمة المستخدمين في {0} دور + + + لا يسمح لك باستخدام هذا الأمر في الأدوار التي تملك الكثير من المستخدمين فيها لكي تمنع الإساءة + + + قيمة {0} غير صالحة + Invalid months value/ Invalid hours value + + + انضم إلى ديسكورد + + + انضم إلى السيرفر + There are two terms that can be used here other than what is already used. +مُزَوِّد and خادم. +خادم could be mistaken for another word so I avoided it. + + + الهوية: {0} +الأعضاء: {1} +هوية المالك: {2} + + + لم يتم ايجاد سيرفر على تلك الصفحة + + + قائمة المكررين + + + اعضاء + + + ذاكرة + + + رسالة + + + مكرر رسائل + + + الاسم + + + الاسم المستعار + + + لا احد يلعب تلك اللعبة + + + لا نشاط للمكريرن + Fuzzy + + + لا يوجد ادوار في هذه الصفحة + + + + + + لم يضبط الموضوع + + + مالك + + + صاحب IDs + + + حضور + + + (0) سيرفرز +(1) قناة الرسائل +(2) قناة الصوت + + + تم حذف جميع علامات الاقتباس باستخدام كلمة رئيسية (0) + + + صفحة (0) من علامات الاقتباس + + + لا توجد علامات اقتباس في هذه الصفحة. + + + لم يتم العثور على علامات الاقتباس التي يمكنك إزالة. + + + تمت إضافة اقتباس + + + تم حذف الاقتباس # (0) + + + منطقة + + + مسجل في + + + + + + تنسيق الوقت ليس صالحا. تحقق من قائمة الأوامر. + + + تذكير جديد قالب مضبوط + + + + + + قائمة المكررين + + + لا يوجد مكررين على هذا السيرفر + + + #(0) توقف + + + لم اجد رسائل مكررة على هذا السيرفر + + + ناتج + + + دور + + + صفحة #(0) لجميع الادوار على هذا السيرفر + + + صفحة #(0) من الادوار ل (1) + Fuzzy + + + لا توجد ألوان بالتنسيق الصحيح. استخدم `# 00ff00` على سبيل المثال. + + + بدأ تدوير لون الدور (0) + + + توقف الألوان الدورية لدور (0) + + + (0) من هذا السيرفر(1) + + + معلومات السيرفر + + + + + + + + + + + + **الاسم:** (0) **الرابط:**(1) + + + لم يتم العثور على رموز تعبيرية خاصة. + + + تشغيل الأغاني (0). (1) في قائمة الانتظار. + + + قناة الرسائل + + + إليك رابط غرفتك: + + + مدة التشغيل + + + (0) للمستخدم (1) هو (2) + Id of the user kwoth#1234 is 123123123123 + + + المستخدمين + + + قناة الصوت + + + لقد انضممت بالفعل لهذا السباق! + + + نتائج الاستطلاع الحالية + + + لا اصوات وضعت + + + يتم تشغيل الاستطلاع بالفعل على هذا السيرفر + + + 📃 (0) قام بإنشاء استطلاع يتطلب انتباهك: + + + `{0}.` {1} مع {2} اصوات. + + + (0) صوت. + Kwoth voted. + + + + + + + + + شكرا للتصويت (0) + + + مجموع الاصوات (0) + + + + + + + + + لم يتم العثور على مستخدم + + + صفحة (0) + + + يجب أن تكون في قناة الصوت على هذا السيرفر + + + لا توجد أدوار لقنوات الصوت + + + + + + + + + + + + ادوار قناة الصوت + + + + + + + + + + + + + + + لم يتم العثور على اسم مستعار + + + + + + + + + + + + + + + + + + + + + + + + + PLURAL + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 186e8ee384c749bee14654255e460fba7f967271 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Wed, 12 Apr 2017 21:23:32 +0200 Subject: [PATCH 481/496] Fixed a string --- src/NadekoBot/Resources/ResponseStrings.Designer.cs | 2 +- src/NadekoBot/Resources/ResponseStrings.resx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index 67942c21..a4342f09 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -944,7 +944,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to You are not in voice channel on this server.. + /// Looks up a localized string similar to You are not in a voice channel on this server.. /// public static string administration_not_in_voice { get { diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index e3c2ffa4..70142b88 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -2441,7 +2441,7 @@ Owner ID: {2} {0} is a Game Voice Channel now. - You are not in voice channel on this server. + You are not in a voice channel on this server. Item From 522d7d53f8f83a6e2b3ceba3b6fc20d5bbe4c57c Mon Sep 17 00:00:00 2001 From: Mirai Date: Sat, 15 Apr 2017 00:32:49 +0200 Subject: [PATCH 482/496] Added Google Maps --- docs/guides/Windows Guide.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/guides/Windows Guide.md b/docs/guides/Windows Guide.md index 0f141fad..d6c7d0de 100644 --- a/docs/guides/Windows Guide.md +++ b/docs/guides/Windows Guide.md @@ -1,5 +1,5 @@ ________________________________________________________________________________ -*Thanks to @Flatbread and Mirai for making this guide* +*Thanks to @Flatbread and @Mirai for making this guide* ________________________________________________________________________________ ## Setting Up NadekoBot on Windows @@ -106,7 +106,7 @@ In order to have a functioning music module, you need to install ffmpeg and setu - Follow these steps on how to setup Google API keys: - Go to [Google Console][Google Console] and log in. - Create a new project (name does not matter). Once the project is created, go into "Enable and manage APIs." - - Under the "Other Popular APIs" section, enable `URL Shortener API` and `Custom Search Api`. Under the `YouTube APIs` section, enable `YouTube Data API`. + - Under the "Other Popular APIs" section, enable `URL Shortener API` and `Custom Search API`. Under the `YouTube APIs` section, enable `YouTube Data API`. - On the left tab, access `Credentials`. Click `Create Credentials` button. Click on `API Key`. A new window will appear with your `Google API key`. - Copy the key. - Open up `credentials.json`. @@ -118,6 +118,10 @@ In order to have a functioning music module, you need to install ffmpeg and setu - All requests for an API key must go through the review process, where applications will be reviewed on a case by case basis, in line with Soundcloud API Terms of Use. If your application is successful, you will receive an API key. - **Restart your computer** +### Setting Up NadekoBot For GoogleMaps + - Go to [Google Console][Google Console] and log in. + - Under the "Google Maps APIs" section, enable `Google Maps Geocoding API` and `Google Maps Time Zone API`. + [.NET Core SDK]: https://github.com/dotnet/core/blob/master/release-notes/download-archives/1.1-preview2.1-download.md From db962f8e76a874d992324e3cb9922d2a76ab8521 Mon Sep 17 00:00:00 2001 From: Mirai Date: Sat, 15 Apr 2017 00:35:29 +0200 Subject: [PATCH 483/496] Google Mapso --- docs/guides/Windows Guide.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/guides/Windows Guide.md b/docs/guides/Windows Guide.md index d6c7d0de..5902c062 100644 --- a/docs/guides/Windows Guide.md +++ b/docs/guides/Windows Guide.md @@ -107,6 +107,7 @@ In order to have a functioning music module, you need to install ffmpeg and setu - Go to [Google Console][Google Console] and log in. - Create a new project (name does not matter). Once the project is created, go into "Enable and manage APIs." - Under the "Other Popular APIs" section, enable `URL Shortener API` and `Custom Search API`. Under the `YouTube APIs` section, enable `YouTube Data API`. + - Under the "Google Maps APIs" section, enable `Google Maps Geocoding API` and `Google Maps Time Zone API`. - On the left tab, access `Credentials`. Click `Create Credentials` button. Click on `API Key`. A new window will appear with your `Google API key`. - Copy the key. - Open up `credentials.json`. @@ -118,9 +119,7 @@ In order to have a functioning music module, you need to install ffmpeg and setu - All requests for an API key must go through the review process, where applications will be reviewed on a case by case basis, in line with Soundcloud API Terms of Use. If your application is successful, you will receive an API key. - **Restart your computer** -### Setting Up NadekoBot For GoogleMaps - - Go to [Google Console][Google Console] and log in. - - Under the "Google Maps APIs" section, enable `Google Maps Geocoding API` and `Google Maps Time Zone API`. + From bb12c12df7eda5ddaf471214d1348a99631deb9b Mon Sep 17 00:00:00 2001 From: DogeOps97 Date: Mon, 17 Apr 2017 12:26:41 -0700 Subject: [PATCH 484/496] Changing pause to timeout - latest Well, with pause, the autorun requires you to press some key to get it running. A little bit of change --- scripts/Latest.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/Latest.bat b/scripts/Latest.bat index 13248a96..36c5b3be 100644 --- a/scripts/Latest.bat +++ b/scripts/Latest.bat @@ -162,5 +162,5 @@ GOTO end ECHO. ECHO Installation complete! ECHO. - PAUSE - del Latest.bat \ No newline at end of file + timeout /t 5 + del Latest.bat From db824d23b0e98576db6ce18b238d18fca8ddf386 Mon Sep 17 00:00:00 2001 From: DogeOps97 Date: Mon, 17 Apr 2017 12:35:09 -0700 Subject: [PATCH 485/496] Changing PAUSE to timeout - stable Making things smoother for auto-update --- scripts/Stable.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/Stable.bat b/scripts/Stable.bat index a3ffb6f4..43f8cf23 100644 --- a/scripts/Stable.bat +++ b/scripts/Stable.bat @@ -162,5 +162,5 @@ GOTO end ECHO. ECHO Installation complete! ECHO. - PAUSE - del Stable.bat \ No newline at end of file + timeout /t 5 + del Stable.bat From e1b9a2c3af0cdae938d29fe9611e6559d203e3b2 Mon Sep 17 00:00:00 2001 From: DogeOps97 Date: Tue, 18 Apr 2017 17:09:25 -0700 Subject: [PATCH 486/496] Optimizing the guide (I guess?) :thinking: Deleted the manual steps (except for the prerequisite) --- docs/guides/Linux Guide.md | 181 ++----------------------------------- 1 file changed, 9 insertions(+), 172 deletions(-) diff --git a/docs/guides/Linux Guide.md b/docs/guides/Linux Guide.md index 4e168cf4..3d2732dc 100644 --- a/docs/guides/Linux Guide.md +++ b/docs/guides/Linux Guide.md @@ -38,7 +38,7 @@ If you entered your Droplets IP address correctly, it should show **login as:** - The bot should have been added to your server. ####Getting NadekoBot -#####Part I +#####Part I - Downloading the installer Use the following command to get and run `linuxAIO.sh` (Remember **Do Not** rename the file **linuxAIO.sh**) @@ -55,7 +55,9 @@ You should see these following options after using the above command: 6. Set up credentials.json (if you have downloaded the bot already) 7. To exit ``` -#####Part II (Optional) +#####Part II - Downloading Nadekobot prerequisites + +(Optional) **If** you want to install it manually, you can try finding it [here](https://raw.githubusercontent.com/Kwoth/NadekoBot-BashScript/master/nadekoautoinstaller.sh) **If** you are running NadekoBot for the first time on your system and never had any *prerequisites* installed and have Ubuntu, Debian or CentOS, Press `5` and `enter` key, then `y` when you see the following: ``` Welcome to NadekoBot Auto Prerequisites Installer. @@ -63,10 +65,8 @@ Would you like to continue? ``` That will install all the prerequisites your system need to run NadekoBot. -If you prefer to install them [manually](http://nadekobot.readthedocs.io/en/latest/guides/Linux%20Guide/#installing-manually-optional), click on the link. *(Optional)* - Once *prerequisites* finish installing. -#####Part III +#####Part III - Installing Nadeko Choose either `1` to get the **most updated build of NadekoBot** or @@ -76,8 +76,7 @@ and then press `enter` key. Once Installation is completed you should see the options again. Next, check out: -#####Part IV (Optional) -If you prefer to skip this step and want to do it [manually](http://nadekobot.readthedocs.io/en/latest/guides/Linux%20Guide/#setting-up-sftp) or already have the `credentials.json` file, click on the link. *(Optional)* +#####Part IV - Setting up credentials - [1. Setting up credentials.json](http://nadekobot.readthedocs.io/en/latest/guides/Linux%20Guide/#setting-up-credentialsjson) - [2. To Get the Google API](http://nadekobot.readthedocs.io/en/latest/guides/Windows%20Guide/#setting-up-nadekobot-for-music) @@ -102,11 +101,11 @@ You will be asked to enter the required informations, just follow the on-screen (If you want to skip any optional infos, just press `enter` key without typing/pasting anything.) Once done, -#####Part V +#####Part V - Checking if Nadeko is working You should see the options again. Next, press `3` to **Run Nadeko (Normally)** Check in your discord server if your new bot is working properly. -#####Part VI +#####Part VI - Running Nadeko on tmux If your bot is working properly in your server, type `.die` to **shut down the bot**, then press `7` to **exit**. Next, [Run your bot again with **tmux**.](http://nadekobot.readthedocs.io/en/latest/guides/Linux%20Guide/#running-nadekobot) @@ -147,7 +146,7 @@ See how that happens: **Now check your Discord, the bot should be online** -Next to **move the bot to background** and to do that, press **CTRL+B+D** (that will detach the nadeko session using TMUX) and you can finally close **PuTTY** if you want. +Next to **move the bot to background** and to do that, press **CTRL+B, release, D** (that will detach the nadeko session using TMUX) and you can finally close **PuTTY** if you want. ####Restarting Nadeko @@ -177,167 +176,6 @@ Open **PuTTY** and login as you have before, type `reboot` and hit Enter. - Choose either `3` or `4` to run the bot again with **normally** or **auto restart** respectively. - Done. You can close **PuTTY** now. -####Installing Manually (Optional) - -#####Installing Git - -![img1](https://cdn.discordapp.com/attachments/251504306010849280/251504416019054592/git.gif) - -Ubuntu: - -`sudo apt-get install git -y` - -CentOS: - -`yum -y install git` - -**NOTE:** If the command is not being initiated, hit **Enter** - -#####Installing .NET Core SDK - -![img2](https://cdn.discordapp.com/attachments/251504306010849280/251504746987388938/dotnet.gif) - -Go to [this link](https://www.microsoft.com/net/core#ubuntu) (for Ubuntu) or to [this link](https://www.microsoft.com/net/core#linuxcentos) (for CentOS) provided by microsoft for instructions on how to get the most up to date version of the dotnet core sdk! -Make sure that you're on the correct page for your distribution of linux as the guides are different for the various distributions. -Install the **currently supported version** `1.0.0-preview2-1-003177`. -You can find it [here](https://github.com/dotnet/core/blob/master/release-notes/download-archives/1.1-preview2.1-download.md) if you prefer manual installing `dpkg` files. - -We'll go over the steps here for few linux distributions, accurate as of March 08, 2017: -**NOTE:** .NET CORE SDK only supports 64-bit Linux Operating Systems (Raspberry Pis are not supported because of this) - -**Ubuntu x64 17.04 & 16.10** -```sh -sudo sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/ yakkety main" > /etc/apt/sources.list.d/dotnetdev.list' -sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 417A0893 -sudo apt-get update && sudo apt-get install dotnet-dev-1.0.0-preview2.1-003177 -y -``` - -**Ubuntu x64 16.04** -```sh -sudo sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/ xenial main" > /etc/apt/sources.list.d/dotnetdev.list' -sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 417A0893 -sudo apt-get update && sudo apt-get install dotnet-dev-1.0.0-preview2.1-003177 -y -``` - -**Ubuntu x64 14.04** -```sh -sudo sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/ trusty main" > /etc/apt/sources.list.d/dotnetdev.list' -sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 417A0893 -sudo apt-get update && sudo apt-get install dotnet-dev-1.0.0-preview2.1-003177 -y -``` - -**Debian 8 x64** -```sh -sudo apt-get install curl libunwind8 gettext -y -curl -sSL -o dotnet.tar.gz https://go.microsoft.com/fwlink/?LinkID=835021 -sudo mkdir -p /opt/dotnet && sudo tar zxf dotnet.tar.gz -C /opt/dotnet -sudo ln -s /opt/dotnet/dotnet /usr/local/bin -``` - -**CentOS 7 x64** -```sh -sudo yum install libunwind libicu -y -curl -sSL -o dotnet.tar.gz https://go.microsoft.com/fwlink/?LinkID=835019 -sudo mkdir -p /opt/dotnet && sudo tar zxf dotnet.tar.gz -C /opt/dotnet -sudo ln -s /opt/dotnet/dotnet /usr/local/bin -``` - -#####Installing Opus Voice Codec and libsodium - -![img3](https://cdn.discordapp.com/attachments/251504306010849280/251505294654308353/libopus.gif) - -Ubuntu: - -`sudo apt-get install libopus0 opus-tools libopus-dev libsodium-dev -y` - -CentOS: - -`yum -y install opus opus-devel` - -#####Installing FFMPEG - -![img4](https://cdn.discordapp.com/attachments/251504306010849280/251505443111829505/ffmpeg.gif) - -Ubuntu: - -`apt-get install ffmpeg -y` - -Centos: - -```sh -yum -y install http://li.nux.ro/download/nux/dextop/el7/x86_64/nux-dextop-release-0-5.el7.nux.noarch.rpm epel-release -yum -y install ffmpeg -``` - -**NOTE:** If you are running **UBUNTU 14.04**, you must run these first: - -```sh -sudo add-apt-repository ppa:mc3man/trusty-media -sudo apt-get update -sudo apt-get dist-upgrade -``` - -**Before executing:** `sudo apt-get install ffmpeg` - - -**NOTE:** If you are running **Debian 8 Jessie**, please, follow these steps: - -```sh -sudo apt-get update -echo "deb http://ftp.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/debian-backports.list -sudo apt-get update && sudo apt-get install ffmpeg -y -``` - -#####Installing TMUX - -![img5](https://cdn.discordapp.com/attachments/251504306010849280/251505519758409728/tmux.gif) - -Ubuntu: - -`sudo apt-get install tmux -y` - -Centos: - -`yum -y install tmux` - -####Guide for Advance Users (Optional) - -**Skip this step if you are a Regular User or New to Linux.** - -[![img7][img7]](http://nadekobot.readthedocs.io/en/latest/guides/Linux%20Guide/#getting-nadekobot) - -- Right after [Getting NadekoBot](http://nadekobot.readthedocs.io/en/latest/guides/Linux%20Guide/#getting-nadekobot) -- `cd NadekoBot/src/NadekoBot/` (go to this folder) -- `pico credentials.json` (open credentials.json to edit) -- Insert your bot **Client ID, Bot ID** (should be same as your Client ID) **and Token** if you got it following [Creating and Inviting bot](http://nadekobot.readthedocs.io/en/latest/guides/Linux%20Guide/#creating-and-inviting-bot). -- Insert your own ID in Owners ID follow: [Setting up credentials.json](http://nadekobot.readthedocs.io/en/latest/guides/Windows%20Guide/#setting-up-credentialsjson-file) -- And Google API from [Setting up NadekoBot for Music](http://nadekobot.readthedocs.io/en/latest/guides/Windows%20Guide/#setting-up-nadekobot-for-music) -- Once done, press `CTRL+X` -- It will ask for "Save Modified Buffer?", press `Y` for yes -- It will then ask "File Name to Write" (rename), just hit `Enter` and Done. -- You can now move to [Running NadekoBot](http://nadekobot.readthedocs.io/en/latest/guides/Linux%20Guide/#running-nadekobot) - -####Setting up SFTP - -- Open **WinSCP** -- Click on **New Site** (top-left corner). -- On the right-hand side, you should see **File Protocol** above a drop-down selection menu. -- Select **SFTP** *(SSH File Transfer Protocol)* if its not already selected. -- Now, in **Host name:** paste or type in your `Digital Ocean Droplets IP address` and leave `Port: 22` (no need to change it). -- In **Username:** type `root` -- In **Password:** type `the new root password (you changed at the start)` -- Click on **Login**, it should connect. -- It should show you the NadekoBot folder which was created by git earlier on the right-hand side window. -- Open that folder, then open the `src` folder, followed by another `NadekoBot` folder and you should see `credentials.json` there. - -####Setting up credentials.json - -- Copy the `credentials.json` to desktop -- EDIT it as it is guided here: [Setting up credentials.json](http://nadekobot.readthedocs.io/en/latest/guides/Windows%20Guide/#setting-up-credentialsjson-file) -- Paste/put it back in the folder once done. `(Using WinSCP)` -- **If** you already have Nadeko 1.0 setup and have `credentials.json` and `NadekoBot.db`, you can just copy and paste the `credentials.json` to `NadekoBot/src/NadekoBot` and `NadekoBot.db` to `NadekoBot/src/NadekoBot/bin/Release/netcoreapp1.0/data` using WinSCP. -- **If** you have Nadeko 0.9x follow the [Upgrading Guide](http://nadekobot.readthedocs.io/en/latest/guides/Upgrading%20Guide/) - ####Setting up Music To set up Nadeko for music and Google API Keys, follow [Setting up NadekoBot for Music](http://nadekobot.readthedocs.io/en/latest/guides/Windows%20Guide/#setting-up-nadekobot-for-music) @@ -373,4 +211,3 @@ If you are getting error using the above steps try: cd ~/NadekoBot/discord.net && dotnet restore -s https://dotnet.myget.org/F/dotnet-core/api/v3/index.json && dotnet restore cd ~/NadekoBot/src/NadekoBot/ && dotnet restore && dotnet build --configuration Release ``` -[img7]: https://cdn.discordapp.com/attachments/251504306010849280/251505766370902016/setting_up_credentials.gif From f596e46f6aec0f574f4442abf1206da77c186b7a Mon Sep 17 00:00:00 2001 From: DogeOps97 Date: Tue, 18 Apr 2017 17:13:34 -0700 Subject: [PATCH 487/496] tfw I basically deleted almost everything Optimized, I guess --- docs/guides/Linux Guide.md | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/docs/guides/Linux Guide.md b/docs/guides/Linux Guide.md index 3d2732dc..2c16d703 100644 --- a/docs/guides/Linux Guide.md +++ b/docs/guides/Linux Guide.md @@ -57,7 +57,6 @@ You should see these following options after using the above command: ``` #####Part II - Downloading Nadekobot prerequisites -(Optional) **If** you want to install it manually, you can try finding it [here](https://raw.githubusercontent.com/Kwoth/NadekoBot-BashScript/master/nadekoautoinstaller.sh) **If** you are running NadekoBot for the first time on your system and never had any *prerequisites* installed and have Ubuntu, Debian or CentOS, Press `5` and `enter` key, then `y` when you see the following: ``` Welcome to NadekoBot Auto Prerequisites Installer. @@ -65,6 +64,8 @@ Would you like to continue? ``` That will install all the prerequisites your system need to run NadekoBot. +(Optional) **If** you want to install it manually, you can try finding it [here](https://raw.githubusercontent.com/Kwoth/NadekoBot-BashScript/master/nadekoautoinstaller.sh) + Once *prerequisites* finish installing. #####Part III - Installing Nadeko Choose either @@ -189,25 +190,3 @@ Once done, go back to **PuTTY** - If you want to **see the sessions** after logging back again, type `tmux ls`, and that will give you the list of sessions running. - If you want to **switch to/ see that session**, type `tmux a -t nadeko` (**nadeko** is the name of the session we created before so, replace **“nadeko”** with the session name you created.) - If you want to **kill** NadekoBot **session**, type `tmux kill-session -t nadeko` - -#####Alternative way to Install - -If the [Nadeko installer](http://nadekobot.readthedocs.io/en/latest/guides/Linux%20Guide/#getting-nadekobot) shows any kind error, check if you have the `linuxAIO.sh` file and make sure its not renamed or if you want to manually install the bot. Use the following command(s): - -![img6](https://cdn.discordapp.com/attachments/251504306010849280/251505587089571850/getting_nadeko.gif) - -`cd ~ && curl -L https://github.com/Kwoth/NadekoBot-BashScript/raw/master/nadeko_installer.sh | sh` - -**OR** - -```sh -cd ~ && git clone -b dev --recursive --depth 1 https://github.com/Kwoth/NadekoBot.git -cd ~/NadekoBot/discord.net/src/Discord.Net && dotnet restore && cd ../Discord.Net.Commands && dotnet restore && cd ../../../src/NadekoBot/ && dotnet restore && dotnet build --configuration Release -``` - -If you are getting error using the above steps try: - -```sh -cd ~/NadekoBot/discord.net && dotnet restore -s https://dotnet.myget.org/F/dotnet-core/api/v3/index.json && dotnet restore -cd ~/NadekoBot/src/NadekoBot/ && dotnet restore && dotnet build --configuration Release -``` From 56587028013a0cb568d2229e5e90cab2636d3c7a Mon Sep 17 00:00:00 2001 From: DogeOps97 Date: Tue, 18 Apr 2017 17:18:07 -0700 Subject: [PATCH 488/496] Slight changes Well, wget is one of the dependencies too right? --- docs/guides/OSX Guide.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/guides/OSX Guide.md b/docs/guides/OSX Guide.md index 366a5319..c5cdd329 100644 --- a/docs/guides/OSX Guide.md +++ b/docs/guides/OSX Guide.md @@ -14,6 +14,7 @@ Run `brew update` to fetch the latest package data. ####Installing dependencies ``` +brew install wget brew install git brew install ffmpeg brew update && brew upgrade ffmpeg From 3fff43206f8018fe2062ea9e7b41a242a800807b Mon Sep 17 00:00:00 2001 From: DogeOps97 Date: Tue, 18 Apr 2017 19:05:45 -0700 Subject: [PATCH 489/496] Added gifs Because why not? :3 --- docs/guides/Windows Guide.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/guides/Windows Guide.md b/docs/guides/Windows Guide.md index 5902c062..56ca531b 100644 --- a/docs/guides/Windows Guide.md +++ b/docs/guides/Windows Guide.md @@ -24,6 +24,7 @@ ________________________________________________________________________________ - Wait a while for the file to finish installing, it'll display it's progress in the command prompt. - You should now have a new folder named `NadekoBot` inside the `Nadeko` folder we previously created. - Once Installation is completed, press any key to close the command prompt. +![img1](http://i.imgur.com/O1dY9eW.gif) ####Creating DiscordBot application - Go to [the Discord developer application page][DiscordApp]. @@ -33,6 +34,7 @@ ________________________________________________________________________________ - Create the application. - Click on `Create a Bot User` and confirm that you do want to add a bot to this app. - Keep this window open for now. +![img2](http://i.imgur.com/x3jWudH.gif) ####Setting up credentials.json file - In our `NadekoBot` folder you should see a `src` folder, then *another* `NadekoBot` folder, in this final folder, you should see a `.json` file named `credentials.json`. (Note: If you do not see a `.json` after `credentials.json`, do not add the `.json`. You most likely have **"Hide file extensions"** enabled.) @@ -48,6 +50,7 @@ ________________________________________________________________________________ - The message will appear as a mention if done correctly, copy the numbers from the message you sent (`145521851676884992`) and replace the ID (By default, the ID is `105635576866156544`) on the `OwnerIds` section with your user ID shown earlier. - Save `credentials.json` (make sure you aren't saving it as `credentials.json.txt`) - If done correctly, you are now the bot owner. You can add multiple owners by seperating each owner ID with a comma within the square brackets. +![img3](http://i.imgur.com/QwKMnTG.gif) ####Inviting your bot to your server - [Invite Guide][Invite Guide] @@ -56,6 +59,7 @@ ________________________________________________________________________________ - The link should now look like this: `https://discordapp.com/oauth2/authorize?client_id=**YOUR_CLENT_ID_HERE**&scope=bot&permissions=66186303`. - Go to the newly created link and pick the server we created, and click `Authorize`. - The bot should have been added to your server. +![img4](http://i.imgur.com/aFK7InR.gif) ####Starting the bot - Go to the `Nadeko` folder that we have created earlier, and run the `NadekoInstaller.bat` file as Administrator. From 85275a74c8fe8cb14e6903cc7d0dfcb7f1e1f418 Mon Sep 17 00:00:00 2001 From: DogeOps97 Date: Tue, 18 Apr 2017 22:58:46 -0700 Subject: [PATCH 490/496] More changes to linux guide on samvaio's tips --- docs/guides/Linux Guide.md | 71 ++++++++++++++++++++++++++++++-------- 1 file changed, 56 insertions(+), 15 deletions(-) diff --git a/docs/guides/Linux Guide.md b/docs/guides/Linux Guide.md index 2c16d703..1575484f 100644 --- a/docs/guides/Linux Guide.md +++ b/docs/guides/Linux Guide.md @@ -1,9 +1,9 @@ -##Setting up NadekoBot on Linux +## Setting up NadekoBot on Linux -####Setting up NadekoBot on Linux Digital Ocean Droplet +#### Setting up NadekoBot on Linux Digital Ocean Droplet If you want Nadeko to play music for you 24/7 without having to hosting it on your PC and want to keep it cheap, reliable and convenient as possible, you can try Nadeko on Linux Digital Ocean Droplet using the link [DigitalOcean](http://m.do.co/c/46b4d3d44795/) (and using this link will be supporting Nadeko and will give you **$10 credit**) -####Setting up NadekoBot +#### Setting up NadekoBot Assuming you have followed the link above to setup an account and Droplet with 64bit OS in Digital Ocean and got the `IP address and root password (in email)` to login, its time to get started. **Go through this whole guide before setting up Nadeko** @@ -12,7 +12,7 @@ Assuming you have followed the link above to setup an account and Droplet with 6 - Download [PuTTY](http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html) - Download [WinSCP](https://winscp.net/eng/download.php) *(optional)* -####Starting up +#### Starting up - **Open PuTTY.exe** that you downloaded before, and paste or enter your `IP address` and then click **Open**. If you entered your Droplets IP address correctly, it should show **login as:** in a newly opened window. @@ -24,7 +24,7 @@ If you entered your Droplets IP address correctly, it should show **login as:** **NOTE:** Copy the commands, and just paste them using **mouse single right-click.** -####Creating and Inviting bot +#### Creating and Inviting bot - Read here how to [create a DiscordBot application](http://nadekobot.readthedocs.io/en/latest/guides/Windows%20Guide/#creating-discordbot-application) - [Visual Invite Guide](http://discord.kongslien.net/guide.html) **(Note: Client ID is your Bot ID)** @@ -37,8 +37,8 @@ If you entered your Droplets IP address correctly, it should show **login as:** - Go to the newly created link and pick the server we created, and click `Authorize` - The bot should have been added to your server. -####Getting NadekoBot -#####Part I - Downloading the installer +#### Getting NadekoBot +##### Part I - Downloading the installer Use the following command to get and run `linuxAIO.sh` (Remember **Do Not** rename the file **linuxAIO.sh**) @@ -55,7 +55,7 @@ You should see these following options after using the above command: 6. Set up credentials.json (if you have downloaded the bot already) 7. To exit ``` -#####Part II - Downloading Nadekobot prerequisites +##### Part II - Downloading Nadekobot prerequisites **If** you are running NadekoBot for the first time on your system and never had any *prerequisites* installed and have Ubuntu, Debian or CentOS, Press `5` and `enter` key, then `y` when you see the following: ``` @@ -64,7 +64,7 @@ Would you like to continue? ``` That will install all the prerequisites your system need to run NadekoBot. -(Optional) **If** you want to install it manually, you can try finding it [here](https://raw.githubusercontent.com/Kwoth/NadekoBot-BashScript/master/nadekoautoinstaller.sh) +(Optional) **If** you want to install it manually, you can try finding it [here](https://github.com/Kwoth/NadekoBot-BashScript/blob/master/nadekoautoinstaller.sh) Once *prerequisites* finish installing. #####Part III - Installing Nadeko @@ -77,7 +77,7 @@ and then press `enter` key. Once Installation is completed you should see the options again. Next, check out: -#####Part IV - Setting up credentials +##### Part IV - Setting up credentials - [1. Setting up credentials.json](http://nadekobot.readthedocs.io/en/latest/guides/Linux%20Guide/#setting-up-credentialsjson) - [2. To Get the Google API](http://nadekobot.readthedocs.io/en/latest/guides/Windows%20Guide/#setting-up-nadekobot-for-music) @@ -149,7 +149,7 @@ See how that happens: Next to **move the bot to background** and to do that, press **CTRL+B, release, D** (that will detach the nadeko session using TMUX) and you can finally close **PuTTY** if you want. -####Restarting Nadeko +#### Restarting Nadeko **Restarting NadekoBot:** @@ -166,7 +166,7 @@ Open **PuTTY** and login as you have before, type `reboot` and hit Enter. - `tmux kill-session -t nadeko` (don't forget to replace "nadeko" to what ever you named your bot's session) - [Run the bot again.](http://nadekobot.readthedocs.io/en/latest/guides/Linux%20Guide/#running-nadekobot) -####Updating Nadeko +#### Updating Nadeko - Connect to the terminal through **PuTTY**. - `tmux kill-session -t nadeko` (don't forget to replace **nadeko** in the command with the name of your bot's session) @@ -177,16 +177,57 @@ Open **PuTTY** and login as you have before, type `reboot` and hit Enter. - Choose either `3` or `4` to run the bot again with **normally** or **auto restart** respectively. - Done. You can close **PuTTY** now. -####Setting up Music +#### Setting up Music To set up Nadeko for music and Google API Keys, follow [Setting up NadekoBot for Music](http://nadekobot.readthedocs.io/en/latest/guides/Windows%20Guide/#setting-up-nadekobot-for-music) Once done, go back to **PuTTY** -####Some more Info +#### Some more Info -#####Info about tmux +##### Info about tmux - If you want to **see the sessions** after logging back again, type `tmux ls`, and that will give you the list of sessions running. - If you want to **switch to/ see that session**, type `tmux a -t nadeko` (**nadeko** is the name of the session we created before so, replace **“nadeko”** with the session name you created.) - If you want to **kill** NadekoBot **session**, type `tmux kill-session -t nadeko` + +####Guide for Advance Users (Optional) + +**Skip this step if you are a Regular User or New to Linux.** + +[![img7][img7]](http://nadekobot.readthedocs.io/en/latest/guides/Linux%20Guide/#getting-nadekobot) + +- Right after [Getting NadekoBot](http://nadekobot.readthedocs.io/en/latest/guides/Linux%20Guide/#getting-nadekobot) +- `cd NadekoBot/src/NadekoBot/` (go to this folder) +- `pico credentials.json` (open credentials.json to edit) +- Insert your bot **Client ID, Bot ID** (should be same as your Client ID) **and Token** if you got it following [Creating and Inviting bot](http://nadekobot.readthedocs.io/en/latest/guides/Linux%20Guide/#creating-and-inviting-bot). +- Insert your own ID in Owners ID follow: [Setting up credentials.json](http://nadekobot.readthedocs.io/en/latest/guides/Windows%20Guide/#setting-up-credentialsjson-file) +- And Google API from [Setting up NadekoBot for Music](http://nadekobot.readthedocs.io/en/latest/guides/Windows%20Guide/#setting-up-nadekobot-for-music) +- Once done, press `CTRL+X` +- It will ask for "Save Modified Buffer?", press `Y` for yes +- It will then ask "File Name to Write" (rename), just hit `Enter` and Done. +- You can now move to [Running NadekoBot](http://nadekobot.readthedocs.io/en/latest/guides/Linux%20Guide/#running-nadekobot) + +#### Setting up SFTP + +- Open **WinSCP** +- Click on **New Site** (top-left corner). +- On the right-hand side, you should see **File Protocol** above a drop-down selection menu. +- Select **SFTP** *(SSH File Transfer Protocol)* if its not already selected. +- Now, in **Host name:** paste or type in your `Digital Ocean Droplets IP address` and leave `Port: 22` (no need to change it). +- In **Username:** type `root` +- In **Password:** type `the new root password (you changed at the start)` +- Click on **Login**, it should connect. +- It should show you the NadekoBot folder which was created by git earlier on the right-hand side window. +- Open that folder, then open the `src` folder, followed by another `NadekoBot` folder and you should see `credentials.json` there. + +#### Setting up credentials.json + +- Copy the `credentials.json` to desktop +- EDIT it as it is guided here: [Setting up credentials.json](http://nadekobot.readthedocs.io/en/latest/guides/Windows%20Guide/#setting-up-credentialsjson-file) +- Paste/put it back in the folder once done. `(Using WinSCP)` +- **If** you already have Nadeko 1.0 setup and have `credentials.json` and `NadekoBot.db`, you can just copy and paste the `credentials.json` to `NadekoBot/src/NadekoBot` and `NadekoBot.db` to `NadekoBot/src/NadekoBot/bin/Release/netcoreapp1.0/data` using WinSCP. +- **If** you have Nadeko 0.9x follow the [Upgrading Guide](http://nadekobot.readthedocs.io/en/latest/guides/Upgrading%20Guide/) + + +[img7]: https://cdn.discordapp.com/attachments/251504306010849280/251505766370902016/setting_up_credentials.gif From 0221678d35ec2518d43eed835068eabdba6a896e Mon Sep 17 00:00:00 2001 From: DogeOps97 Date: Tue, 18 Apr 2017 23:06:22 -0700 Subject: [PATCH 491/496] Oops, missed a few lines --- docs/guides/Linux Guide.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/guides/Linux Guide.md b/docs/guides/Linux Guide.md index 1575484f..3a042695 100644 --- a/docs/guides/Linux Guide.md +++ b/docs/guides/Linux Guide.md @@ -8,7 +8,7 @@ Assuming you have followed the link above to setup an account and Droplet with 6 **Go through this whole guide before setting up Nadeko** -####Prerequisites +#### Prerequisites - Download [PuTTY](http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html) - Download [WinSCP](https://winscp.net/eng/download.php) *(optional)* @@ -112,7 +112,7 @@ Next, [Run your bot again with **tmux**.](http://nadekobot.readthedocs.io/en/lat [Check this when you need to **restart** your **NadekoBot** anytime later along with tmux session.](http://nadekobot.readthedocs.io/en/latest/guides/Linux%20Guide/#restarting-nadeko) -####Running NadekoBot +#### Running NadekoBot **Create a new Session:** From 4989a7db020492c4398670cf50a2010cb079cc05 Mon Sep 17 00:00:00 2001 From: DogeOps97 Date: Tue, 18 Apr 2017 23:08:18 -0700 Subject: [PATCH 492/496] Just a bit more --- docs/guides/OSX Guide.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/guides/OSX Guide.md b/docs/guides/OSX Guide.md index c5cdd329..db24f0a3 100644 --- a/docs/guides/OSX Guide.md +++ b/docs/guides/OSX Guide.md @@ -6,13 +6,13 @@ - Soundcloud Account (if you want soundcloud support) - Text Editor (TextWrangler, or equivalent) or outside editor such as [Atom][Atom] -####Installing Homebrew +#### Installing Homebrew ```/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"``` Run `brew update` to fetch the latest package data. -####Installing dependencies +#### Installing dependencies ``` brew install wget brew install git @@ -27,7 +27,7 @@ brew install libsodium brew install tmux ``` -####Installing .NET Core SDK +#### Installing .NET Core SDK - `ln -s /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/` - `ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/` @@ -35,7 +35,7 @@ brew install tmux - Open the `.pkg` file you downloaded and install it. - `ln -s /usr/local/share/dotnet/dotnet /usr/local/bin` -####Check your `FFMPEG` +#### Check your `FFMPEG` **In case your `FFMPEG` wasnt installed properly (Optional)** @@ -46,7 +46,7 @@ brew install tmux - `brew doctor` (Check your Homebrew installation for common issues) - Then try `brew install ffmpeg` again. -####Installing xcode-select +#### Installing xcode-select Xcode command line tools. You will do this in Terminal.app by running the following command line: @@ -54,7 +54,7 @@ Xcode command line tools. You will do this in Terminal.app by running the follow A dialog box will open asking if you want to install `xcode-select`. Select install and finish the installation. -####Downloading and building Nadeko +#### Downloading and building Nadeko Use the following command to get and run `linuxAIO.sh`: (Remember **DO NOT** rename the file `linuxAIO.sh`) @@ -70,7 +70,7 @@ Choose either `1` or `2` then press `enter` key. Once Installation is completed you should see the options again. Next, choose `5` to exit. -####Creating and Inviting bot +#### Creating and Inviting bot - Read here how to [create a DiscordBot application](http://nadekobot.readthedocs.io/en/latest/guides/Windows%20Guide/#creating-discordbot-application) - [Visual Invite Guide](http://discord.kongslien.net/guide.html) *NOTE: Client ID is your Bot ID* @@ -80,17 +80,17 @@ Next, choose `5` to exit. - Go to the newly created link and pick the server we created, and click `Authorize`. - The bot should have been added to your server. -####Setting up Credentials.json file +#### Setting up Credentials.json file - Open up the `NadekoBot` folder, which should be in your home directory, then `NadekoBot` folder then `src` folder and then the additonal `NadekoBot` folder. - EDIT it as it is guided here: [Setting up credentials.json](http://nadekobot.readthedocs.io/en/latest/guides/Windows%20Guide/#setting-up-credentialsjson-file) - **If** you already have Nadeko 1.0 setup and have `credentials.json` and `NadekoBot.db`, you can just copy and paste the `credentials.json` to `NadekoBot/src/NadekoBot` and `NadekoBot.db` to `NadekoBot/src/NadekoBot/bin/Release/netcoreapp1.0/data`. - **If** you have Nadeko 0.9x follow the [Upgrading Guide](http://nadekobot.readthedocs.io/en/latest/guides/Upgrading%20Guide/) -####Setting NadekoBot Music +#### Setting NadekoBot Music For Music Setup and API keys check [Setting up NadekoBot for Music](http://nadekobot.readthedocs.io/en/latest/guides/Windows%20Guide/#setting-up-nadekobot-for-music) and [JSON Explanations](http://nadekobot.readthedocs.io/en/latest/JSON%20Explanations/). -####Running NadekoBot +#### Running NadekoBot - Using tmux @@ -124,7 +124,7 @@ Choose `4` To Run the bot with Auto Restart. Now time to move bot to background and to do that, press CTRL+B+D (this will detach the nadeko session using TMUX) If you used Screen press CTRL+A+D (this will detach the nadeko screen) -####Updating Nadeko +#### Updating Nadeko - Connect to the terminal. - `tmux kill-session -t nadeko` [(don't forget to replace **nadeko** in the command to what ever you named your bot's session)](http://nadekobot.readthedocs.io/en/latest/guides/OSX%20Guide/#some-more-info) @@ -135,7 +135,7 @@ If you used Screen press CTRL+A+D (this will detach the nadeko screen) - Choose either `3` or `4` to run the bot again with **normally** or **auto restart** respectively. - Done. You can close terminal now. -####Some more Info +#### Some more Info **TMUX** @@ -149,7 +149,7 @@ If you used Screen press CTRL+A+D (this will detach the nadeko screen) - If you want to switch to/ see that screen, type `screen -r nadeko` (nadeko is the name of the screen we created before so, replace `nadeko` with the screen name you created.) - If you want to kill the NadekoBot screen, type `screen -X -S nadeko quit` -####Alternative Method to Install Nadeko +#### Alternative Method to Install Nadeko **METHOD I** From 956ebdb0fd945941c2c98c45cec85fad686d5010 Mon Sep 17 00:00:00 2001 From: DogeOps97 Date: Tue, 18 Apr 2017 23:09:08 -0700 Subject: [PATCH 493/496] o.o)/ --- docs/guides/Windows Guide.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/guides/Windows Guide.md b/docs/guides/Windows Guide.md index 56ca531b..280f1299 100644 --- a/docs/guides/Windows Guide.md +++ b/docs/guides/Windows Guide.md @@ -13,7 +13,7 @@ ________________________________________________________________________________ - 6) [Notepad++][Notepad++] - 7) Windows 8 or later -####Guide +#### Guide - Make sure you have installed both [Git][Git] and the [.NET Core SDK][.NET Core SDK]. - Create a **new folder** anywhere you like and name it `Nadeko`. - Next, [Right-Click on this link](https://github.com/Kwoth/NadekoBotInstallerWin/raw/master/NadekoInstaller.bat) and select **Save link as** and save the file `NadekoInstaller.bat` inside the `Nadeko` folder that we created earlier. (Please **DO NOT** rename the file `NadekoInstaller.bat`.) @@ -26,7 +26,7 @@ ________________________________________________________________________________ - Once Installation is completed, press any key to close the command prompt. ![img1](http://i.imgur.com/O1dY9eW.gif) -####Creating DiscordBot application +#### Creating DiscordBot application - Go to [the Discord developer application page][DiscordApp]. - Log in with your Discord account. - On the left side, press `New Application`. @@ -36,7 +36,7 @@ ________________________________________________________________________________ - Keep this window open for now. ![img2](http://i.imgur.com/x3jWudH.gif) -####Setting up credentials.json file +#### Setting up credentials.json file - In our `NadekoBot` folder you should see a `src` folder, then *another* `NadekoBot` folder, in this final folder, you should see a `.json` file named `credentials.json`. (Note: If you do not see a `.json` after `credentials.json`, do not add the `.json`. You most likely have **"Hide file extensions"** enabled.) - If you mess up the setup of `credentials.json`, rename `credentials_example.json` to `credentials.json`. - Open the file with [Notepad++][Notepad++]. @@ -52,7 +52,7 @@ ________________________________________________________________________________ - If done correctly, you are now the bot owner. You can add multiple owners by seperating each owner ID with a comma within the square brackets. ![img3](http://i.imgur.com/QwKMnTG.gif) -####Inviting your bot to your server +#### Inviting your bot to your server - [Invite Guide][Invite Guide] - Copy your `Client ID` from your [applications page][DiscordApp]. - Replace the `12345678` in this link `https://discordapp.com/oauth2/authorize?client_id=12345678&scope=bot&permissions=66186303` with your `Client ID`. @@ -61,7 +61,7 @@ ________________________________________________________________________________ - The bot should have been added to your server. ![img4](http://i.imgur.com/aFK7InR.gif) -####Starting the bot +#### Starting the bot - Go to the `Nadeko` folder that we have created earlier, and run the `NadekoInstaller.bat` file as Administrator. - From the options, - Choose `3` to **run the bot normally**. @@ -69,7 +69,7 @@ ________________________________________________________________________________ - Choose `4` to **run the bot with auto restart**. (with auto restart the bot will restart itself if it disconnects by the use of `.die` command. Useful if you want to have restart function for any reason.) -####Updating NadekoBot +#### Updating NadekoBot - Make sure the bot is closed and is not running (Run `.die` in a connected server to ensure it's not running). - Once that's checked, go to the `Nadeko` folder. - Run the `NadekoInstaller.bat` file. From 07fa82c1fdafc39a96fa77e7ba034be640407d76 Mon Sep 17 00:00:00 2001 From: DogeOps97 Date: Tue, 18 Apr 2017 23:22:26 -0700 Subject: [PATCH 494/496] One more check .-. --- docs/guides/Linux Guide.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/guides/Linux Guide.md b/docs/guides/Linux Guide.md index 3a042695..a6346c12 100644 --- a/docs/guides/Linux Guide.md +++ b/docs/guides/Linux Guide.md @@ -66,8 +66,9 @@ That will install all the prerequisites your system need to run NadekoBot. (Optional) **If** you want to install it manually, you can try finding it [here](https://github.com/Kwoth/NadekoBot-BashScript/blob/master/nadekoautoinstaller.sh) -Once *prerequisites* finish installing. -#####Part III - Installing Nadeko +Once *prerequisites* finish installing, + +##### Part III - Installing Nadeko Choose either `1` to get the **most updated build of NadekoBot** or @@ -102,11 +103,11 @@ You will be asked to enter the required informations, just follow the on-screen (If you want to skip any optional infos, just press `enter` key without typing/pasting anything.) Once done, -#####Part V - Checking if Nadeko is working +##### Part V - Checking if Nadeko is working You should see the options again. -Next, press `3` to **Run Nadeko (Normally)** +Next, press `3` to **Run Nadeko (Normally)**. Check in your discord server if your new bot is working properly. -#####Part VI - Running Nadeko on tmux +##### Part VI - Running Nadeko on tmux If your bot is working properly in your server, type `.die` to **shut down the bot**, then press `7` to **exit**. Next, [Run your bot again with **tmux**.](http://nadekobot.readthedocs.io/en/latest/guides/Linux%20Guide/#running-nadekobot) From a59c9d49c052ade7305039541e24c93672e38616 Mon Sep 17 00:00:00 2001 From: DogeOps97 Date: Tue, 18 Apr 2017 23:30:11 -0700 Subject: [PATCH 495/496] <_< Oh please >_> Should be cleaned enough, I think? --- docs/guides/Linux Guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/guides/Linux Guide.md b/docs/guides/Linux Guide.md index a6346c12..597058c2 100644 --- a/docs/guides/Linux Guide.md +++ b/docs/guides/Linux Guide.md @@ -192,7 +192,7 @@ Once done, go back to **PuTTY** - If you want to **switch to/ see that session**, type `tmux a -t nadeko` (**nadeko** is the name of the session we created before so, replace **“nadeko”** with the session name you created.) - If you want to **kill** NadekoBot **session**, type `tmux kill-session -t nadeko` -####Guide for Advance Users (Optional) +#### Guide for Advance Users (Optional) **Skip this step if you are a Regular User or New to Linux.** From 0210601213bd0585803615dc7a7e195dced953c8 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 21 Apr 2017 00:20:21 +0200 Subject: [PATCH 496/496] It was a poor joke. --- src/NadekoBot/Modules/NSFW/NSFW.cs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/NadekoBot/Modules/NSFW/NSFW.cs b/src/NadekoBot/Modules/NSFW/NSFW.cs index 5f45af24..614c1308 100644 --- a/src/NadekoBot/Modules/NSFW/NSFW.cs +++ b/src/NadekoBot/Modules/NSFW/NSFW.cs @@ -212,12 +212,6 @@ namespace NadekoBot.Modules.NSFW public Task Gelbooru([Remainder] string tag = null) => InternalDapiCommand(tag, Searches.Searches.DapiSearchType.Gelbooru); - [NadekoCommand, Usage, Description, Aliases] - public async Task Cp() - { - await Context.Channel.SendMessageAsync("http://i.imgur.com/MZkY1md.jpg").ConfigureAwait(false); - } - [NadekoCommand, Usage, Description, Aliases] public async Task Boobs() {