-
-
Save Crizz0/94d8f572113d8255bfbf to your computer and use it in GitHub Desktop.
phpBB 3.1.1 zu phpBB 3.1.2 Sprachänderungen
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php | |
index ae7565d..8d6c1c1 100644 | |
--- a/phpBB/language/en/acp/board.php | |
+++ b/phpBB/language/en/acp/board.php | |
@@ -221,7 +221,8 @@ $lang = array_merge($lang, array( | |
'ACP_REGISTER_SETTINGS_EXPLAIN' => 'Here you are able to define registration and profile related settings.', | |
'ACC_ACTIVATION' => 'Account activation', | |
- 'ACC_ACTIVATION_EXPLAIN' => 'This determines whether users have immediate access to the board or if confirmation is required. You can also completely disable new registrations. “Board-wide email” must be enabled in order to use user or admin activation.', | |
+ 'ACC_ACTIVATION_EXPLAIN' => 'This determines whether users have immediate access to the board or if confirmation is required. You can also completely disable new registrations. <em>“Board-wide email” must be enabled in order to use user or admin activation.</em>', | |
+ 'ACC_ACTIVATION_WARNING' => 'Please note that the currently selected activation method requires emails to be enabled, otherwise registration will be disabled. We recommend to either select a different activation method or reenable emails.', | |
'NEW_MEMBER_POST_LIMIT' => 'New member post limit', | |
'NEW_MEMBER_POST_LIMIT_EXPLAIN' => 'New members are within the <em>Newly Registered Users</em> group until they reach this number of posts. You can use this group to keep them from using the PM system or to review their posts. <strong>A value of 0 disables this feature.</strong>', | |
'NEW_MEMBER_GROUP_DEFAULT' => 'Set Newly Registered Users group to default', | |
@@ -556,7 +557,7 @@ $lang = array_merge($lang, array( | |
'EMAIL_SIG' => 'Email signature', | |
'EMAIL_SIG_EXPLAIN' => 'This text will be attached to all emails the board sends.', | |
'ENABLE_EMAIL' => 'Enable board-wide emails', | |
- 'ENABLE_EMAIL_EXPLAIN' => 'If this is set to disabled no emails will be sent by the board at all. <em>Note the user and admin account activation settings require this setting to be enabled. If currently using “user” or “admin” activation in the activation settings, disabling this setting will require no activation of new accounts.</em>', | |
+ 'ENABLE_EMAIL_EXPLAIN' => 'If this is set to disabled no emails will be sent by the board at all. <em>Note the user and admin account activation settings require this setting to be enabled. If currently using “user” or “admin” activation in the activation settings, disabling this setting will disable registration.</em>', | |
'SMTP_AUTH_METHOD' => 'Authentication method for SMTP', | |
'SMTP_AUTH_METHOD_EXPLAIN' => 'Only used if a username/password is set, ask your provider if you are unsure which method to use.', | |
'SMTP_CRAM_MD5' => 'CRAM-MD5', | |
diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php | |
index 506d569..e6b05c8 100644 | |
--- a/phpBB/language/en/acp/styles.php | |
+++ b/phpBB/language/en/acp/styles.php | |
@@ -74,6 +74,7 @@ $lang = array_merge($lang, array( | |
'STYLE_INSTALLED_RETURN_INSTALLED_STYLES' => 'Return to installed styles list', | |
'STYLE_INSTALLED_RETURN_UNINSTALLED_STYLES' => 'Install more styles', | |
'STYLE_NAME' => 'Style name', | |
+ 'STYLE_NAME_RESERVED' => 'Style "%s" can not be installed, because the name is reserved.', | |
'STYLE_NOT_INSTALLED' => 'Style "%s" was not installed.', | |
'STYLE_PATH' => 'Style path', | |
'STYLE_UNINSTALL' => 'Uninstall', | |
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php | |
index bc0fd03..a961068 100644 | |
--- a/phpBB/language/en/mcp.php | |
+++ b/phpBB/language/en/mcp.php | |
@@ -237,7 +237,7 @@ $lang = array_merge($lang, array( | |
'NOT_MODERATOR' => 'You are not a moderator of this forum.', | |
'NO_DESTINATION_FORUM' => 'Please select a forum for destination.', | |
'NO_DESTINATION_FORUM_FOUND' => 'There is no destination forum available.', | |
- 'NO_ENTRIES' => 'No log entries for this period.', | |
+ 'NO_ENTRIES' => 'No log entries.', | |
'NO_FEEDBACK' => 'No feedback exists for this user.', | |
'NO_FINAL_TOPIC_SELECTED' => 'You have to select a destination topic for merging posts.', | |
'NO_MATCHES_FOUND' => 'No matches found.', | |
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php | |
index b8c626d..5605f8f 100644 | |
--- a/phpBB/language/en/memberlist.php | |
+++ b/phpBB/language/en/memberlist.php | |
@@ -48,7 +48,7 @@ $lang = array_merge($lang, array( | |
'BEFORE' => 'Before', | |
- 'CC_EMAIL' => 'Send a copy of this email to yourself.', | |
+ 'CC_SENDER' => 'Send a copy of this email to yourself.', | |
'CONTACT_ADMIN' => 'Contact a Board Administrator', | |
'DEST_LANG' => 'Language', |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment