diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-07-23 15:50:54 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-07-23 15:50:54 +0200 |
| commit | 9480a5e5123518091055ddc8eb1bf137d8243eb0 (patch) | |
| tree | fef3ed96d016e3123d84ec54a00eaeab6f285b66 /phpBB/language/en/acp/profile.php | |
| parent | 147a125f69683f2f87017bf9870c804a9f09c3d3 (diff) | |
| parent | 7b98e75ec3ab06d295834d5b48f85ad4b8744742 (diff) | |
| download | forums-9480a5e5123518091055ddc8eb1bf137d8243eb0.tar forums-9480a5e5123518091055ddc8eb1bf137d8243eb0.tar.gz forums-9480a5e5123518091055ddc8eb1bf137d8243eb0.tar.bz2 forums-9480a5e5123518091055ddc8eb1bf137d8243eb0.tar.xz forums-9480a5e5123518091055ddc8eb1bf137d8243eb0.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1
[ticket/10965] Introduce a new profile field option to display no value
Conflicts:
phpBB/includes/acp/acp_profile.php
Diffstat (limited to 'phpBB/language/en/acp/profile.php')
| -rw-r--r-- | phpBB/language/en/acp/profile.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php index 92e642a993..8509845860 100644 --- a/phpBB/language/en/acp/profile.php +++ b/phpBB/language/en/acp/profile.php @@ -132,6 +132,8 @@ $lang = array_merge($lang, array( 'SAVE' => 'Save', 'SECOND_OPTION' => 'Second option', + 'SHOW_NOVALUE_FIELD' => 'Show field if no value was selected', + 'SHOW_NOVALUE_FIELD_EXPLAIN' => 'Determines if the profile field should be displayed if no value was selected for optional fields or if no value has been selected yet for required fields.', 'STEP_1_EXPLAIN_CREATE' => 'Here you can enter the first basic parameters of your new profile field. This information is needed for the second step where you’ll be able to set remaining options and tweak your profile field further.', 'STEP_1_EXPLAIN_EDIT' => 'Here you can change the basic parameters of your profile field. The relevant options are re-calculated within the second step.', 'STEP_1_TITLE_CREATE' => 'Add profile field', |