aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/common.php
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | [ticket/11975] Change shortened ACP/MCP label to Administer/ModerateDavid King2013-11-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Also utilizing the new data-responsive-text attribute PHPBB3-11975
* | | | [ticket/11975] Make link text shorter on smaller resolutionsDavid King2013-11-021-0/+2
|/ / / | | | | | | | | | PHPBB3-11975
* | | Merge pull request #1812 from prototech/ticket/11746Nathan Guse2013-11-021-0/+1
|\ \ \ | | | | | | | | [ticket/11746] Add "admin activation required" notification.
| * | | [ticket/11746] Add "admin activation required" notification.Cesar G2013-10-241-0/+1
| |/ / | | | | | | | | | PHPBB3-11746
* | | [ticket/11974] Fix timezone names with underscoresJoas Schilling2013-10-271-59/+59
| | | | | | | | | | | | PHPBB3-11974
* | | [ticket/11974] Translate all timezonesJoas Schilling2013-10-271-0/+432
|/ / | | | | | | PHPBB3-11974
* | [ticket/11921] Move any HTML for Notifications to the templatesMatt Friedman2013-10-161-1/+0
| | | | | | | | PHPBB3-11921
* | [ticket/11921] Improve appearance of PM notifications in linklistMatt Friedman2013-10-151-8/+0
| | | | | | | | PHPBB3-11921
* | [ticket/11921] Improve appearance of Notifications in linklistMatt Friedman2013-10-151-5/+1
| | | | | | | | PHPBB3-11921
* | Merge pull request #1620 from EXreaction/ticket/11745David King2013-09-121-0/+1
|\ \ | | | | | | Group join approved notification
| * | [ticket/11745] Correct language, coding guidelinesNathan Guse2013-09-121-1/+1
| | | | | | | | | | | | PHPBB3-11745
| * | [ticket/11745] Group request approved notificationNathan Guse2013-07-271-0/+1
| | | | | | | | | | | | PHPBB3-11745
* | | Merge pull request #1617 from EXreaction/ticket/11744David King2013-09-121-0/+1
|\ \ \ | |/ / | | | [ticket/11744] Group join request notification
| * | [ticket/11744] LanguageNathan Guse2013-07-271-1/+1
| | | | | | | | | | | | PHPBB3-11744
| * | [ticket/11744] Group join request notificationNathan Guse2013-07-261-0/+1
| | | | | | | | | | | | PHPBB3-11744
* | | [feature/oauth] Changes due to code reviewJoseph Warner2013-08-241-0/+1
| | | | | | | | | | | | PHPBB3-11673
* | | [feature/oauth] Fix indentation on new language constantsJoseph Warner2013-08-241-7/+7
| | | | | | | | | | | | PHPBB3-11673
* | | [feature/oauth] Finish cleaning up TODOsJoseph Warner2013-08-241-0/+2
| | | | | | | | | | | | PHPBB3-11673
* | | [feature/oauth] Clean up TODOsJoseph Warner2013-08-241-0/+2
| | | | | | | | | | | | PHPBB3-11673
* | | [feature/oauth] Move language constants for oauth services to common.phpJoseph Warner2013-07-241-0/+3
| | | | | | | | | | | | PHPBB3-11673
* | | [feature/oauth] Update error message with actual errorJoseph Warner2013-07-231-0/+1
|/ / | | | | | | PHPBB3-11673
* | Merge remote-tracking branch 'phpbb/develop' into ticket/9657Joas Schilling2013-07-131-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * phpbb/develop: (216 commits) [ticket/11626] Remove last reference to template in ldap [ticket/11626] Remove LDAP dependency on template [develop-olympus] Increment version number to 3.0.13-dev. [develop-olympus] Add changelog for 3.0.12 release. [develop-olympus] Bump version numbers for 3.0.12-RC1 release. [develop-olympus] Bumping version numbers to final for 3.0.12 releases. [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./) [ticket/11668] Run lint test at the end of the test suite [ticket/11548] Fix test errors in groups test on develop [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0 [ticket/11548] Fix incorrect usage of array_map on acp groups page [ticket/11665] Fix test class name [ticket/11664] Stop creating php.html file in root path in tests [ticket/11665] Can't change file names already sent to set_filenames [ticket/11662] Typos: occured -> occurred [ticket/11662] Typos: occured -> occurred [ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect) [feature/auth-refactor] Add parent::setUp() in setUp() [feature/auth-refactor] Changes [feature/auth-refactor] DataProvider for acp_board test ...
| * \ Merge branch 'develop-olympus' into developNathaniel Guse2013-07-121-3/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer (1) and Nathaniel Guse (1) * develop-olympus: [ticket/11662] Typos: occured -> occurred Conflicts: tests/template/template_test.php
| | * [ticket/11662] Typos: occured -> occurredAndreas Fischer2013-07-121-3/+3
| | | | | | | | | | | | PHPBB3-11662
* | | Merge remote-tracking branch 'phpbb/develop' into ↵Joas Schilling2013-07-111-0/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-1-permission * phpbb/develop: (704 commits) [ticket/11630] Improvements to the PHP lint pre-commit hook [feature/auth-refactor] Move auth providers to separate directory [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling. [ticket/11619] Some tests for get_remote_file(). [ticket/11617] Remove spaces and tabs from empty lines [ticket/11617] Missing U_ACTION in acp_captcha.php [feature/auth-refactor] Fix code style issue [feature/auth-refactor] Fix comment grammar [feature/auth-refactor] Fix the actual cause of test failures [ticket/10838] Fix URL for wiki and remove irrelevant line [ticket/10838] Remove php 5.4 and builtin server references [ticket/10838] Fix missing data [ticket/10838] separate database used mentioned in unit tests [ticket/11585] Make $auth_admin class property [feature/auth-refactor] A possible fix for the functional test failures [ticket/11566] Subsilver template error displayed after table headers [ticket/11566] Remove extra pair of brackets from conditional statement [ticket/11566] Check that guest doesn't have reporting permission by default [ticket/11566] Add captcha to report post template in subsilver [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init ... Conflicts: phpBB/docs/sphinx.sample.conf phpBB/feed.php phpBB/styles/prosilver/template/search_results.html phpBB/styles/prosilver/template/viewforum_body.html
| * | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-261-0/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11538] Add optional switch as argument to hex colour validation [ticket/11538] Modify test colour values [ticket/11538] Limit comment in acp_groups to 80 characters per line [ticket/11538] Move group ID into abstract test class and add more test cases [ticket/11538] Merge calls to validate_data() in acp_groups [ticket/11538] Rename phpbb_validate_colour to phpbb_validate_hex_colour [ticket/11538] Use abstract class for functional test cases for group colour [ticket/11538] Add function phpbb_validate_colour for validating colours [ticket/11538] Make sure regex doesn't allow multiple color values [ticket/11538] Add tests for acp group manage page [ticket/11538] Simplify colour value check and remove support for '#' [ticket/11538] Fix incorrect regex and test for duplicate # in color string [ticket/11538] Use regex for testing color value and improve tests [ticket/11538] Make sure group color can't exceed maximum of 6 characters Conflicts: phpBB/includes/functions_user.php phpBB/styles/prosilver/template/ucp_groups_manage.html
| | * [ticket/11538] Simplify colour value check and remove support for '#'Marc Alexander2013-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The input length for the hex color is now limited to 6 characters and the support for colors starting with a '#' has been dropped. The allowed input length of 7 in prosilver seems to have been a relict from old ages of phpBB3. In order to have proper support for correct checking of the colour value, the new code was also ported to the ACP groups manage page. The tests have been modified to reflect the changes to the behavior of the color check. Tests for the ACP will follow. PHPBB3-11538
| | * [ticket/11538] Use regex for testing color value and improve testsMarc Alexander2013-05-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | We are now using a regex with preg_match() in order to properly check if the entered color value is in hex color format or not. A proper error message is triggered if an incorrect color value is entered and the prepended '#' is removed if necessary. PHPBB3-11538
| * | [ticket/11279] Clearer AJAX errorsVjacheslav Trushkin2013-05-201-0/+3
| | | | | | | | | | | | | | | | | | Display clearer AJAX errors rather than generic error PHPBB3-11279
| * | [ticket/11413] Translate the errorNathan Guse2013-05-101-0/+1
| | | | | | | | | | | | PHPBB3-11413
| * | Merge remote-tracking branch 'github-asperous/ticket/9975' into developNils Adermann2013-04-241-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-asperous/ticket/9975: [ticket/9975] Moved a few E_USER_ERROR errors to /language Conflicts: phpBB/includes/user.php
| | * | [ticket/9975] Moved a few E_USER_ERROR errors to /languageasperous2013-04-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | There were a few error messages that a user could experience that would, previously, be without any the ability to be localized. There are some more E_USER_ERRORs that I did not change to a constant, for example the error message that is displayed if there aren't any folders in /language. PHPBB3-9975
| * | | Merge branch 'develop-olympus' into developNils Adermann2013-04-241-0/+1
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | | | | * develop-olympus: [ticket/9975] Translate missing style error message Conflicts: phpBB/includes/session.php
| | * [ticket/9975] Translate missing style error messageGaëtan Muller2013-04-211-0/+1
| | | | | | | | | | | | | | | | | | | | | The error message about missing style data was not translated PHPBB3-9975
* | | [ticket/9657] Include poster name in "deleted post" messageJoas Schilling2013-03-111-2/+2
| | | | | | | | | | | | | | | | | | Also switched from passive to active form PHPBB3-9657
* | | [ticket/9657] Fix some language problems and inconsistencesJoas Schilling2013-03-111-1/+1
| | | | | | | | | | | | PHPBB3-9657
* | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ↵Joas Schilling2013-03-051-0/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-1-permission * 'develop' of https://github.com/phpbb/phpbb3: (234 commits) [ticket/11398] Correctly call permission_set method in permission tool [ticket/11394] Relax Migration Tools [ticket/11386] Fix missing ; [ticket/10714] Get log from container in install, update and download/file [feature/avatars] Update module_auth of ucp module and fix small issues [ticket/11396] Rename insert_migration to set_migration_state [ticket/11395] Prevent acp_modules::get_modules_info from reincluding files [ticket/11393] Give more information on database updater [ticket/11386] Send list of migrations instead of using load_migrations [feature/avatars] Add migrations data file for avatars [feature/avatars] Reduce module auth of ucp avatar settings [ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/ [ticket/10714] Logs are disabled for this page call only [ticket/10411] Fix call to function on non-object $db->...() [ticket/10411] Remove ajax delete, so the page is refreshed [feature/avatars] Auto-clear avatar dimensions when first changing avatars [ticket/10411] Update schema file with new table and remove the column [ticket/10411] Add unit tests for move() with values >1 [ticket/10411] Add migrations file for teampage table [ticket/10411] Revert database_update.php changes from for easier update ...
| * | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-03-041-0/+24
| |\ \ | | | | | | | | | | | | | | | | Conflicts: phpBB/install/database_update.php
| * | | [feature/avatars] Use "Main" as category for avatars in root of galleryMarc Alexander2013-02-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change the whole avatar gallery path would show as category. Additionally, the avatars that were selected like that had an incorrect path and didn't show up correctly. With this patch it'll display "Main" as category and properly work. PHPBBB3-10018
| * | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-02-071-0/+11
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/config/services.yml
| * | | | [feature/avatars] Improve handling of incorrect input for avatarsMarc Alexander2013-01-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The upload avatar driver will now inform the user if insufficient data has been entered for both remote and local avatar uploads. The local avatar driver (gallery avatar) will also inform the user if he didn't select a category and/or file before submitting. PHPBB3-10018
| * | | | [feature/avatars] Inform user of no available local avatarsMarc Alexander2013-01-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than showing the user an empty drop-down list for the local avatar categories, inform him/her that there are currently no (local) avatars available. PHPBB3-10018
* | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ↵Joas Schilling2013-03-031-0/+35
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-1-permission * 'develop' of https://github.com/phpbb/phpbb3: (480 commits) [ticket/6723] Show info that message has been deleted before delivery [ticket/11385] Fix issue with migration module tool not getting extension module info [ticket/11386] Fix failing tests from constructor changes [ticket/11386] Fix circular reference error & serialize error [ticket/11386] Remove tests that check if finder cache is working [ticket/11386] Forgot to get the migration classes [ticket/11386] Update tests with new constructors for ext.manager/migrator [ticket/11386] Use finder to find migration files [ticket/11363] Fix to make get_module_infos get from all extensions [ticket/11381] Make finder able to search in all available extensions [ticket/11103] Revert whitespace changes [ticket/11103] Few more minor language things [ticket/11103] Don't call generate_board_url many times [ticket/11103] Case time in queries as an int [ticket/11103] Fix effectively installed check [ticket/11103] Remove padding from notifications for now. [ticket/11363] Fix a couple bugs and throw errors if the file not found [ticket/11372] Migrator should only check if effectively installed if not [ticket/11363] Load module info files for extensions too [ticket/11103] Notifications Migration file ... Conflicts: phpBB/includes/functions_posting.php phpBB/includes/mcp/mcp_queue.php phpBB/includes/search/fulltext_mysql.php phpBB/includes/search/fulltext_native.php phpBB/includes/search/fulltext_postgres.php phpBB/includes/search/fulltext_sphinx.php phpBB/install/database_update.php phpBB/styles/prosilver/template/ajax.js
| * | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathaniel Guse2013-02-261-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/install/database_update.php
| | * \ \ \ Merge branch 'develop-olympus' into developNils Adermann2013-02-241-0/+1
| | |\ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALID [ticket/10896] Adds email validation to email settings in ACP Conflicts: phpBB/adm/index.php phpBB/language/en/common.php phpBB/language/en/ucp.php
| | | * | [ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALIDNathan Guse2013-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10896
| | | * | [ticket/10896] Adds email validation to email settings in ACPDavid Tobin2013-02-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a new validation type to the ACP validate_config_vars function and implements it on the board_contact and board_email settings. PHPBB3-10896
| * | | | [ticket/11103] Make the number of notifications strong if > 0Nathaniel Guse2013-02-131-2/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| * | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11103Nathaniel Guse2013-02-111-0/+11
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nathan Guse (28) and others # Via Andreas Fischer (9) and others * 'develop' of https://github.com/phpbb/phpbb3: (90 commits) [ticket/11350] Do not pass $db by reference; typehint phpbb_db_driver [feature/migrations] Remove default values from necessary parameters [ticket/11201] Revert WLM dropping because it is still used in China. [ticket/11220] Improvement to the info pop-up from "list=" [feature/migrations] Revert unrelated changes to functions.php [ticket/11233] prohibit selecting anonymous user as a PM recipient [ticket/11343] Remove spare parentheses. [ticket/11343] Remove spare space. [ticket/11343] Use === when checking stored user_actkey against user input. [ticket/11295] Correct cases: replace postgres with phpbb_db_driver_postgres. [ticket/10050] removing prosilver edits [ticket/9737] Fix some comments [ticket/11337] Abort setup-webserver.sh script when an error occurs. [ticket/11337] Only run functional tests on 5.3.19 or higher. No FPM otherwise. [ticket/11337] Silence nginx config file writing. [ticket/11337] php-fpm.conf is no longer owned by root. [ticket/11337] Run functional tests on travis using nginx and php-fpm. [ticket/11338] Travis CI: Install PHP extension for redis key-value store. [ticket/10050] adding .topicrow to template condition [ticket/9737] Fix a few minor things in migrations ... Conflicts: phpBB/config/services.yml phpBB/config/tables.yml
| | * | | [ticket/11201] Revert WLM dropping because it is still used in China.Andreas Fischer2013-02-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows Live Messenger is still in use in china which accounts for ~20% of world population. Revert WLM dropping which has been merged under the assumption that WLM data and features are completely useless. This commit reverts commits - 460470229d972b93ef5a98b0d1d97a2a970d684f - 9affd6f7e7b95442f1ef14894858d8213f3fbd2a which have been merged by d59431691c27c73fba8ae9934b84b34a13280dd2. PHPBB3-11201
generated by cgit v1.2.1 (git 2.21.0) at 2026-03-27 11:16:26 +0000