preview me in the right spot!
Signed-off-by: Antes <antes@simplemachines.org>
oops
Signed-off-by: Antes <antes@simplemachines.org>
Better for topic settings
Signed-off-by: Antes <antes@simplemachines.org>
Conflict is the ... problem
Signed-off-by: Antes <antes@simplemachines.org>
Resolve the conflict... Please?

Signed-off-by: Antes <antes@simplemachines.org>
Now this is the last point!
Signed-off-by: Antes <antes@simplemachines.org>
small language mistake
Signed-off-by: Antes <antes@simplemachines.org>
Merge pull request #1472 from Antes/preview

preview me in the right spot!
! Remove old code (fixes #1621)
Merge pull request #1627 from Oldiesmann/release-2.1

! Remove old code (fixes #1621)
! Update language strings to reflect new functionality (fixes #1622)

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #1628 from Oldiesmann/release-2.1

! Update language strings to reflect new functionality (fixes #1622)