Merge remote-tracking branch 'megalodon_main/main'
# Conflicts: # mastodon/build.gradle # mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java # metadata/en-US/full_description.txt # metadata/ja-JP/title.txt
This commit is contained in:
@@ -569,7 +569,7 @@
|
||||
<item quantity="other">%,d โพสต์วันนี้</item>
|
||||
</plurals>
|
||||
<string name="error_playing_video">เกิดข้อผิดพลาดในการเล่นวิดีโอ</string>
|
||||
<string name="timeline_following">กำลังติดตาม</string>
|
||||
<string name="timeline_following">หน้าแรก</string>
|
||||
<string name="lists">รายการ</string>
|
||||
<string name="followed_hashtags">แฮชแท็กที่ติดตาม</string>
|
||||
<string name="no_lists">คุณยังไม่มีรายการใด ๆ</string>
|
||||
|
||||
Reference in New Issue
Block a user