mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Master Kwoth 2017-05-07 15:00:51 +02:00
commit 13dea118a9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/guides/Windows Guide.md
View File

@ -41,7 +41,7 @@ ________________________________________________________________________________
- If you mess up the setup of `credentials.json`, rename `credentials_example.json` to `credentials.json`. - If you mess up the setup of `credentials.json`, rename `credentials_example.json` to `credentials.json`.
- Open the file with [Notepad++][Notepad++]. - Open the file with [Notepad++][Notepad++].
- In there you will see fields such as `Token`, `ClientId`, `BotId` and `OwnerIDs`. - In there you will see fields such as `Token`, `ClientId`, `BotId` and `OwnerIDs`.
- In your [applications page][DiscordApp] (the window you were asked to keep open earlier), under the `Bot User` section, you will see `Token:click to reveal`, click to reveal the token. - In your [applications page][DiscordApp] (the window you were asked to keep open earlier), under the `Bot User` section, you will see `Token:click to reveal`, click to reveal the token. (Note: Make sure that you actually use a Token and not a Client Secret! It is in the **App Bot User** tab.)
- Copy your bot's token, and on the `"Token"` line of your `credentials.json`, paste your bot token between the quotation marks. - Copy your bot's token, and on the `"Token"` line of your `credentials.json`, paste your bot token between the quotation marks.
- Copy the `Client ID` on the page and replace the `12312123` part of the `ClientId` line with it. - Copy the `Client ID` on the page and replace the `12312123` part of the `ClientId` line with it.
- Again, copy the same `Client ID` and replace the `null` part of the `BotId` line with it. - Again, copy the same `Client ID` and replace the `null` part of the `BotId` line with it.

6
src/NadekoBot/Resources/CommandStrings.resx
View File

@ -184,7 +184,7 @@
<value>greetmsg</value> <value>greetmsg</value>
</data> </data>
<data name="greetmsg_desc" xml:space="preserve"> <data name="greetmsg_desc" xml:space="preserve">
<value>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 &lt;http://nadekobot.xyz/embedbuilder/&gt; instead of a regular text, if you want the message to be embedded.</value> <value>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 &lt;http://nadekobot.me/embedbuilder/&gt; instead of a regular text, if you want the message to be embedded.</value>
</data> </data>
<data name="greetmsg_usage" xml:space="preserve"> <data name="greetmsg_usage" xml:space="preserve">
<value>`{0}greetmsg Welcome, %user%.`</value> <value>`{0}greetmsg Welcome, %user%.`</value>
@ -202,7 +202,7 @@
<value>byemsg</value> <value>byemsg</value>
</data> </data>
<data name="byemsg_desc" xml:space="preserve"> <data name="byemsg_desc" xml:space="preserve">
<value>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 &lt;http://nadekobot.xyz/embedbuilder/&gt; instead of a regular text, if you want the message to be embedded.</value> <value>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 &lt;http://nadekobot.me/embedbuilder/&gt; instead of a regular text, if you want the message to be embedded.</value>
</data> </data>
<data name="byemsg_usage" xml:space="preserve"> <data name="byemsg_usage" xml:space="preserve">
<value>`{0}byemsg %user% has left.`</value> <value>`{0}byemsg %user% has left.`</value>
@ -2329,7 +2329,7 @@
<value>`{0}greetdmmsg Welcome to the server, %user%`.</value> <value>`{0}greetdmmsg Welcome to the server, %user%`.</value>
</data> </data>
<data name="greetdmmsg_desc" xml:space="preserve"> <data name="greetdmmsg_desc" xml:space="preserve">
<value>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 &lt;http://nadekobot.xyz/embedbuilder/&gt; instead of a regular text, if you want the message to be embedded.</value> <value>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 &lt;http://nadekobot.me/embedbuilder/&gt; instead of a regular text, if you want the message to be embedded.</value>
</data> </data>
<data name="cash_desc" xml:space="preserve"> <data name="cash_desc" xml:space="preserve">
<value>Check how much currency a person has. (Defaults to yourself)</value> <value>Check how much currency a person has. (Defaults to yourself)</value>