aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | [ticket/13181] Replace database credentials with placeholders in sphinx confNils Adermann2014-10-181-1/+1
| |_|/ |/| | | | | | | | PHPBB3-13181
* | | [ticket/12796] Use dedicated lang varsPayBas2014-10-152-0/+3
| |/ |/| | | | | PHPBB3-12796
* | Merge pull request #2942 from Senky/ticket/12489Joas Schilling2014-10-071-1/+1
|\ \ | | | | | | | | | [ticket/12489] Description for Contact link in custom profile fields
| * | [ticket/12489] Language correctionJakub Senko2014-10-071-1/+1
| | | | | | | | | | | | PHPBB3-12489
| * | [ticket/12489] Add notice about %s wildcard in FIELD_IS_CONTACT_EXPLAINJakub Senko2014-09-181-1/+1
| | | | | | | | | | | | PHPBB3-12489
* | | Merge pull request #2307 from PayBas/ticket/12408Joas Schilling2014-10-061-1/+5
|\ \ \ | | | | | | | | | | | | [ticket/12408] Add quick setting for "default guest style" to ACP
| * | | [ticket/12408] Clarify the behavior of "override style"PayBas2014-09-151-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12408
| * | | [ticket/12408] Changed lang vars, added fieldset and removed "default"PayBas2014-09-151-3/+4
| | | | | | | | | | | | | | | | PHPBB3-12408
| * | | [ticket/12408] Add quick setting for "default guest style" to ACPPayBas2014-09-151-0/+3
| | | | | | | | | | | | | | | | PHPBB3-12408
* | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-09-241-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/13086] String replaces 50 with 20 Conflicts: phpBB/language/en/acp/email.php
| * | | | [ticket/13086] String replaces 50 with 20Mario Skouat2014-09-241-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13086
* | | | | Merge pull request #2844 from marc1706/ticket/12858Joas Schilling2014-09-241-26/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/12858] Remove hard-coded GMT from timezone drop-down and rename to UTC
| * | | | | [ticket/12858] Remove hardcoded language entries from timezone selectsMarc Alexander2014-09-171-26/+28
| | |/ / / | |/| | | | | | | | | | | | | PHPBB3-12858
* | | | | Merge pull request #2954 from rxu/ticket/13055Joas Schilling2014-09-242-0/+11
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | [ticket/13055] Fix string profile fields validation to support unicode
| * | | | [ticket/13055] Add string profile fields validation options to support unicoderxu2014-09-182-0/+11
| | | | | | | | | | | | | | | | | | | | PHPBB3-13055
* | | | | Merge pull request #2875 from PayBas/ticket/12961Joas Schilling2014-09-181-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12961] Add link in anti-spam ACP page which links directly to captchas in titania * PayBas/ticket/12961: [ticket/12961] Shorten ext-db link text [ticket/12961] Fix missing phpBB.com [ticket/12961] Remove target="_blank" and switch to <strong> [ticket/12961] Add additional link to the KB [ticket/12961] Move link to language file [ticket/12961] Refactor lang entry [ticket/12961] Change url to anti-spam-ext [ticket/12961] Change url to https://www.phpbb.com/go/anti-spam/ [ticket/12961] Add link in anti-spam ACP page to titania
| * | | | | [ticket/12961] Shorten ext-db link textPayBas2014-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12961
| * | | | | [ticket/12961] Fix missing phpBB.comPayBas2014-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't know how that happened. Weird PHPBB3-12961
| * | | | | [ticket/12961] Remove target="_blank" and switch to <strong>PayBas2014-08-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12961
| * | | | | [ticket/12961] Add additional link to the KBPayBas2014-08-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12961
| * | | | | [ticket/12961] Move link to language filePayBas2014-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12961
| * | | | | [ticket/12961] Refactor lang entryPayBas2014-08-141-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12961
| * | | | | [ticket/12961] Add link in anti-spam ACP page to titaniaPayBas2014-08-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12961
* | | | | | Merge pull request #2927 from Senky/ticket/13022Joas Schilling2014-09-181-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13022] "Return to advanced search" wrong assumption * Senky/ticket/13022: [ticket/13022] Language adjustments [ticket/13022] Remove ternary condition [ticket/13022] Condition Return to advanced search link
| * | | | | [ticket/13022] Language adjustmentsJakub Senko2014-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13022
* | | | | | [ticket/13068] Language correction in FIELD_IS_CONTACT_EXPLAINGiampaolo Falqui2014-09-181-1/+1
| |_|_|/ / |/| | | | | | | | | | | | | | PHPBB3-13068
* | | | | [ticket/13019] Rename deletion reason label.Cesar G2014-09-141-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13019
* | | | | [ticket/12976] Correctly use plurals for attachment count in UCP navigationJoas Schilling2014-09-091-0/+4
| |_|/ / |/| | | | | | | | | | | PHPBB3-12976
* | | | [ticket/12983] Correctly validate sorting options in the UCPJoas Schilling2014-09-051-0/+4
|/ / / | | | | | | | | | PHPBB3-12983
* | | [ticket/13003] Add missing language keysMario Skouat2014-08-211-0/+3
|/ / | | | | | | PHPBB3-13003
* | Merge remote-tracking branch 'github-marc1706/ticket/12822' into ↵Nils Adermann2014-08-111-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-marc1706/ticket/12822: [ticket/12822] Fix test runs of avatar manager_test [ticket/12822] Add method for deleting avatars and use confirm_box [ticket/12822] Remove "None" option from avatar select boxes
| * | [ticket/12822] Add method for deleting avatars and use confirm_boxMarc Alexander2014-08-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | The method will take care of the actual deletion process in the avatar manager. Additionally, we'll be using a confirm box while deleting the avatar to prevent users from accidentally deleting their avatars. PHPBB3-12822
| * | [ticket/12822] Remove "None" option from avatar select boxesMarc Alexander2014-08-071-1/+0
| | | | | | | | | | | | | | | | | | | | | This option is just used for deleting avatars for which we already have a checkbox. PHPBB3-12822
* | | [ticket/12938] Remove the 'Download all attachments' feature.Andreas Fischer2014-08-091-2/+0
|/ / | | | | | | PHPBB3-12938
* | Merge pull request #2729 from Nicofuma/ticket/12847Joas Schilling2014-08-071-0/+1
|\ \ | | | | | | | | | | | | | | | | | | [ticket/12847] Allow the extensions to say if they can be enabled * Nicofuma/ticket/12847: [ticket/12847] Allow the extensions to say if they can be enabled
| * | [ticket/12847] Allow the extensions to say if they can be enabledTristan Darricau2014-07-131-0/+1
| | | | | | | | | | | | PHPBB3-12847
* | | Merge pull request #2772 from dhruvgoel92/ticket/12656Andreas Fischer2014-07-281-5/+39
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12656] Translate existing CLI commands * dhruvgoel92/ticket/12656: [ticket/12656] Fix typo for "purged extension" [ticket/12656] Fix syntax in language file [ticket/12656] Fix typo [ticket/12656] Use utf8 ’ instead of escaping ' [ticket/12656] Use lang keys for all CLI strings [ticket/12656] Use lang keys for CLI command descriptions
| * | | [ticket/12656] Fix typo for "purged extension"Dhruv2014-07-271-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12656
| * | | [ticket/12656] Fix syntax in language fileDhruv2014-07-241-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12656
| * | | [ticket/12656] Use utf8 ’ instead of escaping 'Dhruv2014-07-241-5/+5
| | | | | | | | | | | | | | | | PHPBB3-12656
| * | | [ticket/12656] Use lang keys for all CLI stringsDhruv2014-07-231-1/+24
| | | | | | | | | | | | | | | | PHPBB3-12656
| * | | [ticket/12656] Use lang keys for CLI command descriptionsDhruv2014-07-231-6/+17
| | | | | | | | | | | | | | | | PHPBB3-12656
* | | | Merge pull request #2733 from n-aleha/ticket/12851Andreas Fischer2014-07-231-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | [ticket/12851] Fix the Font colour button title * n-aleha/ticket/12851: [ticket/12851] Fix the Font colour button title
| * | | [ticket/12851] Fix the Font colour button titlen-aleha2014-07-211-1/+1
| |/ / | | | | | | | | | PHPBB3-12851
* | | Merge pull request #2755 from Elsensee/ticket/12748Andreas Fischer2014-07-181-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12748] Fix typo in terms of use * Elsensee/ticket/12748: [ticket/12748] Fix typo in terms of use
| * | | [ticket/12748] Fix typo in terms of useOliver Schramm2014-07-181-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12748
* | | | [ticket/12663] Have cli.php language file at top level; unrelated to ACP.Andreas Fischer2014-07-171-0/+0
| | | | | | | | | | | | | | | | PHPBB3-12663
* | | | [ticket/12663] Extract CLI language string into their own fileCarlo2014-07-172-7/+44
|/ / / | | | | | | | | | PHPBB3-12663
* | | Merge pull request #2576 from carlo94it/ticket/12685Tristan Darricau2014-07-171-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12685] New CLI container for load extensions * carlo94it/ticket/12685: [ticket/12685] Setup class loader for extensions only if not in safe mode [ticket/12685] Replace getParameterOption with hasParameterOption [ticket/12685] Do not dump container [ticket/12685] Override getDefaultInputDefinition() [ticket/12685] Removed unused USE statement [ticket/12685] Inject console.command_collection instead of the container [ticket/12685] Add a new line [ticket/12685] Container is dumped by default [ticket/12685] Removed spaces [ticket/12685] Add --safe-mode [ticket/12685] We need extensions enabled [ticket/12685] Add space after foreach [ticket/12685] Add console collection and fixing CLI
| * | | [ticket/12685] Add --safe-modeCarlo2014-07-151-0/+1
| |/ / | | | | | | | | | PHPBB3-12685