2024/01/30までの原文変更点を反映。

original-en/billing.md

@@ -920,7 +920,7 @@ If you would like to add a subscription to a customer who already has a default
 <a name="creating-subscriptions-from-the-stripe-dashboard"></a>
 #### Creating Subscriptions From the Stripe Dashboard
 
-You may also create subscriptions from the Stripe dashboard itself. When doing so, Cashier will sync newly added subscriptions and assign them a type of `default`. To customize the subscription type that is assigned to dashboard created subscriptions, [extend the `WebhookController`](#defining-webhook-event-handlers) and overwrite the `newSubscriptionType` method.
+You may also create subscriptions from the Stripe dashboard itself. When doing so, Cashier will sync newly added subscriptions and assign them a type of `default`. To customize the subscription type that is assigned to dashboard created subscriptions, [define webhook event handlers](#defining-webhook-event-handlers).
 
 In addition, you may only create one type of subscription via the Stripe dashboard. If your application offers multiple subscriptions that use different types, only one type of subscription may be added through the Stripe dashboard.
 

original-en/broadcasting.md

@@ -52,7 +52,7 @@ The core concepts behind broadcasting are simple: clients connect to named chann
 <a name="supported-drivers"></a>
 #### Supported Drivers
 
-By default, Laravel includes two server-side broadcasting drivers for you to choose from: [Pusher Channels](https://pusher.com/channels) and [Ably](https://ably.com). However, community driven packages such as [laravel-websockets](https://beyondco.de/docs/laravel-websockets/getting-started/introduction) and [soketi](https://docs.soketi.app/) provide additional broadcasting drivers that do not require commercial broadcasting providers.
+By default, Laravel includes two server-side broadcasting drivers for you to choose from: [Pusher Channels](https://pusher.com/channels) and [Ably](https://ably.com). However, community driven packages such as [soketi](https://docs.soketi.app/) provide additional broadcasting drivers that do not require commercial broadcasting providers.
 
 > [!NOTE]  
 > Before diving into event broadcasting, make sure you have read Laravel's documentation on [events and listeners](/docs/{{version}}/events).
@@ -110,7 +110,7 @@ Finally, you are ready to install and configure [Laravel Echo](#client-side-inst
 <a name="pusher-compatible-open-source-alternatives"></a>
 #### Open Source Pusher Alternatives
 
-The [laravel-websockets](https://github.com/beyondcode/laravel-websockets) and [soketi](https://docs.soketi.app/) packages provide Pusher compatible WebSocket servers for Laravel. These packages allow you to leverage the full power of Laravel broadcasting without a commercial WebSocket provider. For more information on installing and using these packages, please consult our documentation on [open source alternatives](#open-source-alternatives).
+[soketi](https://docs.soketi.app/) provides a Pusher compatible WebSocket server for Laravel, allowing you to leverage the full power of Laravel broadcasting without a commercial WebSocket provider. For more information on installing and using open source packages for broadcasting, please consult our documentation on [open source alternatives](#open-source-alternatives).
 
 <a name="ably"></a>
 ### Ably
@@ -141,11 +141,6 @@ Finally, you are ready to install and configure [Laravel Echo](#client-side-inst
 <a name="open-source-alternatives"></a>
 ### Open Source Alternatives
 
-<a name="open-source-alternatives-php"></a>
-#### PHP
-
-The [laravel-websockets](https://github.com/beyondcode/laravel-websockets) package is a pure PHP, Pusher compatible WebSocket package for Laravel. This package allows you to leverage the full power of Laravel broadcasting without a commercial WebSocket provider. For more information on installing and using this package, please consult its [official documentation](https://beyondco.de/docs/laravel-websockets).
-
 <a name="open-source-alternatives-node"></a>
 #### Node
 

original-en/facades.md

@@ -282,6 +282,7 @@ Process  |  [Illuminate\Process\Factory](https://laravel.com/api/{{version}}/Ill
 Queue  |  [Illuminate\Queue\QueueManager](https://laravel.com/api/{{version}}/Illuminate/Queue/QueueManager.html)  |  `queue`
 Queue (Instance)  |  [Illuminate\Contracts\Queue\Queue](https://laravel.com/api/{{version}}/Illuminate/Contracts/Queue/Queue.html)  |  `queue.connection`
 Queue (Base Class)  |  [Illuminate\Queue\Queue](https://laravel.com/api/{{version}}/Illuminate/Queue/Queue.html)  |   
+RateLimiter  |  [Illuminate\Cache\RateLimiter](https://laravel.com/api/{{version}}/Illuminate/Cache/RateLimiter.html)  |   
 Redirect  |  [Illuminate\Routing\Redirector](https://laravel.com/api/{{version}}/Illuminate/Routing/Redirector.html)  |  `redirect`
 Redis  |  [Illuminate\Redis\RedisManager](https://laravel.com/api/{{version}}/Illuminate/Redis/RedisManager.html)  |  `redis`
 Redis (Instance)  |  [Illuminate\Redis\Connections\Connection](https://laravel.com/api/{{version}}/Illuminate/Redis/Connections/Connection.html)  |  `redis.connection`

original-en/installation.md

@@ -64,7 +64,7 @@ composer create-project laravel/laravel example-app
 Or, you may create new Laravel projects by globally installing [the Laravel installer](https://github.com/laravel/installer) via Composer:
 
 ```nothing
-composer global require laravel/installer
+composer global require laravel/installer:^5.4
 
 laravel new example-app
 ```
@@ -244,7 +244,7 @@ Once the application's Docker containers have been started, you can access the a
 <a name="choosing-your-sail-services"></a>
 ### Choosing Your Sail Services
 
-When creating a new Laravel application via Sail, you may use the `with` query string variable to choose which services should be configured in your new application's `docker-compose.yml` file. Available services include `mysql`, `pgsql`, `mariadb`, `redis`, `memcached`, `meilisearch`, `minio`, `selenium`, and `mailpit`:
+When creating a new Laravel application via Sail, you may use the `with` query string variable to choose which services should be configured in your new application's `docker-compose.yml` file. Available services include `mysql`, `pgsql`, `mariadb`, `redis`, `memcached`, `meilisearch`, `typesense`, `minio`, `selenium`, and `mailpit`:
 
 ```shell
 curl -s "https://laravel.build/example-app?with=mysql,redis" | bash

original-en/notifications.md

@@ -325,6 +325,13 @@ If you would like to provide the recipient's name when sending an on-demand noti
         '[email protected]' => 'Barrett Blair',
     ])->notify(new InvoicePaid($invoice));
 
+Using the `routes` method, you may provide ad-hoc routing information for multiple notification channels at once:
+
+    Notification::routes([
+        'mail' => ['[email protected]' => 'Barrett Blair'],
+        'vonage' => '5555555555',
+    ])->notify(new InvoicePaid($invoice));
+
 <a name="mail-notifications"></a>
 ## Mail Notifications
 

original-en/queries.md

@@ -56,7 +56,6 @@ You may use the `table` method provided by the `DB` facade to begin a query. The
 
     namespace App\Http\Controllers;
 
-    use App\Http\Controllers\Controller;
     use Illuminate\Support\Facades\DB;
     use Illuminate\View\View;
 

original-en/sail.md

@@ -14,6 +14,7 @@
     - [MySQL](#mysql)
     - [Redis](#redis)
     - [Meilisearch](#meilisearch)
+    - [Typesense](#typesense)
 - [File Storage](#file-storage)
 - [Running Tests](#running-tests)
     - [Laravel Dusk](#laravel-dusk)
@@ -238,6 +239,20 @@ If you chose to install the [Meilisearch](https://www.meilisearch.com) service w
 
 From your local machine, you may access Meilisearch's web based administration panel by navigating to `http://localhost:7700` in your web browser.
 
+<a name="typesense"></a>
+### Typesense
+
+If you chose to install the [Typesense](https://typesense.org) service when installing Sail, your application's `docker-compose.yml` file will contain an entry for this lightning fast, open-source search-engine that is natively integrated with [Laravel Scout](/docs/{{version}}/scout#typesense). Once you have started your containers, you may connect to the Typesense instance within your application by setting the following environment variables:
+
+```ini
+TYPESENSE_HOST=typesense
+TYPESENSE_PORT=8108
+TYPESENSE_PROTOCOL=http
+TYPESENSE_API_KEY=xyz
+```
+
+From your local machine, you may access Typesense's API via `http://localhost:8108`.
+
 <a name="file-storage"></a>
 ## File Storage
 

original-en/scout.md

@@ -177,6 +177,8 @@ public function toSearchableArray()
 }
 ```
 
+You should also define your Typesense collection schemas in your application's `config/scout.php` file. A collection schema describes the data types of each field that is searchable via Typesense. For more information on all available schema options, please consult the [Typesense documentation](https://typesense.org/docs/latest/api/collections.html#schema-parameters). If you need to change your Typesense collection's schema after it has been defined, you must do so via Typesense's API.
+
 If your searchable model is soft deletable, you should define a `__soft_deleted` field in the model's corresponding Typesense schema within your application's `config/scout.php` configuration file:
 
 ```php
@@ -197,12 +199,12 @@ User::class => [
 <a name="typesense-dynamic-search-parameters"></a>
 #### Dynamic Search Parameters
 
-Typesense allows you to modify your [search parameters](https://typesense.org/docs/latest/api/search.html#search-parameters) dynamically when performing a search operation via the `withSearchParameters` method:
+Typesense allows you to modify your [search parameters](https://typesense.org/docs/latest/api/search.html#search-parameters) dynamically when performing a search operation via the `options` method:
 
 ```php
 use App\Models\Todo;
 
-Todo::search('Groceries')->withSearchParameters([
+Todo::search('Groceries')->options([
     'query_by' => 'title, description'
 ])->get();
 ```

original-en/strings.md

@@ -100,6 +100,7 @@ Laravel includes a variety of functions for manipulating string values. Many of
 [Str::ucsplit](#method-str-ucsplit)
 [Str::upper](#method-str-upper)
 [Str::ulid](#method-str-ulid)
+[Str::unwrap](#method-str-unwrap)
 [Str::uuid](#method-str-uuid)
 [Str::wordCount](#method-str-word-count)
 [Str::wordWrap](#method-str-word-wrap)
@@ -195,6 +196,7 @@ Laravel includes a variety of functions for manipulating string values. Many of
 [trim](#method-fluent-str-trim)
 [ucfirst](#method-fluent-str-ucfirst)
 [ucsplit](#method-fluent-str-ucsplit)
+[unwrap](#method-fluent-str-unwrap)
 [upper](#method-fluent-str-upper)
 [when](#method-fluent-str-when)
 [whenContains](#method-fluent-str-when-contains)
@@ -1204,6 +1206,21 @@ use Illuminate\Support\Str;
 $date = Carbon::createFromId((string) Str::ulid());
 ```
 
+<a name="method-str-unwrap"></a>
+#### `Str::unwrap()` {.collection-method}
+
+The `Str::unwrap` method removes the specified strings from the beginning and end of a given string:
+
+    use Illuminate\Support\Str;
+
+    Str::unwrap('-Laravel-', '-');
+
+    // Laravel
+
+    Str::unwrap('{framework: "Laravel"}', '{', '}');
+
+    // framework: "Laravel"
+
 <a name="method-str-uuid"></a>
 #### `Str::uuid()` {.collection-method}
 
@@ -2421,6 +2438,21 @@ The `ucsplit` method splits the given string into a collection by uppercase char
 
     // collect(['Foo', 'Bar'])
 
+<a name="method-fluent-str-unwrap"></a>
+#### `unwrap` {.collection-method}
+
+The `unwrap` method removes the specified strings from the beginning and end of a given string:
+
+    use Illuminate\Support\Str;
+
+    Str::of('-Laravel-')->unwrap('-');
+
+    // Laravel
+
+    Str::of('{framework: "Laravel"}')->unwrap('{', '}');
+
+    // framework: "Laravel"
+
 <a name="method-fluent-str-upper"></a>
 #### `upper` {.collection-method}
 

translation-ja/billing.md

@@ -920,7 +920,7 @@ Stripeがサポートしている[顧客](https://stripe.com/docs/api/customers/
 <a name="creating-subscriptions-from-the-stripe-dashboard"></a>
 #### Stripeダッシュボードからのサブスクリプション作成
 
-Stripeダッシュボード自体からも、サブスクリプションを作成できます。その際、Cashierは新しく追加したサブスクリプションを同期し、それらに`default`のタイプを割り当てます。ダッシュボードから作成するサブスクリプションに割り当てるサブスクリプション名をカスタマイズするには、[`WebhookController`を拡張](#defining-webhook-event-handlers)し、`newSubscriptionType`メソッドを上書きします。
+Stripeダッシュボード自体からも、サブスクリプションを作成できます。その際、Cashierは新しく追加したサブスクリプションを同期し、それらに`default`のタイプを割り当てます。ダッシュボードから作成するサブスクリプションに割り当てるサブスクリプション名をカスタマイズするには、[Webフックイベントハンドラを定義](#defining-webhook-event-handlers)してください。
 
 また、Stripeダッシュボードから作成できるサブスクリプションのタイプは１つだけです。アプリケーションが異なるタイプを使用する複数のサブスクリプションを提供している場合でも、Stripeダッシュボードから追加できるサブスクリプションのタイプは１つのみです。
 

translation-ja/broadcasting.md

@@ -52,7 +52,7 @@
 <a name="supported-drivers"></a>
 #### サポートしているドライバ
 
-Laravelはデフォルトで、[Pusherチャンネル](https://pusher.com/channels)と[Ably](https://ably.com)、２つのサーバ側ブロードキャストドライバを用意しています。ただし、[laravel-websockets](https://beyondco.de/docs/laravel-websockets/getting-started/introduction)や[soketi](https://docs.soketi.app/)など、コミュニティ主導のパッケージでは、商用ブロードキャストプロバイダを必要としないドライバを提供しています。
+Laravelはデフォルトで、[Pusherチャンネル](https://pusher.com/channels)と[Ably](https://ably.com)、２つのサーバ側ブロードキャストドライバを用意しています。ただし、[soketi](https://docs.soketi.app/)などのコミュニティ主導のパッケージでは、商用ブロードキャストプロバイダを必要としないドライバを提供しています。
 
 > [!NOTE]
 > イベントブロードキャストに取り掛かる前に、[イベントとリスナ](/docs/{{version}}/events)に関するLaravelのドキュメントをしっかりと読んでください。
@@ -110,7 +110,7 @@ BROADCAST_DRIVER=pusher
 <a name="pusher-compatible-open-source-alternatives"></a>
 #### オープンソースによるPusherの代替
 
-[laravel-websockets](https://github.com/beyondcode/laravel-websockets)と[soketi](https://docs.soketi.app/)パッケージは、Laravel用のPusher互換WebSocketサーバを提供します。これらのパッケージを使用することにより、商用WebSocketプロバイダーを使わずとも、Laravelブロードキャストの機能をフルに活用できます。これらのパッケージのインストールと使用に関する詳細は、[オープンソース代替](#open-source-alternatives)のドキュメントを参照してください。
+[soketi](https://docs.soketi.app/)は、Laravel用のPusher互換WebSocketサーバを提供しており、商用WebSocketプロバイダーを使わずにLaravelブロードキャストのフルパワーを活用できます。ブロードキャスト用のオープンソースパッケージのインストールと使用の詳細については、[オープンソースの代替](#open-source-alternatives)のドキュメントを参照してください。
 
 <a name="ably"></a>
 ### Ably
@@ -141,11 +141,6 @@ BROADCAST_DRIVER=ably
 <a name="open-source-alternatives"></a>
 ### オープンソースの代替
 
-<a name="open-source-alternatives-php"></a>
-#### PHP
-
-[laravel-websockets](https://github.com/beyondcode/laravel-websockets)パッケージは、PHP製のLaravel用Pusher互換WebSocketパッケージです。このパッケージを使用すると、商用WebSocketプロバイダを使用せずとも、Laravelブロードキャストの全機能を活用できます。このパッケージのインストールと使用の詳細は、[公式ドキュメント](https://beyondco.de/docs/laravel-websockets)を参照してください。
-
 <a name="open-source-alternatives-node"></a>
 #### Node
 

translation-ja/facades.md

@@ -282,6 +282,7 @@ Laravelアプリケーションのファサードは、コンテナからのオ
 | Queue                | [Illuminate\Queue\QueueManager](https://laravel.com/api/{{version}}/Illuminate/Queue/QueueManager.html)                                     | `queue`                  |
 | Queue (Instance)     | [Illuminate\Contracts\Queue\Queue](https://laravel.com/api/{{version}}/Illuminate/Contracts/Queue/Queue.html)                               | `queue.connection`       |
 | Queue (Base Class)   | [Illuminate\Queue\Queue](https://laravel.com/api/{{version}}/Illuminate/Queue/Queue.html)                                                   |                     |
+RateLimiter  |  [Illuminate\Cache\RateLimiter](https://laravel.com/api/{{version}}/Illuminate/Cache/RateLimiter.html)  |   
 | Redirect             | [Illuminate\Routing\Redirector](https://laravel.com/api/{{version}}/Illuminate/Routing/Redirector.html)                                     | `redirect`               |
 | Redis                | [Illuminate\Redis\RedisManager](https://laravel.com/api/{{version}}/Illuminate/Redis/RedisManager.html)                                     | `redis`                  |
 | Redis (Instance)     | [Illuminate\Redis\Connections\Connection](https://laravel.com/api/{{version}}/Illuminate/Redis/Connections/Connection.html)                 | `redis.connection`       |

translation-ja/installation.md

@@ -64,7 +64,7 @@ composer create-project laravel/laravel example-app
 もしくは、Composerを使い、[Laravelインストーラ](https://github.com/laravel/installer)をグローバルにインストールして、新しいLaravelプロジェクトを作成することもできます。
 
 ```nothing
-composer global require laravel/installer
+composer global require laravel/installer:^5.4
 
 laravel new example-app
 ```
@@ -244,7 +244,7 @@ cd example-app
 <a name="choosing-your-sail-services"></a>
 ### Sailサービスの選択
 
-Sailで新しいLaravelアプリケーションを作成する際に、`with`というクエリ文字列変数を使って、新しいアプリケーションの`docker-compose.yml`ファイルで設定するサービスを選択できます。利用可能なサービスは、`mysql`、`pgsql`、`mariadb`、`redis`、`memcached`、`meilisearch`、`minio`、`selenium`、`mailpit`です。
+Sailで新しいLaravelアプリケーションを作成する際に、`with`というクエリ文字列変数を使って、新しいアプリケーションの`docker-compose.yml`ファイルで設定するサービスを選択できます。利用可能なサービスは、`mysql`、`pgsql`、`mariadb`、`redis`、`memcached`、`meilisearch`、`typesence`、`minio`、`selenium`、`mailpit`です。
 
 ```shell
 curl -s "https://laravel.build/example-app?with=mysql,redis" | bash

translation-ja/notifications.md

@@ -325,6 +325,13 @@ php artisan make:notification InvoicePaid
         '[email protected]' => 'Barrett Blair',
     ])->notify(new InvoicePaid($invoice));
 
+routes`メソッドを使用すると、一度に複数の通知チャネルに対してアドホックなルーティング情報を提供できます。
+
+    Notification::routes([
+        'mail' => ['[email protected]' => 'Barrett Blair'],
+        'vonage' => '5555555555',
+    ])->notify(new InvoicePaid($invoice));
+
 <a name="mail-notifications"></a>
 ## メール通知
 

translation-ja/queries.md

@@ -56,7 +56,6 @@ Laravelクエリビルダは、PDOパラメーターバインディングを使
 
     namespace App\Http\Controllers;
 
-    use App\Http\Controllers\Controller;
     use Illuminate\Support\Facades\DB;
     use Illuminate\View\View;