aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/common.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'p/feature/template-events' into developDavid King2012-12-101-0/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Oleg Pudeyev (36) and others # Via Oleg Pudeyev * p/feature/template-events: (47 commits) [feature/template-events] Pass arguments in correct order. [feature/template-events] Order extensions in mock extension manager. [feature/template-events] Changes per imkingdavid's review. [feature/template-events] Make style names private on template. [feature/template-events] Test for event that is defined in parent style only. [feature/template-events] Specify style names, add inheritance tests. [feature/template-events] Normalize expected directory trees. [feature/template-events] Allow dataset to be correctly selectable. [feature/template-events] Dataset for template event testing with inheritance. [feature/template-events] Use style names array in template filter. [feature/template-events] Generate style names array in set_style. [feature/template-events] Convert a single style name to array of them. [feature/template-events] Chase dependency injection for template context. [feature/template-events] Adjust template events test to use the dataset. [feature/template-events] Create a dataset for template event tests. [feature/template-events] Indentation fix. [feature/template-events] Cosmetic changes. [feature/template-events] Wording: wrongly -> improperly. [feature/template-events] Indentation fix. [feature/template-events] Rename template_name to style_name. ...
| * [feature/template-events] Changes per imkingdavid's review.Oleg Pudeyev2012-11-171-0/+1
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Wording: wrongly -> improperly.Nathan Guse2012-11-171-1/+1
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Handle incorrect template event identifiersErik Frèrejean2012-11-171-0/+1
| | | | | | | | | | | | | | | | If the template event identifier is wrongly formatted phpBB will triggern an `E_USER_NOTICE` if the `DEBUG` constant is set, otherwise the location is ignored. PHPBB3-9550
* | Merge PR #1065 branch 'dhruvgoel92/ticket/10771' into developOleg Pudeyev2012-12-021-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | * dhruvgoel92/ticket/10771: [ticket/10771] fix remember me language [ticket/10771] use remember me in ucp [ticket/10771] use remember me in acp [ticket/10771] changed value in help_faq.php [ticket/10771] Using Remember Me instead of autologin or persistent keys
| * [ticket/10771] Using Remember Me instead of autologin or persistent keysHari Sankar R2012-12-021-1/+1
| | | | | | | | | | | | | | Changed language variable LOG_ME_IN's value to "Remember me" PHPBB3-10771
* | Merge PR #1074 branch 'develop-olympus' into developOleg Pudeyev2012-11-161-0/+2
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11192] Merge dataProvider arrays because the test is the same now. [ticket/11192] Update $value parameter description to support other types. [ticket/11192] Mark negative byte numbers as unsupported. [ticket/11192] Test strings not converted to int/float before. [ticket/11192] Also test strings, e.g. sums returned by the database. [ticket/11192] Also test powers of 10 / 1000. [ticket/11192] Add tests. [ticket/11192] Add Tebibyte to get_formatted_filesize().
| * [ticket/11192] Add Tebibyte to get_formatted_filesize().Andreas Fischer2012-11-111-0/+2
| | | | | | | | PHPBB3-11192
| * Merge remote-tracking branch 'github-dhruv/ticket/10797' into develop-olympusNils 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/10780] Replace colon usage in template output with {L_COLON}Nathan Guse2012-11-101-0/+1
| | | | | | | | | | | | | | | | | | | | | Replace all the instances (I could find) where the colon is displayed to the user with {L_COLON} so it can be localised. PHPBB3-10780
* | | [feature/attach-dl] Removed the use of some abbreviationsFyorl2012-08-201-1/+1
| | | | | | | | | | | | PHPBB3-11042
* | | [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
| |\
generated by cgit v1.2.1 (git 2.21.0) at 2026-03-31 21:31:45 +0000