husky: add new flavor to be able to override original Tusky strings. Restore strings from upstream

This commit is contained in:
Alibek Omarov 2020-05-23 00:42:31 +03:00
parent 06bd1c4b76
commit 51845b3cd9
13 changed files with 195 additions and 66 deletions

View File

@ -22,7 +22,7 @@ def buildnum = {
android {
compileSdkVersion 29
//ndkVersion "20.1.5948944"
// ndkVersion "20.1.5948944"
defaultConfig {
applicationId APP_ID
minSdkVersion 21
@ -55,10 +55,13 @@ android {
debug {}
}
flavorDimensions "color"
flavorDimensions "husky", "color"
productFlavors {
blue {}
husky { dimension "husky" }
blue { dimension "color" }
green {
dimension "color"
applicationIdSuffix ".test"
versionNameSuffix "-" + getGitSha()
}

View File

@ -2,8 +2,6 @@
<!-- I'm not a native but I've read Catalan for a few years now and I double-checked everything. -->
<string name="action_reply_to">Respondre a</string>
<string name="action_mute_conversation">Oculta la conversa</string>
<string name="action_unmute_conversation">Mostra la conversa</string>
<!-- In the Spanish translation, I changed "mute" and "unmute" for "hide" and "show". Here, I did the same. -->
<string name="action_emoji_react">Reaccionar</string>
<string name="action_emoji_unreact">Suprimir reacció</string>

View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--<string name="action_unmute_conversation">Gesprächstummhaltung aufheben</string>-->
<string name="action_disable_formatting_syntax">%s deaktivieren</string>
<string name="action_emoji_react">Reagieren</string>
<string name="action_emoji_unreact">Reaktion entfernen</string>
@ -17,7 +16,6 @@
<string name="notification_emoji_description">Benachrictigungen über neue Emojireaktionen</string>
<string name="pref_title_default_formatting">Standardformatierungssyntax (wenn von der Instanz unterstützt)</string>
<string name="pref_title_hide_muted_users">Ignorierte Nutzer verstecken</string>
<!--<string name="action_mute_conversation">Gespräch stummschalten</string>-->
<string name="pref_title_notification_filter_emoji">Reaktionen auf meine Nachrichten</string>
<string name="action_reply_to">Antwort auf</string>
</resources>

View File

@ -2,8 +2,6 @@
<resources>
<string name="action_reply_to">Responder a</string>
<string name="action_mute_conversation">Ocultar conversación</string>
<string name="action_unmute_conversation">Mostrar conversación</string>
<!-- "Unmute" does not have a proper equivalent in Spanish so I chose "Show". Consequently, I used "Hide" instead of "Mute" in the previous one. -->
<string name="action_emoji_react">Reaccionar</string>
<string name="action_emoji_unreact">Eliminar la reacción</string>

View File

@ -6,7 +6,6 @@
<string name="hint_website">Site internet de l\'application</string>
<string name="pref_title_notification_filter_emoji">mes messages peuvent recevoir des réactions</string>
<string name="action_reply_to">Répondre à</string>
<!--<string name="action_unmute_conversation">Afficher la conversation</string>-->
<string name="action_emoji_react">Réagir</string>
<string name="action_emoji_unreact">Supprimer la réaction</string>
<string name="action_emoji_reacted_by">Réaction de</string>
@ -17,7 +16,6 @@
<string name="error_media_upload_size">La taille du fichier dépasse la limite de l\'instance</string>
<string name="action_enable_formatting_syntax">Activer %s</string>
<string name="action_disable_formatting_syntax">Désactiver %s</string>
<!--<string name="action_mute_conversation">Masquer la conversation</string>-->
<string name="admin">Administrateur•rice</string>
<string name="pref_title_default_formatting">Syntaxe de formatage par défaut (si supportée par l\'instance)</string>
</resources>

View File

@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="action_reply_to">返信</string>
<string name="action_mute_conversation">会話をミユート</string>
<string name="action_unmute_conversation">会話をミュート解除</string>
<string name="action_emoji_react">絵文字反応</string>
<string name="action_emoji_reacted_by">誰が反応したか</string>
<string name="action_enable_formatting_syntax">可能にする %s</string>
@ -11,4 +9,4 @@
<string name="hint_website">アプリのウェブサイト</string>
<string name="admin">管理者</string>
<string name="moderator">モデレーター</string>
</resources>
</resources>

View File

@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="action_reply_to">Відповісти</string>
<string name="action_mute_conversation">Приглушити бесіду</string>
<string name="action_unmute_conversation">Скасувати приглушення бесіди</string>
<string name="action_emoji_react">Відреагувати</string>
<string name="action_emoji_unreact">Прибрати реакцію</string>
<string name="action_emoji_reacted_by">Хто відреагував</string>
@ -20,4 +18,4 @@
<string name="error_media_upload_size">Розмір файлу перевищує обмеження інстанції</string>
<string name="pref_title_default_formatting">Синтакс форматування за замовчуванням (якщо підтримується інстанцією)</string>
<string name="pref_title_notification_filter_emoji">мої пости мають емодзі реакції</string>
</resources>
</resources>

View File

@ -0,0 +1,9 @@
<resources>
<!-- HUSKY SPECIFIC STRINGS -->
<!-- REPLACEMENT FOR TUSKY STRINGS -->
<string name="tusky_website" translatable="false">https://husky.fwgs.ru</string>
</resources>

View File

@ -0,0 +1,125 @@
<resources>
<!-- HUSKY SPECIFIC STRINGS -->
<string name="action_reply_to">Reply to</string>
<string name="action_emoji_react">React</string>
<string name="action_emoji_unreact">Remove reaction</string>
<string name="action_emoji_reacted_by">Who reacted</string>
<string name="action_enable_formatting_syntax">Enable %s</string>
<string name="action_disable_formatting_syntax">Disable %s</string>
<string name="action_sticker">Stickers</string>
<string name="title_emoji_reacted_by">%s reacted by</string>
<string name="hint_appname">Application name</string>
<string name="hint_website">Application website</string>
<string name="admin">Admin</string>
<string name="moderator">Moderator</string>
<string name="error_media_upload_size">File size exceeds instance limits</string>
<string name="error_sticker_fetch">An error occurred while fetching sticker</string>
<string name="notification_emoji_format">%s reacted with %s to your post</string>
<string name="notification_emoji_name">Emoji Reactions</string>
<string name="notification_emoji_description">Notifications about new emoji reactions</string>
<string name="pref_title_default_formatting">Default formatting syntax(if supported by instance)</string>
<string name="pref_title_notification_filter_emoji">my posts are reacted with emojis</string>
<string name="pref_title_hide_muted_users">Hide muted users</string>
<string name="pref_title_enable_big_emojis">Enable bigger custom emojis</string>
<string name="pref_title_enable_experimental_stickers">Enable experimental Pleroma-FE stickers(if available)</string>
<!-- REPLACEMENT FOR TUSKY STRINGS -->
<string name="action_toggle_visibility">Post visibility</string>
<string name="action_schedule_toot">Schedule post</string>
<string name="action_reblog">Repeat</string>
<string name="action_unreblog">Remove repeats</string>
<string name="action_hide_reblogs">Hide repeats</string>
<string name="action_show_reblogs">Show repeats</string>
<string name="action_send">POST</string>
<string name="action_send_public">POST!</string>
<string name="action_open_reblogger">Open repeat author</string>
<string name="action_open_reblogged_by">Show repeats</string>
<string name="reblog_private">Repeat to original audience</string>
<string name="unreblog_private">Remove repeat</string>
<string name="action_open_toot">Open post</string>
<string name="compose_shortcut_long_label">Compose Post</string>
<string name="description_status_reblogged">
Repeated
</string>
<string name="dialog_delete_toot_warning">Delete this post?</string>
<string name="dialog_redraft_toot_warning">Delete and re-draft this post?</string>
<string name="error_sender_account_gone">Error sending post.</string>
<string name="notification_reblog_format">%s repeated your post</string>
<string name="notification_favourite_format">%s favorited your post</string>
<string name="notification_boost_name">Repeats</string>
<string name="notification_boost_description">Notifications when your posts get repeated</string>
<string name="notification_favourite_description">Notifications when your posts get marked as favorite</string>
<string name="pref_title_confirm_reblogs">Show confirmation dialog before repeating</string>
<string name="pref_title_notification_filter_reblogs">my posts are repeated</string>
<string name="pref_title_show_boosts">Show repeats</string>
<string name="pref_title_alway_open_spoiler">Always expand posts marked with content warnings</string>
<plurals name="reblogs">
<item quantity="one">&lt;b>%s&lt;/b> Repeat</item>
<item quantity="other">&lt;b>%s&lt;/b> Repeats</item>
</plurals>
<string name="send_status_link_to">Share post URL to…</string>
<string name="send_status_content_to">Share post to…</string>
<string name="send_toot_notification_title">Sending post…</string>
<string name="send_toot_notification_error_title">Error sending post</string>
<string name="send_toot_notification_channel_name">Sending posts</string>
<string name="send_toot_notification_saved_content">A copy of the post has been saved to your drafts</string>
<string name="status_share_content">Share content of post</string>
<string name="status_share_link">Share link to post</string>
<string name="status_boosted_format">%s repeated</string>
<string name="title_scheduled_toot">Scheduled posts</string>
<string name="title_reblogged_by">Repeated by</string>
<string name="title_view_thread">Post</string>
<!--
<string name="about_tusky_version">Husky %s</string>
<string name="about_powered_by_tusky">Powered by Husky</string>
<string name="about_tusky_license">Husky is free and open-source software.
It is licensed under the GNU General Public License Version 3.
You can view the license here: https://www.gnu.org/licenses/gpl-3.0.en.html</string> -->
<!-- note to translators:
* you should think of “free” as in “free speech,” not as in “free beer”.
We sometimes call it “libre software,” borrowing the French or Spanish word for “free” as in freedom,
to show we do not mean the software is gratis. Source: https://www.gnu.org/philosophy/free-sw.html
* the url can be changed to link to the localized version of the license.
--> <!--
<string name="about_project_site">
Project website:\n
https://husky.fwgs.ru
</string>
<string name="about_bug_feature_request_site">
Bug reports &amp; feature requests:\n
https://git.mentality.rip/FWGS/Husky/issues
</string>
<string name="about_tusky_account">Husky\'s Profile</string>
<string name="restart_emoji">You\'ll need to restart Husky in order to apply these changes</string>
<string name="license_description">Husky contains code and assets from the following open source projects:</string>
<string name="add_account_description">Add new Fediverse Account</string>
<string name="action_login">Login!</string>
<string name="dialog_whats_an_instance">The address or domain of any instance can be entered
here, such as shitposter.club, blob.cat, fedi.absturztau.be, expired.mentality.rip, and
<a href="https://instances.social">more!</a>
\n\nIf you don\'t yet have an account, you can enter the name of the instance you\'d like to
join and create an account there.\n\nAn instance is a single place where your account is
hosted, but you can easily communicate with and follow folks on other instances as though
you were on the same site.
\n\nMore info can be found at <a href="https://joinmastodon.org">joinmastodon.org</a>.
</string>
<string name="warning_scheduling_interval">Mastodon/Pleroma has a minimum scheduling interval of 5 minutes.</string> -->
</resources>

View File

@ -19,7 +19,7 @@
<string name="error_media_download_permission">Permission to store media is required.</string>
<string name="error_media_upload_image_or_video">Images and videos cannot both be attached to the same status.</string>
<string name="error_media_upload_sending">The upload failed.</string>
<string name="error_sender_account_gone">Error sending post.</string>
<string name="error_sender_account_gone">Error sending toot.</string>
<string name="title_home">Home</string>
<string name="title_notifications">Notifications</string>
@ -27,7 +27,7 @@
<string name="title_public_federated">Federated</string>
<string name="title_direct_messages">Direct Messages</string>
<string name="title_tab_preferences">Tabs</string>
<string name="title_view_thread">Post</string>
<string name="title_view_thread">Toot</string>
<string name="title_statuses">Posts</string>
<string name="title_statuses_with_replies">With replies</string>
<string name="title_statuses_pinned">Pinned</string>
@ -41,11 +41,11 @@
<string name="title_follow_requests">Follow Requests</string>
<string name="title_edit_profile">Edit your profile</string>
<string name="title_saved_toot">Drafts</string>
<string name="title_scheduled_toot">Scheduled posts</string>
<string name="title_scheduled_toot">Scheduled toots</string>
<string name="title_licenses">Licenses</string>
<string name="status_username_format">\@%s</string>
<string name="status_boosted_format">%s reposted</string>
<string name="status_boosted_format">%s boosted</string>
<string name="status_sensitive_media_title">Sensitive content</string>
<string name="status_media_hidden_title">Media hidden</string>
<string name="status_sensitive_media_directions">Click to view</string>
@ -57,8 +57,8 @@
<string name="message_empty">Nothing here.</string>
<string name="footer_empty">Nothing here. Pull down to refresh!</string>
<string name="notification_reblog_format">%s reposted your post</string>
<string name="notification_favourite_format">%s favorited your post</string>
<string name="notification_reblog_format">%s boosted your toot</string>
<string name="notification_favourite_format">%s favorited your toot</string>
<string name="notification_follow_format">%s followed you</string>
<string name="notification_follow_request_format">%s requested to follow you</string>
@ -67,28 +67,28 @@
<string name="action_quick_reply">Quick Reply</string>
<string name="action_reply">Reply</string>
<string name="action_reblog">Repost</string>
<string name="action_unreblog">Remove repost</string>
<string name="action_reblog">Boost</string>
<string name="action_unreblog">Remove boost</string>
<string name="action_favourite">Favorite</string>
<string name="action_bookmark">Bookmark</string>
<string name="action_unfavourite">Remove favorite</string>
<string name="action_more">More</string>
<string name="action_compose">Compose</string>
<string name="action_login">Login!</string>
<string name="action_login">Login with Mastodon</string>
<string name="action_logout">Log Out</string>
<string name="action_logout_confirm">Are you sure you want to log out of the account %1$s?</string>
<string name="action_follow">Follow</string>
<string name="action_unfollow">Unfollow</string>
<string name="action_block">Block</string>
<string name="action_unblock">Unblock</string>
<string name="action_hide_reblogs">Hide reposts</string>
<string name="action_show_reblogs">Show reposts</string>
<string name="action_hide_reblogs">Hide boosts</string>
<string name="action_show_reblogs">Show boosts</string>
<string name="action_report">Report</string>
<string name="action_edit">Edit</string>
<string name="action_delete">Delete</string>
<string name="action_delete_and_redraft">Delete and re-draft</string>
<string name="action_send">POST</string>
<string name="action_send_public">POST!</string>
<string name="action_send">TOOT</string>
<string name="action_send_public">TOOT!</string>
<string name="action_retry">Retry</string>
<string name="action_close">Close</string>
<string name="action_view_profile">Profile</string>
@ -122,18 +122,18 @@
<string name="action_reject">Reject</string>
<string name="action_search">Search</string>
<string name="action_access_saved_toot">Drafts</string>
<string name="action_access_scheduled_toot">Scheduled posts</string>
<string name="action_toggle_visibility">Post visibility</string>
<string name="action_access_scheduled_toot">Scheduled toots</string>
<string name="action_toggle_visibility">Toot visibility</string>
<string name="action_content_warning">Content warning</string>
<string name="action_emoji_keyboard">Emoji keyboard</string>
<string name="action_schedule_toot">Schedule Post</string>
<string name="action_schedule_toot">Schedule Toot</string>
<string name="action_reset_schedule">Reset</string>
<string name="action_add_tab">Add Tab</string>
<string name="action_links">Links</string>
<string name="action_mentions">Mentions</string>
<string name="action_hashtags">Hashtags</string>
<string name="action_open_reblogger">Open repost author</string>
<string name="action_open_reblogged_by">Show reposts</string>
<string name="action_open_reblogger">Open boost author</string>
<string name="action_open_reblogged_by">Show boosts</string>
<string name="action_open_faved_by">Show favorites</string>
<string name="title_hashtags_dialog">Hashtags</string>
@ -149,8 +149,8 @@
<string name="download_media">Download media</string>
<string name="downloading_media">Downloading media</string>
<string name="send_status_link_to">Share post URL to…</string>
<string name="send_status_content_to">Share post to…</string>
<string name="send_status_link_to">Share toot URL to…</string>
<string name="send_status_content_to">Share toot to…</string>
<string name="send_media_to">Share media to…</string>
<string name="confirmation_reported">Sent!</string>
@ -179,21 +179,21 @@
<string name="login_connection">Connecting…</string>
<string name="dialog_whats_an_instance">The address or domain of any instance can be entered
here, such as mastodon.social, pleroma.site, expired.mentality.rip, and
here, such as mastodon.social, icosahedron.website, social.tchncs.de, and
<a href="https://instances.social">more!</a>
\n\nIf you don\'t yet have an account, you can enter the name of the instance you\'d like to
join and create an account there.\n\nAn instance is a single place where your account is
hosted, but you can easily communicate with and follow folks on other instances as though
you were on the same site.
\n\nMore info can be found at <a href="https://joinmastodon.org">joinmastodon.org</a>, and a full list of instances can be found at <a href="https://fediverse.network">fediverse.network</a>.
\n\nMore info can be found at <a href="https://joinmastodon.org">joinmastodon.org</a>.
</string>
<string name="dialog_title_finishing_media_upload">Finishing Media Upload</string>
<string name="dialog_message_uploading_media">Uploading…</string>
<string name="dialog_download_image">Download</string>
<string name="dialog_message_cancel_follow_request">Revoke the follow request?</string>
<string name="dialog_unfollow_warning">Unfollow this account?</string>
<string name="dialog_delete_toot_warning">Delete this post?</string>
<string name="dialog_redraft_toot_warning">Delete and re-draft this [pst?</string>
<string name="dialog_delete_toot_warning">Delete this toot?</string>
<string name="dialog_redraft_toot_warning">Delete and re-draft this toot?</string>
<string name="mute_domain_warning">Are you sure you want to block all of %s? You will not see content from that domain in any public timelines or in your notifications. Your followers from that domain will be removed.</string>
<string name="mute_domain_warning_dialog_ok">Hide entire domain</string>
<string name="dialog_block_warning">Block @%s?</string>
@ -213,8 +213,8 @@
<string name="pref_title_notification_filters">Notify me when</string>
<string name="pref_title_notification_filter_mentions">mentioned</string>
<string name="pref_title_notification_filter_follows">followed</string>
<string name="pref_title_notification_filter_reblogs">my posts are reposted</string>
<string name="pref_title_notification_filter_follow_requests">follow requested</string>
<string name="pref_title_notification_filter_reblogs">my posts are boosted</string>
<string name="pref_title_notification_filter_favourites">my posts are favorited</string>
<string name="pref_title_notification_filter_poll">polls have ended</string>
<string name="pref_title_appearance_settings">Appearance</string>
@ -238,7 +238,7 @@
<string name="pref_title_status_filter">Timeline filtering</string>
<string name="pref_title_status_tabs">Tabs</string>
<string name="pref_title_show_boosts">Show reposts</string>
<string name="pref_title_show_boosts">Show boosts</string>
<string name="pref_title_show_replies">Show replies</string>
<string name="pref_title_show_media_preview">Download media previews</string>
<string name="pref_title_proxy_settings">Proxy</string>
@ -268,12 +268,12 @@
<string name="notification_mention_descriptions">Notifications about new mentions</string>
<string name="notification_follow_name">New Followers</string>
<string name="notification_follow_description">Notifications about new followers</string>
<string name="notification_boost_name">Reposts</string>
<string name="notification_boost_description">Notifications when your posts get reposted</string>
<string name="notification_follow_request_name">Follow Requests</string>
<string name="notification_follow_request_description">Notifications about follow requests</string>
<string name="notification_boost_name">Boosts</string>
<string name="notification_boost_description">Notifications when your toots get boosted</string>
<string name="notification_favourite_name">Favorites</string>
<string name="notification_favourite_description">Notifications when your posts get marked as favorite</string>
<string name="notification_favourite_description">Notifications when your toots get marked as favorite</string>
<string name="notification_poll_name">Polls</string>
<string name="notification_poll_description">Notifications about polls that have ended</string>
@ -287,9 +287,9 @@
<string name="description_account_locked">Locked Account</string>
<string name="about_title_activity">About</string>
<string name="about_tusky_version">Husky %s</string>
<string name="about_powered_by_tusky">Powered by Husky</string>
<string name="about_tusky_license">Husky is free and open-source software.
<string name="about_tusky_version">Tusky %s</string>
<string name="about_powered_by_tusky">Powered by Tusky</string>
<string name="about_tusky_license">Tusky is free and open-source software.
It is licensed under the GNU General Public License Version 3.
You can view the license here: https://www.gnu.org/licenses/gpl-3.0.en.html</string>
<!-- note to translators:
@ -304,12 +304,12 @@
</string>
<string name="about_bug_feature_request_site">
Bug reports &amp; feature requests:\n
https://git.mentality.rip/FWGS/Husky/issues
https://github.com/tuskyapp/Tusky/issues
</string>
<string name="about_tusky_account">Husky\'s Profile</string>
<string name="about_tusky_account">Tusky\'s Profile</string>
<string name="status_share_content">Share content of post</string>
<string name="status_share_link">Share link to post</string>
<string name="status_share_content">Share content of toot</string>
<string name="status_share_link">Share link to toot</string>
<string name="status_media_images">Images</string>
<string name="status_media_video">Video</string>
@ -329,7 +329,7 @@
<string name="follows_you">Follows you</string>
<string name="pref_title_alway_show_sensitive_media">Always show sensitive content</string>
<string name="pref_title_alway_open_spoiler">Always expand posts marked with content warnings</string>
<string name="pref_title_alway_open_spoiler">Always expand toots marked with content warnings</string>
<string name="title_media">Media</string>
<string name="replying_to">Replying to @%s</string>
<string name="load_more_placeholder_text">load more</string>
@ -345,7 +345,7 @@
<string name="filter_add_description">Phrase to filter</string>
<string name="add_account_name">Add Account</string>
<string name="add_account_description">Add new Fediverse Account</string>
<string name="add_account_description">Add new Mastodon Account</string>
<string name="action_lists">Lists</string>
<string name="title_lists">Lists</string>
@ -370,11 +370,11 @@
<string name="lock_account_label">Lock account</string>
<string name="lock_account_label_description">Requires you to manually approve followers</string>
<string name="compose_save_draft">Save draft?</string>
<string name="send_toot_notification_title">Sending Post…</string>
<string name="send_toot_notification_error_title">Error sending post</string>
<string name="send_toot_notification_channel_name">Sending Posts</string>
<string name="send_toot_notification_title">Sending Toot…</string>
<string name="send_toot_notification_error_title">Error sending toot</string>
<string name="send_toot_notification_channel_name">Sending Toots</string>
<string name="send_toot_notification_cancel_title">Sending cancelled</string>
<string name="send_toot_notification_saved_content">A copy of the post has been saved to your drafts</string>
<string name="send_toot_notification_saved_content">A copy of the toot has been saved to your drafts</string>
<string name="action_compose_shortcut">Compose</string>
<string name="error_no_custom_emojis">Your instance %s does not have any custom emojis</string>
@ -384,7 +384,7 @@
<string name="download_fonts">You\'ll need to download these emoji sets first</string>
<string name="performing_lookup_title">Performing lookup…</string>
<string name="expand_collapse_all_statuses">Expand/Collapse all statuses</string>
<string name="action_open_toot">Open post</string>
<string name="action_open_toot">Open toot</string>
<string name="restart_required">App restart required</string>
<string name="restart_emoji">You\'ll need to restart Tusky in order to apply these changes</string>
<string name="later">Later</string>
@ -399,8 +399,8 @@
<string name="profile_badge_bot_text">Bot</string>
<string name="account_moved_description">%1$s has moved to:</string>
<string name="reblog_private">Repost to original audience</string>
<string name="unreblog_private">Unrepost</string>
<string name="reblog_private">Boost to original audience</string>
<string name="unreblog_private">Unboost</string>
<string name="license_description">Tusky contains code and assets from the following open source projects:</string>
<string name="license_apache_2">Licensed under the Apache License (copy below)</string>
@ -425,11 +425,11 @@
</plurals>
<plurals name="reblogs">
<item quantity="one">&lt;b>%s&lt;/b> Repost</item>
<item quantity="other">&lt;b>%s&lt;/b> Reposts</item>
<item quantity="one">&lt;b>%s&lt;/b> Boost</item>
<item quantity="other">&lt;b>%s&lt;/b> Boosts</item>
</plurals>
<string name="title_reblogged_by">Reposted by</string>
<string name="title_reblogged_by">Boosted by</string>
<string name="title_favourited_by">Favorited by</string>
<string name="conversation_1_recipients">%1$s</string>
@ -483,7 +483,7 @@
<string name="notifications_apply_filter">Filter</string>
<string name="filter_apply">Apply</string>
<string name="compose_shortcut_long_label">Compose Post</string>
<string name="compose_shortcut_long_label">Compose Toot</string>
<string name="compose_shortcut_short_label">Compose</string>
<string name="notification_clear_text">Are you sure you want to permanently clear all your notifications?</string>
@ -496,6 +496,10 @@
<item quantity="one">%s vote</item>
<item quantity="other">%s votes</item>
</plurals>
<plurals name="poll_info_people">
<item quantity="one">%s person</item>
<item quantity="other">%s people</item>
</plurals>
<string name="poll_info_time_relative">%s left</string>
<string name="poll_info_time_absolute">ends at %s</string>
<string name="poll_info_closed">closed</string>