Skip to content

Commit 813d140

Browse files
ssddanbrownssddanbrown
committed
Merge branch 'development' of github.com:BookStackApp/BookStack into development
2 parents 3dc5942 + 03e2a9b commit 813d140

File tree

134 files changed

+1117
-323
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+1117
-323
lines changed

‎resources/lang/ar/entities.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@
141141
'books_search_this' => 'البحث في هذا الكتاب',
142142
'books_navigation' => 'تصفح الكتاب',
143143
'books_sort' => 'فرز محتويات الكتاب',
144+
'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books.',
144145
'books_sort_named' => 'فرز كتاب :bookName',
145146
'books_sort_name' => 'ترتيب حسب الإسم',
146147
'books_sort_created' => 'ترتيب حسب تاريخ الإنشاء',
@@ -149,6 +150,17 @@
149150
'books_sort_chapters_last' => 'الفصول الأخيرة',
150151
'books_sort_show_other' => 'عرض كتب أخرى',
151152
'books_sort_save' => 'حفظ الترتيب الجديد',
153+
'books_sort_show_other_desc' => 'Add other books here to include them in the sort operation, and allow easy cross-book reorganisation.',
154+
'books_sort_move_up' => 'Move Up',
155+
'books_sort_move_down' => 'Move Down',
156+
'books_sort_move_prev_book' => 'Move to Previous Book',
157+
'books_sort_move_next_book' => 'Move to Next Book',
158+
'books_sort_move_prev_chapter' => 'Move Into Previous Chapter',
159+
'books_sort_move_next_chapter' => 'Move Into Next Chapter',
160+
'books_sort_move_book_start' => 'Move to Start of Book',
161+
'books_sort_move_book_end' => 'Move to End of Book',
162+
'books_sort_move_before_chapter' => 'Move to Before Chapter',
163+
'books_sort_move_after_chapter' => 'Move to After Chapter',
152164
'books_copy' => 'Copy Book',
153165
'books_copy_success' => 'Book successfully copied',
154166

‎resources/lang/ar/errors.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,12 @@
4545
'cannot_create_thumbs' => 'لا يمكن للخادم إنشاء صور مصغرة. الرجاء التأكد من تثبيت إضافة GD PHP.',
4646
'server_upload_limit' => 'الخادم لا يسمح برفع ملفات بهذا الحجم. الرجاء محاولة الرفع بحجم أصغر.',
4747
'uploaded' => 'الخادم لا يسمح برفع ملفات بهذا الحجم. الرجاء محاولة الرفع بحجم أصغر.',
48+
'file_upload_timeout' => 'انتهت عملية تحميل الملف.',
49+
50+
// Drawing & Images
4851
'image_upload_error' => 'حدث خطأ خلال رفع الصورة',
4952
'image_upload_type_error' => 'صيغة الصورة المرفوعة غير صالحة',
50-
'file_upload_timeout' => 'انتهت عملية تحميل الملف.',
53+
'drawing_data_not_found' => 'Drawing data could not be loaded. The drawing file might no longer exist or you may not have permission to access it.',
5154

5255
// Attachments
5356
'attachment_not_found' => 'لم يتم العثور على المرفق',

‎resources/lang/ar/settings.php‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
'app_custom_html_desc' => 'سيتم إدراج أي محتوى مضاف هنا في الجزء السفلي من قسم <head> من كل صفحة. هذا أمر مفيد لتجاوز الأنماط أو إضافة رمز التحليل.',
3434
'app_custom_html_disabled_notice' => 'تم تعطيل محتوى HTML الرئيسي المخصص في صفحة الإعدادات هذه لضمان عكس أي تغييرات متتالية.',
3535
'app_logo' => 'شعار التطبيق',
36-
'app_logo_desc' => 'يجب أن تكون الصورة بارتفاع 43 بكسل. <br>سيتم تصغير الصور الأكبر من ذلك.',
37-
'app_primary_color' => 'اللون الأساسي للتطبيق',
38-
'app_primary_color_desc' => 'يجب أن تكون القيمة من نوع hex. <br>اترك الخانة فارغة للرجوع للون الافتراضي.',
36+
'app_logo_desc' => 'This is used in the application header bar, among other areas. This image should be 86px in height. Large images will be scaled down.',
37+
'app_icon' => 'Application Icon',
38+
'app_icon_desc' => 'This icon is used for browser tabs and shortcut icons. This should be a 256px square PNG image.',
3939
'app_homepage' => 'الصفحة الرئيسية للتطبيق',
4040
'app_homepage_desc' => 'الرجاء اختيار صفحة لتصبح الصفحة الرئيسية بدل من الافتراضية. سيتم تجاهل جميع الأذونات الخاصة بالصفحة المختارة.',
4141
'app_homepage_select' => 'اختر صفحة',
@@ -49,8 +49,12 @@
4949
'app_disable_comments_desc' => 'تعطيل التعليقات على جميع الصفحات داخل التطبيق. التعليقات الموجودة من الأصل لن تكون ظاهرة.',
5050

