aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/common.php
Commit message (Collapse)AuthorAgeFilesLines
* [feature/attach-dl] Added links to the templatesFyorl2012-08-021-0/+2
| | | | PHPBB3-11042
* Merge pull request #914 from EXreaction/ticket/10990Nils Adermann2012-07-221-1/+1
|\ | | | | Ticket/10990
| * [ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriateNathan2012-07-221-1/+1
| | | | | | | | PHPBB3-10990
* | [ticket/11002] Use translating option to rename the Etc/GMT optionsJoas Schilling2012-07-211-0/+29
|/ | | | | | | They have the invers offset of their name. So GMT+2 has the offset -7200. To avoid additional confusion, we simply overwrite their name. PHPBB3-11002
* [feature/new-tz-handling] Introduce 2 step timezone selection using javascriptJoas Schilling2012-06-181-0/+1
| | | | PHPBB3-9558
* [feature/new-tz-handling] Fix displaying of "All times are" stringJoas Schilling2012-06-181-1/+1
| | | | PHPBB3-9558
* Merge branch 'feature/new-tz-handling' of https://github.com/p/phpbb3 into ↵Joas Schilling2012-06-041-87/+0
|\ | | | | | | | | | | | | | | | | feature/new-tz-handling Conflicts: phpBB/includes/functions_profile_fields.php phpBB/includes/session.php phpBB/install/database_update.php
| * [feature/new-tz-handling] Removed DST and numeric timezone-related language.Oleg Pudeyev2012-03-141-87/+0
| | | | | | | | PHPBB3-9558
* | Merge PR #721 branch 'rahulr92/ticket/10650' into developOleg Pudeyev2012-05-211-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rahulr92/ticket/10650: [ticket/10650] Subject is cleared if no permissions exist [ticket/10650] Changed apostrophe to utf8 single quote [ticket/10650] Moving censoring to before truncation [ticket/10650] Added apostrophe in explanation in language file [ticket/10650] Inserted correct utf ELLIPSIS character [ticket/10650] Added space after if and comment [ticket/10650] Added ellipsis to language file [ticket/10650] Added href title to subject link [ticket/10650] Made use of truncate_string() function [ticket/10650] Removed changes from acp_forums.php [ticket/10650]Removed incorrect newline [ticket/10650] Changed acp option from per forum to global [ticket/10650] Added checking for empty subjects [ticket/10650] Corrected intendation [ticket/10650]Added permission checking and utf8 functions [ticket/10650] Cropped subject and inserted newline [ticket/10650] Corrected space before true [ticket/10650] Changed language files and forumlist [ticket/10650] Added static sql files [ticket/10650] Displaying last topic on forum list Conflicts: phpBB/install/database_update.php phpBB/language/en/common.php
| * | [ticket/10650] Inserted correct utf ELLIPSIS characterRahul R2012-04-091-1/+1
| | | | | | | | | | | | | | | | | | Inserted the correct utf-8 ellipsis to the language file. PHPBB3-10650
| * | [ticket/10650] Added space after if and commentRahul R2012-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | | Added space in proper places in database_update.php. Also corrected language entry of ELLIPSIS to utf8 PHPBB3-10650
| * | [ticket/10650] Added ellipsis to language fileRahul R2012-04-081-0/+1
| | | | | | | | | | | | | | | | | | | | | Added ELLIPSIS to language file common.php and also corrected language explanation of ACP option. PHPBB3-10650
* | | Merge PR #753 branch 'Senky/ticket/10161' into developOleg Pudeyev2012-04-261-14/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * Senky/ticket/10161: [ticket/10161] added fullstop to the end of sentence [ticket/10161] coding-guidelines.html updated [ticket/10161] all "e-mail" strings in language files changed to "email"
| * | | [ticket/10161] all "e-mail" strings in language files changed to "email"Senky2012-04-151-14/+14
| |/ / | | | | | | | | | | | | | | | | | | according to Oleg's comment: email is preferred by RFCs and probably the way of the future PHPBB3-10161
* | | Merge remote-tracking branch 'github-dhruv/ticket/10797' into developNils Adermann2012-04-201-0/+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-201-0/+1
| | | | | | | | | | | | | | | | | | | | | Language key RANK moved from memberlist to common. Removed from mcp language. PHPBB3-10797
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-04-051-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10508] Marked as read message now less specific.
| * \ \ 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
* | | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-04-041-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10607] Added 'Powered by' translation string. Conflicts: phpBB/adm/index.php phpBB/language/en/common.php
| * | | [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
* | | [feature/ajax] Generic error handling with a phpbb.alert boxIgor Wiedler2012-03-311-0/+2
| | | | | | | | | | | | PHPBB3-10270
* | | [ticket/10272] Renamed l-err-processing-req to l-timeout-processing-req.Callum Macrae2012-03-311-1/+1
| | | | | | | | | | | | PHPBB3-10272
* | | [ticket/10270] Removed all the inline language and HTML from the JS.Callum Macrae2012-03-311-0/+2
| | | | | | | | | | | | PHPBB3-10270
* | | [ticket/10270] Moved some HTML from the JavaScript to overall_footer.Callum Macrae2012-03-311-0/+2
| | | | | | | | | | | | PHPBB3-10270
* | | [ticket/10273] AJAXified approve / disapprove posts (in viewtopic).Callum Macrae2012-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This commit AJAXifies the moderator approval functionality, and adds it to viewtopic instead of the MCP. This commit has involved some language changes, which may affect fallbacks. PHPBB3-10273
* | | [ticket/10586] Extension front controllerDavid King2012-03-191-0/+4
| | | | | | | | | | | | | | | | | | Handle extension front pages PHPBB3-10586
* | | Merge remote-tracking branch 'imkingdavid/ticket/10535' into developOleg Pudeyev2012-02-031-2/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * imkingdavid/ticket/10535: [ticket/10535] Delete no longer needed email confirm language entries. [ticket/10535] Delete email confirm from installer [ticket/10535] Removed email confirm field from acp_users module [ticket/10535] Forgot a subsilver2 change. *doh* [ticket/10535] Removed email confirm from UCP, removed unused language entries [ticket/10535] Remove email confirm check on registration form
| * | | [ticket/10535] Delete no longer needed email confirm language entries.Oleg Pudeyev2012-02-031-2/+0
| | | | | | | | | | | | | | | | PHPBB3-10535
* | | | [ticket/9916] Updating header license and removing Version $Id$Unknown2011-12-311-2/+1
|/ / / | | | | | | | | | PHPBB3-9916
* | | [ticket/10345] Remove more useless 0-casesJoas Schilling2011-11-251-17/+0
| | | | | | | | | | | | PHPBB3-10345
* | | [ticket/10345] Remove some unused 0 casesJoas Schilling2011-11-251-6/+0
| | | | | | | | | | | | PHPBB3-10345
* | | [ticket/10345] Use the plural function in some more places.Joas Schilling2011-11-251-1/+11
| | | | | | | | | | | | | | | | | | | | | I added two function avatar_explanation_string() and avatar_error_wrong_size() for easier handling of the "pixels"-languages, as they are used quite often. PHPBB3-10345
* | | [ticket/10345] Make use of the plural function in some basic placesJoas Schilling2011-11-251-56/+103
| | | | | | | | | | | | PHPBB3-10345
* | | [ticket/10345] Remove '1 hour ago' string which conflicted with plural rulesJoas Schilling2011-11-251-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | This message was only viewed for 1 second anyway, as floor($delta / 60) is only 60 for 3600 to 3660, but the code was limited to $delta <= 3600 PHPBB3-10345
* | | [ticket/10345] Fix documentation on the new function and the switchJoas Schilling2011-11-251-0/+1
| | | | | | | | | | | | | | | | | | Also do not min/max the value, but throw an error on an invalid Plural rule. PHPBB3-10345
* | | [ticket/10345] Add a system to allow multiple plural formsJoas Schilling2011-11-251-0/+5
| |/ |/| | | | | | | | | See http://wiki.phpbb.com/Plural_Rules for explanation and examples. PHPBB3-10345
* | Merge branch 'develop-olympus' into developJoas Schilling2011-10-301-0/+1
|\ \ | |/
| * Merge remote-tracking branch 'remotes/marc1706/ticket/9778' into develop-olympusJoas Schilling2011-10-301-0/+1
| |\
| | * [ticket/9778] Replaced "Find a member" with "Enter username"Marc Alexander2011-10-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When clicking on the "Users and groups" tab in the ACP, the user is able to either enter the username of the member he wants to manage or click on "Find a member" below the input field. Unfortunately, the label for the input field is also "Find a member", which leads some users to the idea that they can search for users using that input field. By changing the label to "Enter username" this should be clear to the user. PHPBB3-9778
* | | Merge branch 'develop-olympus' into developNils Adermann2011-10-141-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT. [ticket/10278] Also timeout when receiving data over a slow connection. [ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds. [ticket/10278] Return with a timeout error when fread() or fgets() time out. [ticket/10278] Also set timeout on stream in get_remote_file().
| * | [ticket/10278] Return with a timeout error when fread() or fgets() time out.Andreas Fischer2011-08-251-0/+1
| | | | | | | | | | | | PHPBB3-10278
* | | Merge branch 'develop-olympus' into developNils Adermann2011-07-161-0/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10237] Also display login-box on subscribing [ticket/10237] Handle watching and unwatching the same way. [ticket/10237] Use confirm-box to handle unwatching a forum/topic actions Conflicts: phpBB/includes/functions_display.php
| * | [ticket/10237] Handle watching and unwatching the same way.Joas Schilling2011-07-111-0/+6
| | | | | | | | | | | | | | | | | | Also add some information to the confirm-box (forum_name / topic title) PHPBB3-10237
| * | [ticket/10237] Use confirm-box to handle unwatching a forum/topic actionsJoas Schilling2011-07-071-0/+2
| | | | | | | | | | | | PHPBB3-10237
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-05-231-1/+1
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/9630] Make language for moving posts clearer in quickmod/mcp.
| * | Merge remote-tracking branch 'p/ticket/9630' into develop-olympusAndreas Fischer2011-05-231-1/+1
| |\ \ | | | | | | | | | | | | | | | | * p/ticket/9630: [ticket/9630] Make language for moving posts clearer in quickmod/mcp.
| | * | [ticket/9630] Make language for moving posts clearer in quickmod/mcp.Oleg Pudeyev2011-05-021-1/+1
| | | | | | | | | | | | | | | | PHPBB3-9630
* | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-05-091-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9999] SEARCH_USER_POSTS is also used on viewtopic. Move to common. [ticket/9999] Remove broken and unused L_FORUM_FOLDER_ALT variable.
| * | | [ticket/9999] SEARCH_USER_POSTS is also used on viewtopic. Move to common.Andreas Fischer2011-05-091-0/+1
| |/ / | | | | | | | | | PHPBB3-9999
generated by cgit v1.2.1 (git 2.21.0) at 2026-05-20 12:58:05 +0000