merge develop and fix conflicts.

3 files changed, 44 insertions, 1 deletions

diff --git a/sharkey-locales/en-US.yml b/sharkey-locales/en-US.yml
index 0ad01b96be..4196e3ea09 100644
--- a/sharkey-locales/en-US.yml
+++ b/sharkey-locales/en-US.yml
@@ -371,6 +371,8 @@ _mfm:
   smallDescription: "Displays content small and thin."
   center: "Center"
   centerDescription: "Displays content centered."
+  unixtime: "Unix Time"
+  unixtimeDescription: "Displays a timestamp in the viewer's current timezone."
   inlineCode: "Code (Inline)"
   inlineCodeDescription: "Displays inline syntax highlighting for (program) code."
   blockCode: "Code (Block)"
@@ -572,6 +574,12 @@ bubbleTimelineMustBeEnabled: "Note: the bubble timeline is hidden by default, an
 popularUsersGlobal: "Users popular on the global network"
 popularUsersLocal: "Users popular on {name}"
 
+pollsOnLocal: "Polls trending on {name}"
+pollsOnRemote: "Polls trending on the global network"
+pollsExpired: "Polls that have ended recently"
+trendingPollsDisabled: "Trending polls are disabled on this instance."
+trendingPollsDisabledLogIn: "Please log in to view trending polls."
+
 silenced: "Silenced"
 totalFollowers: "Total followers"
 totalFollowing: "Total following"
@@ -593,3 +601,16 @@ translationTimeoutCaption: "Timeout in milliseconds for translation API requests
 attributionDomains: "Attribution Domains"
 attributionDomainsDescription: "A list of domains whose content can be attributed to you on link previews, separated by new-line. Any subdomain will also be valid. The following needs to be on the webpage:"
 writtenBy: "Written by {user}"
+
+followingPub: "Following (Pub)"
+followersSub: "Followers (Sub)"
+wellKnownResources: "Well-known resources"
+lastPosted: "Last posted: {at}"
+nsfw: "NSFW"
+raw: "Raw"
+cw: "CW"
+mediaSilenced: "Media Silenced"
+bubble: "Bubble"
+verified: "Verified"
+notVerified: "Not Verified"
+hibernated: "Hibernated"
diff --git a/sharkey-locales/th-TH.yml b/sharkey-locales/th-TH.yml
index 9da88bc05c..c4670d48bb 100644
--- a/sharkey-locales/th-TH.yml
+++ b/sharkey-locales/th-TH.yml
@@ -26,7 +26,7 @@ _timelineDescription:
 _timelines:
     bubble: "ฟอง"
 
-scheduleNoteFailed: "การกำหนดเวลาเผยแพร่โพสต์ล้มเหลว" 
+scheduleNoteFailed: "การกำหนดเวลาเผยแพร่โพสต์ล้มเหลว"
 
 scheduleNotePosted: "มีการโพสต์กำหนดการแล้ว"
 
@@ -41,3 +41,14 @@ _externalNavigationWarning:
     trustThisDomain: "วางใจโดเมนนี้บนอุปกรณ์นี้ในอนาคต"
 
 mutuals: "ติดตามกันและกัน"
+
+_moderationLogTypes:
+  approve: "ที่ได้รับการอนุมัติ"
+  decline: "ปฏิเสธ"
+  setMandatoryCW: "ตั้งค่าคำเตือนเนื้อหาสำหรับผู้ใช้"
+  setRemoteInstanceNSFW: "ตั้งค่าเซิร์ฟเวอร์ระยะไกลเป็น NSFW"
+  unsetRemoteInstanceNSFW: "ปิดการใช้งานการตั้งค่าเซิร์ฟเวอร์ระยะไกลเป็น NSFW"
+  rejectRemoteInstanceReports: "รายงานถูกปฏิเสธจากเซิร์ฟเวอร์ระยะไกล"
+  acceptRemoteInstanceReports: "รายงานได้รับการยอมรับจากเซิร์ฟเวอร์ระยะไกล"
+  rejectQuotesUser: "โพสต์คำพูดของผู้ใช้ถูกบล็อค/ลบ"
+  allowQuotesUser: "อนุญาตให้อ้างอิงข้อความจากผู้ใช้"
diff --git a/sharkey-locales/vi-VN.yml b/sharkey-locales/vi-VN.yml
index 361083d69e..c382e317e6 100644
--- a/sharkey-locales/vi-VN.yml
+++ b/sharkey-locales/vi-VN.yml
@@ -36,3 +36,14 @@ _externalNavigationWarning:
     trustThisDomain: "Tin tưởng tên miền này trên thiết bị này trong tương lai"
 misskeyUpdated: "Sharkey vừa được cập nhật!"
 mutuals: "Theo dõi nhau"
+
+_moderationLogTypes:
+    approve: "Đã chấp thuận"
+    decline: "Từ chối"
+    setMandatoryCW: "Đặt cảnh báo nội dung cho người dùng"
+    setRemoteInstanceNSFW: "Đặt máy chủ từ xa thành NSFW"
+    unsetRemoteInstanceNSFW: "Hủy cài đặt máy chủ từ xa thành NSFW"
+    rejectRemoteInstanceReports: "Báo cáo bị từ chối từ máy chủ từ xa"
+    acceptRemoteInstanceReports: "Đã chấp nhận báo cáo từ máy chủ từ xa"
+    rejectQuotesUser: "Đã chặn/Xóa bài đăng trích dẫn của người dùng"
+    allowQuotesUser: "Cho phép trích dẫn bài đăng từ người dùng"