5151
// Color settings
52-
'content_colors' => 'ألوان المحتوى',
53-
'content_colors_desc' => 'تعيين الألوان لجميع العناصر في التسلسل الهرمي لتنظيم الصفحات. يوصى باختيار الألوان ذات السطوع المماثل للألوان الافتراضية للقراءة.',
52+
'color_scheme' => 'Application Color Scheme',
53+
'color_scheme_desc' => 'Set the colors to use in the BookStack interface. Colors can be configured separately for dark and light modes to best fit the theme and ensure legibility.',
54+
'ui_colors_desc' => 'Set the primary color and default link color for BookStack. The primary color is mainly used for the header banner, buttons and interface decorations. The default link color is used for text-based links and actions, both within written content and in the Bookstack interface.',
55+
'app_color' => 'Primary Color',
56+
'link_color' => 'Default Link Color',
57+
'content_colors_desc' => 'Set colors for all elements in the page organisation hierarchy. Choosing colors with a similar brightness to the default colors is recommended for readability.',
5458
'bookshelf_color' => 'لون الرف',
5559
'book_color' => 'لون الكتاب',
5660
'chapter_color' => 'لون الفصل',

‎resources/lang/bg/entities.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@
141141
'books_search_this' => 'Търси в книгата',
142142
'books_navigation' => 'Навигация на книгата',
143143
'books_sort' => 'Сортирай съдържанието на книгата',
144+
'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books.',
144145
'books_sort_named' => 'Сортирай книга :bookName',
145146
'books_sort_name' => 'Сортиране по име',
146147
'books_sort_created' => 'Сортирай по дата на създаване',
@@ -149,6 +150,17 @@
149150
'books_sort_chapters_last' => 'Последна глава',
150151
'books_sort_show_other' => 'Покажи други книги',
151152
'books_sort_save' => 'Запази новата подредба',
153+
'books_sort_show_other_desc' => 'Add other books here to include them in the sort operation, and allow easy cross-book reorganisation.',
154+
'books_sort_move_up' => 'Move Up',
155+
'books_sort_move_down' => 'Move Down',
156+
'books_sort_move_prev_book' => 'Move to Previous Book',
157+
'books_sort_move_next_book' => 'Move to Next Book',
158+
'books_sort_move_prev_chapter' => 'Move Into Previous Chapter',
159+
'books_sort_move_next_chapter' => 'Move Into Next Chapter',
160+
'books_sort_move_book_start' => 'Move to Start of Book',
161+
'books_sort_move_book_end' => 'Move to End of Book',
162+
'books_sort_move_before_chapter' => 'Move to Before Chapter',
163+
'books_sort_move_after_chapter' => 'Move to After Chapter',
152164
'books_copy' => 'Копирай книгата',
153165
'books_copy_success' => 'Книгата е копирана успешно',
154166

‎resources/lang/bg/errors.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,12 @@
4545
'cannot_create_thumbs' => 'Сървърът не може да създаде малки изображения. Моля, увери се, че разширението GD PHP е инсталирано.',
4646
'server_upload_limit' => 'Сървърът не позволява качвания с такъв размер. Моля, пробвайте файл с по-малък размер.',
4747
'uploaded' => 'Сървърът не позволява качвания с такъв размер. Моля, пробвайте файл с по-малък размер.',
48+
'file_upload_timeout' => 'Качването на файла изтече.',
49+
50+
// Drawing & Images
4851
'image_upload_error' => 'Възникна грешка при качването на изображението',
4952
'image_upload_type_error' => 'Типът на качваното изображение е невалиден',
50-
'file_upload_timeout' => 'Качването на файла изтече.',
53+
'drawing_data_not_found' => 'Drawing data could not be loaded. The drawing file might no longer exist or you may not have permission to access it.',
5154

5255
// Attachments
5356
'attachment_not_found' => 'Прикачения файл не е намерен',

