* prototech/ticket/11959:
[ticket/11959] Move phpbb_generate_string_list() to functions_content.php.
[ticket/11959] Add unit tests.
[ticket/11959] Remove use of plurals and make it possible to use Oxford comma.
[ticket/11959] Rename phpbb_gen_string_list() & fix incorrect var name.
[ticket/11959] Simplify how the users are trimmed.
[ticket/11959] Add function to create a string list.
[ticket/11959] Add samples for the untrimmed strings.
[ticket/11959] List the last user with "and" instead of a comma.
[ticket/11959] Use the plurals system for the untrimmed language strings.
[ticket/11959] Fix the NOTIFICATION_QUOTE_TRIMMED text.
[ticket/11959] Use plurals for the language strings.
* crizz0/ticket/11336:
[ticket/11336] Adds 301 info to redirect
[ticket/11336] Adds redirect for old "leaders" mode
[ticket/11336] Changes language variabel LOGIN_EXPLAIN_LEADERS to _TEAM
[ticket/11336] Changes "leaders"-mode to "team"-mode and so in test-file
Changing the language string from "Ban usernames" to "Ban users"
to clarify its use. It bans users by their name and not the username itself
PHPBB3-10174
* EXreaction/ticket/9871-2:
[ticket/9871] Can set current version to use instead of the phpBB version
[ticket/9871] Fix indentation on comment
[ticket/9871] Fix test name
[ticket/9871] Split fast and slow version tests
[ticket/9871] Option to force the stability when checking for updates
[ticket/9871] Allow setting the host/file to load for the version class
[ticket/9871] Restore get_remote_file_test
[ticket/9871] Fix tests
[ticket/9871] Typehint and comment on var types
[ticket/9871] Mark test as slow
[ticket/9871] Restore phpbb_version_compare
[ticket/9871] Restore get_remote_file
[ticket/9871] Use $request->variable instead of request_var
[ticket/9871] Update version check file to use json format
* crizz0/ticket/8785:
[ticket/8785] Deletes additional add and add_bcc buttons
[ticket/8785] Fixed problem with add empty.png and travis will now pass
[ticket/8785] and again a fresh line
[ticket/8785] Just one blank line
[ticket/8785] pm_layout.html back to more standard code
[ticket/8785] <hr /> will only displayed when needed
[ticket/8785] Adds blank lines at file end
[ticket/8785] Adds a new optical improvement, new file and fixes html bugs
[ticket/8785] Adds two <hr /> to seperate recipients and BCC
[ticket/8785] Scrollbar to Reciepients and BCC with max-height: 200px
[ticket/8785] Little spaces mistake
[ticket/8785] Rebuilding posting_editor pm head + new language vars
[ticket/8041] Merge item name into "Return to" string for better translations
* nickvergessen/ticket/8041:
[ticket/8041] Add space/tabs after => in array list
[ticket/8041] Wrap forum name, topic title and pm folder name with quotes
[ticket/8041] Merge item name into "Return to" string for better translations
* develop-olympus:
[ticket/12176] Reword comment about config entries.
[ticket/12176] Add newest_user_colour to config array to ensure it exists
[ticket/12176] Display correct message when trying to delete founder.
[ticket/12176] Add functional test for founder deletion message.
Conflicts:
tests/test_framework/phpbb_functional_test_case.php
* bantu/ticket/12176:
[ticket/12176] Reword comment about config entries.
[ticket/12176] Add newest_user_colour to config array to ensure it exists
[ticket/12176] Display correct message when trying to delete founder.
[ticket/12176] Add functional test for founder deletion message.
* develop-olympus:
[ticket/10549] using correct variable in includes/functions_module.php too
[ticket/10549] changed "right" to "incorrect"
Conflicts:
phpBB/includes/functions_module.php
* remotes/upstream/develop-olympus:
[ticket/12106] Combined first and second sentence
[ticket/12106] Adds a explaination that admin/mods still able to use the board
Conflicts:
phpBB/language/en/acp/board.php
