commit 5610ffb

Merge branch 'master' into feature/visibility

1@@ -1,6 +1,6 @@
2 # Release Notes
3 
4-## UNRELEASED
5+## 2.83
6 
7 After receiving a follow confirmation, a bunch of posts from that account are requested and inserted into the timeline as context.
8 

 1@@ -762,20 +762,20 @@ msgstr "Časové pásmo:"
 2 
 3 #: html.c:491
 4 msgid "Language:"
 5-msgstr ""
 6+msgstr "Jazyk:"
 7 
 8 #: html.c:1512
 9 msgid "Notify webhook:"
10-msgstr ""
11+msgstr "Notify webhook:"
12 
13 #: html.c:1518
14 msgid "http://example.com/webhook"
15-msgstr ""
16+msgstr "http://priklad.cz/webhook"
17 
18 #: html.c:1626
19 msgid "Languages you usually post in:"
20-msgstr ""
21+msgstr "Jazyky ve kterých píšete:"
22 
23 #: html.c:1632
24 msgid "en fr es de_AT"
25-msgstr ""
26+msgstr "cs en fr de_AT"

  1@@ -22,11 +22,11 @@ msgstr "只有提及到的人："
  2 
  3 #: html.c:446
  4 msgid "Reply to (URL): "
  5-msgstr "回复给(网址)："
  6+msgstr "回复给(URL)："
  7 
  8 #: html.c:455
  9 msgid "Don't send, but store as a draft"
 10-msgstr "不要发送，但是保存为草稿"
 11+msgstr "不发送，但保存为草稿"
 12 
 13 #: html.c:456
 14 msgid "Draft:"
 15@@ -54,7 +54,7 @@ msgstr "投票..."
 16 
 17 #: html.c:620
 18 msgid "Poll options (one per line, up to 8):"
 19-msgstr "投票选项（每项一行，最多八项）："
 20+msgstr "投票选项（每行一项，最多八项）："
 21 
 22 #: html.c:632
 23 msgid "One choice"
 24@@ -78,7 +78,7 @@ msgstr "一天后结束"
 25 
 26 #: html.c:656
 27 msgid "Post"
 28-msgstr ""
 29+msgstr "发布"
 30 
 31 #: html.c:758 html.c:765
 32 msgid "Site description"
 33@@ -86,7 +86,7 @@ msgstr "站点描述"
 34 
 35 #: html.c:776
 36 msgid "Admin email"
 37-msgstr "管理员电子邮箱"
 38+msgstr "管理员邮箱"
 39 
 40 #: html.c:789
 41 msgid "Admin account"
 42@@ -126,11 +126,11 @@ msgid ""
 43 "Search posts by URL or content (regular expression), @user@host accounts, or "
 44 "#tag"
 45 msgstr ""
 46-"通过网址、内容（正则表达式）、@用户@服务器 帐号，或者 #话题标签搜索贴子"
 47+"通过 URL、内容（正则表达式）、@<用户名>@<主机名>帐号，或者 #话题标签 搜索贴子"
 48 
 49 #: html.c:1019
 50 msgid "Content search"
 51-msgstr "内容搜索"
 52+msgstr "搜索内容"
 53 
 54 #: html.c:1145
 55 msgid "verified link"
 56@@ -158,7 +158,7 @@ msgstr "关注"
 57 
 58 #: html.c:1262
 59 msgid "(by URL or user@host)"
 60-msgstr "（通过网址或者 用户名@服务器）"
 61+msgstr "（通过 URL 或者 <用户名>@<主机名>）"
 62 
 63 #: html.c:1277 html.c:1857 html.c:4678
 64 msgid "Boost"
 65@@ -166,7 +166,7 @@ msgstr "转发"
 66 
 67 #: html.c:1279 html.c:1296
 68 msgid "(by URL)"
 69-msgstr "（通过网址）"
 70+msgstr "（通过 URL）"
 71 
 72 #: html.c:1294 html.c:1836 html.c:4669
 73 msgid "Like"
 74@@ -218,11 +218,11 @@ msgstr "用于通知的电子邮箱地址"
 75 
 76 #: html.c:1484
 77 msgid "Telegram notifications (bot key and chat id):"
 78-msgstr "Telegram通知（bot密钥和聊天ID）"
 79+msgstr "Telegram 通知（bot 密钥和聊天 ID）"
 80 
 81 #: html.c:1498
 82 msgid "ntfy notifications (ntfy server and token):"
 83-msgstr "ntfy通知（ntfy服务器和令牌）："
 84+msgstr "ntfy 通知（ntfy 服务器和令牌）："
 85 
 86 #: html.c:1520
 87 msgid "Maximum days to keep posts (0: server settings):"
 88@@ -282,15 +282,15 @@ msgstr "更新用户信息："
 89 
 90 #: html.c:1663
 91 msgid "Followed hashtags..."
 92-msgstr "已关注的话题标签..."
 93+msgstr "关注的标签..."
 94 
 95 #: html.c:1665 html.c:1698
 96 msgid "One hashtag per line"
 97-msgstr "每行一个话题标签"
 98+msgstr "每行一个标签"
 99 
