4.1.0 language

EllisLab · Mar 1, 2018 · e8d5fcf · e8d5fcf
1 parent 96bbc50
commit e8d5fcf
Show file tree

Hide file tree

Showing 10 changed files with 116 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -4,6 +4,7 @@ English Language Pack for ExpressionEngine 4
 Changes Between Versions
 ------------------------
 
+- [4.0.9 → 4.1.0](https://github.com/EllisLab/EE-Language-English/compare/4.0.9...4.1.0)
 - [4.0.8 → 4.0.9](https://github.com/EllisLab/EE-Language-English/compare/4.0.8...4.0.9)
 - [4.0.7 → 4.0.8](https://github.com/EllisLab/EE-Language-English/compare/4.0.7...4.0.8)
 - [4.0.6 → 4.0.7](https://github.com/EllisLab/EE-Language-English/compare/4.0.6...4.0.7)

diff --git a/user/language/english/admin_content_lang.php b/user/language/english/admin_content_lang.php
@@ -766,16 +766,12 @@
 
 'invalid_url_title_prefix' => 'Invalid URL Title Prefix',
 
-'live_look_template' => 'Live Look Template',
-
 'ltr' => 'Left to Right',
 
 'multiple_cat_group_preferences' => 'Multiple Category Group Preferences',
 
 'new_status' => 'New Status',
 
-'no_live_look_template' => '- No Live Look Template -',
-
 'rtl' => 'Right to Left',
 
 'show_all_statuses' => 'All %d statuses',

diff --git a/user/language/english/channel_lang.php b/user/language/english/channel_lang.php
@@ -326,9 +326,9 @@
 
 'invalid_url_title_prefix' => 'This field cannot contain spaces.',
 
-'live_look_template' => 'Live Look template',
+'preview_url' => 'Preview <abbr title="Unified Resource Locator">URL</abbr>',
 
-'live_look_template_desc' => 'Template to use for the <mark>Live Look</mark> feature.',
+'preview_url_desc' => 'Template path or route to use for previewing. Use <code>{url_title}</code> or <code>{entry_id}</code> for single-entry templates. i.e. <b><code>blog/entry/{url_title}</code></b>',
 
 'max_characters' => 'Maximum characters allowed?',
 
@@ -342,8 +342,6 @@
 
 'moderate_comments_desc' => 'When enabled, submitted comments will be put into a moderation queue, and must be approved by a Super Admin or other member group with moderation permissions.',
 
-'no_live_look_template' => 'No template chosen',
-
 'notifications' => 'Notifications',
 
 'open' => 'Open',

diff --git a/user/language/english/content_lang.php b/user/language/english/content_lang.php
@@ -230,6 +230,8 @@
 
 'calendar' => 'Calendar',
 
+'cancel_preview' => 'Cancel Preview',
+
 'category' => 'Category',
 
 'channel_name' => 'Channel:',
@@ -482,8 +484,6 @@
 
 'link' => 'Link',
 
-'live_look' => 'Live Look',
-
 'live_view' => 'Click to View',
 
 'load_revision' => 'Load Revision',
@@ -918,6 +918,50 @@
 
 'rel_ft_no_entries' => 'No Entries',
 
+/* Bulk Edit */
+
+'add_categories' => 'Add Categories',
+
+'add_categories_entries' => 'Add categories to %d entries',
+
+'add_editable_fields' => 'Add editable fields',
+
+'add_editable_fields_desc' => 'Chosen fields will be added below, and will be editable for <b>all</b> selected entries.',
+
+'btn_save_all_and_close' => 'Save All & Close',
+
+'editing_entries' => 'Editing %d entries',
+
+'entries_updated' => '%d entries have been updated.',
+
+'filter_selected_entries' => 'Filter selected entries',
+
+'important' => 'Important!',
+
+'no_cat_groups_in_common' => 'No <b>Category Groups</b> in common.',
+
+'bulk_edit' => 'Bulk Edit',
+
+'bulk_edit_add_categories_notice' => 'Any categories selected will be assigned to the selected entries <b>in addition</b> to the current category selection for those entries.',
+
+'bulk_edit_destructive' => 'This is a destructive and irreversible action.',
+
+'bulk_edit_notice' => 'Any fields submitted will overwrite that field\'s stored content for all selected entries.',
+
+'bulk_edit_remove_categories_notice' => 'Any categories selected will be <b>removed</b> from the selected entries, leaving the entries\' other category assignments intact.',
+
+'remove_categories' => 'Remove Categories',
+
+'remove_categories_entries' => 'Remove categories from %d entries',
+
+'remove_from_selection' => 'Remove from selection',
+
+'selected_entries' => 'Selected Entries',
+
+'showing' => 'Showing',
+
+'unauthorized_entry_desc' => 'You do not have permission to edit one of the selected entries.'
+
 );
 
 // EOF
diff --git a/user/language/english/cp_lang.php b/user/language/english/cp_lang.php
@@ -213,7 +213,7 @@
 
 'ip_address' => 'IP Address',
 
-'member_changed_email' => 'Changed email for "%s" (%d)',
+'member_changed_email' => 'Changed email for "%s" (%d) from "%s" to "%s"',
 
 'member_changed_member_group' => 'Changed member group to "%s" for "%s" (%d)',
 

diff --git a/user/language/english/design_lang.php b/user/language/english/design_lang.php
@@ -72,6 +72,8 @@
 
 'default' => 'default',
 
+'default_404_option' => 'Default 404 Page',
+
 'design' => 'Design',
 
 'duplicate_existing_template' => 'Duplicate existing template?',

diff --git a/user/language/english/email_data.php b/user/language/english/email_data.php
@@ -180,6 +180,59 @@ function forgot_password_instructions()
 	}
 }
 
+if ( ! function_exists('password_changed_notification_title'))
+{
+	function password_changed_notification_title()
+	{
+return <<<EOF
+Password changed
+EOF;
+	}
+}
+
+if ( ! function_exists('password_changed_notification'))
+{
+	function password_changed_notification()
+	{
+return <<<EOF
+{name},
+
+Your password was just changed.
+
+If you didn't make this change yourself, please contact an administrator right away.
+
+{site_name}
+{site_url}
+EOF;
+	}
+}
+
+if ( ! function_exists('email_changed_notification_title'))
+{
+	function email_changed_notification_title()
+	{
+return <<<EOF
+Email address changed
+EOF;
+	}
+}
+
+if ( ! function_exists('email_changed_notification'))
+{
+	function email_changed_notification()
+	{
+return <<<EOF
+{name},
+
+Your email address has been changed, and this email address is no longer associated with your account.
+
+If you didn't make this change yourself, please contact an administrator right away.
+
+{site_name}
+{site_url}
+EOF;
+	}
+}
 
 //---------------------------------------------------
 //	Validated Member Notification

diff --git a/user/language/english/forum_cp_lang.php b/user/language/english/forum_cp_lang.php
@@ -555,7 +555,7 @@
 
 'mod_can_split' => 'Split',
 
-'mod_can_view_ip' => 'View <abbr title="Internet Protocol">IP</abbr> addresses',
+'mod_can_view_ip' => 'View IP addresses',
 
 'moderator_removed' => 'Moderator Removed',
 

diff --git a/user/language/english/members_lang.php b/user/language/english/members_lang.php
@@ -734,9 +734,9 @@
 
 'can_not_delete_only_member' => 'You cannot delete the only member in the database',
 
-'can_send_bulletins' => 'Access bulletins',
+'can_send_bulletins' => 'Send bulletins',
 
-'can_send_bulletins_desc' => 'When enabled, users assigned to this group may send and receive bulletins.',
+'can_send_bulletins_desc' => 'When enabled, users assigned to this group may send bulletins.',
 
 'cannot_change_your_group' => 'Super Admins cannot change their member group assignment. Please have another Super Admin reassign you.',
 

diff --git a/user/language/english/specialty_tmp_lang.php b/user/language/english/specialty_tmp_lang.php
@@ -28,6 +28,10 @@
 
 'decline_member_validation' => 'User &ndash; Account declined notification',
 
+'email_changed_notification' => 'User &ndash; Email changed notification',
+
+'email_changed_notification_desc' => 'This template defines the message a user receives when their email address was changed.',
+
 'email_message' => 'Email Message',
 
 'email_subject' => 'Email Subject',
@@ -118,6 +122,10 @@
 
 'notification_has_char_limit' => 'Most of the above variables accept a char_limit parameter: {title char_limit="40"}',
 
+'password_changed_notification' => 'User &ndash; Password changed notification',
+
+'password_changed_notification_desc' => 'This template defines the message a user receives when their password was changed on the front end.',
+
 'pm_inbox_full' => 'User &ndash; Inbox full notification',
 
 'pm_inbox_full_desc' => 'This template defines the message that a user receives when they are not able to receive Private Messages due to a full InBox',