aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/common.php
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | [ticket/11328] Add language variables for buttonsVjacheslav Trushkin2013-01-161-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New language variables for buttons PHPBB3-11328
| | * | | [ticket/11201] Remove MSN/WLM fieldsJoas Schilling2013-01-111-3/+0
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | WLM will be shutdown in March 2013. Skype is the new replacement. But as Skype uses a different login ID and service, the values in this field are useless. So we can safely remove the field and the links/functions we create. PHPBB3-11201
| * | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathaniel Guse2012-12-121-0/+2
| |\ \ \ | | |/ /
| * | | Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103Nathan Guse2012-12-071-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/install/database_update.php phpBB/styles/prosilver/template/ucp_prefs_personal.html phpBB/styles/subsilver2/template/ucp_prefs_personal.html
| * \ \ \ Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathan Guse2012-11-201-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/config/services.yml phpBB/index.php
| * \ \ \ \ Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103Nathaniel Guse2012-11-101-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/install/schemas/mssql_schema.sql phpBB/report.php phpBB/styles/prosilver/template/ucp_prefs_personal.html phpBB/styles/subsilver2/template/ucp_prefs_personal.html
| * | | | | | [ticket/11103] Message of no notifications if you have noneNathan Guse2012-10-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| * | | | | | [ticket/11103] U_VIEW_ALL_NOTIFICATIONS LinkNathan Guse2012-10-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| * | | | | | [ticket/11103] Make sure notifications are marked read when clicking themNathan Guse2012-10-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | How do we do this? If an item is unread, the URL to view that item will be the URL to mark it as read (index.php?mark_notification=$id). When the URL is visited it marks the item as read and redirects them to the correct URL for the item. If the item is read, the URL is directly to the item. Prettify the html output PHPBB-11103
| * | | | | | [ticket/11103] Fix some language stringsNathan Guse2012-10-141-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Newlines at end of email files PHPBB3-11103
| * | | | | | [ticket/11103] Finishing up report post/pm and adding report closedNathan Guse2012-10-111-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| * | | | | | [ticket/11103] Finishing up PM Report notificationsNathan Guse2012-10-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| * | | | | | [ticket/11103] Working on report notifications (post/pm)Nathan Guse2012-10-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| * | | | | | [ticket/11103] Do not abbreviate template outputNathan Guse2012-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| * | | | | | [ticket/11103] UCP Notification Options can now be setNathan Guse2012-09-271-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| * | | | | | [ticket/11103] Prettify the output for prosilver.Nathaniel Guse2012-09-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a way to mark items read from the output list. PHPBB3-11103
| * | | | | | [ticket/11103] Topic/Post in queue notificationNathan Guse2012-09-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, bug fixes and cleanup PHPBB3-11103
| * | | | | | [ticket/11103] Topic and post dis/approval notificationsNathan Guse2012-09-151-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the formatted title function, plaintext is not needed since email templates are used Fix a number of bugs. PHPBB3-11103
| * | | | | | [ticket/11103] Add/Update/Mark Read functions accept an array for the typeNathan Guse2012-09-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This saves a lot of code in some areas (where the same data is sent, just for different types) Notifications for bookmarks PHPBB3-11103
| * | | | | | [ticket/11103] Quote notificationsNathan Guse2012-09-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| * | | | | | [ticket/11103] Add topic ID to view post URLNathan Guse2012-09-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| * | | | | | [ticket/11103] Use the language system, topic notificationsNathan Guse2012-09-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
* | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ↵Joas Schilling2012-12-201-1/+5
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-1-permission-rebase * 'develop' of https://github.com/phpbb/phpbb3: (544 commits) [feature/events] Fix improperly named event in documentation [feature/events] Fix alphabetization of events [feature/events] Put events in alphabetical order [feature/events] Make EVENTS.md lowercase [ticket/11285] Use more granularity in dependency checks in compress test [ticket/10880] The m_approve permisson no longer implies f_noapprove. [ticket/10803] Show failure message until user dismisses it [ticket/10954] Add missing semi-colon [ticket/10954] Make sure to mark subforums unread and add small fixes [feature/events] Use ` to escape HTML tags in markdown [feature/events] Remove HTML tags from markdown so they don't get parsed [ticket/10954] Miscellaneous coding fixes [feature/events] Remove extraneous space [feature/events] Add markdown template event documentation file [feature/events] forumlist_body_last_post_title_after -> _prepend (subsilver2) [feature/events] Fix overall_footer_end -> overall_footer_after (subsilver2) [feature/events] Fix typo in event name [ticket/10763] Use self when calling get_extension() in filespec class [feature/events] Fix more subsilver2 events [feature/events] Fix some subsilver2 events ... Conflicts: phpBB/install/database_update.php phpBB/posting.php
| * | | | | | 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
* | | \ \ Merge remote-tracking branch 'remotes/phpbb/develop' into ↵Joas Schilling2012-11-101-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-merge-develop # By Oleg Pudeyev (45) and others # Via Oleg Pudeyev (42) and others * remotes/phpbb/develop: (289 commits) [ticket/10865] Use code tags for install/database_update.php. [ticket/10865] Should have been a slash. [ticket/10780] Use L_COLON on LDAP page. [ticket/10780] Use L_COLON on search backend ACP pages. [ticket/10780] Use L_COLON for "download all attachments". [ticket/10780] Use colon from language in ucp_pm_compose.php where possible. [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html. [ticket/10780] Replace colon usage in adm template output with {L_COLON} [ticket/10780] Replace colon usage in template output with {L_COLON} [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus] [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [ticket/10172] Show prosilver birthday list even if there are no birthdays. [ticket/11050] make all properties protected in all search backends [ticket/11050] get_common_words() returns empty array for sphinx [ticket/11050] fix tidied search query docblock language [ticket/11050] fix min/max length docblock language [ticket/11050] multi sentences separated by period in docblocks [ticket/11050] fix separated spelling in docblock [ticket/11050] fix split words doc block language [ticket/11050] remove class word from docblocks ... Conflicts: phpBB/install/database_update.php phpBB/install/schemas/mssql_schema.sql phpBB/language/en/acp/permissions_phpbb.php phpBB/styles/prosilver/template/posting_editor.html
| * | | | [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/soft-delete] Use JS to display softdeleted/ignored postsJoas Schilling2012-11-091-1/+4
| | | | | | | | | | | | | | | | PHPBB3-9567
* | | | [feature/soft-delete] Fix naming of soft delete (we wont use that in the UI)Joas Schilling2012-11-031-1/+1
| | | | | | | | | | | | | | | | PHPBB3-9567
* | | | [feature/soft-delete] Update restoring feature to use ajax if requested.Joas Schilling2012-08-291-0/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | Also fixes the mcp as a hole: - displayes a success message - gives a link to the post, if only one was restored PHPBB3-9657
* | | [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
generated by cgit v1.2.1 (git 2.21.0) at 2026-03-31 01:47:22 +0000