Skip to content

Commit d79d2a8

Browse files
Merge remote-tracking branch 'origin/master' into minor
ja.po conflict resolved by a per-msgid three-way merge: minor's message set with master's translation updates from PR 5077 applied on top. Where both branches had independently translated the same string, master's wording was taken.
2 parents 52a80b5 + 4790067 commit d79d2a8

4 files changed

Lines changed: 5098 additions & 3630 deletions

File tree

packages/dashboard/lingui.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ export default defineConfig({
3030
'sv',
3131
'tr',
3232
'ja',
33+
'ko',
3334
'bg',
3435
'nl',
3536
'ro',

packages/dashboard/src/i18n/locales/ja.po

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ msgstr "タイプ"
180180

181181
#: src/app/routes/_authenticated/_channels/channels_.$id.tsx
182182
msgid "The default currency is chosen from this list."
183-
msgstr ""
183+
msgstr "デフォルト通貨はこのリストから選択されます。"
184184

185185
#. placeholder {0}: asset.name
186186
#. placeholder {0}: entityName.toLowerCase()
@@ -194,7 +194,7 @@ msgstr "{0}を選択"
194194
#. placeholder {0}: selectedItems.length
195195
#: src/lib/components/data-input/relation-selector.tsx
196196
msgid "Add more ({0} selected)"
197-
msgstr "さらに追加({0}件選択中)"
197+
msgstr "さらに追加({0} 件選択中)"
198198

199199
#: src/app/routes/_authenticated/_facets/facets.tsx
200200
#~ msgid "View values"
@@ -647,7 +647,7 @@ msgstr "注文数"
647647

648648
#: src/app/routes/_authenticated/_channels/channels_.$id.tsx
649649
msgid "You must first select an available currency to set a default currency"
650-
msgstr ""
650+
msgstr "デフォルト通貨を設定するには、まず利用可能な通貨を選択する必要があります"
651651

652652
#: src/app/routes/_authenticated/_orders/components/fulfillment-details.tsx
653653
msgid "Fulfilled items"
@@ -972,7 +972,7 @@ msgstr "{0}個の適格な配送方法が見つかりました"
972972
#: src/lib/components/shared/asset/asset-gallery.tsx
973973
#: src/lib/components/shared/asset/asset-properties.tsx
974974
msgid "Dimensions"
975-
msgstr "サイズ"
975+
msgstr "寸法"
976976

977977
#: src/lib/components/ui/password-input.tsx
978978
msgid "Show password"
@@ -1214,7 +1214,7 @@ msgstr "割り当て済み"
12141214
#. placeholder {0}: error.message
12151215
#: src/app/routes/_authenticated/_orders/orders_.draft.$id.tsx
12161216
msgid "Failed to set coupon code for order: {0}"
1217-
msgstr "注文へのクーポンコードの設定に失敗しました: {0}"
1217+
msgstr "注文のクーポンコードの設定に失敗しました: {0}"
12181218

12191219
#: src/app/routes/_authenticated/_stock-locations/components/delete-stock-locations-dialog.tsx
12201220
msgid "Select what to do with remaining stock"
@@ -1430,7 +1430,7 @@ msgstr "価格はデフォルト税ゾーンの税を含みます"
14301430
#: src/app/routes/_authenticated/_channels/channels_.$id.tsx
14311431
#: src/app/routes/_authenticated/_channels/channels_.$id.tsx
14321432
msgid "This field is required"
1433-
msgstr ""
1433+
msgstr "このフィールドは必須です"
14341434

14351435
#: src/app/routes/_authenticated/_orders/components/order-modification-preview-dialog.tsx
14361436
msgid "Total refund:"
@@ -1521,7 +1521,7 @@ msgstr "アカウントに割り当てられたロールのみ使用可能です
15211521

15221522
#: src/app/routes/_authenticated/_system/components/cancel-jobs-bulk-action.tsx
15231523
msgid "{cancellableCount, plural, one {Cancel {cancellableCount} job} other {Cancel {cancellableCount} jobs}}"
1524-
msgstr "{cancellableCount, plural, one {{cancellableCount}件のジョブをキャンセル} other {{cancellableCount}件のジョブをキャンセル}}"
1524+
msgstr "{cancellableCount, plural, other {{cancellableCount} 件のジョブをキャンセル}}"
15251525

15261526
#: src/lib/components/data-input/product-multi-selector-input.tsx
15271527
msgid "{buttonText}"
@@ -1799,7 +1799,7 @@ msgstr "顧客"
17991799

18001800
#: src/app/routes/_authenticated/_shipping-methods/components/shipping-calculator-selector.tsx
18011801
msgid "Select Shipping Calculator"
1802-
msgstr "配送料計算機を選択"
1802+
msgstr "配送料の計算方法を選択"
18031803

18041804
#: src/lib/components/layout/language-dialog.tsx
18051805
msgid "Sample Formatting"
@@ -1914,7 +1914,7 @@ msgstr "キャンセル"
19141914
#. placeholder {0}: error.message
19151915
#: src/app/routes/_authenticated/_orders/orders_.draft.$id.tsx
19161916
msgid "Failed to update order custom fields: {0}"
1917-
msgstr "注文のカスタムフィールドの更新に失敗しました: {0}"
1917+
msgstr "注文カスタムフィールドの更新に失敗しました: {0}"
19181918

19191919
#: src/app/routes/_authenticated/_product-variants/product-variants_.$id.tsx
19201920
#: src/app/routes/_authenticated/_products/components/add-product-variant-dialog.tsx
@@ -2318,7 +2318,7 @@ msgstr "テーマ"
23182318

23192319
#: src/app/routes/_authenticated/_channels/channels_.$id.tsx
23202320
msgid "You must select at least one available currency"
2321-
msgstr ""
2321+
msgstr "利用可能な通貨を少なくとも1つ選択する必要があります"
23222322

23232323
#. placeholder {0}: value.totalItems
23242324
#: src/app/routes/_authenticated/_customer-groups/customer-groups.tsx
@@ -3072,7 +3072,7 @@ msgstr "すべてのタイプ"
30723072
#. placeholder {0}: entityIds.length
30733073
#: src/lib/components/shared/assign-to-channel-dialog.tsx
30743074
msgid "Select channels to assign {0} {entityType} to"
3075-
msgstr ""
3075+
msgstr "{0}件の{entityType}を割り当てるチャネルを選択"
30763076

30773077
#: src/app/routes/_authenticated/_collections/collections.tsx
30783078
msgid "Collapse"
@@ -3436,7 +3436,7 @@ msgstr "住所を更新しました"
34363436
#. placeholder {0}: selectedChannelIds.length
34373437
#: src/lib/components/shared/assign-to-channel-dialog.tsx
34383438
msgid "Successfully assigned {entityIdsLength} {entityType} to {0} channels"
3439-
msgstr ""
3439+
msgstr "{entityIdsLength} 件の{entityType}を {0} 件のチャネルに割り当てました"
34403440

34413441
#: src/app/routes/_authenticated/_orders/hooks/use-refund-order.ts
34423442
msgid "Refund processed successfully"
@@ -3730,7 +3730,7 @@ msgstr "販売者を作成しました"
37303730
#. placeholder {1}: selectedChannelIds.length
37313731
#: src/lib/components/shared/assign-to-channel-dialog.tsx
37323732
msgid "Failed to assign {entityIdsLength} {entityType} to {0} of {1} channels"
3733-
msgstr ""
3733+
msgstr "{entityIdsLength} 件の{entityType}を {1} 件中 {0} 件のチャネルに割り当てられませんでした"
37343734

37353735
#: src/app/routes/_authenticated/_profile/profile.tsx
37363736
msgid "Failed to update profile picture"
@@ -4949,7 +4949,7 @@ msgstr "高さ"
49494949

49504950
#: src/lib/components/shared/assign-to-channel-dialog.tsx
49514951
msgid "Assign {entityType} to channels"
4952-
msgstr ""
4952+
msgstr "{entityType}をチャネルに割り当て"
49534953

49544954
#: src/app/routes/_authenticated/_orders/components/order-modification-preview-dialog.tsx
49554955
msgid "A refund of {formattedDiff} is required. Select payment amounts and enter a note to proceed."
@@ -5034,7 +5034,7 @@ msgstr "支払い適格性チェッカーを選択"
50345034

50355035
#: src/lib/components/shared/assign-to-channel-dialog.tsx
50365036
msgid "Select one or more channels"
5037-
msgstr ""
5037+
msgstr "1つ以上のチャネルを選択"
50385038

50395039
#: src/lib/components/data-table/filters/data-table-enum-filter.tsx
50405040
msgid "Select operator"
@@ -5209,7 +5209,7 @@ msgstr "OR"
52095209

52105210
#: src/app/routes/_authenticated/_channels/channels_.$id.tsx
52115211
msgid "You must select a default currency from the list of available currencies"
5212-
msgstr ""
5212+
msgstr "利用可能な通貨のリストからデフォルト通貨を選択する必要があります"
52135213

52145214
#: src/app/routes/_authenticated/_assets/components/asset-tags-editor.tsx
52155215
msgid "Manage tags"
@@ -5240,7 +5240,7 @@ msgstr "注文をフルフィルメントしました"
52405240

52415241
#: src/lib/components/data-input/product-multi-selector-input.tsx
52425242
msgid "Loading selected items..."
5243-
msgstr "選択した項目を読み込み中..."
5243+
msgstr "選択したアイテムを読み込み中..."
52445244

52455245
#. placeholder {0}: error.message
52465246
#: src/app/routes/_authenticated/_orders/orders_.draft.$id.tsx
@@ -6164,7 +6164,7 @@ msgstr "名"
61646164

61656165
#: src/lib/components/shared/product-variant-selector.tsx
61666166
msgid "Add item to order"
6167-
msgstr "注文に商品を追加"
6167+
msgstr "注文にアイテムを追加"
61686168

61696169
#: src/lib/components/data-table/human-readable-operator.tsx
61706170
msgid "contains"
@@ -6317,7 +6317,7 @@ msgstr "最初のプロモーションを作成しましょう"
63176317

63186318
#: src/app/routes/_authenticated/_channels/channels_.$id.tsx
63196319
msgid "Defaults to the default language."
6320-
msgstr ""
6320+
msgstr "デフォルト言語が使用されます。"
63216321

63226322
#: src/lib/components/data-input/custom-field-list-input.tsx
63236323
msgid "Remove item"
@@ -6516,7 +6516,7 @@ msgstr "すべての可能なバリアントの組み合わせは既に存在し
65166516

65176517
#: src/app/routes/_authenticated/_system/components/cancel-jobs-bulk-action.tsx
65186518
msgid "{cancellableCount, plural, one {Are you sure you want to cancel {cancellableCount} job? This action cannot be undone.} other {Are you sure you want to cancel {cancellableCount} jobs? This action cannot be undone.}}"
6519-
msgstr "{cancellableCount, plural, one {{cancellableCount}件のジョブをキャンセルしてもよろしいですか?この操作は元に戻せません。} other {{cancellableCount}件のジョブをキャンセルしてもよろしいですか?この操作は元に戻せません。}}"
6519+
msgstr "{cancellableCount, plural, other {{cancellableCount} 件のジョブをキャンセルしてもよろしいですか?この操作は取り消せません。}}"
65206520

65216521
#: src/app/routes/_authenticated/_product-variants/components/variant-option-select.tsx
65226522
msgid "Go to option group"
@@ -6610,7 +6610,7 @@ msgstr "エントリーを検索..."
66106610
#: src/app/routes/_authenticated/_payment-methods/payment-methods_.$id.tsx
66116611
#: src/app/routes/_authenticated/_shipping-methods/shipping-methods_.$id.tsx
66126612
msgid "Calculator"
6613-
msgstr "計算機"
6613+
msgstr "計算方法"
66146614

66156615
#: src/app/routes/_authenticated/_option-groups/components/option-group-bulk-actions.tsx
66166616
msgid "Failed to remove option group from channel: {message}"

0 commit comments

Comments
 (0)