Feature/wording

.github/workflows/crowdin-upload.yml

@@ -18,7 +18,7 @@ jobs:
         uses: crowdin/github-action@v2
         with:
           upload_sources: true
-          upload_translations: false
+          upload_translations: true
           download_translations: false
         env:
           CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}

app/src/main/java/dev/dimension/flare/common/ComposeInAppNotification.kt

@@ -38,7 +38,7 @@ internal class ComposeInAppNotification : InAppNotification {
     }
 
     override fun onSuccess(message: Message) {
-        _source.value = Event(Notification.StringNotification(message.title, success = true))
+        _source.value = Event(Notification.StringNotification(message.successTitle, success = true))
     }
 
     fun message(
@@ -54,7 +54,7 @@ internal class ComposeInAppNotification : InAppNotification {
         _source.value =
             Event(
                 Notification.StringNotification(
-                    message.title,
+                    message.errorTitle,
                     success = false,
                     args =
                         listOfNotNull(
@@ -69,9 +69,16 @@ internal class ComposeInAppNotification : InAppNotification {
     }
 }
 
-private val Message.title
+private val Message.successTitle
     get() =
         when (this) {
-            Message.Compose -> R.string.compose_notification_title
+            Message.Compose -> R.string.compose_notification_success
+            Message.LoginExpired -> R.string.notification_login_expired
+        }
+
+private val Message.errorTitle
+    get() =
+        when (this) {
+            Message.Compose -> R.string.compose_notification_error
             Message.LoginExpired -> R.string.notification_login_expired
         }

app/src/main/java/dev/dimension/flare/ui/screen/settings/SettingsScreen.kt

@@ -134,7 +134,7 @@ internal fun SettingsScreen(
                     )
                 },
                 supportingContent = {
-                    Text(text = stringResource(id = R.string.settings_accounts_title))
+                    Text(text = stringResource(id = R.string.settings_accounts_subtitle))
                 },
             )
             Column(

compose-ui/src/commonMain/composeResources/values/strings.xml

@@ -17,56 +17,56 @@
     <string name="profile_header_button_is_fans">Follows you</string>
 
     <string name="mastodon_notification_item_followed_you">followed you</string>
-    <string name="mastodon_notification_item_favourited_your_status">favourited</string>
+    <string name="mastodon_notification_item_favourited_your_status">favorited your post</string>
     <string name="mastodon_notification_item_reblogged_your_status">reblogged</string>
     <string name="mastodon_notification_item_poll_ended">A poll you were participating in has ended</string>
     <string name="mastodon_notification_item_mentioned_you">mentioned you</string>
-    <string name="mastodon_notification_item_requested_follow">request to follow you</string>
-    <string name="mastodon_notification_item_posted_status">just posted a post</string>
+    <string name="mastodon_notification_item_requested_follow">requested to follow you</string>
+    <string name="mastodon_notification_item_posted_status">posted</string>
     <string name="mastodon_notification_item_updated_status">updated a post</string>
     <string name="mastodon_item_reblogged_status">boosted a post</string>
     <string name="mastodon_item_show_more">Show more</string>
     <string name="mastodon_item_show_less">Show less</string>
-    <string name="mastodon_item_pinned">Pinned post</string>
+    <string name="mastodon_item_pinned">pinned a post</string>
 
     <string name="post_show_full_text">Show full text</string>
 
     <string name="bluesky_notification_item_followed_you">followed you</string>
-    <string name="bluesky_notification_item_favourited_your_status">favourited</string>
-    <string name="bluesky_notification_item_reblogged_your_status">reblogged</string>
+    <string name="bluesky_notification_item_favourited_your_status">liked your post</string>
+    <string name="bluesky_notification_item_reblogged_your_status">reposted your post</string>
     <string name="bluesky_notification_item_poll_ended">A poll you were participating in has ended</string>
     <string name="bluesky_notification_item_mentioned_you">mentioned you</string>
-    <string name="bluesky_item_reblogged_status">reposted a post</string>
+    <string name="bluesky_item_reblogged_status">reposted</string>
     <string name="bluesky_notification_item_replied_to_you">replied to you</string>
-    <string name="bluesky_notification_item_quoted_your_status">quoted</string>
-    <string name="bluesky_notification_item_starterpack_joined">Starterpack Joined</string>
-    <string name="bluesky_notification_item_unKnown">UnKnown</string>
-    <string name="bluesky_notification_item_pin">Pinned</string>
+    <string name="bluesky_notification_item_quoted_your_status">quoted your post</string>
+    <string name="bluesky_notification_item_starterpack_joined">joined via a Starter Pack</string>
+    <string name="bluesky_notification_item_unKnown">Unknown</string>
+    <string name="bluesky_notification_item_pin">pinned a post</string>
 
     <string name="misskey_notification_item_mentioned_you">mentioned you</string>
     <string name="misskey_notification_item_replied_to_you">replied to you</string>
-    <string name="misskey_notification_item_reposted_your_status">reposted</string>
-    <string name="misskey_notification_item_quoted_your_status">quoted</string>
+    <string name="misskey_notification_item_reposted_your_status">reposted your post</string>
+    <string name="misskey_notification_item_quoted_your_status">quoted your post</string>
     <string name="misskey_notification_item_reacted_to_your_status">reacted to your post</string>
     <string name="misskey_notification_item_poll_ended">A poll you were participating in has ended</string>
     <string name="misskey_notification_item_follow_request_accepted">accepted your follow request</string>
-    <string name="misskey_notification_item_scheduled_note_posted">Scheduled note posted</string>
-    <string name="misskey_notification_item_scheduled_note_post_failed">Scheduled note failed to post</string>
-    <string name="misskey_notification_item_role_assigned">Role assigned</string>
+    <string name="misskey_notification_item_scheduled_note_posted">scheduled note posted</string>
+    <string name="misskey_notification_item_scheduled_note_post_failed">scheduled note failed to post</string>
+    <string name="misskey_notification_item_role_assigned">assigned you a role</string>
     <string name="misskey_notification_item_chat_room_invitation_received">invited you to a chat room</string>
     <string name="misskey_notification_item_achievement_earned">You\'ve earned an achievement: %1$s\n%2$s</string>
-    <string name="misskey_notification_item_app">App</string>
-    <string name="misskey_notification_item_export_completed">Export completed</string>
-    <string name="misskey_notification_item_test">Test notification</string>
-    <string name="misskey_notification_item_login">Login detected</string>
-    <string name="misskey_notification_item_create_token">Access token created</string>
+    <string name="misskey_notification_item_app">app notification</string>
+    <string name="misskey_notification_item_export_completed">export completed</string>
+    <string name="misskey_notification_item_test">test notification</string>
+    <string name="misskey_notification_item_login">new login detected</string>
+    <string name="misskey_notification_item_create_token">access token created</string>
     <string name="misskey_notification_item_followed_you">followed you</string>
     <string name="misskey_notification_item_requested_follow">requested to follow you</string>
-    <string name="misskey_notification_unknwon">Unknown notification %1$s</string>
-    <string name="misskey_item_reblogged_status">reposted a post</string>
+    <string name="misskey_notification_unknwon">Unknown notification: %1$s</string>
+    <string name="misskey_item_reblogged_status">reposted</string>
 
-    <string name="xqt_item_reblogged_status">retweeted</string>
-    <string name="xqt_item_mention_status">mentions you</string>
+    <string name="xqt_item_reblogged_status">reposted</string>
+    <string name="xqt_item_mention_status">mentioned you</string>
 
     <string name="mastodon_visibility_public">Public</string>
     <string name="mastodon_visibility_unlisted">Unlisted</string>
@@ -88,11 +88,11 @@
     <string name="show_media">Show media</string>
     <string name="hide_media">Hide media</string>
     <string name="login_expired">Login session expired</string>
-    <string name="login_expired_message">Click to login again</string>
-    <string name="login_expired_relogin">Login again</string>
+    <string name="login_expired_message">Tap to log in again</string>
+    <string name="login_expired_relogin">Log in again</string>
 
-    <string name="permission_denied_title">Permission Denied</string>
-    <string name="permission_denied_message">You need re-login in order to access this page</string>
+    <string name="permission_denied_title">Permission denied</string>
+    <string name="permission_denied_message">Log in again to access this page</string>
 
     <string name="misskey_compose_local_only">Local only</string>
     <string name="misskey_compose_local_only_description">Only users on this instance can see this post</string>
@@ -119,8 +119,8 @@
     <string name="bookmark_add">Add bookmark</string>
     <string name="like">Like</string>
     <string name="unlike">Unlike</string>
-    <string name="favourite">Favourite</string>
-    <string name="unfavourite">Unfavourite</string>
+    <string name="favourite">Favorite</string>
+    <string name="unfavourite">Unfavorite</string>
     <string name="more">More</string>
     <string name="quote">Quote</string>
     <string name="reaction_add">Add reaction</string>
@@ -142,11 +142,11 @@
     <string name="user_block_with_parameter">Block %1$s</string>
     <string name="mastodon_item_content_warning">Content warning</string>
     <string name="reply_to">Reply to %1$s</string>
-    <string name="status_detail_translate">Translate Post</string>
-    <string name="status_detail_tldr">Summary Post</string>
+    <string name="status_detail_translate">Translate</string>
+    <string name="status_detail_tldr">Summarize</string>
     <string name="translation_badge_translated">Translated</string>
-    <string name="translation_badge_translating">Translating</string>
-    <string name="translation_badge_failed">Failed</string>
+    <string name="translation_badge_translating">Translating…</string>
+    <string name="translation_badge_failed">Translation failed</string>
     <string name="translation_retry">Retry translation</string>
     <string name="translation_show_original">Show original</string>
 
@@ -413,7 +413,7 @@
     <string name="poll_expired">Poll expired</string>
     <string name="poll_voted">Voted</string>
     <string name="poll_expired_at">Expired at %1$s</string>
-    <string name="user_send_message">Send message</string>
+    <string name="user_send_message">Send direct message</string>
 
     <string name="profile_search_user_using_account">Find %1$s in %2$s using %3$s</string>
     <string name="profile_search_user_using_account_compat">Find in %1$s</string>
@@ -429,12 +429,12 @@
     <string name="send">Send</string>
     <string name="dm_send_placeholder">Send a message</string>
     <string name="dm_deleted">Deleted</string>
-    <string name="dm_conversation">Direct Message Room</string>
+    <string name="dm_conversation">Direct message conversation</string>
     <string name="dm_sending">Sending</string>
     <string name="dm_leave">Leave conversation</string>
     <string name="dm_to_profile">Show profile</string>
 
-    <string name="settings_side_panel_empty">Default will display side panel depends on the account platform.</string>
+    <string name="settings_side_panel_empty">By default, the side panel follows the current account\'s platform.</string>
     <string name="tab_settings_add">Add</string>
     <string name="tab_settings_drag">Drag</string>
     <string name="tab_settings_edit">Edit</string>
@@ -448,30 +448,30 @@
     <string name="list_delete">Delete list</string>
 
     <string name="rss_sources_title">Subscriptions</string>
-    <string name="add_rss_source">Add Subscription</string>
-    <string name="edit_rss_source">Edit Subscription</string>
-    <string name="delete_rss_source">Delete Subscription</string>
+    <string name="add_rss_source">Add subscription</string>
+    <string name="edit_rss_source">Edit subscription</string>
+    <string name="delete_rss_source">Delete subscription</string>
 
     <string name="rss_sources_title_label">Title</string>
-    <string name="rss_sources_url_label">Url</string>
+    <string name="rss_sources_url_label">URL</string>
     <string name="rss_title">Subscriptions</string>
     <string name="empty_rss_sources">No subscriptions</string>
     <string name="mastodon_trending_statuses">Trending statuses</string>
     <string name="mastodon_federated_timeline">Federated timeline</string>
     <string name="mastodon_local_timeline">Local timeline</string>
 
     <string name="service_select_welcome_title">Welcome to Flare</string>
-    <string name="service_select_welcome_message">Please input the server to get started.</string>
-    <string name="service_select_welcome_hint">Flare supports Mastodon, Misskey, Bluesky, Nostr and X.</string>
-    <string name="service_select_welcome_list_hint">Or pick from these servers</string>
+    <string name="service_select_welcome_message">Enter a server to get started.</string>
+    <string name="service_select_welcome_hint">Flare supports Mastodon, Misskey, Bluesky, Nostr, and X.</string>
+    <string name="service_select_welcome_list_hint">Or choose from these servers</string>
     <string name="bluesky_login_username_hint">Username</string>
     <string name="bluesky_login_password_hint">Password</string>
-    <string name="bluesky_login_auth_factor_token_hint">Authentication Factor Token</string>
-    <string name="bluesky_login_oauth_button">Login with OAuth</string>
-    <string name="bluesky_login_use_password_button">Use Password</string>
-    <string name="bluesky_login_oauth_hint">Bluesky OAuth might not stable enough, please use password login if you encounter any issues.</string>
-    <string name="login_button">Login</string>
-    <string name="mastodon_login_verify_message">Please wait while we verify your credentials.</string>
+    <string name="bluesky_login_auth_factor_token_hint">2FA token</string>
+    <string name="bluesky_login_oauth_button">Log in with OAuth</string>
+    <string name="bluesky_login_use_password_button">Use password</string>
+    <string name="bluesky_login_oauth_hint">Bluesky OAuth may still be unstable. If you run into issues, use password login instead.</string>
+    <string name="login_button">Log in</string>
+    <string name="mastodon_login_verify_message">Verifying your credentials…</string>
     <string name="nostr_login_title">Import Nostr account</string>
     <string name="nostr_login_hint">Paste an npub or hex pubkey for read-only access, provide an nsec for local signing, use a bunker URI for remote signing, or connect Amber and QR-based Nostr Connect signers.</string>
     <string name="nostr_login_account_hint">npub, nsec, hex key, bunker://, or nostrconnect://</string>
@@ -483,7 +483,7 @@
     <string name="nostr_login_qr_waiting">Waiting for signer approval…</string>
     <string name="nostr_login_qr_link_label">Nostr Connect link</string>
     <string name="cancel_button">Cancel</string>
-    <string name="nostr_login_generate_button">Generate and login</string>
+    <string name="nostr_login_generate_button">Generate and log in</string>
     <string name="nostr_login_npub_hint">npub or hex pubkey (optional if nsec is set)</string>
     <string name="nostr_login_nsec_hint">nsec or hex private key</string>
     <string name="nostr_login_relays_hint">Relay URLs, separated by commas</string>
@@ -503,19 +503,19 @@
     <string name="mastodon_tab_public_title">Public</string>
     <string name="home_tab_featured_title">Featured</string>
     <string name="home_tab_bookmarks_title">Bookmarks</string>
-    <string name="home_tab_favorite_title">Favorite</string>
-    <string name="home_tab_list_title">List</string>
+    <string name="home_tab_favorite_title">Favorites</string>
+    <string name="home_tab_list_title">Lists</string>
     <string name="home_tab_feeds_title">Feeds</string>
     <string name="dm_list_title">Direct Messages</string>
     <string name="social_title">Social</string>
-    <string name="antenna_title">Antenna</string>
+    <string name="antenna_title">Antennas</string>
     <string name="mixed_timeline_title">Mixed</string>
     <string name="liked_title">Liked</string>
     <string name="all_rss_feeds_title">All Subscriptions</string>
     <string name="posts_title">Posts</string>
     <string name="settings_appearance_absolute_timestamp">Absolute timestamp</string>
-    <string name="settings_appearance_absolute_timestamp_description">Display absolute timestamps on posts</string>
-    <string name="settings_about_description">The ultimate next generation open-sourced AI powered decentralized social network client.</string>
+    <string name="settings_appearance_absolute_timestamp_description">Show exact timestamps on posts</string>
+    <string name="settings_about_description">An open-source, AI-powered client for decentralized social platforms.</string>
     <string name="settings_about_source_code">Source code</string>
     <string name="settings_about_telegram">Telegram</string>
     <string name="settings_about_telegram_description">Join our Telegram group</string>