aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
Commit message (Collapse)AuthorAgeFilesLines
* Merge PR #785 branch 'develop-olympus' into developOleg Pudeyev2012-05-111-1/+2
|\ | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10835] changing "e-mail" to "email" [ticket/10835] changing CURRENT_CHANGE_PASSWORD_EXPLAIN language entry [ticket/10835] fixing misleading message in UCP Conflicts: phpBB/language/en/ucp.php
| * [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/10847] fixing all misspelled "dependant" to "dependent"Senky2012-04-301-1/+1
| | | | | | | | | | | | PHPBB3-10847
* | | Merge PR #753 branch 'Senky/ticket/10161' into developOleg Pudeyev2012-04-2629-143/+143
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * 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-1529-143/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-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/10813] Installer now checks json extensionriadhchtara2012-04-191-0/+2
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | Installer now checks json extension and cannot continue without it. Changes are made in phpBB/install/install_install.php where the checking for json is added and to phpBB/language/en/install.php where 2 new keys for the messages that would be displayed are also added. PHPBB3-10813
* | | Merge PR #718 branch 'develop-olympus' into developOleg Pudeyev2012-04-071-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | * develop-olympus: [ticket/10764] FAQ now mentions Area51 instead of SourceForge [ticket/10764] FAQ now mentions GitHub instead of SourceForge
| * | [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 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
* | | | [ticket/10650] Revert merge of 'rahulr92/ticket/10650' into developOleg Pudeyev2012-04-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pull request (#654) was merged a little too quickly. In particular, display_last_subject per-forum option needs consensus. This reverts commit b1fb34a4d7e446768b9f66ba6dd359173cd2a5fb, reversing changes made to 7d6b289671c51694f17dd5f9849abf2534b55e59. PHPBB3-10650
* | | | Merge remote-tracking branch 'rahulr92/ticket/10650' into developDavid King2012-04-041-0/+2
|\ \ \ \
| * | | | [ticket/10650] Changed language files and forumlistRahul2012-04-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The entry in languages have been changed from title to subject. Also the IF condition in forumlist_body.html has been properly intented. PHPBB3-10650
| * | | | [ticket/10650] Displaying last topic on forum listRahul2012-04-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The most recent topic title of the forum can now be displayed on the board index. An option is provided in the ACP under the 'General Forum Setting' which allows the admin to enable or disable this feature. PHPBB3-10650
* | | | | 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
* | | Merge pull request #670 from imkingdavid/feature/qrpreviewrxu2012-04-011-1/+1
|\ \ \ | | | | | | | | [feature/qrpreview] Preview from Quick Reply
| * | | [feature/qrpreview] Preview from Quick ReplyDavid King2012-03-301-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10726
* | | | Merge remote-tracking branch 'brunoais/ticket/10705' into developDavid King2012-03-311-1/+1
|\ \ \ \
| * | | | [ticket/10705] Change WARNINGS_ZERO_TOTAL in en languageBruno Ais2012-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Located the WARNINGS_ZERO_TOTAL in the language and replaced it with NO_WARNINGS PHPBB3-10705
* | | | | Merge branch 'develop-olympus' into developIgor Wiedler2012-03-311-0/+1
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [Ticket/10675] Correct language string ATTACH_DISK_FULL [feature/event-dispatcher] Adding composer.phar to .gitignore for olympus [ticket/10675] Add disk full language string when posting attachments
| * | | | 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
* | | | | [feature/merging-style-components] Renaming "delete" to "uninstall" for stylesVjacheslav Trushkin2012-03-311-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing from "delete" to "uninstall" in acp_styles to avoid confusing users PHPBB3-10632
* | | | | Merge branch 'develop' into feature/merging-style-componentsVjacheslav Trushkin2012-03-316-13/+29
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (175 commits) [feature/ajax] Remove strange non-breaking spaces from approve button [feature/ajax] Add entirely unrelated but nice newlines [feature/ajax] Unify phpbb_json_response instantiation [feature/ajax] Fix acp_styles activate_deactivate ajax callback name [feature/ajax] Send correct activate/deactivate JSON response in acp_profile [ticket/10270] Alter background colors for posts [feature/ajax] Remove not working module enable/disable ajax code [feature/ajax] Replace static call to phpbb_request with OO [feature/ajax] Remove quick-reply AJAX handling until we have something good [ticket/10270] Changing close button for ajax popups [ticket/10270] Disabling links in disappearing content [ticket/10291] Fixed an AJAX bug on quick reply form submit. [ticket/10273] Fixed accepting / denying posts AJAX. [ticket/10272] Removed code that was prevent event propogation in AJAX. [ticket/10291] Fixed a bug in the quick reply AJAX. [feature/ajax] Handle acp_modules error cases with JSON response [feature/ajax] Fix filter check, quick mod tools data-attribute [feature/ajax] Use the error handler [feature/ajax] Generic error handling with a phpbb.alert box [feature/ajax] Change filter semantics, some minor adjustments ... Conflicts: phpBB/adm/style/acp_styles.html phpBB/includes/acp/acp_styles.php
| * | | | [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/10271] AJAXified buttons on acp_main.Callum Macrae2012-03-311-0/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-10271
| * | | | [ticket/10271] AJAXified the styles tab in the ACP.Callum Macrae2012-03-311-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10271
| * | | | [ticket/10271] AJAXified various deletions in the ACP.Callum Macrae2012-03-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following places have had deletion AJAXified: * Smilies and icons * Word censors * BBCodes * Attachment groups * Groups * Admin / User / Moderator / Forum roles * Report / denial reasons * Module management * Custom profile fields PHPBB3-10271
| * | | | [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-312-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Merge remote-tracking branch 'imkingdavid/ticket/10727' into developVjacheslav Trushkin2012-03-311-2/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * imkingdavid/ticket/10727: [ticket/10727] Do not hide Quick Reply with javascript on prosilver
| | * | | | [ticket/10727] Do not hide Quick Reply with javascript on prosilverDavid King2012-03-241-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10727
| * | | | | Merge branch 'develop-olympus' into developDavid King2012-03-292-10/+10
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | Conflicts: phpBB/language/en/acp/common.php
| | * | | | [ticket/10129] Remove apostrophes and plurals in ACP user management -> ↵HTF2012-03-242-10/+10
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | permissions language file as per ticket. PHPBB3-10129
* | | | | [feature/merging-style-components] Changing acp_styles textVjacheslav Trushkin2012-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing acp styles welcome message a little bit. PHPBB3-10632
* | | | | Merge remote-tracking branch 'upstream/develop' into ↵Vjacheslav Trushkin2012-03-293-2/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/merging-style-components * upstream/develop: (65 commits) [ticket/10730] Added label tag around "select" text in post splitting UI [ticket/10732] Add config_dev.php and config_test.php to .gitignore [ticket/10586] Added space in if statement [ticket/10586] Tidy up comments [task/php5.3] Updated range of tested PHP versions [task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed to PHP 5.3.2 [task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2 [ticket/10723] Stop Travis running all tests on sqlite [ticket/10703] Added a condition to check if ext directory exists [task/travis] Refactor php version check for dbunit install [task/travis] Exclude functional and slow tests [ticket/10719] Revert "Skip functional tests on PHP 5.2" [task/travis-develop2] Update version from 5.3 to 5.3.2 [task/travis] Dropping support for 5.2 in develop branch [task/travis] Some more small travis fixes [task/travis] Rename travis phpunit config files [task/travis] Fixing some travis issues [ticket/10684] Adjust function and parameter name, minor changes. [task/travis] Add automated testing to readme [task/travis] Removing development information ... Conflicts: phpBB/install/database_update.php
| * | | | Merge remote-tracking branch 'imkingdavid/ticket/10586' into developIgor Wiedler2012-03-281-0/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * imkingdavid/ticket/10586: [ticket/10586] Added space in if statement [ticket/10586] Tidy up comments [ticket/10586] Tests finally work (thanks naderman) [ticket/10586] Correctly purge board cache and don't rename install directory [ticket/10586] trying to get tests to work [ticket/10586] more work on getting tests to pass [ticket/10586] Tests are coming along, just a little more to go [ticket/10586] Rename install directory back to install/ after tests [ticket/10586] browse tests now work, but mine dont. at least we are making progress [ticket/10586] initial work on copying fixtures. Note that this depends on 10706 [ticket/10586] Adding the extensions used by the tests [ticket/10586] Now tests run, but fail. But here is what I have. [ticket/10586] some bootstrap additions and test changes to try and make it work [ticket/10586] test stuff. does not work yet, still need to put phpBB objects in bootstrap.php [ticket/10586] Copy/paste fail fixed [ticket/10586] Sanitize periods from class names, use manager to get path. [ticket/10586] Removed file_exists() check because class_exists() covers that. [ticket/10586] Extension front controller
| | * | | | [ticket/10586] Extension front controllerDavid King2012-03-191-0/+4
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | Handle extension front pages PHPBB3-10586
generated by cgit v1.2.1 (git 2.21.0) at 2025-10-09 11:26:44 +0000