From afbbcafd44839e09ae9464ce6f98a04664b82006 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Wed, 10 Jan 2024 14:33:49 +0000 Subject: [PATCH 1/5] Readme: Updates sponsor list --- readme.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/readme.md b/readme.md index b6174f41219..a32e2293138 100644 --- a/readme.md +++ b/readme.md @@ -43,29 +43,29 @@ Big thanks to these companies for supporting the project. [Project donation details](https://www.bookstackapp.com/donate/) - [GitHub Sponsors Page](https://github.com/sponsors/ssddanbrown) - [Ko-fi Page](https://ko-fi.com/ssddanbrown) -#### Silver Sponsors +#### Gold Sponsor -
- Diagrams.net + + Diagrams.net
#### Bronze Sponsors - - - - From adf1806feaa541f7ff627ba83278ea7dd2fd7a04 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Tue, 16 Jan 2024 12:06:13 +0000 Subject: [PATCH 2/5] Chapters API: Added missing book_slug field Was removed during previous changes, but reflected in response examples. This adds into all standard single chapter responses. For #4765 --- app/Entities/Controllers/ChapterApiController.php | 5 +++-- dev/api/responses/chapters-create.json | 1 + dev/api/responses/chapters-update.json | 1 + tests/Api/ChaptersApiTest.php | 13 ++++++++----- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/Entities/Controllers/ChapterApiController.php b/app/Entities/Controllers/ChapterApiController.php index c2132326200..85c81c2485c 100644 --- a/app/Entities/Controllers/ChapterApiController.php +++ b/app/Entities/Controllers/ChapterApiController.php @@ -134,8 +134,9 @@ protected function forJsonDisplay(Chapter $chapter): Chapter $chapter->unsetRelations()->refresh(); $chapter->load(['tags']); - $chapter->makeVisible('description_html') - ->setAttribute('description_html', $chapter->descriptionHtml()); + $chapter->makeVisible('description_html'); + $chapter->setAttribute('description_html', $chapter->descriptionHtml()); + $chapter->setAttribute('book_slug', $chapter->book()->first()->slug); return $chapter; } diff --git a/dev/api/responses/chapters-create.json b/dev/api/responses/chapters-create.json index 183186b0b42..2d404440587 100644 --- a/dev/api/responses/chapters-create.json +++ b/dev/api/responses/chapters-create.json @@ -11,6 +11,7 @@ "updated_by": 1, "owned_by": 1, "description_html": "

This is a great new chapter<\/strong> that I've created via the API<\/p>", + "book_slug": "example-book", "tags": [ { "name": "Category", diff --git a/dev/api/responses/chapters-update.json b/dev/api/responses/chapters-update.json index 5ac3c64c12f..3dad6aa0c12 100644 --- a/dev/api/responses/chapters-update.json +++ b/dev/api/responses/chapters-update.json @@ -11,6 +11,7 @@ "updated_by": 1, "owned_by": 1, "description_html": "

This is an updated chapter<\/strong> that I've altered via the API<\/p>", + "book_slug": "example-book", "tags": [ { "name": "Category", diff --git a/tests/Api/ChaptersApiTest.php b/tests/Api/ChaptersApiTest.php index 81a91887794..002046c3a3b 100644 --- a/tests/Api/ChaptersApiTest.php +++ b/tests/Api/ChaptersApiTest.php @@ -22,11 +22,12 @@ public function test_index_endpoint_returns_expected_chapter() $resp = $this->getJson($this->baseEndpoint . '?count=1&sort=+id'); $resp->assertJson(['data' => [ [ - 'id' => $firstChapter->id, - 'name' => $firstChapter->name, - 'slug' => $firstChapter->slug, - 'book_id' => $firstChapter->book->id, - 'priority' => $firstChapter->priority, + 'id' => $firstChapter->id, + 'name' => $firstChapter->name, + 'slug' => $firstChapter->slug, + 'book_id' => $firstChapter->book->id, + 'priority' => $firstChapter->priority, + 'book_slug' => $firstChapter->book->slug, ], ]]); } @@ -130,6 +131,7 @@ public function test_read_endpoint() $resp->assertJson([ 'id' => $chapter->id, 'slug' => $chapter->slug, + 'book_slug' => $chapter->book->slug, 'created_by' => [ 'name' => $chapter->createdBy->name, ], @@ -148,6 +150,7 @@ public function test_read_endpoint() ], ], ]); + $resp->assertJsonMissingPath('book'); $resp->assertJsonCount($chapter->pages()->count(), 'pages'); } From 57284bb869bcf8e1f9aced986a72c386fee5d086 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Tue, 16 Jan 2024 12:10:22 +0000 Subject: [PATCH 3/5] Updated translations with latest Crowdin changes (#4747) --- lang/ca/entities.php | 4 ++-- lang/cs/entities.php | 4 ++-- lang/da/notifications.php | 14 +++++++------- lang/de/entities.php | 4 ++-- lang/de_informal/entities.php | 4 ++-- lang/fa/notifications.php | 6 +++--- lang/fa/settings.php | 6 +++--- lang/ja/entities.php | 12 ++++++------ lang/ja/notifications.php | 2 +- lang/nn/editor.php | 28 ++++++++++++++-------------- lang/nn/entities.php | 12 ++++++------ lang/nn/notifications.php | 22 +++++++++++----------- lang/nn/pagination.php | 2 +- lang/zh_CN/entities.php | 4 ++-- lang/zh_TW/common.php | 6 +++--- lang/zh_TW/components.php | 14 +++++++------- lang/zh_TW/settings.php | 6 +++--- 17 files changed, 75 insertions(+), 75 deletions(-) diff --git a/lang/ca/entities.php b/lang/ca/entities.php index 9bffe493cb5..53b766b4259 100644 --- a/lang/ca/entities.php +++ b/lang/ca/entities.php @@ -23,7 +23,7 @@ 'meta_updated' => 'Actualitzat :timeLength', 'meta_updated_name' => 'Actualitzat :timeLength per :user', 'meta_owned_name' => 'Propietat de :user', - 'meta_reference_count' => 'Referenced by :count item|Referenced by :count items', + 'meta_reference_count' => 'Hi fa referència :count element|Hi fan referència :count elements', 'entity_select' => 'Selecciona una entitat', 'entity_select_lack_permission' => 'No teniu els permisos necessaris per a seleccionar aquest element', 'images' => 'Imatges', @@ -409,7 +409,7 @@ // References 'references' => 'Referències', 'references_none' => 'Ni hi ha cap referència detectada a aquest element.', - 'references_to_desc' => 'Listed below is all the known content in the system that links to this item.', + 'references_to_desc' => 'A continuació es llisten tots els continguts coneguts del sistema que enllacen a aquest element.', // Watch Options 'watch' => 'Segueix', diff --git a/lang/cs/entities.php b/lang/cs/entities.php index 55b2e71de68..4471c4b3787 100644 --- a/lang/cs/entities.php +++ b/lang/cs/entities.php @@ -23,7 +23,7 @@ 'meta_updated' => 'Aktualizováno :timeLength', 'meta_updated_name' => 'Aktualizováno :timeLength uživatelem :user', 'meta_owned_name' => 'Vlastník :user', - 'meta_reference_count' => 'Referenced by :count item|Referenced by :count items', + 'meta_reference_count' => 'Odkazováno :count položkou|Odkazováno :count položkami', 'entity_select' => 'Výběr entity', 'entity_select_lack_permission' => 'Nemáte dostatečná oprávnění k výběru této položky', 'images' => 'Obrázky', @@ -409,7 +409,7 @@ // References 'references' => 'Odkazy', 'references_none' => 'Nebyly nalezeny žádné odkazy na tuto položku.', - 'references_to_desc' => 'Listed below is all the known content in the system that links to this item.', + 'references_to_desc' => 'Níže je uveden veškerý obsah o kterém systém ví, že odkazuje na tuto položku.', // Watch Options 'watch' => 'Sledovat', diff --git a/lang/da/notifications.php b/lang/da/notifications.php index 1afd23f1dc4..61a44f1f094 100644 --- a/lang/da/notifications.php +++ b/lang/da/notifications.php @@ -4,13 +4,13 @@ */ return [ - 'new_comment_subject' => 'New comment on page: :pageName', - 'new_comment_intro' => 'A user has commented on a page in :appName:', - 'new_page_subject' => 'New page: :pageName', - 'new_page_intro' => 'A new page has been created in :appName:', - 'updated_page_subject' => 'Updated page: :pageName', - 'updated_page_intro' => 'A page has been updated in :appName:', - 'updated_page_debounce' => 'To prevent a mass of notifications, for a while you won\'t be sent notifications for further edits to this page by the same editor.', + 'new_comment_subject' => 'Ny kommentar på siden: :pageName', + 'new_comment_intro' => 'En bruger har kommenteret på en side i :appName:', + 'new_page_subject' => 'Ny side: :pageName', + 'new_page_intro' => 'En ny side er blevet oprettet i :appName:', + 'updated_page_subject' => 'Opdateret side: :pageName', + 'updated_page_intro' => 'En side er blevet opdateret i :appName:', + 'updated_page_debounce' => 'For at forhindre en masse af notifikationer, i et stykke tid vil du ikke blive sendt notifikationer for yderligere redigeringer til denne side af den samme editor.', 'detail_page_name' => 'Page Name:', 'detail_page_path' => 'Page Path:', diff --git a/lang/de/entities.php b/lang/de/entities.php index 21a0d3befd4..0b46b41f398 100644 --- a/lang/de/entities.php +++ b/lang/de/entities.php @@ -23,7 +23,7 @@ 'meta_updated' => 'Zuletzt aktualisiert: :timeLength', 'meta_updated_name' => 'Zuletzt aktualisiert: :timeLength von :user', 'meta_owned_name' => 'Im Besitz von :user', - 'meta_reference_count' => 'Referenced by :count item|Referenced by :count items', + 'meta_reference_count' => 'Referenziert von :count Element|Referenziert von :count Elementen', 'entity_select' => 'Eintrag auswählen', 'entity_select_lack_permission' => 'Sie haben nicht die benötigte Berechtigung, um dieses Element auszuwählen', 'images' => 'Bilder', @@ -409,7 +409,7 @@ // References 'references' => 'Verweise', 'references_none' => 'Es gibt keine nachverfolgten Referenzen zu diesem Element.', - 'references_to_desc' => 'Listed below is all the known content in the system that links to this item.', + 'references_to_desc' => 'Unten sind alle bekannten Inhalte im System aufgelistet, die auf diesen Eintrag verweisen.', // Watch Options 'watch' => 'Beobachten', diff --git a/lang/de_informal/entities.php b/lang/de_informal/entities.php index 2da655c1f31..43842a55d16 100644 --- a/lang/de_informal/entities.php +++ b/lang/de_informal/entities.php @@ -23,7 +23,7 @@ 'meta_updated' => 'Zuletzt aktualisiert: :timeLength', 'meta_updated_name' => 'Zuletzt aktualisiert: :timeLength von :user', 'meta_owned_name' => 'Im Besitz von :user', - 'meta_reference_count' => 'Referenced by :count item|Referenced by :count items', + 'meta_reference_count' => 'Referenziert von :count Element|Referenziert von :count Elementen', 'entity_select' => 'Eintrag auswählen', 'entity_select_lack_permission' => 'Du hast nicht die benötigte Berechtigung, um dieses Element auszuwählen', 'images' => 'Bilder', @@ -409,7 +409,7 @@ // References 'references' => 'Verweise', 'references_none' => 'Es gibt keine nachverfolgten Referenzen zu diesem Element.', - 'references_to_desc' => 'Listed below is all the known content in the system that links to this item.', + 'references_to_desc' => 'Unten sind alle bekannten Inhalte im System aufgelistet, die auf diesen Eintrag verweisen.', // Watch Options 'watch' => 'Beobachten', diff --git a/lang/fa/notifications.php b/lang/fa/notifications.php index 675eaa762b6..12f4230a13e 100644 --- a/lang/fa/notifications.php +++ b/lang/fa/notifications.php @@ -5,7 +5,7 @@ return [ 'new_comment_subject' => 'نظر جدید در صفحه: :pageName', - 'new_comment_intro' => 'یک کاربر در بر روی صفحه‌ای نظر ثبت کرده است :appName:', + 'new_comment_intro' => 'یک کاربر در صفحه نظر ارایه کرده است :appName:', 'new_page_subject' => 'صفحه جدید: :pageName', 'new_page_intro' => 'یک صفحه جدید ایجاد شده است در :appName:', 'updated_page_subject' => 'صفحه جدید: :pageName', @@ -13,14 +13,14 @@ 'updated_page_debounce' => 'برای جلوگیری از انبوه اعلان‌ها، برای مدتی اعلان‌ ویرایش‌هایی که توسط همان ویرایشگر در این صفحه انجام می‌شود، ارسال نخواهد شد.', 'detail_page_name' => 'نام صفحه:', - 'detail_page_path' => 'Page Path:', + 'detail_page_path' => 'نام میسر صفحه:', 'detail_commenter' => 'نظر دهنده:', 'detail_comment' => 'نظر:', 'detail_created_by' => 'ایجاد شده توسط:', 'detail_updated_by' => 'به روزرسانی شده توسط:', 'action_view_comment' => 'مشاهده نظر', - 'action_view_page' => 'View Page', + 'action_view_page' => 'مشاهده صفحه', 'footer_reason' => 'This notification was sent to you because :link cover this type of activity for this item.', 'footer_reason_link' => 'تنظیمات اطلاع‌رسانی شما', diff --git a/lang/fa/settings.php b/lang/fa/settings.php index 0659cde465a..c48f4d8e92b 100644 --- a/lang/fa/settings.php +++ b/lang/fa/settings.php @@ -194,7 +194,7 @@ 'users_send_invite_option' => 'ارسال ایمیل دعوت کاربر', 'users_external_auth_id' => 'شناسه احراز هویت خارجی', 'users_external_auth_id_desc' => 'When an external authentication system is in use (such as SAML2, OIDC or LDAP) this is the ID which links this BookStack user to the authentication system account. You can ignore this field if using the default email-based authentication.', - 'users_password_warning' => 'Only fill the below if you would like to change the password for this user.', + 'users_password_warning' => 'فقط در صورتی که مایل به تغییر رمز عبور این کاربر هستید، موارد زیر را پر کنید.', 'users_system_public' => 'این کاربر نماینده هر کاربر مهمانی است که از نمونه شما بازدید می کند. نمی توان از آن برای ورود استفاده کرد اما به طور خودکار اختصاص داده می شود.', 'users_delete' => 'حذف کاربر', 'users_delete_named' => 'حذف :userName', @@ -210,12 +210,12 @@ 'users_preferred_language' => 'زبان ترجیحی', 'users_preferred_language_desc' => 'این گزینه زبان مورد استفاده برای رابط کاربری برنامه را تغییر می دهد. این روی محتوای ایجاد شده توسط کاربر تأثیری نخواهد داشت.', 'users_social_accounts' => 'حساب های اجتماعی', - 'users_social_accounts_desc' => 'View the status of the connected social accounts for this user. Social accounts can be used in addition to the primary authentication system for system access.', + 'users_social_accounts_desc' => 'مشاهده وضعیت حساب‌های اجتماعی متصل به این کاربر. حساب‌های اجتماعی می‌توانند به عنوان تکمیلی به سیستم اصلی احراز هویت برای دسترسی به سیستم استفاده شوند.', 'users_social_accounts_info' => 'در اینجا می‌توانید حساب‌های دیگر خود را برای ورود سریع‌تر و آسان‌تر متصل کنید. قطع ارتباط حساب در اینجا، دسترسی مجاز قبلی را لغو نمی کند. دسترسی را از تنظیمات نمایه خود در حساب اجتماعی متصل لغو کنید.', 'users_social_connect' => 'اتصال حساب کاربری', 'users_social_disconnect' => 'قطع حساب', 'users_social_status_connected' => 'Connected', - 'users_social_status_disconnected' => 'Disconnected', + 'users_social_status_disconnected' => 'قطع اتصال', 'users_social_connected' => 'حساب :socialAccount با موفقیت به نمایه شما پیوست شد.', 'users_social_disconnected' => 'حساب :socialAccount با موفقیت از نمایه شما قطع شد.', 'users_api_tokens' => 'توکن‌های API', diff --git a/lang/ja/entities.php b/lang/ja/entities.php index dd4c2746982..0b39c2c27e8 100644 --- a/lang/ja/entities.php +++ b/lang/ja/entities.php @@ -23,7 +23,7 @@ 'meta_updated' => '更新: :timeLength', 'meta_updated_name' => '更新: :timeLength (:user)', 'meta_owned_name' => '所有者: :user', - 'meta_reference_count' => 'Referenced by :count item|Referenced by :count items', + 'meta_reference_count' => ':count 項目から参照|:count 項目から参照', 'entity_select' => 'エンティティ選択', 'entity_select_lack_permission' => 'この項目を選択するために必要な権限がありません', 'images' => '画像', @@ -132,9 +132,9 @@ 'books_edit_named' => 'ブック「:bookName」を編集', 'books_form_book_name' => 'ブック名', 'books_save' => 'ブックを保存', - 'books_default_template' => 'Default Page Template', - 'books_default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this book. Keep in mind this will only be used if the page creator has view access to those chosen template page.', - 'books_default_template_select' => 'Select a template page', + 'books_default_template' => 'デフォルトページテンプレート', + 'books_default_template_explain' => 'このブックに新しいページを作成する際にデフォルトコンテンツとして使用されるページテンプレートを割り当てます。 これはページ作成者が選択したテンプレートページへのアクセス権を持つ場合にのみ使用されることに注意してください。', + 'books_default_template_select' => 'テンプレートページを選択', 'books_permissions' => 'ブックの権限', 'books_permissions_updated' => 'ブックの権限を更新しました', 'books_empty_contents' => 'まだページまたはチャプターが作成されていません。', @@ -207,7 +207,7 @@ 'pages_delete_draft' => 'ページの下書きを削除', 'pages_delete_success' => 'ページを削除しました', 'pages_delete_draft_success' => 'ページの下書きを削除しました', - 'pages_delete_warning_template' => 'This page is in active use as a book default page template. These books will no longer have a default page template assigned after this page is deleted.', + 'pages_delete_warning_template' => 'このページは現在ブックのデフォルトページテンプレートとして使用されています。 このページが削除されると、それらのブックでデフォルトのページテンプレートが割り当てられなくなります。', 'pages_delete_confirm' => 'このページを削除してもよろしいですか？', 'pages_delete_draft_confirm' => 'このページの下書きを削除してもよろしいですか？', 'pages_editing_named' => 'ページ :pageName を編集', @@ -410,7 +410,7 @@ // References 'references' => '参照', 'references_none' => 'この項目への追跡された参照はありません。', - 'references_to_desc' => 'Listed below is all the known content in the system that links to this item.', + 'references_to_desc' => 'この項目はシステム内の以下のコンテンツからリンクされています。', // Watch Options 'watch' => 'ウォッチ', diff --git a/lang/ja/notifications.php b/lang/ja/notifications.php index 364b4a3aa0c..6fc0321d353 100644 --- a/lang/ja/notifications.php +++ b/lang/ja/notifications.php @@ -13,7 +13,7 @@ 'updated_page_debounce' => '大量の通知を防ぐために、しばらくの間は同じユーザがこのページをさらに編集しても通知は送信されません。', 'detail_page_name' => 'ページ名：', - 'detail_page_path' => 'Page Path:', + 'detail_page_path' => 'ページパス：', 'detail_commenter' => 'コメントユーザ：', 'detail_comment' => 'コメント：', 'detail_created_by' => '作成ユーザ：', diff --git a/lang/nn/editor.php b/lang/nn/editor.php index 2f3b22d8bd2..4eef9d28aa8 100644 --- a/lang/nn/editor.php +++ b/lang/nn/editor.php @@ -14,24 +14,24 @@ 'save' => 'Lagre', 'close' => 'Lukk', 'undo' => 'Angre', - 'redo' => 'Gjør om', + 'redo' => 'Gjer om', 'left' => 'Venstre', 'center' => 'Sentrert', - 'right' => 'Høyre', + 'right' => 'Høgre', 'top' => 'Topp', 'middle' => 'Sentrert', - 'bottom' => 'Bunn', - 'width' => 'Bredde', - 'height' => 'Høyde', - 'More' => 'Mer', + 'bottom' => 'Botn', + 'width' => 'Breidde', + 'height' => 'Høgde', + 'More' => 'Meir', 'select' => 'Velg …', // Toolbar 'formats' => 'Formater', 'header_large' => 'Stor overskrift', 'header_medium' => 'Medium overskrift', - 'header_small' => 'Liten overskrift', - 'header_tiny' => 'Bitteliten overskrift', + 'header_small' => 'Lita overskrift', + 'header_tiny' => 'Bittelita overskrift', 'paragraph' => 'Avsnitt', 'blockquote' => 'Blokksitat', 'inline_code' => 'Kodesetning', @@ -40,24 +40,24 @@ 'callout_success' => 'Positiv', 'callout_warning' => 'Advarsel', 'callout_danger' => 'Negativ', - 'bold' => 'Fet', + 'bold' => 'Feit', 'italic' => 'Kursiv', 'underline' => 'Understrek', 'strikethrough' => 'Strek over', - 'superscript' => 'Hevet skrift', - 'subscript' => 'Senket skrift', + 'superscript' => 'Heva skrift', + 'subscript' => 'Senka skrift', 'text_color' => 'Tekstfarge', - 'custom_color' => 'Egenvalgt farge', + 'custom_color' => 'Eigenvalgt farge', 'remove_color' => 'Fjern farge', 'background_color' => 'Bakgrunnsfarge', 'align_left' => 'Venstrejustering', 'align_center' => 'Midtstilling', - 'align_right' => 'Høyrejustering', + 'align_right' => 'Høgrejustering', 'align_justify' => 'Blokkjustering', 'list_bullet' => 'Punktliste', 'list_numbered' => 'Nummerert liste', 'list_task' => 'Oppgaveliste', - 'indent_increase' => 'Øk innrykk', + 'indent_increase' => 'Auk innrykk', 'indent_decrease' => 'Redusér innrykk', 'table' => 'Tabell', 'insert_image' => 'Sett inn bilde', diff --git a/lang/nn/entities.php b/lang/nn/entities.php index f2ad696776c..21ab84310b2 100644 --- a/lang/nn/entities.php +++ b/lang/nn/entities.php @@ -23,7 +23,7 @@ 'meta_updated' => 'Oppdatert :timeLength', 'meta_updated_name' => 'Oppdatert :timeLength av :user', 'meta_owned_name' => 'Eigd av :user', - 'meta_reference_count' => 'Referenced by :count item|Referenced by :count items', + 'meta_reference_count' => 'Sitert på :count side|Sitert på :count sider', 'entity_select' => 'Velg entitet', 'entity_select_lack_permission' => 'Du har ikkje tilgang til å velge dette elementet', 'images' => 'Bilete', @@ -132,9 +132,9 @@ 'books_edit_named' => 'Endre boken :bookName', 'books_form_book_name' => 'Boktittel', 'books_save' => 'Lagre bok', - 'books_default_template' => 'Default Page Template', - 'books_default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this book. Keep in mind this will only be used if the page creator has view access to those chosen template page.', - 'books_default_template_select' => 'Select a template page', + 'books_default_template' => 'Standard sidemal', + 'books_default_template_explain' => 'Tildel ein sidemal som vil bli brukt som standardinnhold for alle nye sider i denne boka. Hugs at dette berre vil bli brukt om sideskaperen har tilgang til den valgte malsida.', + 'books_default_template_select' => 'Velg ei malside', 'books_permissions' => 'Boktilganger', 'books_permissions_updated' => 'Boktilganger oppdatert', 'books_empty_contents' => 'Ingen sider eller kapittel finst i denne boka.', @@ -207,7 +207,7 @@ 'pages_delete_draft' => 'Slett utkastet', 'pages_delete_success' => 'Siden er slettet', 'pages_delete_draft_success' => 'Sideutkastet vart sletta', - 'pages_delete_warning_template' => 'This page is in active use as a book default page template. These books will no longer have a default page template assigned after this page is deleted.', + 'pages_delete_warning_template' => 'Denne siden er i aktiv bruk som en standard sidemal for bok. Desse bøkene vil ikkje lenger ha ein standard sidemal som er tilordnet etter at denne sida vert sletta.', 'pages_delete_confirm' => 'Er du sikker på at du vil slette siden?', 'pages_delete_draft_confirm' => 'Er du sikker på at du vil slette utkastet?', 'pages_editing_named' => 'Redigerer :pageName (side)', @@ -409,7 +409,7 @@ // References 'references' => 'Referanser', 'references_none' => 'Det er ingen sporede referanser til dette elementet.', - 'references_to_desc' => 'Listed below is all the known content in the system that links to this item.', + 'references_to_desc' => 'Nedanfor vises alle dei kjente sidene i systemet som lenker til denne oppføringa.', // Watch Options 'watch' => 'Overvåk', diff --git a/lang/nn/notifications.php b/lang/nn/notifications.php index 98c686e4414..247d8d10572 100644 --- a/lang/nn/notifications.php +++ b/lang/nn/notifications.php @@ -4,24 +4,24 @@ */ return [ - 'new_comment_subject' => 'Ny kommentar på siden: :pageName', - 'new_comment_intro' => 'En bruker har kommentert en side i :appName:', + 'new_comment_subject' => 'Ny kommentar på sida: :pageName', + 'new_comment_intro' => 'Ein brukar har kommentert ei side i :appName:', 'new_page_subject' => 'Ny side: :pageName', - 'new_page_intro' => 'En ny side er opprettet i :appName:', + 'new_page_intro' => 'Ei ny side vart oppretta i :appName:', 'updated_page_subject' => 'Oppdatert side: :pageName', - 'updated_page_intro' => 'En side er oppdatert i :appName:', - 'updated_page_debounce' => 'For å forhindre mange varslinger, vil du ikke få nye varslinger for endringer på denne siden fra samme forfatter.', + 'updated_page_intro' => 'Ei side vart oppdatert i :appName:', + 'updated_page_debounce' => 'For å forhindre mange varslingar, vil du ikkje få nye varslinger for endringar på denne siden frå same forfattar.', - 'detail_page_name' => 'Sidenavn:', + 'detail_page_name' => 'Sidenamn:', 'detail_page_path' => 'Sidenamn:', - 'detail_commenter' => 'Kommentar fra:', + 'detail_commenter' => 'Kommentar frå:', 'detail_comment' => 'Kommentar:', - 'detail_created_by' => 'Opprettet av:', + 'detail_created_by' => 'Oppretta av:', 'detail_updated_by' => 'Oppdatert av:', 'action_view_comment' => 'Vis kommentar', - 'action_view_page' => 'Se side', + 'action_view_page' => 'Sjå side', - 'footer_reason' => 'Denne meldingen ble sendt til deg fordi :link dekker denne typen aktivitet for dette elementet.', - 'footer_reason_link' => 'dine varslingsinnstillinger', + 'footer_reason' => 'Denne meldinga vart sendt til deg fordi :link dekker denne typen aktivitet for dette elementet.', + 'footer_reason_link' => 'dine varslingsinnstillingar', ]; diff --git a/lang/nn/pagination.php b/lang/nn/pagination.php index d910da124be..15529d12af8 100644 --- a/lang/nn/pagination.php +++ b/lang/nn/pagination.php @@ -6,7 +6,7 @@ */ return [ - 'previous' => '« Forrige', + 'previous' => '« Førre', 'next' => 'Neste »', ]; diff --git a/lang/zh_CN/entities.php b/lang/zh_CN/entities.php index a0c32fa4f4d..e12f6051afb 100644 --- a/lang/zh_CN/entities.php +++ b/lang/zh_CN/entities.php @@ -23,7 +23,7 @@ 'meta_updated' => '更新于 :timeLength', 'meta_updated_name' => '由 :user 更新于 :timeLength', 'meta_owned_name' => '拥有者 :user', - 'meta_reference_count' => 'Referenced by :count item|Referenced by :count items', + 'meta_reference_count' => '被 :count 个页面引用|被 :count 个页面引用', 'entity_select' => '选择项目', 'entity_select_lack_permission' => '您没有选择此项目所需的权限', 'images' => '图片', @@ -133,7 +133,7 @@ 'books_form_book_name' => '书名', 'books_save' => '保存图书', 'books_default_template' => '默认页面模板', - 'books_default_template_explain' => 'Assign a page template that will be used as the default content for all new pages in this book. Keep in mind this will only be used if the page creator has view access to those chosen template page.', + 'books_default_template_explain' => '指定一个页面模板，该模板将用作本书中所有新页面的默认内容。请注意，仅当页面创建者具有对所选页面模板的查看访问权限时，此功能才会生效。', 'books_default_template_select' => '选择模板页面', 'books_permissions' => '图书权限', 'books_permissions_updated' => '图书权限已更新', diff --git a/lang/zh_TW/common.php b/lang/zh_TW/common.php index 22bde3f0872..53b2a531037 100644 --- a/lang/zh_TW/common.php +++ b/lang/zh_TW/common.php @@ -6,7 +6,7 @@ // Buttons 'cancel' => '取消', - 'close' => 'Close', + 'close' => '關閉', 'confirm' => '確認', 'back' => '返回', 'save' => '儲存', @@ -42,7 +42,7 @@ 'remove' => '移除', 'add' => '新增', 'configure' => '配置', - 'manage' => 'Manage', + 'manage' => '管理', 'fullscreen' => '全螢幕', 'favourite' => '最愛', 'unfavourite' => '取消最愛', @@ -52,7 +52,7 @@ 'filter_clear' => '清理過濾', 'download' => '下載', 'open_in_tab' => '在新分頁中開啟', - 'open' => 'Open', + 'open' => '開啟', // Sort Options 'sort_options' => '排序選項', diff --git a/lang/zh_TW/components.php b/lang/zh_TW/components.php index 36f2265d133..682a8ed4d8c 100644 --- a/lang/zh_TW/components.php +++ b/lang/zh_TW/components.php @@ -6,10 +6,10 @@ // Image Manager 'image_select' => '選取圖片', - 'image_list' => 'Image List', - 'image_details' => 'Image Details', - 'image_upload' => 'Upload Image', - 'image_intro' => 'Here you can select and manage images that have been previously uploaded to the system.', + 'image_list' => '圖片列表', + 'image_details' => '圖片詳細資訊', + 'image_upload' => '上傳圖片', + 'image_intro' => '您可以在這裡選取和管理上傳到系統的圖片。', 'image_intro_upload' => 'Upload a new image by dragging an image file into this window, or by using the "Upload Image" button above.', 'image_all' => '全部', 'image_all_title' => '檢視所有圖片', @@ -26,14 +26,14 @@ 'image_delete_confirm_text' => '您確認想要刪除這個圖片？', 'image_select_image' => '選取圖片', 'image_dropzone' => '拖曳圖片或點擊此處上傳', - 'image_dropzone_drop' => 'Drop images here to upload', + 'image_dropzone_drop' => '將圖片拖放到此處上傳', 'images_deleted' => '圖片已刪除', 'image_preview' => '圖片預覽', 'image_upload_success' => '圖片上傳成功', 'image_update_success' => '圖片詳細資訊更新成功', 'image_delete_success' => '圖片刪除成功', - 'image_replace' => 'Replace Image', - 'image_replace_success' => 'Image file successfully updated', + 'image_replace' => '替換圖片', + 'image_replace_success' => '圖片更新成功', 'image_rebuild_thumbs' => 'Regenerate Size Variations', 'image_rebuild_thumbs_success' => 'Image size variations successfully rebuilt!', diff --git a/lang/zh_TW/settings.php b/lang/zh_TW/settings.php index ee05b202467..c3c86177026 100644 --- a/lang/zh_TW/settings.php +++ b/lang/zh_TW/settings.php @@ -32,7 +32,7 @@ 'app_custom_html_desc' => '此處加入的任何內容都將插入到每個頁面的 部分的底部，這對於覆蓋樣式或加入分析程式碼很方便。', 'app_custom_html_disabled_notice' => '在此設定頁面上停用了自訂 HTML 標題內容，以確保任何重大變更都能被還原。', 'app_logo' => '應用程式圖示', - '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.', + 'app_logo_desc' => '這個設定會被使用在應用程式標題欄等區域；圖片的高度應為 86 像素，大型圖片將會按比例縮小。', 'app_icon' => '應用程式圖示', 'app_icon_desc' => 'This icon is used for browser tabs and shortcut icons. This should be a 256px square PNG image.', 'app_homepage' => '應用程式首頁', @@ -53,7 +53,7 @@ 'ui_colors_desc' => 'Set the application primary color and default link color. 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 application interface.', 'app_color' => '主要顏色', 'link_color' => '連結預設顏色', - '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.', + 'content_colors_desc' => '設定頁面層次結構中的元素顏色；為了提高可讀性，建議選擇亮度與預設顏色相似的顏色。', 'bookshelf_color' => '書架顔色', 'book_color' => '書本顔色', 'chapter_color' => '章節顔色', @@ -269,7 +269,7 @@ 'webhooks_delete' => '刪除 Webhook', 'webhooks_delete_warning' => 'This will fully delete this webhook, with the name \':webhookName\', from the system.', 'webhooks_delete_confirm' => 'Are you sure you want to delete this webhook?', - 'webhooks_format_example' => 'Webhook Format Example', + 'webhooks_format_example' => 'Webhook 格式範例', 'webhooks_format_example_desc' => 'Webhook data is sent as a POST request to the configured endpoint as JSON following the format below. The "related_item" and "url" properties are optional and will depend on the type of event triggered.', 'webhooks_status' => 'Webhook 狀態', 'webhooks_last_called' => 'Last Called:', From 496b4264d9df114a0bc4bde8fba2ff4bd9d4c266 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Tue, 16 Jan 2024 12:14:25 +0000 Subject: [PATCH 4/5] Updated translator attribution --- .github/translators.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/translators.txt b/.github/translators.txt index a27717f9421..ef16da25722 100644 --- a/.github/translators.txt +++ b/.github/translators.txt @@ -324,7 +324,7 @@ Robin Flikkema (RobinFlikkema) :: Dutch Michal Gurcik (mgurcik) :: Slovak Pooyan Arab (pooyanarab) :: Persian Ochi Darma Putra (troke12) :: Indonesian -H.-H. Peng (Hsins) :: Chinese Traditional +Hsin-Hsiang Peng (Hsins) :: Chinese Traditional Mosi Wang (mosiwang) :: Chinese Traditional 骆言 (LawssssCat) :: Chinese Simplified Stickers Gaming Shøw (StickerSGSHOW) :: French @@ -386,3 +386,5 @@ Y (cnsr) :: Ukrainian ZY ZV (vy0b0x) :: Chinese Simplified diegobenitez :: Spanish Marc Hagen (MarcHagen) :: Dutch +Kasper Alsøe (zeonos) :: Danish +sultani :: Persian From 369e499dce442dab5bbdd1f853c6cd82a1f6c0fa Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Tue, 16 Jan 2024 12:16:06 +0000 Subject: [PATCH 5/5] Updated version and assets for release v23.12.1 --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 5df372daff1..6a54901b092 100644 --- a/version +++ b/version @@ -1 +1 @@ -v23.12 +v23.12.1

- Cloudabove + + Diagrams.net - Practicali + + Cloudabove
- Stellar Hosted + + Practicali - Torutec + + Stellar Hosted