aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
Commit message (Collapse)AuthorAgeFilesLines
* Merge PR #918 branch 'Senky/ticket/10568' into develop-olympusOleg Pudeyev2012-10-171-0/+1
|\ | | | | | | | | * Senky/ticket/10568: [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm
| * [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pmSenky2012-08-021-0/+1
| | | | | | | | PHPBB3-10568
* | Merge PR #624 branch 'nickvergessen/ticket/8743' into develop-olympusOleg Pudeyev2012-10-163-3/+3
|\ \ | | | | | | | | | | | | * nickvergessen/ticket/8743: [ticket/8743] Include poster´s name in mail notifications
| * | [ticket/8743] Include poster´s name in mail notificationsJoas Schilling2012-03-153-3/+3
| | | | | | | | | | | | PHPBB3-8743
* | | [ticket/11131] Correctly use indefinite article for "warning".Andreas Fischer2012-10-021-1/+1
| | | | | | | | | | | | PHPBB3-11131
* | | [ticket/10873] Change language for notice about undelivered, deleted PM.David King2012-08-211-1/+1
| | | | | | | | | | | | | | | | | | See the ticket for my reasoning. PHPBB3-10873
* | | [ticket/10943] displays searched query in search resultDhruv Goel2012-08-111-0/+1
| | | | | | | | | | | | | | | | | | | | | Search backend displays an additional normalized search query just above the ignored words. PHPBB3-10943
* | | [ticket/10965] Introduce a new profile field option to display no valueNils Adermann2012-07-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | By default the 3.0.10 behaviour is kept, profile fields will not show up if they have either not yet been selected or in case of an optional dropdown field if the novalue option was selected. PHPBB3-10965
* | | [ticket/10950] Delete PMs for users that have not yet read the pmJoas Schilling2012-07-201-1/+1
| |/ |/| | | | | PHPBB3-10950
* | [ticket/10935] Limit number of PM rules per user to 5000Joas Schilling2012-06-201-0/+1
| | | | | | | | PHPBB3-10935
* | Merge remote-tracking branch 'naderman/ticket/10908' into develop-olympusAndreas Fischer2012-05-312-2/+2
|\ \ | | | | | | | | | | | | | | | * naderman/ticket/10908: [ticket/10908] Document that 0 filesize configuration means limited by PHP [ticket/10908] Download files only up to max_upload_filesize if limit is 0
| * | [ticket/10908] Document that 0 filesize configuration means limited by PHPNils Adermann2012-05-292-2/+2
| | | | | | | | | | | | PHPBB3-10908
* | | Merge remote-tracking branch 'github-dhruv/ticket/10308' into develop-olympusNils Adermann2012-05-291-0/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Dhruv Goel via Dhruv Goel * github-dhruv/ticket/10308: [ticket/10308] fixes indentation [ticket/10308] fixes language variable name [ticket/10308] makes variable boolean [ticket/10308] fixes sql query, limit it to 1 [ticket/10308] fixes user deletion if no posts [ticket/10308] renames language key to USER_NO_POSTS_DELETE [ticket/10308] fix language and user's total posts [ticket/10308] fixes language entity. [ticket/10308] Displays message to user if there are no posts. [ticket/10308] disable retain/ delete posts option when deleting a user
| * | [ticket/10308] fixes language variable nameDhruv Goel2012-05-101-1/+1
| | | | | | | | | | | | | | | | | | Language variable has be renamed for better understanding PHPBB3-10308
| * | [ticket/10308] renames language key to USER_NO_POSTS_DELETEDhruv Goel2012-05-101-1/+1
| | | | | | | | | | | | | | | | | | language key renamed to make its usability more clearer. PHPBB3-10308
| * | [ticket/10308] fix language and user's total postsDhruv Goel2012-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | language modified to be clear and select box disappears in case no posts by user. user's total posts are fetched using a new query. PHPBB3-10308
| * | [ticket/10308] fixes language entity.Dhruv Goel2012-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | Language key has been changed and has been made more specific to avoid conflicts PHPBB3-10308
| * | [ticket/10308] Displays message to user if there are no posts.Dhruv Goel2012-05-101-0/+1
| | | | | | | | | | | | | | | | | | | | | While deletng the user, if the user has no posts in addition to the options being disabled an added message is displayed. PHPBB3-10308
* | | [ticket/10835] changing "e-mail" to "email"Senky2012-05-111-1/+1
| | | | | | | | | | | | PHPBB3-10835
* | | [ticket/10835] changing CURRENT_CHANGE_PASSWORD_EXPLAIN language entrySenky2012-05-071-1/+1
| | | | | | | | | | | | PHPBB3-10835
* | | [ticket/10835] fixing misleading message in UCPSenky2012-05-011-1/+2
|/ / | | | | | | PHPBB3-10835
* | Merge remote-tracking branch 'github-dhruv/ticket/10797' into develop-olympusNils Adermann2012-04-202-1/+1
|\ \ | | | | | | | | | | | | | | | * github-dhruv/ticket/10797: [ticket/10797] language key rank moved to common [ticket/10797] user rank is displayed in mcp_warn.php
| * | [ticket/10797] language key rank moved to commonDhruv Goel2012-04-203-2/+1
| | | | | | | | | | | | | | | | | | | | | Language key RANK moved from memberlist to common. Removed from mcp language. PHPBB3-10797
| * | [ticket/10797] user rank is displayed in mcp_warn.phpDhruv Goel2012-04-161-0/+1
| | | | | | | | | | | | | | | | | | | | | When warning a user in MCP, the user's rank title and image are displayed. language key user rank also added. PHPBB3-10797
* | | [ticket/10764] FAQ now mentions Area51 instead of SourceForgeAdonais Romero González2012-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The answer of the question "Why isn't X feature available?" in the FAQ now mentions Area51 instead of SourceForge and GitHub as the way to handle feature requests. PHPBB3-10764
* | | [ticket/10764] FAQ now mentions GitHub instead of SourceForgeAdonais Romero González2012-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The answer of the question "Why isn't X feature available?" in the FAQ now mentions GitHub instead of SourceForge as the way to handle feature requests. PHPBB3-10764
* | | Merge remote-tracking branch 'Fyorl/ticket/10508' into develop-olympusOleg Pudeyev2012-04-051-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * Fyorl/ticket/10508: [ticket/10508] Marked as read message now less specific.
| * | | [ticket/10508] Marked as read message now less specific.Fyorl2012-04-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed 'The selected forums have been marked read' to 'Forums have been marked read' PHPBB3-10508
* | | | [ticket/10607] Added 'Powered by' translation string.Fyorl2012-04-041-0/+1
|/ / / | | | | | | | | | | | | | | | | | | Added POWERED_BY line to common.php and modified the templates to use it. PHPBB3-10607
* | | Merge remote-tracking branch 'Dickyf/ticket/10675' into develop-olympusIgor Wiedler2012-03-311-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | * Dickyf/ticket/10675: [Ticket/10675] Correct language string ATTACH_DISK_FULL [ticket/10675] Add disk full language string when posting attachments
| * | | [Ticket/10675] Correct language string ATTACH_DISK_FULLRichard Foote2012-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Add period to ATTACH_DISK_FULL language string PHPBB3-10675
| * | | [ticket/10675] Add disk full language string when posting attachmentsRichard Foote2012-03-191-0/+1
| |/ / | | | | | | | | | | | | | | | | | | Add language string visible by admins only for when the disk does not have enough free space to upload attachments. PHPBB3-10675
* | | [ticket/10129] Remove apostrophes and plurals in ACP user management -> ↵HTF2012-03-242-10/+10
|/ / | | | | | | | | | | permissions language file as per ticket. PHPBB3-10129
* | Merge remote-tracking branch 'p/ticket/7432' into develop-olympusAndreas Fischer2012-03-091-1/+1
|\ \ | |/ |/| | | | | | | * p/ticket/7432: [ticket/7432] Delete redundant reference to "appropriate menu item". [ticket/7432] Explain what users are inactive in more detail.
| * [ticket/7432] Delete redundant reference to "appropriate menu item".Oleg Pudeyev2012-03-071-1/+1
| | | | | | | | PHPBB3-7432
| * [ticket/7432] Explain what users are inactive in more detail.Oleg Pudeyev2011-12-231-1/+1
| | | | | | | | PHPBB3-7432
* | [ticket/9914] Add backup warning to updater.Michael Cullum2012-02-031-0/+1
| | | | | | | | PHPBB3-9914
* | [ticket/10563] Show deactivated styles below active styles in acpVjacheslav Trushkin2012-01-021-0/+1
|/ | | | | | Separates active and deactivated styles in styles list in acp PHPBB3-10563
* Merge remote-tracking branch 'p/ticket/10511' into develop-olympusAndreas Fischer2011-12-081-1/+1
|\ | | | | | | | | * p/ticket/10511: [ticket/10511] Fix a grammar defect in permissions language.
| * [ticket/10511] Fix a grammar defect in permissions language.Oleg Pudeyev2011-12-031-1/+1
| | | | | | | | PHPBB3-10511
* | [ticket/9876] Distinctly name user and forum roles for newly registered users.Oleg Pudeyev2011-12-031-2/+2
|/ | | | PHPBB3-9876
* [ticket/10501] Fix description of table prefixesJoas Schilling2011-11-281-2/+2
| | | | | | They must start with a letter, not an alphanumeric character PHPBB3-10501
* Merge remote-tracking branch 'nickvergessen/ticket/10479' into ↵Oleg Pudeyev2011-11-231-1/+1
|\ | | | | | | | | | | | | prep-release-3.0.10 * nickvergessen/ticket/10479: [ticket/10479] Remove PostgreSQL version numbers from driver's language string
| * [ticket/10479] Remove PostgreSQL version numbers from driver's language stringJoas Schilling2011-11-211-1/+1
| | | | | | | | | | | | | | The versions should be removed like for all other DBMS so we don't have to add each new version. PHPBB3-10479
* | Merge remote-tracking branch 'cs278/ticket/10239' into develop-olympusOleg Pudeyev2011-11-191-0/+1
|\ \ | |/ |/| | | | | | | * cs278/ticket/10239: [ticket/10239] Correct undefined variable error. [ticket/10239] Add confirm box to backup restore.
| * [ticket/10239] Add confirm box to backup restore.Chris Smith2011-09-211-0/+1
| | | | | | | | PHPBB3-10239
* | Merge remote-tracking branch 'nickvergessen/ticket/10157' into develop-olympusOleg Pudeyev2011-11-171-0/+1
|\ \ | | | | | | | | | | | | * nickvergessen/ticket/10157: [ticket/10157] Add notification to update cpfs when installing a language.
| * | [ticket/10157] Add notification to update cpfs when installing a language.Joas Schilling2011-11-171-0/+1
| |/ | | | | | | | | | | | | We currently just copy the language-strings from the default language. But the admin should be reminded to change them. PHPBB3-10157
* | Merge remote-tracking branch 'rxu/ticket/10419' into develop-olympusAndreas Fischer2011-11-151-0/+10
|\ \ | | | | | | | | | | | | | | | | | | * rxu/ticket/10419: [ticket/10419] Reword the language strings [ticket/10419] Reword some language strings, minor code changes [ticket/10419] Add mbstring PHP ini parameters checks to ACP
| * | [ticket/10419] Reword the language stringsrxu2011-11-151-8/+8
| | | | | | | | | | | | PHPBB3-10419