Marie
|
85355813ad
|
merge: latest changes
|
2024-02-09 19:22:06 +01:00 |
|
syuilo
|
b5b31bfd5b
|
New Crowdin updates (#13179)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Czech)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Catalan)
|
2024-02-09 17:05:37 +09:00 |
|
おさむのひと
|
614c9a0fc6
|
fix: 特定文字列を含むノートを投稿できないようにする管理画面用設定項目を追加 (#13210)
* fix: 特定文字列を含むノートを投稿できないようにする管理画面用設定項目を追加
* Serviceでチェックするように変更
|
2024-02-09 10:07:18 +09:00 |
|
Marie
|
6a94a52131
|
merge: upstream
|
2024-02-06 21:23:37 +01:00 |
|
syuilo
|
c5ac2ae163
|
New Crowdin updates (#13156)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Catalan)
|
2024-02-05 11:03:55 +09:00 |
|
Marie
|
11628e4b6a
|
merge: upstream
|
2024-02-03 20:19:44 +01:00 |
|
Marie
|
d3d0e510d8
|
merge: DeepLX-JS support (!396)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/396
Closes #324
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: dakkar <dakkar@thenautilus.net>
|
2024-02-03 17:54:59 +00:00 |
|
Marie
|
65a1bc2199
|
upd: add i18n
|
2024-02-03 18:49:41 +01:00 |
|
syuilo
|
580cec33a9
|
New Crowdin updates (#13090)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (French)
|
2024-02-02 21:37:21 +09:00 |
|
ShittyKopper
|
132bf2d200
|
feat: oneko
|
2024-02-01 17:31:04 +03:00 |
|
かっこかり
|
6a41afaaee
|
fix/refactor(reversi): 既存のバグを修正・型定義を強化 (#13105)
* 既存のバグを修正
* fix types
* fix misskey-js autogen
* Update index.d.ts
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
|
2024-01-30 20:54:30 +09:00 |
|
かっこかり
|
4535f9b41b
|
fix(i18n): ストック情報とフロー情報の文言をわかりやすく変更 (#13085)
* fix(i18n): ストック情報とフロー情報をわかりやすく書き直す
* Update ja-JP.yml
* Update ja-JP.yml
|
2024-01-29 21:33:42 +09:00 |
|
syuilo
|
bb330533c1
|
New Crowdin updates (#13082)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Japanese, Kansai)
|
2024-01-26 14:24:38 +09:00 |
|
Marie
|
913dd581ef
|
merge: upstream
|
2024-01-25 14:21:42 +01:00 |
|
syuilo
|
ef8eaf8e89
|
New Crowdin updates (#13080)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Traditional)
|
2024-01-24 20:29:05 +09:00 |
|
syuilo
|
5719a929ad
|
enhance(reversi): 変則なしマッチングを可能に
|
2024-01-24 16:37:06 +09:00 |
|
syuilo
|
37d87854c2
|
New translations ja-jp.yml (Japanese, Kansai) (#13077)
|
2024-01-24 15:19:14 +09:00 |
|
syuilo
|
608e7c1546
|
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
|
2024-01-24 13:17:36 +09:00 |
|
syuilo
|
a3ba315dc6
|
enhance(reversi): improve game setting flow
|
2024-01-24 13:17:34 +09:00 |
|
syuilo
|
df5f14ca7a
|
New translations ja-jp.yml (Japanese, Kansai) (#13074)
|
2024-01-24 10:52:47 +09:00 |
|
syuilo
|
645f5e8633
|
enhance(reversi): 開始時に対局をシェアできるように
|
2024-01-24 10:36:02 +09:00 |
|
syuilo
|
62f6f6af02
|
New Crowdin updates (#13061)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Korean)
|
2024-01-23 10:53:47 +09:00 |
|
Marie
|
fd69a2fbbd
|
merge: upstream
|
2024-01-22 19:58:43 +01:00 |
|
syuilo
|
0cfeb42786
|
New Crowdin updates (#13056)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Lao)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Romanian)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Arabic)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Czech)
* New translations ja-jp.yml (Danish)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Greek)
* New translations ja-jp.yml (Hungarian)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Dutch)
* New translations ja-jp.yml (Norwegian)
* New translations ja-jp.yml (Polish)
* New translations ja-jp.yml (Portuguese)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Slovak)
* New translations ja-jp.yml (Swedish)
* New translations ja-jp.yml (Turkish)
* New translations ja-jp.yml (Ukrainian)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Vietnamese)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (Bengali)
* New translations ja-jp.yml (Croatian)
* New translations ja-jp.yml (Uyghur)
* New translations ja-jp.yml (Lojban)
* New translations ja-jp.yml (Sinhala)
* New translations ja-jp.yml (Uzbek)
* New translations ja-jp.yml (Kannada)
* New translations ja-jp.yml (Haitian Creole)
* New translations ja-jp.yml (Kabyle)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Traditional)
|
2024-01-22 09:29:26 +09:00 |
|
Marie
|
db012fc8c3
|
merge: upstream (1)
|
2024-01-21 13:11:23 +01:00 |
|
syuilo
|
3ff229af6f
|
enhance(frontend): リファクタリングなど
|
2024-01-21 20:26:52 +09:00 |
|
かっこかり
|
3784b39a5f
|
enhance(frontend): 季節に応じた画面の演出を南半球に対応させる (#12838)
* (enhance) 季節に応じた画面の演出を南半球に対応させる
* Update Changelog
* (add) 半球の簡易自動判定
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
|
2024-01-21 19:08:07 +09:00 |
|
syuilo
|
b52fe6cc86
|
New Crowdin updates (#12845)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Lao)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Lao)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Lao)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Romanian)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Arabic)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Czech)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Dutch)
* New translations ja-jp.yml (Polish)
* New translations ja-jp.yml (Portuguese)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Slovak)
* New translations ja-jp.yml (Swedish)
* New translations ja-jp.yml (Ukrainian)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Vietnamese)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (Bengali)
* New translations ja-jp.yml (Uzbek)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Arabic)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Czech)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Greek)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Polish)
* New translations ja-jp.yml (Portuguese)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Slovak)
* New translations ja-jp.yml (Ukrainian)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Vietnamese)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (Bengali)
* New translations ja-jp.yml (Uzbek)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Arabic)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Czech)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Portuguese)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Slovak)
* New translations ja-jp.yml (Ukrainian)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Vietnamese)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Romanian)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Arabic)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Czech)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Greek)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Polish)
* New translations ja-jp.yml (Portuguese)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Slovak)
* New translations ja-jp.yml (Ukrainian)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Vietnamese)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (Bengali)
* New translations ja-jp.yml (Uzbek)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Chinese Simplified)
|
2024-01-21 18:44:51 +09:00 |
|
syuilo
|
f4657eb16f
|
update deps
|
2024-01-21 18:43:01 +09:00 |
|
かっこかり
|
0580ba1fb5
|
enhance(frontend): タイムラインフィルターの設定を保持+センシティブなノートを隠せるように (#12848)
* (enhance) タイムラインフィルターの状態を記憶するように
* fix
* (enhance) センシティブな投稿をミュート形式で表示する(TLのみ)
* fix
* Update Changelog
* Fix changelog
* Lintエラーを潰す
* Update locales/ja-JP.yml
* hideSensitive -> withSensitive
* Update CHANGELOG.md
* Update ja-JP.yml
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
|
2024-01-21 18:29:17 +09:00 |
|
syuilo
|
6039f27bd5
|
enhance(reversi): tweak reversi
|
2024-01-21 12:05:51 +09:00 |
|
かっこかり
|
4de77784c9
|
enhance(sw): オフライン表示のデザインを改善 (#13052)
* enhance(sw): オフライン表示のデザインを改善
* Update Changelog
* fix
* fix
* fix
* 言語が取得できなかった場合のフォールバックを追加
* (change) translation key
|
2024-01-21 11:50:05 +09:00 |
|
syuilo
|
a17251d913
|
enhance(reversi): tweak reversi
|
2024-01-21 10:07:43 +09:00 |
|
かっこかり
|
576484835e
|
enhance(frontend): ノート作成画面の添付メニューから直接ファイルを消せるように (#12858)
* (enhance) 添付画面から直接ファイルを消せるように
* Update Changelog
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
|
2024-01-21 05:26:13 +09:00 |
|
Acid Chicken (硫酸鶏)
|
7881f06be0
|
refactor: deprecate i18n.t (#13039)
* refactor: deprecate i18n.t
* revert: deprecate i18n.t
This reverts commit 7dbf873a2f745040ee723df5db659acacff84e12.
* chore: reimpl
|
2024-01-20 08:11:59 +09:00 |
|
syuilo
|
a637b4e282
|
feat: reversi
Resolve #12962
|
2024-01-19 20:51:49 +09:00 |
|
Acid Chicken (硫酸鶏)
|
43401210c3
|
refactor: fully typed locales (#13033)
* refactor: fully typed locales
* refactor: hide parameterized locale strings from type data in ts access
* refactor: missing assertions
* docs: annotation
|
2024-01-19 07:58:07 +09:00 |
|
かっこかり
|
c1019a006b
|
feat(frontend): 横スワイプでタブを切り替える機能 (#13011)
* (add) 横スワイプでタブを切り替える機能
* Change Changelog
* y方向の移動が一定量を超えたらスワイプを中断するように
* Update swipe distance thresholds
* Remove console.log
* adjust threshold
* rename, use v-model
* fix
* Update MkHorizontalSwipe.vue
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
* use css module
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
|
2024-01-18 18:21:33 +09:00 |
|
Marie
|
4c1f6be735
|
merge: upstream
|
2024-01-15 12:07:35 +01:00 |
|
かっこかり
|
8b0fdfcd69
|
enhance: 動画・音声周りのUIと動作改良 (#12925)
* wip
* (fix) `/files` をバイトレンジリクエストに対応させる
* video
* audio
* fix
* fix
* spdx
* fix (rangeRequest)
* fix
* Update CHANGELOG.md
* (add) ボリュームを保存できるように
* (fix) ミュート復帰時に音量が固定される
* named export
* tweak design
* Add sensitive class for audio component
* Refactor seekbar styles
* Refactor hms
* Revert "(add) ボリュームを保存できるように"
This reverts commit 6271f9493b63f96d0dd9915207e97fe120ef9037.
* Revert "(fix) ミュート復帰時に音量が固定される"
This reverts commit a65002b56ecdcb10f76bcc2debbe38593a69643f.
* revert revert changes
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
|
2024-01-15 18:17:01 +09:00 |
|
Etone Sabasappugawa
|
812da64e06
|
Merge branch 'develop' into develop
|
2024-01-12 14:20:26 +01:00 |
|
syuilo
|
0aefebf02a
|
enhance(drop-and-fusion): some tweaks
|
2024-01-12 20:38:04 +09:00 |
|
syuilo
|
d2063df78d
|
enhance(drop-and-fusion): add new mode, some tweaks
|
2024-01-12 14:48:44 +09:00 |
|
Marie
|
bbdc4e7789
|
merge: upstream
|
2024-01-11 11:43:20 +01:00 |
|
syuilo
|
cf54c2ba47
|
feat: ranking system of bubble game
Resolve #12961
|
2024-01-11 18:13:39 +09:00 |
|
Marie
|
4df3145993
|
merge: upstream
|
2024-01-11 00:57:57 +01:00 |
|
morotesovtannu
|
a62898bcb7
|
chore: fix ja-KS locale
|
2024-01-10 18:54:22 +09:00 |
|
morotesovtannu
|
9c52e67490
|
chore: fix ja-JP locale
|
2024-01-10 18:46:32 +09:00 |
|
syuilo
|
5c786cace8
|
enhance(drop-and-fusion): add game description
|
2024-01-10 17:31:59 +09:00 |
|
Marie
|
91969623bd
|
merge: upstream
|
2024-01-10 00:25:19 +01:00 |
|