owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'megalodon_main/main' into m3-merger

Browse Source 
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
#	mastodon/src/main/res/values-pl-rPL/strings_sk.xml
#	mastodon/src/main/res/values-ru-rRU/strings_sk.xml
#	metadata/ru/full_description.txt
This commit is contained in:
LucasGGamerM
2023-08-24 08:17:57 -03:00
parent 3db74fb958 40a033d692
commit afc401c1f2
65 changed files with 2604 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mastodon/src/main/res/values-zh-rTW/strings_sk.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="sk_notification_type_status">嘟文</string>
<string name="sk_notification_type_status">鋪文</string>
<string name="sk_notification_type_posts">嘟文通知</string>
<string name="sk_poll_allow_multiple">允許複選</string>
<string name="sk_translate_post">翻譯</string>