100 #: html.c:1687 html.c:1719
101 msgid "Update hashtags"
102-msgstr "更新话题标签"
103+msgstr "更新标签"
104 
105 #: html.c:1836
106 msgid "Say you like this post"
107@@ -702,9 +702,9 @@ msgid ""
108 "Option 3...\n"
109 "..."
110 msgstr ""
111-"选项1...\n"
112-"选项2...\n"
113-"选项3...\n"
114+"选项 1...\n"
115+"选项 2...\n"
116+"选项 3...\n"
117 "..."
118 
119 #: html.c:1490
120@@ -713,15 +713,15 @@ msgstr "Bot API 密钥"
121 
122 #: html.c:1496
123 msgid "Chat id"
124-msgstr "聊天ID"
125+msgstr "聊天 ID"
126 
127 #: html.c:1504
128 msgid "ntfy server - full URL (example: https://ntfy.sh/YourTopic)"
129-msgstr "ntfy服务器 - 完整网址（例如：https://ntft.sh/YourTopic）"
130+msgstr "ntfy 服务器 - 完整网址（例如：https://ntft.sh/YourTopic）"
131 
132 #: html.c:1510
133 msgid "ntfy token - if needed"
134-msgstr "ntft令牌 - 如果需要的话"
135+msgstr "ntft 令牌 - 如果需要的话"
136 
137 #: html.c:3009
138 msgid "pinned"
139@@ -737,31 +737,31 @@ msgstr "草稿"
140 
141 #: html.c:516
142 msgid "Scheduled post..."
143-msgstr ""
144+msgstr "计划发布定时贴文"
145 
146 msgid "Post date and time:"
147-msgstr ""
148+msgstr "发布日期和时间"
149 
150 #: html.c:3044 html.c:4137
151 msgid "Scheduled posts"
152-msgstr ""
153+msgstr "已发布的定时帖文"
154 
155 #: html.c:3045
156 msgid "scheduled posts"
157-msgstr ""
158+msgstr "计划发布定时贴文"
159 
160 #: html.c:510
161 #, c-format
162 msgid "Post date and time (timezone: %s):"
163-msgstr ""
164+msgstr "发布日期和时间（时区： %s）"
165 
166 #: html.c:1621
167 msgid "Time zone:"
168-msgstr ""
169+msgstr "时区"
170 
171 #: html.c:491
172 msgid "Language:"
173-msgstr ""
174+msgstr "语言"
175 
176 #: html.c:1512
177 msgid "Notify webhook:"
178@@ -773,7 +773,7 @@ msgstr ""
179 
180 #: html.c:1626
181 msgid "Languages you usually post in:"
182-msgstr ""
183+msgstr "您通常使用的语言："
184 
185 #: html.c:1632
186 msgid "en fr es de_AT"

1@@ -1,7 +1,7 @@
2 /* snac - A simple, minimalistic ActivityPub instance */
3 /* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
4 
5-#define VERSION "2.83-dev"
6+#define VERSION "2.83"
7 
8 #define USER_AGENT "snac/" VERSION
9