Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Follow 9.0 to patch #307

Merged
merged 311 commits into from
Nov 28, 2023
Merged
Changes from 1 commit
Commits
Show all changes
311 commits
Select commit Hold shift + click to select a range
b188538
Fix missing libyaml-dev dependency in Dockerfile (#27533)
vmstan Oct 24, 2023
134de73
Change icons in web UI (#27385)
Gargron Oct 24, 2023
bc3afb6
Update `rails/ujs` delegate method usage (#27538)
mjankowski Oct 24, 2023
f08ca3f
Fix missing icon props (#27539)
renchap Oct 24, 2023
cb92cdf
Fix `<ColumnBackButtonSlim>` (#27540)
renchap Oct 24, 2023
cec7f0e
Remove unused `#error_explanation` id from error partials (#27536)
mjankowski Oct 25, 2023
f261b64
Update dependency node to 20.9 (#27534)
renovate[bot] Oct 25, 2023
c85e0a6
New Crowdin Translations (automated) (#27544)
github-actions[bot] Oct 25, 2023
c926f5f
Fix haml-lint `UnnecessaryStringOutput` for views (#27531)
mjankowski Oct 25, 2023
fa65c82
Fix cache store pool config deprecation warnings (#27551)
ClearlyClaire Oct 25, 2023
70dbf84
Solve simplest haml-lint `Rubocop` lints (#27529)
mjankowski Oct 25, 2023
a4e6fe3
Add missing ban icons (#27555)
renchap Oct 25, 2023
235a4cf
Fix batch attachment deletion when using OpenStack Swift (#27554)
ClearlyClaire Oct 25, 2023
9a3d047
Run `bin/rails app:update` with Rails 7.1 (#27522)
mjankowski Oct 25, 2023
49b8433
Fix confusing screen when visiting a confirmation link for an already…
ClearlyClaire Oct 25, 2023
1de4964
Bump version to 5.7 LTS
kmycode Oct 22, 2023
7c5b99d
Fix: #172 他のサーバーからの相乗り絵文字削除が反映されない
kmycode Oct 23, 2023
c485044
Test: #166 リモートから自分の絵文字を受け取った時、ライセンスが上書きされないことを確認するテスト
kmycode Oct 23, 2023
e6ad0ec
Merge pull request from GHSA-c7p6-c688-fhgp
kmycode Oct 25, 2023
952ea84
Add: #173 カスタム絵文字新規作成・編集画面にカテゴリ選択欄 (#175)
kmycode Oct 26, 2023
3caa413
Refactor: #160 アカウントのother_settings関連部分を別ファイルに切り出し (#176)
kmycode Oct 26, 2023
551a9e8
Merge pull request #159 from kmycode/upstream-20231021
kmycode Oct 26, 2023
e5e46cb
Bump version to 5.8 LTS (#181)
kmycode Oct 26, 2023
fcc3cd9
Merge
kmycode Oct 26, 2023
6e018f7
Update dependency sass to v1.69.5 (#27566)
renovate[bot] Oct 26, 2023
400f5c9
Update dependency @material-symbols/svg-600 to v0.13.2 (#27565)
renovate[bot] Oct 26, 2023
3ca974e
Use `next` keyword in field loop in admin/accounts/index view (#27559)
mjankowski Oct 26, 2023
5374428
Use a context to propagate column-related Props, and remove `forceUpd…
renchap Oct 26, 2023
3427b51
New Crowdin Translations (automated) (#27567)
github-actions[bot] Oct 26, 2023
5448bcf
Merge remote-tracking branch 'parent/main' into kb-upstream-20231026
kmycode Oct 26, 2023
58476f3
Lintから除外
kmycode Oct 26, 2023
4a4b6c0
Merge pull request #182 from kmycode/kb-connect-5.8-to-dev
kmycode Oct 26, 2023
933e6e7
Fix: haml-lint
kmycode Oct 26, 2023
3ef33db
Fix test
kmycode Oct 26, 2023
d756b2a
Fix test
kmycode Oct 26, 2023
e32f00b
Merge pull request #183 from kmycode/kb-upstream-20231026
kmycode Oct 26, 2023
ae86597
Change: #70 DTL投稿で、公開範囲・検索許可を別々に設定 (#177)
kmycode Oct 26, 2023
75255c0
Fix error when trying to delete already-deleted file with OpenStack S…
ClearlyClaire Oct 26, 2023
ba8dcb5
Issue 26048: swap "muting" and "blocking" list options in settings ->…
fixermark Oct 26, 2023
d2f52f7
Fix report processing notice not mentioning the report number when pe…
ClearlyClaire Oct 26, 2023
2d8f759
Add HTML lang attribute to preview card descriptions (#27503)
srapilly Oct 26, 2023
4aa05d4
Capture minimum postgres version 12 (#27528)
mjankowski Oct 26, 2023
12550a6
Use `Rails.env.local?` shorthand method to check env (#27519)
mjankowski Oct 26, 2023
1d88627
Add: #62 ローカルタイムラインを無効にする管理者向け設定 (#179)
kmycode Oct 26, 2023
26ecad7
Merge remote-tracking branch 'parent/main' into upstream-20231027
kmycode Oct 26, 2023
fa7e64d
Fix various icon styles in web UI (#27579)
Gargron Oct 26, 2023
8ef1617
Merge pull request #188 from kmycode/upstream-20231027
kmycode Oct 27, 2023
c20a882
Fix: #184 アンテナ編集画面のアイコン (#187)
kmycode Oct 27, 2023
8f998cd
Handle featured collections without items (#27581)
tribela Oct 27, 2023
bbf46cc
Fix error and incorrect URLs in `/api/v1/accounts/:id/featured_tags` …
ClearlyClaire Oct 27, 2023
8ca16f0
New Crowdin Translations (automated) (#27583)
github-actions[bot] Oct 27, 2023
37929b9
Update libretranslate/libretranslate Docker tag to v1.4.0 (#27504)
renovate[bot] Oct 27, 2023
1f5187e
Misc spec/refactor to user mailer and user mailer spec (#27486)
mjankowski Oct 27, 2023
78e2260
Fix: アイコンのエラー、一部公開範囲が選択できない問題、サークルアイコン変更 (#190)
kmycode Oct 27, 2023
13d310e
Simplify column headers (#27557)
renchap Oct 27, 2023
15ef654
Update dependency pundit to v2.3.1 (#27585)
renovate[bot] Oct 27, 2023
08bdd57
Fix account click on detailed status (#27587)
SouthFox-D Oct 27, 2023
93e4cdc
Fix hashtag matching pattern matching some URLs (#27584)
ClearlyClaire Oct 27, 2023
1cc5129
Have `Follow` activities bypass availability (#27586)
ShadowJonathan Oct 27, 2023
2e6bf60
Use `deliveries.size` in mailer-related examples in controller specs …
mjankowski Oct 27, 2023
eae5c73
Extract class from CSP configuration/initialization (#26905)
mjankowski Oct 27, 2023
a679c54
Fix: #193 リアクションデッキ表記を削除 (#196)
kmycode Oct 30, 2023
624ccce
Fix: 詳細画面のリンク、ブクマ分類のリンク、アイコン (#200)
kmycode Oct 30, 2023
548d16a
Fix various icon styles in web UI (#27579)
Gargron Oct 26, 2023
f49a49f
Handle featured collections without items (#27581)
tribela Oct 27, 2023
e6b148a
Fix error and incorrect URLs in `/api/v1/accounts/:id/featured_tags` …
ClearlyClaire Oct 27, 2023
5d7e74f
New Crowdin Translations (automated) (#27583)
github-actions[bot] Oct 27, 2023
58d305d
Update libretranslate/libretranslate Docker tag to v1.4.0 (#27504)
renovate[bot] Oct 27, 2023
c51e2f7
Misc spec/refactor to user mailer and user mailer spec (#27486)
mjankowski Oct 27, 2023
c7b7a4e
Simplify column headers (#27557)
renchap Oct 27, 2023
4324b3b
Update dependency pundit to v2.3.1 (#27585)
renovate[bot] Oct 27, 2023
881febc
Fix account click on detailed status (#27587)
SouthFox-D Oct 27, 2023
eb63ba6
Fix hashtag matching pattern matching some URLs (#27584)
ClearlyClaire Oct 27, 2023
b0785c9
Have `Follow` activities bypass availability (#27586)
ShadowJonathan Oct 27, 2023
9937ff6
Use `deliveries.size` in mailer-related examples in controller specs …
mjankowski Oct 27, 2023
2cc6025
Extract class from CSP configuration/initialization (#26905)
mjankowski Oct 27, 2023
33f8c1c
Remove version check from update cache_concern.rb (#27592)
RicardoTrindade Oct 30, 2023
bf1d452
Update libretranslate/libretranslate Docker tag to v1.4.1 (#27616)
renovate[bot] Oct 30, 2023
a918208
New Crowdin Translations (automated) (#27596)
github-actions[bot] Oct 30, 2023
c2cc1df
Update dependency @types/react to v18.2.33 (#27615)
renovate[bot] Oct 30, 2023
547d3c1
Update dependency core-js to v3.33.2 (#27624)
renovate[bot] Oct 30, 2023
372494e
Update dependency punycode to v2.3.1 (#27625)
renovate[bot] Oct 30, 2023
b8adb08
Update dependency axios to v1.6.0 (#27580)
renovate[bot] Oct 30, 2023
6c52f82
Fix posts from force-sensitized accounts being able to trend (#27620)
ClearlyClaire Oct 30, 2023
f8280ca
Add: #95 リストへの新着投稿通知 (#192)
kmycode Oct 30, 2023
30edea4
Change: #197 非収載のアイコン変更 (#203)
kmycode Oct 31, 2023
cc938d7
Fix: 投稿の更新が他サーバーに配信されない問題 (#204)
kmycode Oct 31, 2023
beee9ea
Fix `RSpec/LetSetup` cop in spec/controllers/admin area (#27619)
mjankowski Oct 31, 2023
204c00b
Update dependency bootsnap to '~> 1.17.0' (#27617)
renovate[bot] Oct 31, 2023
147417a
Update dependency rspec-sidekiq to v4.1.0 (#27593)
renovate[bot] Oct 31, 2023
e5b7ae9
New Crowdin Translations (automated) (#27630)
github-actions[bot] Oct 31, 2023
d649bbf
Add some more tests and clean up domain block controller (#27469)
ClearlyClaire Oct 31, 2023
a916251
Update haml-lint line length configuration to match rubocop value (#2…
mjankowski Oct 31, 2023
9c8891b
Rewrite `AutosuggestTextarea` as Functional Component (#27618)
ClearlyClaire Oct 31, 2023
0e3401b
Improve Babel configuration and automatically load polyfills (#27333)
renchap Oct 31, 2023
b264318
Update strong_migrations to version 1.3.0 (#25991)
mjankowski Oct 31, 2023
3107a94
Silence deprecation warning about secrets/credentials with Devise pat…
mjankowski Oct 31, 2023
7ef56d6
Move json_ld context loaders to `config/initializers` (#27590)
mjankowski Oct 31, 2023
277e696
Use helpers to check environment in frontend (#27633)
renchap Oct 31, 2023
99511ee
Add: #198 `context`のAPIについて`with_references`対応 (#209)
kmycode Nov 1, 2023
77a1cab
Fix: 同じ投稿を返信かつ参照している時、同じ投稿が`context`に複数含まれる問題 (#210)
kmycode Nov 1, 2023
ac8e4ed
Fix inserting emojis from emoji picker fails with TypeError (#27647)
mgmn Nov 1, 2023
2aa28e0
Mark version 4.0 as no longer supported (#27627)
renchap Nov 1, 2023
991c0df
Merge remote-tracking branch 'parent/main' into kb_development
kmycode Nov 2, 2023
45cc8ff
Add: #90 スタンプに対応していないと思われるサーバーの投稿からスタンプボタンを隠す設定 (#215)
kmycode Nov 2, 2023
f33dd97
Merge commit '45cc8fff7a5d6db3348c17cb50f6e0df36cab409' into upstream…
kmycode Nov 2, 2023
eba304a
Fix test
kmycode Nov 2, 2023
27ece69
Fix test
kmycode Nov 2, 2023
5eba85c
Merge pull request #216 from kmycode/upstream-20231102
kmycode Nov 2, 2023
86afcdb
Fix: #217 スタンプ利用可能なソフトウェア名から`kmyblue`を削除 (#218)
kmycode Nov 2, 2023
3777991
Fix: ローカルサーバーのスタンプ利用可否が正しく反映できない問題 (#219)
kmycode Nov 2, 2023
0337df3
Fix posts from threads received out-of-order sometimes not being inse…
ClearlyClaire Nov 2, 2023
76c4acd
Merge remote-tracking branch 'parent/main' into upstream-20231103
kmycode Nov 2, 2023
c357897
Fix: #220 インスタンス情報更新時に、スタンプ利用可否のキャッシュをクリアする処理 (#224)
kmycode Nov 2, 2023
10dc6c4
Add: #189 本家由来の独自機能作成時に参考にしたファイルにマーカー (#225)
kmycode Nov 2, 2023
e121c05
Add: いらないブランチをまとめて消す`yarn`コマンド (#227)
kmycode Nov 3, 2023
4fdbb15
Merge pull request #226 from kmycode/upstream-20231103
kmycode Nov 3, 2023
0f85ed2
Fix: #221 投稿フォームの時限投稿メニューが動作しない問題 (#223)
kmycode Nov 3, 2023
2d548e2
New Crowdin Translations (automated) (#27646)
github-actions[bot] Nov 3, 2023
5d9e71e
Archive uploaded CI assets into single file between build/test (#27668)
mjankowski Nov 3, 2023
9d799d4
Reduce CI job matrix job count (#27660)
mjankowski Nov 3, 2023
3bf2a72
Use Immutable `Record` for accounts in Redux state (#26559)
renchap Nov 3, 2023
52dac50
Merge remote-tracking branch 'parent/main' into upstream-20231104
kmycode Nov 4, 2023
7e08886
Fix test
kmycode Nov 4, 2023
a1d197d
Merge pull request #231 from kmycode/upstream-20231104
kmycode Nov 4, 2023
24909f9
Change: #185 『スタンプをつけられた人』ではなく『スタンプをつけた人』のフォロワーにスタンプを転送 (#232)
kmycode Nov 4, 2023
0b04b7a
Fix: #199 投稿フォームでの検索許可アイコン表示崩れ (#233)
kmycode Nov 4, 2023
7d4d2af
Fix: #202 画像拡大表示したときの右下のボタンが機能しない問題(本家由来) (#234)
kmycode Nov 4, 2023
9416eea
Fix: #208 リスト通知で投稿者のアイコンが二重に表示される問題 (#235)
kmycode Nov 4, 2023
6712bf8
Fixes website not loading for unlogged users (#27698)
renchap Nov 4, 2023
c0989b7
Fix incoming status creation date not being restricted to standard IS…
ClearlyClaire Nov 6, 2023
ef140da
Update dependency discard to v1.3.0 (#27720)
renovate[bot] Nov 6, 2023
afd1371
Update dependency rubocop to v1.57.2 (#27719)
renovate[bot] Nov 6, 2023
1416745
Update dependency faker to v3.2.2 (#27718)
renovate[bot] Nov 6, 2023
3bf896c
Disable Babel polyfill injection in dev (#27691)
renchap Nov 6, 2023
22b4713
Update eslint (non-major) (#27715)
renovate[bot] Nov 6, 2023
0ca27b2
Update DefinitelyTyped types (non-major) (#27713)
renovate[bot] Nov 6, 2023
9c34bb4
Update Node.js to v20.9 (#27714)
renovate[bot] Nov 6, 2023
e4e752c
Adjust transform origin for favorite star (#27700)
zunda Nov 6, 2023
949f5eb
Fix `RSpec/MetadataStyle` cop in spec/ (#27729)
mjankowski Nov 6, 2023
fe26f33
Fix `Rails/RedundantActiveRecordAllMethod` cop (#26885)
mjankowski Nov 6, 2023
0c4e7c0
Fix `Rails/FindEach` cop (#26886)
mjankowski Nov 6, 2023
c501d62
Fix `Rails/BulkChangeTable` cop (#26890)
mjankowski Nov 6, 2023
d6f5083
Fix `RSpec/SpecFilePathFormat` cops (#27730)
mjankowski Nov 6, 2023
64578fe
Merge remote-tracking branch 'parent/main' into upstream-20231107
kmycode Nov 7, 2023
aa9a4d8
Fix test
kmycode Nov 7, 2023
59f851d
Merge pull request #244 from kmycode/upstream-20231107
kmycode Nov 7, 2023
d7f07ae
Fix: #241 リスト新着通知で、数日前の古い投稿についての通知が来る場合がある (#242)
kmycode Nov 7, 2023
1b28ab7
New Crowdin Translations (automated) (#27687)
github-actions[bot] Nov 7, 2023
b06284c
Fix `RSpec/HookArgument` cop (#27747)
mjankowski Nov 7, 2023
cfa14ec
Fix `Lint/EmptyBlock` cop (#27748)
mjankowski Nov 7, 2023
2d39268
Fix `Lint/OrAssignmentToConstant` cop (#27750)
mjankowski Nov 7, 2023
2862ad7
Stub controller methods and remove `rubocop:disable` in captcha featu…
mjankowski Nov 7, 2023
ae0d551
Do not copy `public/packs-test` into Docker (#27736)
renchap Nov 7, 2023
49e2772
Fix `RSpec/MessageSpies` cop (#27751)
mjankowski Nov 7, 2023
ec0002c
Fix: フレンドサーバーに投稿削除が配送されない問題 (#249)
kmycode Nov 7, 2023
bbad5b6
Remove false positive cop detection (#27457)
mjankowski Nov 7, 2023
45770c9
Fix `Performance/MapMethodChain` cop (#27744)
mjankowski Nov 7, 2023
f476d9d
Fix the `notificationsUpdate` call (#27758)
renchap Nov 7, 2023
dc0bf87
Remove unused before block from settings/branding spec (#27759)
mjankowski Nov 7, 2023
a688a9e
Use strings instead of numeric literals and remove `rubocop:disable` …
mjankowski Nov 7, 2023
1d51e10
Consolidate JSON parsing in serializers specs (#27693)
mjankowski Nov 7, 2023
370802c
Add coverage for `CLI::Maintenance#fix_duplicates` command (#25252)
mjankowski Nov 7, 2023
02d27de
Move i18n locale configuration to separate initializer (#27571)
mjankowski Nov 7, 2023
ae7c20b
Move search and streaming spec manager classes to separate support fi…
mjankowski Nov 7, 2023
ee57bb4
Account statuses filter spec speedup (#27674)
mjankowski Nov 7, 2023
58f01a5
Add volume saving/reuse to video player (#27488)
thehydrogen Nov 7, 2023
27cbdc6
Change alt text to empty string for avatars (#21875)
jasminjohal Nov 7, 2023
b41e9b1
Update dependency strong_migrations to v1.6.4 (#27631)
renovate[bot] Nov 7, 2023
feea257
Update dependency aws-sdk-s3 to v1.136.0 (#26999)
renovate[bot] Nov 7, 2023
110ace0
Update dependency json-schema to v4.1.1 (#26933)
renovate[bot] Nov 7, 2023
b2619a1
Update dependency json-ld to v3.3.0 (#26762)
renovate[bot] Nov 7, 2023
1341790
Update dependency sidekiq-unique-jobs to v7.1.30 (#26091)
renovate[bot] Nov 7, 2023
4b8aee7
Update dependency thor to v1.3.0 (#27464)
renovate[bot] Nov 7, 2023
bcdfb72
Update dependency json-ld-preloaded to v3.3.0 (#26763)
renovate[bot] Nov 7, 2023
b36b353
Update dependency selenium-webdriver to v4.15.0 (#27649)
renovate[bot] Nov 7, 2023
ac9f92b
Update formatjs monorepo (#27746)
renovate[bot] Nov 7, 2023
8b0d86d
Update dependency simple_form to v5.3.0 (#27725)
renovate[bot] Nov 7, 2023
565d9a6
Update dependency sanitize to v6.1.0 (#27723)
renovate[bot] Nov 7, 2023
14e49e5
Update dependency react-select to v5.8.0 (#27722)
renovate[bot] Nov 7, 2023
389a6cc
Update dependency net-http to '~> 0.4.0' (#27721)
renovate[bot] Nov 7, 2023
d3cd37d
Feature - Prevents multiple audio/video attachments from being played…
TheDevJoao Nov 7, 2023
408da2c
Change: スタンプの`id`をお気に入り特別できるよう変更 (#251)
kmycode Nov 8, 2023
08f86bc
Merge commit '389a6cc4c0e5b63b935fb2f38d50a35cb1d43364' into upstream…
kmycode Nov 8, 2023
cfa9b18
Change: #186 概要画面のkmyblue capabilities表示改善 (#252)
kmycode Nov 8, 2023
9286d8c
Fix test
kmycode Nov 8, 2023
411c6ec
Add: #207 リスト通知機能を`fedibird_capabilities`に追加 (#253)
kmycode Nov 8, 2023
93b4f22
Add: #245 概要画面に全文検索の項目 (#255)
kmycode Nov 8, 2023
cea042e
Merge pull request #254 from kmycode/upstream-20231108
kmycode Nov 8, 2023
a7dec3c
Add: スタンプにブロック・アカウントドメインブロックを反映 (#256)
kmycode Nov 8, 2023
790f635
Deduplicate yarn lock file (#27670)
mjankowski Nov 8, 2023
e545978
Use framework helpers instead of i-vars in controller specs (#27767)
mjankowski Nov 8, 2023
76f2f2e
Add: #87 フォロワーのみに購読を許可する設定 (#239)
kmycode Nov 8, 2023
23e32a4
Fix format-dependent redirects being cached regardless of requested f…
ClearlyClaire Nov 8, 2023
757d7c7
Upgrade to Yarn 4, remove support for Node 16 (#27073)
renchap Nov 8, 2023
33cc3ae
Fix `Style/StabbyLambdaParentheses` cop (#27771)
mjankowski Nov 8, 2023
7d6bcc0
Remove unmatched `rubocop:enable` declaration (#27769)
mjankowski Nov 8, 2023
9b7b4d7
Simplify request cache spec shared examples (#27673)
mjankowski Nov 8, 2023
5c328ae
New Crowdin Translations (automated) (#27768)
github-actions[bot] Nov 8, 2023
c03bd2a
Don't stub SUT in `FollowLimitValidator` spec (#27760)
mjankowski Nov 8, 2023
ce91d14
Fix `Style/WordArray` cop (#27770)
mjankowski Nov 8, 2023
b05575e
Move RSpec config for streaming/search managers to be near classes (#…
mjankowski Nov 8, 2023
13c3e59
Use helper method to build batched status edits in `admin/statuses/sh…
mjankowski Nov 8, 2023
c73d5a6
Using Sidekiq concurrency for default db pool value (#26488)
sinoru Nov 8, 2023
4329616
Ignore block result of `send` method and remove `rubocop:disable` in …
mjankowski Nov 8, 2023
69d00e2
Fix `RSpec/InstanceVariable` cop (#27766)
mjankowski Nov 8, 2023
d3b9f72
Fix: #236 ログインしていない状態で投稿詳細画面でスタンプを押そうとすると画面が操作不能になる (#259)
kmycode Nov 9, 2023
1da7f6f
Fix: #205 投稿の編集履歴一覧ポップアップが表示できない (#260)
kmycode Nov 9, 2023
85a6631
Fix: 引用元の投稿が削除されたときにエラーが出る問題 (#261)
kmycode Nov 9, 2023
e3c71cb
Add: #213 右サイドメニューからお気に入りを削除するオプション (#262)
kmycode Nov 9, 2023
fc1b280
Merge remote-tracking branch 'parent/main' into upstream-20231109
kmycode Nov 9, 2023
4cedcf6
Merge pull request #263 from kmycode/upstream-20231109
kmycode Nov 9, 2023
5af47fb
Update dependency fog-openstack to v1 (#25968)
renovate[bot] Nov 9, 2023
c875dfc
Fix `Lint/UnusedBlockArgument` cop (#27777)
mjankowski Nov 9, 2023
c9204b7
Fix `Rails/I18nLocaleTexts` cop (#27779)
mjankowski Nov 9, 2023
ce1bd81
Reduce complexity in `StatusCacheHydrator` (#27783)
mjankowski Nov 9, 2023
d6c971e
New Crowdin Translations (automated) (#27787)
github-actions[bot] Nov 9, 2023
220a2e8
Run `yarn dedupe` when updating with Renovate (#27786)
ykzts Nov 9, 2023
23d88aa
Update babel monorepo to v7.23.3 (#27789)
renovate[bot] Nov 9, 2023
4812832
Update dependency axios to v1.6.1 (#27773)
renovate[bot] Nov 9, 2023
dec2796
Update dependency lint-staged to v15 (#27407)
renovate[bot] Nov 9, 2023
63c9102
Fix `RSpec/MessageChain` cop (#27776)
mjankowski Nov 9, 2023
9b06c0f
Fix Web UI not displaying appropriate explanation when a user hides t…
ClearlyClaire Nov 9, 2023
548bb30
Consolidate html page title output logic into helper (#27563)
mjankowski Nov 9, 2023
b87bfb8
Fix Yarn version in devcontainer (#27788)
vmstan Nov 9, 2023
c451bbe
Allow viewing and severing relationships with suspended accounts (#27…
ClearlyClaire Nov 9, 2023
9429e30
Disable sidekiq unique jobs in test env (#27737)
mjankowski Nov 9, 2023
e79bf1b
Minor speed improvement on `controllers/accounts` spec (#27679)
mjankowski Nov 9, 2023
7840c6b
Do not try to update an undefined video element (#27798)
thehydrogen Nov 9, 2023
bfc7b01
Merge remote-tracking branch 'parent/main' into upstream-20231110
kmycode Nov 10, 2023
c6bcbb8
Fix: スマホで見た時、ヘッダ右側が隠れる問題 (#265)
kmycode Nov 10, 2023
8c18d76
Fix error
kmycode Nov 10, 2023
ae6fe58
Fix: #264 ハッシュタグをフォローしていても、非収載投稿がホームに流れない問題 (#266)
kmycode Nov 10, 2023
8264723
Merge pull request #267 from kmycode/upstream-20231110
kmycode Nov 10, 2023
fba838d
Update dependency @material-symbols/svg-600 to ^0.14.0 (#27803)
renovate[bot] Nov 10, 2023
ac69f90
Add `Api::V1::Instances::BaseController` base controller class (#27797)
mjankowski Nov 10, 2023
43e2f76
Extract crutches_active_mentions from FeedManager (#27785)
mjankowski Nov 10, 2023
ac62b99
New Crowdin Translations (automated) (#27804)
github-actions[bot] Nov 10, 2023
9dc3ce8
Speed-up in `Settings::` controllers specs (#27808)
mjankowski Nov 10, 2023
55c6192
Merge remote-tracking branch 'parent/main' into upstream-20231111
kmycode Nov 10, 2023
69a28ef
Add: 強制CWの翻訳 (#274)
kmycode Nov 11, 2023
878936d
Add: ユーザー設定画面の小見出し (#275)
kmycode Nov 11, 2023
2753d44
Test: アカウント削除時のブックマーク・スタンプなど削除のテスト (#276)
kmycode Nov 11, 2023
f06f956
Merge pull request #277 from kmycode/upstream-20231111
kmycode Nov 11, 2023
eda8dae
Fix: 環境変数でスタンプの最大数を指定した場合、スタンプつけるときにエラーになる問題 (#289)
kmycode Nov 14, 2023
927e02e
Fix: セットアップスクリプトの`yarn install`でエラーが出る (#292)
kmycode Nov 14, 2023
7742f44
Release: 9.0 (#279)
kmycode Nov 16, 2023
c4410ac
Merge commit '7742f440fa2a1541cd71512cadfec1762f16cdc9' into kbtopic-…
kmycode Nov 28, 2023
d874070
Fix: ミュート操作時のエラー
kmycode Nov 28, 2023
795d2c7
Fix: #301 カスタム絵文字編集時、カテゴリ選択の初期値の異常 (#306)
kmycode Nov 28, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions config/locales/de.yml
Original file line number Diff line number Diff line change
@@ -1043,8 +1043,10 @@ de:
confirmations:
awaiting_review: Deine E-Mail-Adresse wurde bestätigt und das Team von %{domain} überprüft nun deine Registrierung. Sobald es dein Konto genehmigt, wirst du eine E-Mail erhalten.
awaiting_review_title: Deine Registrierung wird überprüft
clicking_this_link: Klick auf diesen Link
login_link: anmelden
proceed_to_login_html: Du kannst dich nun %{login_link}.
redirect_to_app_html: Du hättest zur <strong>%{app_name}</strong>-App weitergeleitet werden sollen. Wenn das nicht geschehen ist, versuche es mit einem %{clicking_this_link} oder kehre manuell zur App zurück.
registration_complete: Deine Registrierung auf %{domain} ist nun abgeschlossen!
welcome_title: Willkommen, %{name}!
wrong_email_hint: Sollte diese E-Mail-Adresse nicht korrekt sein, kannst du sie in den Kontoeinstellungen ändern.
8 changes: 8 additions & 0 deletions config/locales/es-AR.yml
Original file line number Diff line number Diff line change
@@ -1041,6 +1041,14 @@ es-AR:
hint_html: ¡Sólo una cosa más! Necesitamos confirmar que sos humano (¡esto es para que podamos mantener el spam fuera!). Resuelvé la CAPTCHA abajo y hacé clic en "Continuar".
title: Comprobación de seguridad
confirmations:
awaiting_review: "¡Tu dirección de correo electrónico fue confirmada! El equipo de %{domain} está revisando tu registro. ¡Recibirás un correo electrónico si aprueban tu cuenta!"
awaiting_review_title: Tu registro está siendo revisado
clicking_this_link: haciendo clic en este enlace
login_link: iniciar sesión
proceed_to_login_html: Ahora podés %{login_link}.
redirect_to_app_html: Deberías haber sido redirigido a la aplicación <strong>%{app_name}</strong>. Si eso no sucedió, probá %{clicking_this_link} o volvé a la aplicación manualmente.
registration_complete: "¡Tu registro en %{domain} fue completado!"
welcome_title: "¡Te damos la bienvenida, %{name}!"
wrong_email_hint: Si esa dirección de correo electrónico no es correcta, podés cambiarla en la configuración de la cuenta.
delete_account: Eliminar cuenta
delete_account_html: Si querés eliminar tu cuenta, podés <a href="%{path}">seguir por acá</a>. Se te va a pedir una confirmación.
8 changes: 6 additions & 2 deletions config/locales/es.yml
Original file line number Diff line number Diff line change
@@ -1041,6 +1041,10 @@ es:
hint_html: ¡Una última cosita! Necesitamos confirmar que eres humano (¡así podemos evitar el spam!). Resuelve este CAPTCHA de debajo y pulsa en "Continuar".
title: Comprobación de seguridad
confirmations:
awaiting_review: "¡Tu dirección de correo electrónico ha sido confirmada! El personal de %{domain} está revisando tu registro. ¡Recibirás un correo electrónico cuando aprueben tu cuenta!"
awaiting_review_title: Estamos revisando tu registro
clicking_this_link: haciendo clic en este enlace
registration_complete: "¡Has completado tu registro en %{domain}!"
wrong_email_hint: Si esa dirección de correo electrónico no es correcta, puedes cambiarla en la configuración de la cuenta.
delete_account: Borrar cuenta
delete_account_html: Si desea eliminar su cuenta, puede <a href="%{path}">proceder aquí</a>. Será pedido de una confirmación.
@@ -1100,7 +1104,7 @@ es:
account_status: Estado de la cuenta
confirming: Esperando confirmación de correo electrónico.
functional: Tu cuenta está completamente operativa.
pending: Su solicitud está pendiente de revisión por nuestros administradores. Eso puede tardar algún tiempo. Usted recibirá un correo electrónico si el solicitud sea aprobada.
pending: Tu solicitud está pendiente de revisión por nuestro personal. Eso puede tardar un tiempo. Recibirás un correo electrónico cuando tu solicitud sea aprobada.
redirecting_to: Tu cuenta se encuentra inactiva porque está siendo redirigida a %{acct}.
self_destruct: Como %{domain} está en proceso de cierre, solo tendrás acceso limitado a tu cuenta.
view_strikes: Ver amonestaciones pasadas contra tu cuenta
@@ -1786,7 +1790,7 @@ es:
title: Un nuevo inicio de sesión
warning:
appeal: Enviar una apelación
appeal_description: Si crees que esto es un error, puedes enviar una apelación al equipo de %{instance}.
appeal_description: Si crees que esto es un error, puedes enviar una apelación al personal de %{instance}.
categories:
spam: Spam
violation: El contenido viola las siguientes directrices de la comunidad
8 changes: 8 additions & 0 deletions config/locales/fo.yml
Original file line number Diff line number Diff line change
@@ -1041,6 +1041,14 @@ fo:
hint_html: Bara eitt afturat! Tað er neyðugt hjá okkum at vátta, at tú ert eitt menniskja (fyri at sleppa undan ruskposti!). Loys CAPTCHA niðanfyri og trýst á "Halt fram".
title: Trygdarkanning
confirmations:
awaiting_review: Teldupostadressan hjá góðkend! Nú kanna %{domain} ábyrgdarfólk skrásetingina hjá tær. Góðkenna tey kontu tína, so senda tey tær eitt teldubræv!
awaiting_review_title: Skrásetingin hjá tær verður viðgjørd
clicking_this_link: við at klikkja á hetta leinki
login_link: rita inn
proceed_to_login_html: Nú kanst tú fara víðari til %{login_link}.
redirect_to_app_html: Tú skuldi verið send/ur víðari til <strong>%{app_name}</strong> appina. Hendi tað ikki, so kanst tú royna %{clicking_this_link} ella fara manuelt aftur til appina.
registration_complete: Skráseting tín á %{domain} er nú avgreidd!
welcome_title: Vælkomin, %{name}!
wrong_email_hint: Um hesin teldupoststaðurin ikki er rættur, so kanst tú broyta hann í kontustillingunum.
delete_account: Strika kontu
delete_account_html: Ynskir tú at strika kontuna, so kanst tú <a href="%{path}">halda fram her</a>. Tú verður spurd/ur um váttan.
8 changes: 8 additions & 0 deletions config/locales/fr-QC.yml
Original file line number Diff line number Diff line change
@@ -1041,6 +1041,14 @@ fr-QC:
hint_html: Juste une autre chose! Nous avons besoin de confirmer que vous êtes un humain (pour que nous puissions empêcher les spams!). Résolvez le CAPTCHA ci-dessous et cliquez sur "Continuer".
title: Vérification de sécurité
confirmations:
awaiting_review: Votre adresse e-mail est confirmée ! L’équipe de %{domain} vérifie désormais votre inscription. Vous recevrez un e-mail si votre compte est approuvé !
awaiting_review_title: Votre inscription est en cours de validation
clicking_this_link: cliquer sur ce lien
login_link: vous connecter
proceed_to_login_html: Vous pouvez désormais %{login_link}.
redirect_to_app_html: Vous auriez dû être redirigé vers l’application <strong>%{app_name}</strong>. Si cela ne s’est pas produit, essayez de %{clicking_this_link} ou de revenir manuellement à l’application.
registration_complete: Votre inscription sur %{domain} est désormais terminée !
welcome_title: Bienvenue, %{name} !
wrong_email_hint: Si cette adresse de courriel est incorrecte, vous pouvez la modifier dans vos paramètres de compte.
delete_account: Supprimer le compte
delete_account_html: Si vous désirez supprimer votre compte, vous pouvez <a href="%{path}">cliquer ici</a>. Il vous sera demandé de confirmer cette action.
8 changes: 8 additions & 0 deletions config/locales/fr.yml
Original file line number Diff line number Diff line change
@@ -1041,6 +1041,14 @@ fr:
hint_html: Encore une chose ! Nous avons besoin de confirmer que vous êtes un humain (c'est pour que nous puissions empêcher les spams !). Résolvez le CAPTCHA ci-dessous et cliquez sur "Continuer".
title: Vérification de sécurité
confirmations:
awaiting_review: Votre adresse e-mail est confirmée ! L’équipe de %{domain} vérifie désormais votre inscription. Vous recevrez un e-mail si votre compte est approuvé !
awaiting_review_title: Votre inscription est en cours de validation
clicking_this_link: cliquer sur ce lien
login_link: vous connecter
proceed_to_login_html: Vous pouvez désormais %{login_link}.
redirect_to_app_html: Vous auriez dû être redirigé vers l’application <strong>%{app_name}</strong>. Si cela ne s’est pas produit, essayez de %{clicking_this_link} ou de revenir manuellement à l’application.
registration_complete: Votre inscription sur %{domain} est désormais terminée !
welcome_title: Bienvenue, %{name} !
wrong_email_hint: Si cette adresse de courriel est incorrecte, vous pouvez la modifier dans vos paramètres de compte.
delete_account: Supprimer le compte
delete_account_html: Si vous désirez supprimer votre compte, vous pouvez <a href="%{path}">cliquer ici</a>. Il vous sera demandé de confirmer cette action.
8 changes: 8 additions & 0 deletions config/locales/fy.yml
Original file line number Diff line number Diff line change
@@ -1041,6 +1041,14 @@ fy:
hint_html: Noch ien ding! Jo moatte befêstigje dat jo in minske binne (dit is om de spam bûten de doar te hâlden!). Los de ûndersteande CAPTCHA op en klik op ‘Trochgean’.
title: Befeiligingskontrôle
confirmations:
awaiting_review: Jo e-mailadres is befêstige! De %{domain}-meiwurkers binne no dwaande mei it besjen fan jo registraasje. Jo ûntfange in e-mailberjocht as de jo account goedkarre!
awaiting_review_title: Jo registraasje wurdt beoardield
clicking_this_link: klik op dizze keppeling
login_link: oanmelde
proceed_to_login_html: Jo kinne no fierder gean nei %{login_link}.
redirect_to_app_html: Jo soene omlaad wêze moatte nei de <strong>%{app_name}</strong> app. As dat net bard is, probearje dan %{clicking_this_link} of kear hânmjittich werom nei de app.
registration_complete: Jo registraasje op %{domain} is no foltôge!
welcome_title: Wolkom, %{name}!
wrong_email_hint: As it e-mailadres net korrekt is, kinne jo dat wizigje yn de accountynstellingen.
delete_account: Account fuortsmite
delete_account_html: Wannear’t jo jo account graach fuortsmite wolle, kinne jo dat <a href="%{path}">hjir dwaan</a>. Wy freegje jo dêr om in befêstiging.
8 changes: 8 additions & 0 deletions config/locales/he.yml
Original file line number Diff line number Diff line change
@@ -1077,6 +1077,14 @@ he:
hint_html: עוד דבר אחד, עלינו לאשרר שאת(ה) אנושיים (לצורך סינון ספאם). נא לפתור את הקאפצ'ה להלן וללחוץ "המשך".
title: בדיקות אבטחה
confirmations:
awaiting_review: כתובת הדואל שלך אושרה! צוות %{domain} עכשיו יבדוק את הרשמתך. תשלח אליך הודעת דואל אם הצוות יאשר את החשבון!
awaiting_review_title: הרשמתך עוברת בדיקה
clicking_this_link: לחיצה על קישור זה
login_link: כניסה
proceed_to_login_html: ניתן להמשיך עכשיו אל %{login_link}.
redirect_to_app_html: כאן אמורה היתה להיות הפניה אוטמטית ליישומון <strong>%{app_name}</strong>. אם זה לא קרה, ניתן לנסות שוב על ידי %{clicking_this_link} או חזרה ידנית אל היישומון.
registration_complete: הרשמתך לשרת %{domain} הושלמה כעת!
welcome_title: ברוך/ה הבא/ה, %{name}!
wrong_email_hint: אם כתובת הדואל הזו איננה נכונה, ניתן לשנות אותה בעמוד ההגדרות.
delete_account: מחיקת חשבון
delete_account_html: אם ברצונך למחוק את החשבון, ניתן <a href="%{path}">להמשיך כאן</a>. תתבקש/י לספק אישור נוסף.
10 changes: 5 additions & 5 deletions config/locales/hu.yml
Original file line number Diff line number Diff line change
@@ -1041,13 +1041,13 @@ hu:
hint_html: Még egy dolog! Meg kell győződnünk róla, hogy tényleg valós személy vagy (így távol tarthatjuk a spam-et). Oldd meg az alábbi CAPTCHA-t és kattints a "Folytatás"-ra.
title: Biztonsági ellenőrzés
confirmations:
awaiting_review: Az email cím megerősítésre került. %{domain} stáb elenleg áttrkinti a regisztrációt. Ha jóváhagyásra kerül a fiók, egy email kerül kiküldésre!
awaiting_review_title: A regisztráció áttekintés alatt áll.
awaiting_review: Az email címed megerősítésre került. %{domain} stábja jelenleg áttekinti a regisztrációdat. Ha jóváhagyásra került a fiókod, egy emailt küldenek majd!
awaiting_review_title: A regisztrációd áttekintés alatt áll
clicking_this_link: kattintás erre a hivatkozásra
login_link: bejelentkezés
proceed_to_login_html: 'Most továbbléphetünk: %{login_link}.'
redirect_to_app_html: Át kellett volna kerülni <strong>%{app_name}</strong> alkalmazáshoz. Ha ez nem történt meg, próbálkozzunk %{clicking_this_link} lehetőséggel vagy térjünk vissza manuálisan az alkalmazáshoz.
registration_complete: A regisztráció %{domain} domainen befejeződött!
proceed_to_login_html: 'Most továbbléphetsz: %{login_link}.'
redirect_to_app_html: Át kellett volna irányítsunk a <strong>%{app_name}</strong> alkalmazáshoz. Ha ez nem történt meg, próbálkozz a %{clicking_this_link} lehetőséggel vagy térj vissza manuálisan az alkalmazáshoz.
registration_complete: A regisztrációd %{domain} domainen befejeződött!
welcome_title: Üdvözlet, %{name}!
wrong_email_hint: Ha az emailcím nem helyes, a fiókbeállításokban megváltoztathatod.
delete_account: Felhasználói fiók törlése
4 changes: 4 additions & 0 deletions config/locales/is.yml
Original file line number Diff line number Diff line change
@@ -1045,9 +1045,13 @@ is:
Leystu Turing skynprófið og smelltu á "Áfram".
title: Öryggisathugun
confirmations:
awaiting_review: Tölvupóstfangið þitt er staðfest. Umsjónarfólk %{domain} er núna að yfirfara skráninguna þína. Þú munt fá tölvupóst ef þau samþykkja skráninguna þína!
awaiting_review_title: Verið er að yfirfara skráninguna þína
clicking_this_link: smella á þennan tengil
login_link: skrá þig inn
proceed_to_login_html: Þú getur núna farið í að %{login_link}.
redirect_to_app_html: Þér ætti að hafa verið endurbeint í <strong>%{app_name}</strong> forritið. Ef það gerðist ekki, skaltu prófa að %{clicking_this_link} eða fara aftur í forritið.
registration_complete: Skráning þín á %{domain} er núna tilbúin!
welcome_title: Velkomin/n %{name}!
wrong_email_hint: Ef það tölvupóstfang er ekki rétt geturðu breytt því í stillingum notandaaðgangsins.
delete_account: Eyða notandaaðgangi
8 changes: 8 additions & 0 deletions config/locales/it.yml
Original file line number Diff line number Diff line change
@@ -1043,6 +1043,14 @@ it:
hint_html: Solamente un'altra cosa! Dobbiamo confermare che tu sia un essere umano (così possiamo tenere fuori lo spam!). Risolvi il CAPTCHA sottostante e fai clic su "Continua".
title: Controllo di sicurezza
confirmations:
awaiting_review: Il tuo indirizzo e-mail è confermato! Lo staff di %{domain} sta esaminando la tua registrazione. Riceverai una e-mail se il tuo account sarà approvato!
awaiting_review_title: La tua registrazione è in corso di revisione
clicking_this_link: cliccando su questo link
login_link: accedi
proceed_to_login_html: Ora puoi procedere con il %{login_link}.
redirect_to_app_html: Avresti dovuto essere reindirizzato all'app <strong>%{app_name}</strong>. Se ciò non fosse avvenuto, prova %{clicking_this_link} o torna manualmente all'app.
registration_complete: La tua registrazione su %{domain} è ora completata!
welcome_title: Benvenutə, %{name}!
wrong_email_hint: Se l'indirizzo e-mail non è corretto, puoi modificarlo nelle impostazioni dell'account.
delete_account: Elimina account
delete_account_html: Se desideri cancellare il tuo account, puoi <a href="%{path}">farlo qui</a>. Ti sarà chiesta conferma.
8 changes: 8 additions & 0 deletions config/locales/nl.yml
Original file line number Diff line number Diff line change
@@ -1041,6 +1041,14 @@ nl:
hint_html: Nog maar één ding! Je moet bevestigen dat je een mens bent (dit is om de spam buiten de deur te houden!). Los de onderstaande CAPTCHA op en klik op "Doorgaan".
title: Veiligheidscontrole
confirmations:
awaiting_review: Je e-mailadres is bevestigd! De %{domain}-medewerkers zijn nu bezig met het bekijken van jouw registratie. Je ontvangt een e-mailbericht als ze jouw account goedkeuren!
awaiting_review_title: Je registratie wordt beoordeeld
clicking_this_link: klik op deze koppeling
login_link: aanmelden
proceed_to_login_html: Je kunt nu verder gaan naar %{login_link}.
redirect_to_app_html: Je zou omgeleid moeten zijn naar de <strong>%{app_name}</strong> app. Als dat niet is gebeurd, probeer dan %{clicking_this_link} of keer handmatig terug naar de app.
registration_complete: Je registratie op %{domain} is nu voltooid!
welcome_title: Welkom, %{name}!
wrong_email_hint: Als dat e-mailadres niet correct is, kun je het wijzigen in je accountinstellingen.
delete_account: Account verwijderen
delete_account_html: Wanneer je jouw account graag wilt verwijderen, kun je dat <a href="%{path}">hier doen</a>. We vragen jou daar om een bevestiging.
2 changes: 2 additions & 0 deletions config/locales/pt-BR.yml
Original file line number Diff line number Diff line change
@@ -1040,6 +1040,8 @@ pt-BR:
hint_html: Só mais uma coisa! Precisamos confirmar que você é um humano (isso é para que possamos evitar o spam!). Resolva o CAPTCHA abaixo e clique em "Continuar".
title: Verificação de segurança
confirmations:
registration_complete: Seu cadastro no %{domain} foi concluído!
welcome_title: Boas vindas, %{name}!
wrong_email_hint: Se esse endereço de e-mail não estiver correto, você pode alterá-lo nas configurações da conta.
delete_account: Excluir conta
delete_account_html: Se você deseja excluir sua conta, você pode <a href="%{path}">fazer isso aqui</a>. Uma confirmação será solicitada.
8 changes: 8 additions & 0 deletions config/locales/pt-PT.yml
Original file line number Diff line number Diff line change
@@ -1041,6 +1041,14 @@ pt-PT:
hint_html: Só mais uma coisa! Precisamos confirmar que você é um humano (isto para que possamos evitar spam!). Resolva o CAPTCHA abaixo e clique em "Continuar".
title: Verificação de segurança
confirmations:
awaiting_review: O seu endereço de correio eletrónico foi confirmado! A equipa %{domain} está agora a rever a sua inscrição. Receberá uma mensagem de correio eletrónico se aprovarem a sua conta!
awaiting_review_title: A sua inscrição está a ser revista
clicking_this_link: clicar nesta hiperligação
login_link: iniciar sessão
proceed_to_login_html: Pode agora prosseguir para %{login_link}.
redirect_to_app_html: Devia ter sido reencaminhado para a aplicação <strong>%{app_name}</strong>. Se isso não aconteceu, tente %{clicking_this_link} ou volte manualmente para a aplicação.
registration_complete: O seu registo sem %{domain} está agora concluído!
welcome_title: Bem-vindo(a), %{name}!
wrong_email_hint: Se esse endereço de e-mail não estiver correto, você pode alterá-lo nas configurações da conta.
delete_account: Eliminar conta
delete_account_html: Se deseja eliminar a sua conta, pode <a href="%{path}">continuar aqui</a>. Uma confirmação será solicitada.
10 changes: 10 additions & 0 deletions config/locales/ru.yml
Original file line number Diff line number Diff line change
@@ -556,6 +556,7 @@ ru:
total_reported: Жалобы на них
total_storage: Медиафайлы
totals_time_period_hint_html: Итоги, показанные ниже, включают данные за всё время.
unknown_instance: На данный момент нет записей об этом домене на этом сервере.
invites:
deactivate_all: Отключить все
filter:
@@ -1076,6 +1077,12 @@ ru:
hint_html: Еще одна вещь! Нам нужно подтвердить, что вы человек (так что мы можем держать спам!). Решите капчу ниже и нажмите кнопку «Продолжить».
title: Проверка безопасности
confirmations:
awaiting_review: Ваш адрес электронной почты подтвержден! Сотрудники %{domain} проверяют вашу регистрацию. Вы получите письмо, если они подтвердят вашу учетную запись!
awaiting_review_title: Ваша регистрация проверяется
login_link: войти
proceed_to_login_html: Теперь вы можете перейти к %{login_link}.
registration_complete: Ваша регистрация на %{domain} завершена!
welcome_title: Добро пожаловать, %{name}!
wrong_email_hint: Если этот адрес электронной почты неверен, вы можете изменить его в настройках аккаунта.
delete_account: Удалить учётную запись
delete_account_html: Удалить свою учётную запись <a href="%{path}">можно в два счёта здесь</a>, но прежде у вас будет спрошено подтверждение.
@@ -1137,6 +1144,7 @@ ru:
functional: Ваша учётная запись в полном порядке.
pending: Ваша заявка ожидает одобрения администраторами, это может занять немного времени. Вы получите письмо, как только заявку одобрят.
redirecting_to: Ваша учётная запись деактивированна, потому что вы настроили перенаправление на %{acct}.
self_destruct: Поскольку %{domain} закрывается, вы получите ограниченный доступ к вашей учетной записи.
view_strikes: Просмотр предыдущих замечаний в адрес вашей учетной записи
too_fast: Форма отправлена слишком быстро, попробуйте еще раз.
use_security_key: Использовать ключ безопасности
@@ -1622,6 +1630,8 @@ ru:
over_daily_limit: Вы превысили лимит в %{limit} запланированных постов на указанный день
over_total_limit: Вы превысили лимит на %{limit} запланированных постов
too_soon: Запланированная дата должна быть в будущем
self_destruct:
title: Этот сервер закрывается
sessions:
activity: Последняя активность
browser: Браузер
3 changes: 2 additions & 1 deletion config/locales/sv.yml
Original file line number Diff line number Diff line change
@@ -1043,8 +1043,9 @@ sv:
confirmations:
awaiting_review_title: Din registrering är under granskning
clicking_this_link: klicka på denna länk
login_link: logga in
registration_complete: Din registrering på %{domain} är nu slutförd!
welcome_title: Välkommen, %{name}!
welcome_title: Välkommen %{name}!
wrong_email_hint: Om e-postadressen inte är rätt, kan du ändra den i kontoinställningarna.
delete_account: Radera konto
delete_account_html: Om du vill radera ditt konto kan du <a href="%{path}">fortsätta här</a>. Du kommer att bli ombedd att bekräfta.
8 changes: 8 additions & 0 deletions config/locales/th.yml
Original file line number Diff line number Diff line change
@@ -1023,6 +1023,14 @@ th:
hint_html: อีกเพียงหนึ่งสิ่งเพิ่มเติม! เราจำเป็นต้องยืนยันว่าคุณเป็นมนุษย์ (นี่ก็เพื่อให้เราสามารถกันสแปมออกไป!) แก้ CAPTCHA ด้านล่างและคลิก "ดำเนินการต่อ"
title: การตรวจสอบความปลอดภัย
confirmations:
awaiting_review: ยืนยันที่อยู่อีเมลของคุณแล้ว! ตอนนี้พนักงานของ %{domain} กำลังตรวจทานการลงทะเบียนของคุณ คุณจะได้รับอีเมลหากพนักงานอนุมัติบัญชีของคุณ!
awaiting_review_title: กำลังตรวจทานการลงทะเบียนของคุณ
clicking_this_link: คลิกลิงก์นี้
login_link: เข้าสู่ระบบ
proceed_to_login_html: ตอนนี้คุณสามารถดำเนินการต่อเพื่อ %{login_link}
redirect_to_app_html: คุณควรได้รับการเปลี่ยนเส้นทางไปยังแอป <strong>%{app_name}</strong> หากนั่นไม่เกิดขึ้น ลอง %{clicking_this_link} หรือกลับไปยังแอปด้วยตนเอง
registration_complete: ตอนนี้การลงทะเบียนของคุณใน %{domain} เสร็จสมบูรณ์แล้ว!
welcome_title: ยินดีต้อนรับ %{name}!
wrong_email_hint: หากที่อยู่อีเมลนั้นไม่ถูกต้อง คุณสามารถเปลี่ยนที่อยู่อีเมลได้ในการตั้งค่าบัญชี
delete_account: ลบบัญชี
delete_account_html: หากคุณต้องการลบบัญชีของคุณ คุณสามารถ <a href="%{path}">ดำเนินการต่อที่นี่</a> คุณจะได้รับการถามเพื่อการยืนยัน
8 changes: 8 additions & 0 deletions config/locales/tr.yml
Original file line number Diff line number Diff line change
@@ -1041,6 +1041,14 @@ tr:
hint_html: Sadece bir şey daha! Sizin bir insan olduğunuzu doğrulamamız gerekiyor (bu, spam'i dışarıda tutabilmemiz içindir!). Aşağıdaki CAPTCHA'yı çözün ve "Devam Et" düğmesini tıklayın.
title: Güvenlik denetimi
confirmations:
awaiting_review: E-posta adresiniz doğrulandı! %{domain} çalışanları şimdi kaydınızı inceliyorlar. Hesabınızı onayladıklarında bir e-posta alacaksınız!
awaiting_review_title: Kaydınız inceleniyor
clicking_this_link: bu bağlantıyı tıklamayı
login_link: oturum aç
proceed_to_login_html: Şimdi %{login_link} devam edebilirsiniz.
redirect_to_app_html: "<strong>%{app_name}</strong> uygulamasına yönlendirileceksiniz. Eğer yönlendirme olmazsa, %{clicking_this_link} veya uygulamaya geri dönmeyi deneyin."
registration_complete: "%{domain} sunucusunda kaydınız şimdi tamamlandı!"
welcome_title: Hoşgeldin %{name}!
wrong_email_hint: Eğer bu e-posta adresi doğru değilse, hesap ayarlarında değiştirebilirsiniz.
delete_account: Hesabı sil
delete_account_html: Hesabını silmek istersen, <a href="%{path}">buradan devam edebilirsin</a>. Onay istenir.
8 changes: 8 additions & 0 deletions config/locales/uk.yml
Original file line number Diff line number Diff line change
@@ -1077,6 +1077,14 @@ uk:
hint_html: Ще одне! Ми повинні пересвідчитись, що ви людина (щоб ми могли уникнути спаму!). Розв'яжіть CAPTCHA внизу і натисніть кнопку "Продовжити".
title: Перевірка безпеки
confirmations:
awaiting_review: Ваша електронна адреса підтверджена! Співробітники %{domain} тепер переглядають вашу реєстрацію. Ви отримаєте електронного листа, якщо вони затвердять ваш обліковий запис!
awaiting_review_title: Ваша реєстрація розглядається
clicking_this_link: натисніть це посилання
login_link: увійти
proceed_to_login_html: Тепер ви можете перейти до %{login_link}.
redirect_to_app_html: Ви мали бути перенаправлені до програми <strong>%{app_name}</strong>. Якщо цього не сталося, спробуйте %{clicking_this_link} або вручну поверніться до програми.
registration_complete: Ваша реєстрація на %{domain} завершена!
welcome_title: Ласкаво просимо, %{name}!
wrong_email_hint: Якщо ця адреса електронної пошти неправильна, можна змінити її в налаштуваннях облікового запису.
delete_account: Видалити обліковий запис
delete_account_html: Якщо ви хочете видалити свій обліковий запис, ви можете <a href="%{path}">перейти сюди</a>. Вас попросять підтвердити дію.