aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge remote-tracking branch 'rxu/ticket/10419' into develop-olympusAndreas Fischer2011-11-151-0/+10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * rxu/ticket/10419: [ticket/10419] Reword the language strings [ticket/10419] Reword some language strings, minor code changes [ticket/10419] Add mbstring PHP ini parameters checks to ACP
| | * | [ticket/10419] Reword the language stringsrxu2011-11-151-8/+8
| | | | | | | | | | | | | | | | PHPBB3-10419
| | * | [ticket/10419] Reword some language strings, minor code changesrxu2011-11-051-4/+4
| | | | | | | | | | | | | | | | PHPBB3-10419
| | * | [ticket/10419] Add mbstring PHP ini parameters checks to ACPrxu2011-10-181-0/+10
| | | | | | | | | | | | | | | | PHPBB3-10419
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-141-0/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/9361] View correct error messages when editing account information
| * | | Merge remote-tracking branch 'nickvergessen/ticket/9361' into develop-olympusAndreas Fischer2011-11-141-0/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/9361: [ticket/9361] View correct error messages when editing account information
| | * | | [ticket/9361] View correct error messages when editing account informationJoas Schilling2011-11-141-0/+3
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the "current password" is only checked, when you change something. This means you get "Your profile has been updated." although you enter a wrong password. I also added proper error messages, when you leave the confirm fields empty, and sorted them in the order of the field appearances on the html page. PHPBB3-9361
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-141-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9066] Move regex into get_preg_expression function and add tests [ticket/9066] Disallow some database prefix to prevent same errors and problems
| * | | Merge remote-tracking branch 'nickvergessen/ticket/9066' into develop-olympusAndreas Fischer2011-11-141-0/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/9066: [ticket/9066] Move regex into get_preg_expression function and add tests [ticket/9066] Disallow some database prefix to prevent same errors and problems
| | * | | [ticket/9066] Disallow some database prefix to prevent same errors and problemsJoas Schilling2011-11-131-0/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | With this patch database prefixes must not be empty and only contain alphanumeric characters, numbers and underscores. PHPBB3-9066
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-131-0/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10087] Organize bans in acp_baninto optgroups
| * | | Merge remote-tracking branch 'igorw/ticket/10087' into develop-olympusAndreas Fischer2011-11-131-0/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * igorw/ticket/10087: [ticket/10087] Organize bans in acp_baninto optgroups
| | * | | [ticket/10087] Organize bans in acp_baninto optgroupsIgor Wiedler2011-11-111-0/+3
| | |/ / | | | | | | | | | | | | PHPBB3-10087
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-131-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/8616] Include old U_INBOX var for BC [ticket/8616] Rename U_INBOX to U_VIEW_MESSAGE [ticket/8616] Direct links in pm notification emails
| * | | Merge remote-tracking branch 'igorw/ticket/8616' into develop-olympusAndreas Fischer2011-11-131-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/8616: [ticket/8616] Include old U_INBOX var for BC [ticket/8616] Rename U_INBOX to U_VIEW_MESSAGE [ticket/8616] Direct links in pm notification emails
| | * | | [ticket/8616] Rename U_INBOX to U_VIEW_MESSAGEIgor Wiedler2011-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-8616
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/10410' into developAndreas Fischer2011-11-011-2/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10410: [ticket/10410] Add option to display users in their first teampage group
| * | | | | [ticket/10410] Add option to display users in their first teampage groupJoas Schilling2011-10-281-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10410
* | | | | | 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 developIgor Wiedler2011-10-291-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10166] No longer refer to previous mail in admin_welcome_activated.txt
| * | | | | | [ticket/10166] No longer refer to previous mail in admin_welcome_activated.txtAndreas Fischer2011-10-291-1/+1
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It does not make much sense to say "the username you received in a previous e-mail" when the message itself contains the username. PHPBB3-10166
* | | | | | Merge remote-tracking branch 'VSEphpbb/ticket/10390' into developOleg Pudeyev2011-10-201-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * VSEphpbb/ticket/10390: [ticket/10390] Revert back to escaped script tags inside document.write [ticket/10390] Fix wording: fallback should be fall back [ticket/10390] Serve jQuery from Google CDN Yes/No button in ACP [ticket/10390] Use simpler HTML5 compliant js for the jQuery fallback [ticket/10390] Drop http protocol for Microsoft's CDN option [ticket/10390] Reword the language for jQuery host/server options [ticket/10390] Fix a type-o - captialize AJAX [ticket/10390] Improve the jQuery CDN url generation function [ticket/10390] Move jQuery version definition [ticket/10390] Allow option for jQuery to be hosted by a remote CDN Conflicts: phpBB/install/database_update.php
| * | | | | | [ticket/10390] Fix wording: fallback should be fall backMatt Friedman2011-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10390
| * | | | | | [ticket/10390] Serve jQuery from Google CDN Yes/No button in ACPMatt Friedman2011-09-271-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jQuery will now be available via remote CDN from Google. Microsoft and jQuery CDNs have been removed, so we can simplify this option for the user. Default mode is NO so the copy of jQuery included with phpBB is served by default. PHPBB3-10390
| * | | | | | [ticket/10390] Reword the language for jQuery host/server optionsMatt Friedman2011-09-271-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reword some of the language used for the description and pull-down options to try and make it more clear to users that they have the option to use jQuery from their own server with the copy included with phpBB, or from one of the remote CDN servers. PHPBB3-10390
| * | | | | | [ticket/10390] Fix a type-o - captialize AJAXMatt Friedman2011-09-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AJAX should be capitalized where it appears in the ACP as the option: "Google AJAX API CDN" PHPBB3-10390
| * | | | | | [ticket/10390] Allow option for jQuery to be hosted by a remote CDNMatt Friedman2011-09-261-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an option to the ACP so admins can choose to host jQuery from the local version shipped with phpBB, or via a popular CDN. PHPBB3-10390
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-171-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9525] Minimum post length 0 is accepted but not working.
| * | | | | | Merge remote-tracking branch 'nickvergessen/ticket/9525' into develop-olympusAndreas Fischer2011-10-171-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/9525: [ticket/9525] Minimum post length 0 is accepted but not working.
| | * | | | | | [ticket/9525] Minimum post length 0 is accepted but not working.Joas Schilling2011-10-141-1/+1
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | PHPBB3-9525
* | | | | | | 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().
| * | | | | Merge remote-tracking branch 'github-bantu/ticket/10278' into develop-olympusNils Adermann2011-10-141-0/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10278: [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 developAndreas Fischer2011-10-131-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/8094] Remove ambiguity of "phpBB has no categories"
| * | | | Merge remote-tracking branch 'igorw/ticket/8094' into develop-olympusAndreas Fischer2011-10-131-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/8094: [ticket/8094] Remove ambiguity of "phpBB has no categories"
| | * | | | [ticket/8094] Remove ambiguity of "phpBB has no categories"Igor Wiedler2011-10-131-1/+1
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-8094
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-131-1/+1
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | * develop-olympus: [ticket/10275] Remove incorrect password information from FAQ
| * | | [ticket/10275] Remove incorrect password information from FAQIgor Wiedler2011-10-131-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | FAQ contains instructions to find the password in the registration e-mail. We no longer send the password on registration. So let's just remove this incorrect piece of information from the FAQ. PHPBB3-10275
* | | [feature/remove-db-styles] Update language to reflect removal of db storage.Chris Smith2011-09-201-18/+6
| | | | | | | | | | | | PHPBB3-9741
* | | [feature/remove-db-styles] Mark log entrys as deprecated.Chris Smith2011-09-201-0/+6
| | | | | | | | | | | | PHPBB3-9741
* | | [feature/remove-db-styles] Add error if template/theme file is unwritable.Chris Smith2011-09-201-0/+1
| | | | | | | | | | | | PHPBB3-9741
* | | [feature/remove-db-styles] Removed database storage of style components.Chris Smith2011-09-201-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bulk of database storage of templates is removed, rendering template stored in the database as useless. Theme database storage is reduced to a skeleton for full removal soon. This commit was cherry picked from the old feature/ascraeus-experiment branch the old commit hash is 0dbe7e3b6cd450342d3c566eb2caf36ca1b5db8e. PHPBB3-9741
* | | [feature/remove-imagesets] Changing admin control panel styles moduleVjacheslav Trushkin2011-09-032-58/+5
| | | | | | | | | | | | | | | | | | Removing imagesets. Changing admin control panel styles module PHPBB3-10336
* | | [feature/remove-imagesets] Changing database structureVjacheslav Trushkin2011-09-031-1/+1
| | | | | | | | | | | | | | | | | | Removing imagesets. Changing database structure PHPBB3-10336
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-07-301-2/+2
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/8173] Removed some redundant code in the BBCode JavaScript.
| * | Merge remote-tracking branch 'callumacrae/ticket/8173' into develop-olympusOleg Pudeyev2011-07-301-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * callumacrae/ticket/8173: [ticket/8173] Removed some redundant code in the BBCode JavaScript. Conflicts: phpBB/adm/style/acp_users_signature.html
| | * | [ticket/8173] Removed some redundant code in the BBCode JavaScript.Callum Macrae2011-07-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following code can be found in the ACP, when changing a user's signature: t: '{ BBCODE_T_HELP }', The code that uses it and the code that produces it were changed or removed a while ago, but this code remained. In 2c4c1f9, the accesskey for the list item button was changed to y from t, explaining the origin of the redundant code - although it wasn't being used then, either. This commit also changes the helpline code of "[*]" to y, as the access key is y, so this makes it more consistent. PHPBB3-8173
* | | | 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
generated by cgit v1.2.1 (git 2.21.0) at 2025-08-19 16:35:39 +0000