diff options
| author | Nils Adermann <naderman@naderman.de> | 2006-06-20 19:00:30 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2006-06-20 19:00:30 +0000 |
| commit | 4448249a4433c9047b886efe2ec06dce6c4276f8 (patch) | |
| tree | c03475df6cdc346279f33f6931c5214055a8db93 /phpBB/language | |
| parent | c125ae12761e99a0f11703bbbec0defb29ad90c4 (diff) | |
| download | forums-4448249a4433c9047b886efe2ec06dce6c4276f8.tar forums-4448249a4433c9047b886efe2ec06dce6c4276f8.tar.gz forums-4448249a4433c9047b886efe2ec06dce6c4276f8.tar.bz2 forums-4448249a4433c9047b886efe2ec06dce6c4276f8.tar.xz forums-4448249a4433c9047b886efe2ec06dce6c4276f8.zip | |
- correctly display subcategories
- use L_TRANSLATION_INFO [Bug #2357]
- always begin with ACL_UNSET in permission trace
- allow copy permissions when editing a forum
- default to parent forum for copying permissions
- no duplication of the breadcrumps on registration [Bug #2307]
git-svn-id: file:///svn/phpbb/trunk@6107 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/forums.php | 3 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php index ff12e687e8..2087fbf22b 100644 --- a/phpBB/language/en/acp/forums.php +++ b/phpBB/language/en/acp/forums.php @@ -38,7 +38,8 @@ $lang = array_merge($lang, array( 'AUTO_PRUNE_VIEWED_EXPLAIN' => 'Number of days since topic was viewed after which topic is removed.', 'COPY_PERMISSIONS' => 'Copy permissions from', - 'COPY_PERMISSIONS_EXPLAIN' => 'Once created, the forum will have the same permissions as the one you select here. If no forum is selected the newly created forum will not be visible until permissions had been set.', + 'COPY_PERMISSIONS_ADD_EXPLAIN' => 'Once created, the forum will have the same permissions as the one you select here. If no forum is selected the newly created forum will not be visible until permissions had been set.', + 'COPY_PERMISSIONS_EDIT_EXPLAIN' => 'If you select to copy permissions, the forum will have the same permissions as the one you select here. This will overwrite any permissions you have previously set for this forum with the permissions of the forum you select here. If no forum is selected the current permissions will be kept.', 'CREATE_FORUM' => 'Create new forum', 'DECIDE_MOVE_DELETE_CONTENT' => 'Delete content or move to forum', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index ef9da82592..3b5f6a796f 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -29,6 +29,7 @@ if (empty($lang) || !is_array($lang)) // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine $lang = array_merge($lang, array( + 'TRANSLATION_INFO' => 'blah', 'ENCODING' => 'iso-8859-1', 'DIRECTION' => 'ltr', 'LEFT' => 'left', @@ -50,6 +51,7 @@ $lang = array_merge($lang, array( 'ACTIVE_ERROR' => 'You have specified an inactive username. Please activate your account and try again. If you continue to have problems please contact a board administrator.', 'ADMINISTRATOR' => 'Administrator', 'ADMINISTRATORS' => 'Administrators', + 'AGE' => 'Age', 'ALLOWED' => 'Allowed', 'ALL_FILES' => 'All files', 'ALL_FORUMS' => 'All forums', |