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

Merge branch 'master' into donations

Browse Source 
# Conflicts:
#	mastodon/src/main/res/values/strings.xml
This commit is contained in:
Grishka
2024-05-21 20:08:43 +03:00
parent ea53200e23 29ab502d2e
commit 2dae00800e
6 changed files with 63 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mastodon/src/main/res/layout/sheet_photo_viewer_info.xml
View File

@@ -141,6 +141,7 @@
android:layout_marginHorizontal="16dp"
android:textAppearance="@style/m3_body_large"
android:textColor="?colorM3OnSurface"
android:textIsSelectable="true"
tools:text="A cute black cat"/>
</LinearLayout>

14
mastodon/src/main/res/values/strings.xml
View File

@@ -314,7 +314,7 @@
<string name="instance_signup_closed">This server does not accept new registrations.</string>
<string name="text_copied">Copied to clipboard</string>
<string name="add_bookmark">Bookmark</string>
<string name="remove_bookmark">Remove Bookmark</string>
<string name="remove_bookmark">Remove bookmark</string>
<string name="bookmarks">Bookmarks</string>
<string name="your_favorites">Your favorites</string>
<string name="login_title">Welcome back</string>
@@ -751,10 +751,14 @@
<string name="visibility_subtitle_unlisted">Fewer algorithmic fanfares</string>
<string name="visibility_subtitle_followers">Only your followers</string>
<string name="visibility_subtitle_private">Everyone mentioned in the post</string>
<string name="view_boosts">View Boosts</string>
<string name="view_favorites">View Favorites</string>
<string name="undo_reblog">Undo Boost</string>
<string name="undo_favorite">Undo Favorite</string>
<string name="view_boosts">View boosts</string>
<string name="view_favorites">View favorites</string>
<string name="undo_reblog">Undo boost</string>
<string name="undo_favorite">Undo favorite</string>
<string name="could_not_reach_server">Couldn’t reach the server. Check your connection and try again?</string>
<string name="connection_timed_out">The request timed out. Check your connection and try again?</string>
<string name="server_error">Something went wrong talking with your server. It’s probably not your fault. Try again?</string>
<string name="not_found">It could’ve been deleted, or maybe it never existed at all.</string>
<string name="dismiss">Dismiss</string>
<string name="donation_once">Just once</string>
<string name="donation_monthly">Monthly</string>