use pathinfo() instead of strtok()
to get the themes name.

Signed-off-by: Suki <suki@missallsunday.com>
Add a new generic string: $txt['upload']

Signed-off-by: Suki <suki@missallsunday.com>
Remove duplicated string

Signed-off-by: Suki <suki@missallsunday.com>
dup token for inline permissions

Signed-off-by: Suki <suki@missallsunday.com>
oops, wrong location for comment.

Signed-off-by: Suki <suki@missallsunday.com>
! Here come the icons (fixes #2116)

Signed-off-by: John Rayes <live627@gmail.com>
Merge pull request #2121 from live627/dev

! Here come the icons (fixes #2116)
Merge pull request #2117 from MissAllSunday/theme_stuff

Theme stuff
! Fatal errror on profile lang select

Signed-off-by: John Rayes <live627@gmail.com>
! Logic error

Signed-off-by: John Rayes <live627@gmail.com>
Merge pull request #2122 from live627/dev

Random stuff
Merge pull request #2119 from MissAllSunday/dup_token

Dup token
Merge branch 'release-2.1' of https://github.com/SimpleMachines/SMF2.1.git into release-2.1