‎resources/lang/bg/settings.php‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
'app_custom_html_desc' => 'Всяко съдържание, добавено тук, ще бъде поставено в долната част на секцията <head> на всяка страница. Това е удобно за преобладаващи стилове или добавяне на код за анализ.',
3434
'app_custom_html_disabled_notice' => 'Съдържанието на персонализираната HTML шапка е деактивирано на страницата с настройки, за да се гарантира, че евентуални лоши промени могат да бъдат върнати.',
3535
'app_logo' => 'Лого на приложението',
36-
'app_logo_desc' => 'Това изображение трябва да е с 43px височина. <br> Големите изображения ще бъдат намалени.',
37-
'app_primary_color' => 'Основен цвят на приложението',
38-
'app_primary_color_desc' => 'Изберете основния цвят на приложението, включително на банера, бутоните и линковете.',
36+
'app_logo_desc' => 'This is used in the application header bar, among other areas. This image should be 86px in height. Large images will be scaled down.',
37+
'app_icon' => 'Application Icon',
38+
'app_icon_desc' => 'This icon is used for browser tabs and shortcut icons. This should be a 256px square PNG image.',
3939
'app_homepage' => 'Начлна страница на приложението',
4040
'app_homepage_desc' => 'Изберете начална страница, която ще замени изгледа по подразбиране. Дефинираните права на страницата, която е избрана ще бъдат игнорирани.',
4141
'app_homepage_select' => 'Избери страница',
@@ -49,8 +49,12 @@
4949
'app_disable_comments_desc' => 'Изключва коментарите във всички на страници на приложението. <br> Съществуващите коментари няма да се показват.',
5050

5151
// Color settings
52-
'content_colors' => 'Цвят на съдържанието',
53-
'content_colors_desc' => 'Настройва цветовете за всички елементи на йерархията за организацията на страницата. Избор на цвят с яркост, близка до цветовете по подразбиране, се препоръчва за четимостта.',
52+
'color_scheme' => 'Application Color Scheme',
53+
'color_scheme_desc' => 'Set the colors to use in the BookStack interface. Colors can be configured separately for dark and light modes to best fit the theme and ensure legibility.',
54+
'ui_colors_desc' => 'Set the primary color and default link color for BookStack. The primary color is mainly used for the header banner, buttons and interface decorations. The default link color is used for text-based links and actions, both within written content and in the Bookstack interface.',
55+
'app_color' => 'Primary Color',
56+
'link_color' => 'Default Link Color',
57+
'content_colors_desc' => 'Set colors for all elements in the page organisation hierarchy. Choosing colors with a similar brightness to the default colors is recommended for readability.',
5458
'bookshelf_color' => 'Цвят на рафта',
5559
'book_color' => 'Цвят на книгата',
5660
'chapter_color' => 'Цвят на главата',

‎resources/lang/bs/entities.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@
141141
'books_search_this' => 'Pretraži ovu knjigu',
142142
'books_navigation' => 'Navigacija knjige',
143143
'books_sort' => 'Sortiraj sadržaj knjige',
144+
'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books.',
144145
'books_sort_named' => 'Sortiraj knjigu :bookName',
145146
'books_sort_name' => 'Sortiraj po imenu',
146147
'books_sort_created' => 'Sortiraj po datumu kreiranja',
@@ -149,6 +150,17 @@
149150
'books_sort_chapters_last' => 'Poglavlja zadnja',
150151
'books_sort_show_other' => 'Prikaži druge knjige',
151152
'books_sort_save' => 'Spremi trenutni poredak',
153+
'books_sort_show_other_desc' => 'Add other books here to include them in the sort operation, and allow easy cross-book reorganisation.',
154+
'books_sort_move_up' => 'Move Up',
155+
'books_sort_move_down' => 'Move Down',
156+
'books_sort_move_prev_book' => 'Move to Previous Book',
157+
'books_sort_move_next_book' => 'Move to Next Book',
158+
'books_sort_move_prev_chapter' => 'Move Into Previous Chapter',
159+
'books_sort_move_next_chapter' => 'Move Into Next Chapter',
160+
'books_sort_move_book_start' => 'Move to Start of Book',
161+
'books_sort_move_book_end' => 'Move to End of Book',
162+
'books_sort_move_before_chapter' => 'Move to Before Chapter',
163+
'books_sort_move_after_chapter' => 'Move to After Chapter',
152164
'books_copy' => 'Copy Book',
153165
'books_copy_success' => 'Book successfully copied',
154166

‎resources/lang/bs/errors.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,12 @@
4545
'cannot_create_thumbs' => 'Server ne može kreirati sličice. Provjerite da imate instaliranu GD PHP ekstenziju.',
4646
'server_upload_limit' => 'Server ne dopušta učitavanja ove veličine. Pokušajte sa manjom veličinom fajla.',
4747
'uploaded' => 'Server ne dopušta učitavanja ove veličine. Pokušajte sa manjom veličinom fajla.',
48+
'file_upload_timeout' => 'Vrijeme učitavanja fajla je isteklo.',
49+
50+
// Drawing & Images
4851
'image_upload_error' => 'Desila se greška prilikom učitavanja slike',
4952
'image_upload_type_error' => 'Vrsta slike koja se učitava je neispravna',
50-
'file_upload_timeout' => 'Vrijeme učitavanja fajla je isteklo.',
53+
'drawing_data_not_found' => 'Drawing data could not be loaded. The drawing file might no longer exist or you may not have permission to access it.',
5154

