aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/common.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2113 from nickvergessen/ticket/8041Andreas Fischer2014-03-131-1/+2
|\ | | | | | | | | | | | | | | | | [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
| * [ticket/8041] Wrap forum name, topic title and pm folder name with quotesJoas Schilling2014-03-121-1/+2
| | | | | | | | PHPBB3-8041
| * [ticket/8041] Merge item name into "Return to" string for better translationsJoas Schilling2014-03-121-1/+1
| | | | | | | | PHPBB3-8041
* | Merge branch 'develop-olympus' into developAndreas Fischer2014-03-121-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | * 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
| * [ticket/10549] changed "right" to "incorrect"Crizzo2014-03-111-1/+1
| | | | | | | | PHPBB3-10549
* | Merge branch 'develop-olympus' into developNathan Guse2014-03-101-0/+3
|\ \ | |/ | | | | | | | | | | | | * develop-olympus: [ticket/10549] Adds language variables Conflicts: phpBB/includes/functions_module.php
| * [ticket/10549] Adds language variablesCrizzo2014-03-101-0/+3
| | | | | | | | PHPBB3-10549
* | [ticket/12236] Fix language key name for Yahoo MessangerJoas Schilling2014-03-061-1/+1
| | | | | | | | PHPBB3-12236
* | [ticket/12236] Move AOL Instant Messanger field to custom profile fieldJoas Schilling2014-03-051-2/+0
| | | | | | | | PHPBB3-12236
* | [ticket/12237] Convert yahoo messanger to custom profile fieldJoas Schilling2014-03-051-3/+1
| | | | | | | | PHPBB3-12237
* | Merge remote-tracking branch 'github-nickvergessen/ticket/12235' into developNils Adermann2014-03-051-10/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-nickvergessen/ticket/12235: [ticket/12235] Convert WLM to custom profile field [ticket/12187] Do not make clickable when using as contact field [ticket/12187] Split generate_profile_fields_template() into 2 methods [ticket/12187] Remove user_website field [ticket/12187] Remove user_website functionality [ticket/12187] Convert website field data to custom profile field [ticket/12187] Add URL type for profile fields [ticket/12234] Replace ICQ with custom profile field [ticket/12233] Update schema file [ticket/12233] Add images back to subsilver2 [ticket/12233] Allow profile fields to be contact fields Conflicts: phpBB/adm/style/acp_prune_users.html
| * | [ticket/12235] Convert WLM to custom profile fieldJoas Schilling2014-03-041-3/+1
| | | | | | | | | | | | PHPBB3-12235
| * | [ticket/12187] Remove user_website functionalityJoas Schilling2014-03-031-3/+0
| | | | | | | | | | | | PHPBB3-12187
| * | [ticket/12234] Replace ICQ with custom profile fieldJoas Schilling2014-02-281-4/+0
| | | | | | | | | | | | PHPBB3-12234
* | | [ticket/12226] Split language strings to correctly allow multiple plural rulesJoas Schilling2014-02-241-0/+4
|/ / | | | | | | PHPBB3-12226
* | [ticket/12169] Convert user_from to profile field locationJoas Schilling2014-02-101-2/+0
| | | | | | | | | | | | Missing changes on memberlist view due to missing functionality PHPBB3-12169
* | [ticket/12115] Also port user interests to profile fieldsJoas Schilling2014-02-061-2/+0
| | | | | | | | PHPBB3-12115
* | [ticket/12115] Remove old language stringsJoas Schilling2014-02-061-2/+0
| | | | | | | | PHPBB3-12115
* | [ticket/12034] AJAXify notifications popup.Cesar G2013-12-301-0/+2
| | | | | | | | PHPBB3-12034
* | Merge remote-tracking branch 'cyberalien/ticket/11969' into developJoas Schilling2013-12-031-0/+2
|\ \ | | | | | | | | | | | | | | | | | | * cyberalien/ticket/11969: [ticket/11969] Change topic link to unread post in subsilver2 [ticket/11969] Change topic link to unread post in prosilver [ticket/11969] New language strings for first and last post links
| * | [ticket/11969] New language strings for first and last post linksVjacheslav Trushkin2013-10-251-0/+2
| | | | | | | | | | | | PHPBB3-11969
* | | [ticket/12042] Replace B with a more meaningful key nameJoas Schilling2013-11-271-1/+1
| | | | | | | | | | | | PHPBB3-12042
* | | [ticket/12042] Add all language strings from PLUpload 2.0 to the language fileJoas Schilling2013-11-271-0/+1
| | | | | | | | | | | | PHPBB3-12042
* | | Merge pull request #1854 from Pico88/ticket/12005Nathan Guse2013-11-211-4/+0
|\ \ \ | | | | | | | | [ticket/12005] Remove code responsible for PM popup completely
| * | | [ticket/12005] Remove language vars used by PM popupLukasz2013-11-081-4/+0
| | | | | | | | | | | | | | | | PHPBB3-12005
* | | | [ticket/11959] Trim the list of users from post notifications.Cesar G2013-11-211-0/+3
| | | | | | | | | | | | | | | | PHPBB3-11959
* | | | [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