Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop

Browse source
This commit is contained in:
Dane Everitt 2017-06-03 17:05:42 -05:00
commit 2f0f002299
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/lang/en/base.php
View file

@ -24,7 +24,7 @@ return [
], ],
'index' => [ 'index' => [
'header' => 'Your Servers', 'header' => 'Your Servers',
'header_sub' => 'Servers you own and have access to.', 'header_sub' => 'Servers you have access to.',
'list' => 'Server List', 'list' => 'Server List',
], ],
'api' => [ 'api' => [

2
resources/lang/en/strings.php
View file

@ -20,7 +20,7 @@ return [
'account' => 'Account', 'account' => 'Account',
'security' => 'Security', 'security' => 'Security',
'ip' => 'IP Address', 'ip' => 'IP Address',
'last_activity' => 'Last Activitiy', 'last_activity' => 'Last Activity',
'revoke' => 'Revoke', 'revoke' => 'Revoke',
'2fa_token' => 'Authentication Token', '2fa_token' => 'Authentication Token',
'submit' => 'Submit', 'submit' => 'Submit',

2
resources/themes/pterodactyl/admin/servers/view/build.blade.php
View file

@ -66,7 +66,7 @@
<input type="text" name="memory" data-multiplicator="true" class="form-control" value="{{ old('memory', $server->memory) }}"/> <input type="text" name="memory" data-multiplicator="true" class="form-control" value="{{ old('memory', $server->memory) }}"/>
<span class="input-group-addon">MB</span> <span class="input-group-addon">MB</span>
</div> </div>
<p class="text-muted small">The maximum amount of memory allowed for this container. Setting this to <code>0</code> will allow unlimited memorry in a container.</p> <p class="text-muted small">The maximum amount of memory allowed for this container. Setting this to <code>0</code> will allow unlimited memory in a container.</p>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="swap" class="control-label">Allocated Swap</label> <label for="swap" class="control-label">Allocated Swap</label>