5255
// Attachments
5356
'attachment_not_found' => 'Prilog nije pronađen',

‎resources/lang/bs/settings.php‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
'app_custom_html_desc' => 'Any content added here will be inserted into the bottom of the <head> section of every page. This is handy for overriding styles or adding analytics code.',
3434
'app_custom_html_disabled_notice' => 'Custom HTML head content is disabled on this settings page to ensure any breaking changes can be reverted.',
3535
'app_logo' => 'Application Logo',
36-
'app_logo_desc' => 'This image should be 43px in height. <br>Large images will be scaled down.',
37-
'app_primary_color' => 'Application Primary Color',
38-
'app_primary_color_desc' => 'Sets the primary color for the application including the banner, buttons, and links.',
36+
'app_logo_desc' => 'This is used in the application header bar, among other areas. This image should be 86px in height. Large images will be scaled down.',
37+
'app_icon' => 'Application Icon',
38+
'app_icon_desc' => 'This icon is used for browser tabs and shortcut icons. This should be a 256px square PNG image.',
3939
'app_homepage' => 'Application Homepage',
4040
'app_homepage_desc' => 'Select a view to show on the homepage instead of the default view. Page permissions are ignored for selected pages.',
4141
'app_homepage_select' => 'Select a page',
@@ -49,8 +49,12 @@
4949
'app_disable_comments_desc' => 'Disables comments across all pages in the application. <br> Existing comments are not shown.',
5050

5151
// Color settings
52-
'content_colors' => 'Content Colors',
53-
'content_colors_desc' => 'Sets colors for all elements in the page organisation hierarchy. Choosing colors with a similar brightness to the default colors is recommended for readability.',
52+
'color_scheme' => 'Application Color Scheme',
53+
'color_scheme_desc' => 'Set the colors to use in the BookStack interface. Colors can be configured separately for dark and light modes to best fit the theme and ensure legibility.',
54+
'ui_colors_desc' => 'Set the primary color and default link color for BookStack. The primary color is mainly used for the header banner, buttons and interface decorations. The default link color is used for text-based links and actions, both within written content and in the Bookstack interface.',
55+
'app_color' => 'Primary Color',
56+
'link_color' => 'Default Link Color',
57+
'content_colors_desc' => 'Set colors for all elements in the page organisation hierarchy. Choosing colors with a similar brightness to the default colors is recommended for readability.',
5458
'bookshelf_color' => 'Shelf Color',
5559
'book_color' => 'Book Color',
5660
'chapter_color' => 'Chapter Color',

‎resources/lang/ca/entities.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@
141141
'books_search_this' => 'Cerca en aquest llibre',
142142
'books_navigation' => 'Navegació pel llibre',
143143
'books_sort' => 'Ordena el contingut del llibre',
144+
'books_sort_desc' => 'Move chapters and pages within a book to reorganise its contents. Other books can be added which allows easy moving of chapters and pages between books.',
144145
'books_sort_named' => 'Ordena el llibre :bookName',
145146
'books_sort_name' => 'Ordena per nom',
146147
'books_sort_created' => 'Ordena per data de creació',
@@ -149,6 +150,17 @@
149150
'books_sort_chapters_last' => 'Els capítols al final',
150151
'books_sort_show_other' => 'Mostra altres llibres',
151152
'books_sort_save' => 'Desa l\'ordre nou',
153+
'books_sort_show_other_desc' => 'Add other books here to include them in the sort operation, and allow easy cross-book reorganisation.',
154+
'books_sort_move_up' => 'Move Up',
155+
'books_sort_move_down' => 'Move Down',
156+
'books_sort_move_prev_book' => 'Move to Previous Book',
157+
'books_sort_move_next_book' => 'Move to Next Book',
158+
'books_sort_move_prev_chapter' => 'Move Into Previous Chapter',
159+
'books_sort_move_next_chapter' => 'Move Into Next Chapter',
160+
'books_sort_move_book_start' => 'Move to Start of Book',
161+
'books_sort_move_book_end' => 'Move to End of Book',
162+
'books_sort_move_before_chapter' => 'Move to Before Chapter',
163+
'books_sort_move_after_chapter' => 'Move to After Chapter',
152164
'books_copy' => 'Copy Book',
153165
'books_copy_success' => 'Book successfully copied',
154166

0 commit comments

Comments
 (0)