소스 검색

Bump version to 4.0.0rc3 (#20378)

Eugen Rochko 1 년 전
부모
커밋
53028af10e
4개의 변경된 파일35개의 추가작업 그리고 18개의 파일을 삭제
  1. 8 3
      CHANGELOG.md
  2. 24 11
      app/javascript/mastodon/locales/defaultMessages.json
  3. 2 3
      app/javascript/mastodon/locales/en.json
  4. 1 1
      lib/mastodon/version.rb

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 8 - 3
CHANGELOG.md


+ 24 - 11
app/javascript/mastodon/locales/defaultMessages.json

@@ -682,6 +682,10 @@
       {
         "defaultMessage": "Filter this post",
         "id": "status.filter"
+      },
+      {
+        "defaultMessage": "Open original page",
+        "id": "account.open_original_page"
       }
     ],
     "path": "app/javascript/mastodon/components/status_action_bar.json"
@@ -887,16 +891,8 @@
         "id": "about.domain_blocks.preamble"
       },
       {
-        "defaultMessage": "Domain",
-        "id": "about.domain_blocks.domain"
-      },
-      {
-        "defaultMessage": "Severity",
-        "id": "about.domain_blocks.severity"
-      },
-      {
-        "defaultMessage": "Reason",
-        "id": "about.domain_blocks.comment"
+        "defaultMessage": "Reason not available",
+        "id": "about.domain_blocks.no_reason_available"
       },
       {
         "defaultMessage": "Mastodon is free, open-source software, and a trademark of Mastodon gGmbH.",
@@ -1187,6 +1183,10 @@
         "defaultMessage": "Change subscribed languages",
         "id": "account.languages"
       },
+      {
+        "defaultMessage": "Open original page",
+        "id": "account.open_original_page"
+      },
       {
         "defaultMessage": "Follows you",
         "id": "account.follows_you"
@@ -2603,7 +2603,7 @@
         "id": "interaction_modal.on_another_server"
       },
       {
-        "defaultMessage": "Simply copy and paste this URL into the search bar of your favourite app or the web interface where you are signed in.",
+        "defaultMessage": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
         "id": "interaction_modal.other_server_instructions"
       }
     ],
@@ -3598,6 +3598,10 @@
       {
         "defaultMessage": "Unblock @{name}",
         "id": "account.unblock"
+      },
+      {
+        "defaultMessage": "Open original page",
+        "id": "account.open_original_page"
       }
     ],
     "path": "app/javascript/mastodon/features/status/components/action_bar.json"
@@ -3998,6 +4002,15 @@
     ],
     "path": "app/javascript/mastodon/features/ui/components/header.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Close",
+        "id": "lightbox.close"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/ui/components/image_modal.json"
+  },
   {
     "descriptors": [
       {

+ 2 - 3
app/javascript/mastodon/locales/en.json

@@ -2,10 +2,8 @@
   "about.blocks": "Moderated servers",
   "about.contact": "Contact:",
   "about.disclaimer": "Mastodon is free, open-source software, and a trademark of Mastodon gGmbH.",
-  "about.domain_blocks.comment": "Reason",
-  "about.domain_blocks.domain": "Domain",
+  "about.domain_blocks.no_reason_available": "Reason not available",
   "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
-  "about.domain_blocks.severity": "Severity",
   "about.domain_blocks.silenced.explanation": "You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.",
   "about.domain_blocks.silenced.title": "Limited",
   "about.domain_blocks.suspended.explanation": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",
@@ -51,6 +49,7 @@
   "account.mute": "Mute @{name}",
   "account.mute_notifications": "Mute notifications from @{name}",
   "account.muted": "Muted",
+  "account.open_original_page": "Open original page",
   "account.posts": "Posts",
   "account.posts_with_replies": "Posts and replies",
   "account.report": "Report @{name}",

+ 1 - 1
lib/mastodon/version.rb

@@ -17,7 +17,7 @@ module Mastodon
     end
 
     def flags
-      'rc2'
+      'rc3'
     end
 
     def suffix

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.