Merge branch 'dev' into feature/admin-markers

This commit is contained in:
Cooldude2606
2021-04-25 20:18:32 +01:00
committed by GitHub
120 changed files with 2158 additions and 113 deletions

View File

@@ -29,6 +29,7 @@ not-jailed=__1__ is not currently in jail.
[expcom-report]
player-immune=This player can not be reported.
self-report=You cannot report yourself.
non-admin=__1__ was reported for __2__.
admin=__1__ was reported by __2__ for __3__.
already-reported=You can only report a player once, you can ask a moderator to clear this report.
@@ -89,4 +90,10 @@ exit=You have left admin marker mode, all new markers will not be protected.
enter=You have entered admin marker mode, all new markers will be protected.
place=You have placed an admin marker.
edit=You have edited an admin marker.
revert=You cannot edit admin markers.
revert=You cannot edit admin markers.
[expcom-inv-search]
reject-item=No item was found with internal name __1__; try using rich text selection.
results-heading=Players found with [item=__1__]:
results-item=__1__) __2__ has __3__ items. (__4__)
results-none=No players have [item=__1__]