aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/common.php
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | 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
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-03-121-1/+2
|\ \ \ | |/ / | | | | | | | | | | | | * develop-olympus: [ticket/8802] Make FORUMS_MARKED more generic as it is also used for subforums. [ticket/8802] Rename "Mark forums read" to "Mark subforums read" for subforums.
| * | [ticket/8802] Make FORUMS_MARKED more generic as it is also used for subforums.Andreas Fischer2011-03-101-1/+1
| | | | | | | | | | | | PHPBB3-8802
| * | [ticket/8802] Rename "Mark forums read" to "Mark subforums read" for subforums.Andreas Fischer2011-03-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clicking "Mark forums read" when not browsing on the index page only marks all subforums (and sub-sub forums etc.) read, topics in the current forum have to marked seperately by clicking the "Mark topics read" link. Let's indicate this circumstance by using the word "subforums". PHPBB3-8802
* | | [ticket/6109] MSN is now called Windows Live Messenger (WLM)Joas Schilling2011-01-101-3/+3
| | | | | | | | | | | | | | | | | | Replaced the logo with the current one and changed the language strings. PHPBB3-6109
* | | Merge branch 'ticket/VSE/9532' into developAndreas Fischer2010-12-281-0/+1
|\ \ \ | | | | | | | | | | | | | | | | * ticket/VSE/9532: [ticket/9532] Simplified page titles by removing meaningless text.
| * | | [ticket/9532] Simplified page titles by removing meaningless text.Matt2010-05-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed View Forum, View Topic, added pagination to forum and topic page titles, also moved the Site Name to the end of title for forum and topic view pages. PHPBB3-9532
* | | | [ticket/9556] Drop php closing tags, add trailing newlineIgor Wiedler2010-11-111-2/+0
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closing tags converted using Oleg's script. remove-php-end-tags.py -a . Trailing newlines added using the following where $ext is file extension. find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s; Extensions: php, css, html, js, xml. PHPBB3-9556
* | | [ticket/9752] Mark unused language variable as such.Chris Smith2010-11-071-1/+1
| | | | | | | | | | | | PHPBB3-9752
* | | [ticket/9752] Change reference to 'confirmation code' to be more generic.narqelion2010-11-071-1/+1
| | | | | | | | | | | | | | | | | | Related to 71b35a924f7a5f517e8d07d975582c27813f5797 PHPBB3-9752
* | | [ticket/9478] Validate maximum number of allowed recipients per PM value.rxu2010-10-251-0/+6
| |/ |/| | | | | | | | | Do not allow to enter the value larger than it's allowed by MySQL mediumnt(8). PHPBB3-9478
* | [ticket/7720] Fix alternative image-description for unread posts.Joas Schilling2010-07-141-3/+6
| | | | | | | | | | | | | | | | Changed the wrong word "new" to "unread" as that is, what we show with the red-icons, not whether the post is new or not. Language variables were kept for backwards compatibility. PHPBB3-7720
* | Merge branch 'ticket/nickvergessen/9135' into develop-olympusNils Adermann2010-05-301-0/+1
|\ \ | | | | | | | | | | | | * ticket/nickvergessen/9135: [ticket/9135] Fix report-icon for moderators in PM folders.