diff --git a/.circleci/config.yml b/.circleci/config.yml index b2257e72..1bec69a4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,7 @@ jobs: build: docker: # Specify the version you desire here - - image: circleci/php:7.2.3-cli-stretch-node + - image: circleci/php:7.3-cli-stretch-node # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images @@ -15,7 +15,7 @@ jobs: # Using the RAM variation mitigates I/O contention # for database intensive operations. # - image: circleci/mysql:5.7-ram - # + # # - image: redis:2.8.19 steps: @@ -51,4 +51,4 @@ jobs: - store_test_results: path: tests/_output - store_artifacts: - path: tests/_output \ No newline at end of file + path: tests/_output diff --git a/docker-compose.yml b/docker-compose.yml index cab45b55..3d9cccc0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,6 +16,7 @@ services: # Comment to use dockerhub image build: . image: pixelfed + restart: unless-stopped ## If you have a traefik running, uncomment this to expose Pixelfed # labels: # - traefik.enable=true @@ -37,6 +38,7 @@ services: # Comment to use dockerhub image build: . image: pixelfed + restart: unless-stopped env_file: - ./.env volumes: @@ -49,6 +51,7 @@ services: db: image: mysql:8.0 + restart: unless-stopped networks: - internal environment: @@ -61,6 +64,7 @@ services: redis: image: redis:5-alpine + restart: unless-stopped volumes: - "redis-data:/data" networks: diff --git a/resources/lang/cs/notification.php b/resources/lang/cs/notification.php index dda5bd39..6331eda9 100644 --- a/resources/lang/cs/notification.php +++ b/resources/lang/cs/notification.php @@ -2,7 +2,8 @@ return [ - 'likedPhoto' => 'dal/a vaší fotce To se mi líbí.', + 'likedPhoto' => 'dal/a vašemu příspěvku To se mi líbí.', + 'likedComment' => 'dal/a vašemu komentáři To se mi líbí.', 'startedFollowingYou' => 'vás začal/a sledovat.', 'commented' => 'okomentoval/a vaši fotku.', 'mentionedYou' => 'vás zmínil/a.', diff --git a/resources/lang/ja/helpcenter.php b/resources/lang/ja/helpcenter.php new file mode 100644 index 00000000..b4da31f7 --- /dev/null +++ b/resources/lang/ja/helpcenter.php @@ -0,0 +1,26 @@ + 'ヘルプセンター', + 'whatsnew' => 'What\'s New', + + 'gettingStarted' => 'はじめに', + 'sharingMedia' => 'メディアを共有する', + 'profile' => 'プロフィール', + 'stories' => 'ストーリー', + 'hashtags' => 'ハッシュダグ', + 'discover' => '見つける', + 'directMessages' => 'ダイレクトメッセージ', + 'timelines' => 'タイムライン', + + 'embed' => '埋め込む', + 'communityGuidelines' => 'コミュニティガイドライン', + 'whatIsTheFediverse' => 'fediverseとは?', + 'controllingVisibility' => '可視性制御', + 'blockingAccounts' => 'ブロックしたアカウント', + 'safetyTips' => '安全のためのヒント', + 'reportSomething' => '報告する', + 'dataPolicy' => 'データポリシー' + +]; diff --git a/resources/lang/ja/notification.php b/resources/lang/ja/notification.php index fdd4b425..5cdd9834 100644 --- a/resources/lang/ja/notification.php +++ b/resources/lang/ja/notification.php @@ -2,7 +2,8 @@ return [ - 'likedPhoto' => '写真がお気に入りされました。', + 'likedPhoto' => '写真がお気に入りに登録されました。', + 'likedComment' => 'コメントがお気に入りに登録されました。', 'startedFollowingYou' => 'フォローされました。', 'commented' => '投稿にコメントされました。', 'mentionedYou' => 'メンションされました。', diff --git a/resources/lang/ja/profile.php b/resources/lang/ja/profile.php index 517f77fc..58054a01 100644 --- a/resources/lang/ja/profile.php +++ b/resources/lang/ja/profile.php @@ -7,7 +7,7 @@ return [ 'savedWarning' => 'あなたが保存したものはあなただけが見ることが出来ます。', 'emptySaved' => 'あなたはまだ何も保存していません。', 'privateProfileWarning' => 'このアカウントはプライベートです。', - 'alreadyFollow' => 'もう既に :username をフォローしていますか?', + 'alreadyFollow' => 'もう既に :username さんをフォローしています。', 'loginToSeeProfile' => '写真とビデオを見る。', 'status.disabled.header' => 'プロフィールが無効です', diff --git a/resources/views/site/fediverse.blade.php b/resources/views/site/fediverse.blade.php index b2a84fe0..527bbbe5 100644 --- a/resources/views/site/fediverse.blade.php +++ b/resources/views/site/fediverse.blade.php @@ -7,11 +7,14 @@
-

Fediverse is a portmanteau of “federation” and “universe”. It is a common, informal name for a somewhat broad federation of social network servers.

+

Fediverse is a portmanteau of “federation” and “universe”. It is a common, informal name for a federation of social network servers, specializing in different types of media.

Supported Fediverse Projects

-

This is a partial list of well known supported projects

+

Some of the better known fediverse projects include: