From: Dan Brown Date: Sat, 7 Dec 2019 20:36:39 +0000 (+0000) Subject: Merge branch 'settings-color-selector' of git://github.com/james-geiger/BookStack... X-Git-Tag: v0.28.0~1^2~39 X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/615a050856b1200d9dd37d94838b7d9b4a425afa?ds=inline;hp=-c Merge branch 'settings-color-selector' of git://github.com/james-geiger/BookStack into james-geiger-settings-color-selector --- 615a050856b1200d9dd37d94838b7d9b4a425afa diff --combined resources/lang/en/settings.php index 56e0868e4,e709fedfe..efb849077 --- a/resources/lang/en/settings.php +++ b/resources/lang/en/settings.php @@@ -33,7 -33,7 +33,7 @@@ return 'app_logo' => 'Application Logo', 'app_logo_desc' => 'This image should be 43px in height.
Large images will be scaled down.', 'app_primary_color' => 'Application Primary Color', - 'app_primary_color_desc' => 'This should be a hex value.
Leave empty to reset to the default color.', + 'app_primary_color_desc' => 'Sets the primary color for the application including the banner, buttons, and links.', 'app_homepage' => 'Application Homepage', 'app_homepage_desc' => 'Select a view to show on the homepage instead of the default view. Page permissions are ignored for selected pages.', 'app_homepage_select' => 'Select a page', @@@ -41,6 -41,19 +41,19 @@@ 'app_disable_comments_toggle' => 'Disable comments', 'app_disable_comments_desc' => 'Disables comments across all pages in the application.
Existing comments are not shown.', + // Color settings + 'bookshelf_color' => 'Shelf Color', + 'bookshelf_color_desc' => 'Sets the color indicator for shelves.', + 'book_color' => 'Book Color', + 'book_color_desc' => 'Sets the color indicator for books.', + 'chapter_color' => 'Chapter Color', + 'chapter_color_desc' => 'Sets the color indicator for chapters.', + 'page_color' => 'Page Color', + 'page_color_desc' => 'Sets the color indicator for pages.', + 'page_draft_color' => 'Page Draft Color', + 'page_draft_color_desc' => 'Sets the color indicator for page drafts.', + + // Registration Settings 'reg_settings' => 'Registration', 'reg_enable' => 'Enable Registration', @@@ -63,13 -76,6 +76,13 @@@ 'maint_image_cleanup_warning' => ':count potentially unused images were found. Are you sure you want to delete these images?', 'maint_image_cleanup_success' => ':count potentially unused images found and deleted!', 'maint_image_cleanup_nothing_found' => 'No unused images found, Nothing deleted!', + 'maint_send_test_email' => 'Send a Test Email', + 'maint_send_test_email_desc' => 'This sends a test email to your email address specified in your profile.', + 'maint_send_test_email_run' => 'Send test email', + 'maint_send_test_email_success' => 'Email sent to :address', + 'maint_send_test_email_mail_subject' => 'Test Email', + 'maint_send_test_email_mail_greeting' => 'Email delivery seems to work!', + 'maint_send_test_email_mail_text' => 'Congratulations! As you received this email notification, your email settings seem to be configured properly.', // Role Settings 'roles' => 'Roles', @@@ -142,8 -148,9 +155,8 @@@ 'users_social_connected' => ':socialAccount account was successfully attached to your profile.', 'users_social_disconnected' => ':socialAccount account was successfully disconnected from your profile.', - //! Since these labels are already localized this array does not need to be - //! translated in the language-specific files. - //! DELETE BELOW IF COPIED FROM EN + //! If editing translations files directly please ignore this in all + //! languages apart from en. Content will be auto-copied from en. //!//////////////////////////////// 'language_select' => [ 'en' => 'English', @@@ -158,7 -165,7 +171,7 @@@ 'sk' => 'Slovensky', 'cs' => 'Česky', 'sv' => 'Svenska', - 'kr' => '한국어', + 'ko' => '한국어', 'ja' => '日本語', 'pl' => 'Polski', 'it' => 'Italian',