mirror/Infinity-For-Lemmy
1
0
Fork 0
mirror of https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git synced 2025-10-05 21:39:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge changes from Infinity

Browse Source 
This commit merges the changes that were made in the upstream infinity repo
This commit is contained in:
Balazs Toldi
2023-10-27 15:10:00 +02:00
parent 262d9f02ba
commit 4397e09016
182 changed files with 12490 additions and 11105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/res/values/arrays.xml
View File

@@ -44,6 +44,7 @@
<string-array name="settings_default_post_layout">
<item>@string/post_layout_card</item>
<item>@string/post_layout_card_2</item>
<item>@string/post_layout_card_3</item>
<item>@string/post_layout_compact</item>
<item>@string/post_layout_gallery</item>
</string-array>
@@ -51,6 +52,7 @@
<string-array name="settings_default_post_layout_values">
<item>0</item>
<item>3</item>
<item>4</item>
<item>1</item>
<item>2</item>
</string-array>
@@ -59,6 +61,7 @@
<item>@string/link_post_layout_auto</item>
<item>@string/post_layout_card</item>
<item>@string/post_layout_card_2</item>
<item>@string/post_layout_card_3</item>
<item>@string/post_layout_compact</item>
<item>@string/post_layout_gallery</item>
</string-array>
@@ -67,6 +70,7 @@
<item>-1</item>
<item>0</item>
<item>3</item>
<item>4</item>
<item>1</item>
<item>2</item>
</string-array>
@@ -457,10 +461,12 @@
<item>English</item>
<item>Française</item>
<item>Deutsche</item>
<item>Ελληνικά</item>
<item>हिंदी</item>
<item>Magyar</item>
<item>Italiana</item>
<item>日本語</item>
<item>한국인</item>
<item>Polskie</item>
<item>Português</item>
<item>Português (BR)</item>
@@ -468,6 +474,7 @@
<item>русский</item>
<item>Soomaali</item>
<item>Español</item>
<item>தமிழ்</item>
<item>Türkçe</item>
<item>Українська</item>
<item>Tiếng Việt</item>
@@ -482,10 +489,12 @@
<item>en</item>
<item>fr</item>
<item>de</item>
<item>el</item>
<item>hi</item>
<item>hu</item>
<item>it</item>
<item>ja</item>
<item>ko</item>
<item>pl</item>
<item>pt</item>
<item>pt-rBR</item>
@@ -493,6 +502,7 @@
<item>ru</item>
<item>so</item>
<item>es</item>
<item>ta</item>
<item>tr-rTR</item>
<item>uk</item>
<item>vi</item>

2
app/src/main/res/values/colors.xml
View File

@@ -3,7 +3,7 @@
<color name="colorPrimary">#0336FF</color>
<color name="colorPrimaryDark">#002BF0</color>
<color name="colorAccent">#FF1868</color>
<color name="transparentActionBarAndExoPlayerControllerColor">#88000000</color>
<color name="transparentActionBarAndExoPlayerControllerColor">#00000000</color>
<color name="backgroundColor">#FFFFFF</color>
<color name="playButtonBackgroundColor">#000000</color>
<color name="roundedBottomSheetPrimaryBackground">#FFFFFF</color>

80
app/src/main/res/values/strings.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<resources>
<string name="application_name" translatable="false">Eternity</string>
<string name="login_activity_label">Login</string>
<string name="search_activity_label" translatable="false"> </string>
@@ -46,6 +46,9 @@
<string name="edit_profile_activity_label">Edit Profile</string>
<string name="post_poll_activity_label">Poll Post</string>
<string name="history_activity_label">History</string>
<string name="subscription_activity_label">Subscription</string>
<string name="comment_filter_preference_activity_label">Comment Filter</string>
<string name="customize_comment_filter_activity_label">Customize Post Filter</string>
<string name="navigation_drawer_open">Open navigation drawer</string>
<string name="navigation_drawer_close">Close navigation drawer</string>
@@ -97,6 +100,7 @@
<string name="action_playback_speed">Playback Speed</string>
<string name="action_contact_mods">Contact Mods</string>
<string name="action_more_options">More Options</string>
<string name="action_add_to_home_screen">Add to Home screen</string>
<string name="parse_json_response_error">Error occurred when parsing the JSON response</string>
<string name="retrieve_token_error">Error Retrieving the token</string>
@@ -270,6 +274,9 @@
<string name="search_in">Search in</string>
<string name="all_communities">All communities</string>
<string name="confirm">Confirm</string>
<string name="confirm_delete_all_recent_searches">Are you sure you want to delete all recent search queries?</string>
<string name="sort_best">Active</string>
<string name="sort_hot">Hot</string>
<string name="sort_new">New</string>
@@ -655,6 +662,7 @@
<string name="settings_easier_to_watch_in_full_screen_title">Easier to Watch in Full Screen</string>
<string name="settings_hide_fab_in_post_feed">Hide FAB in Post Feed</string>
<string name="settings_comment_divider_type">Comment Divider Type</string>
<string name="settings_comment_filter_title">Comment Filter</string>
<string name="no_link_available">Cannot get the link</string>
@@ -693,6 +701,7 @@
<string name="post_layout_compact">Compact Layout</string>
<string name="post_layout_gallery">Gallery Layout</string>
<string name="post_layout_card_2">Card Layout 2</string>
<string name="post_layout_card_3">Card Layout 3</string>
<string name="elapsed_time_just_now">Just Now</string>
<string name="elapsed_time_a_minute_ago">1 Minute</string>
@@ -806,6 +815,10 @@
<string name="theme_item_card_view_background_color_detail">Applied to: Post background and message background</string>
<string name="theme_item_read_post_card_view_background_color">Read Post Card View Background Color</string>
<string name="theme_item_read_post_card_view_background_color_detail">Applied to: Read Post background</string>
<string name="theme_item_filled_card_view_background_color">Filled Card View Background Color</string>
<string name="theme_item_filled_card_view_background_color_detail">Applied to: Background of a post in a filled card view, some edit text fields</string>
<string name="theme_item_read_post_filled_card_view_background_color">Read Post Filled Card View Background Color</string>
<string name="theme_item_read_post_filled_card_view_background_color_detail">Applied to: Background of a read post in a filled card view</string>
<string name="theme_item_comment_background_color">Comment Background Color</string>
<string name="theme_item_comment_background_color_detail">Applied to: Comment background</string>
<string name="theme_item_fully_collapsed_comment_background_color">Fully-Collapsed Comment Background Color</string>
@@ -1143,18 +1156,31 @@
<string name="post_filter_requires_a_name">What is the name of this post filter?</string>
<string name="duplicate_post_filter_dialog_title">\'%1$s\' Already Exists</string>
<string name="duplicate_post_filter_dialog_message">Override it?</string>
<string name="apply_post_filter_to">Apply to</string>
<string name="apply_to">Apply to</string>
<string name="post_filter_usage_home">Home</string>
<string name="post_filter_usage_community">Community: %1$s</string>
<string name="post_filter_usage_community_all">Community</string>
<string name="post_filter_usage_embedded_subreddit_all">All Communities</string>
<string name="post_filter_usage_user">User: %1$s</string>
<string name="post_filter_usage_user_all">User</string>
<string name="post_filter_usage_embedded_user_all">All users</string>
<string name="post_filter_usage_multireddit">Multicommunity: %1$s</string>
<string name="post_filter_usage_multireddit_all">Multicommunity</string>
<string name="post_filter_usage_embedded_multireddit_all">All Multicommunities</string>
<string name="post_filter_usage_search">Search</string>
<string name="community">Community</string>
<string name="user">User</string>
<string name="edit_post_filter_name_of_usage_info">Leave it blank to apply this post filter to all the communities / users / multicommunities</string>
<string name="click_to_apply_post_filter">Click here to apply it to some post feeds</string>
<string name="post_filter_usage_embedded_more_count">and %1$d more</string>
<string name="excludes_strings_hint">Exclude keywords (key1,key2)</string>
<string name="comment_filter_name_hint">Comment Filter Name</string>
<string name="comment_filter_requires_a_name">What is the name of this comment filter?</string>
<string name="duplicate_comment_filter_dialog_title">\'%1$s\' Already Exists</string>
<string name="duplicate_comment_filter_dialog_message">Override it?</string>
<string name="comment_filter_applied_to_all_subreddits">Applied to all subreddits</string>
<string name="comment_filter_usage_embedded_more_count">and %1$d more</string>
<string name="read_all_messages_time_limit">You are doing this too frequently. Try again later. This is Reddit API\'s rate limit.</string>
<string name="read_all_messages_success">Read all messages successfully</string>
@@ -1173,7 +1199,7 @@
<string name="anonymous_front_page_no_subscriptions">Start by joining a community!</string>
<string name="anonymous_multireddit_no_community">This multicommunity does not have a community!</string>
<string name="backup_settings_success">Successfully exported settings to the destination directory. The password of the generated zip file is 123321. Please don\'t modify the zip file.</string>
<string name="backup_settings_success">Successfully exported settings to the destination directory.</string>
<string name="create_zip_in_destination_directory_failed">Could not create backup zip in the destination directory</string>
<string name="backup_some_settings_failed">Could not backup some settings but others were successfully exported to the destination directory</string>
<string name="restore_settings_success">Successfully restored settings. Restart the app to see the changes.</string>
@@ -1314,12 +1340,8 @@
<string name="handle_link">Handle Link</string>
<string name="invalid_link">Invalid link</string>
<string name="unexpected_intent_action">Unexpected intent action: <xliff:g id="action">%1$s</xliff:g></string>
<string name="enable_random_adaptation">Enable random adaptation</string>
<string name="error_unsupported_video">Media includes video tracks, but none are playable by this device</string>
<string name="error_unsupported_audio">Media includes audio tracks, but none are playable by this device</string>
<string name="storage_permission_denied">Permission to access storage was denied</string>
<string name="sample_list_load_error">One or more sample lists failed to load</string>
<string name="exo_controls_volume_up_description">Volume Up</string>
<string name="exo_controls_volume_off_description">Volume Off</string>
@@ -1334,8 +1356,48 @@
<string name="denied_notification_permission">Notification permission is not granted</string>
<string name="go_to_settings">Settings</string>
<string name="reddit_api_info_title">Important Notice Regarding Reddit API Changes</string>
<string name="reddit_api_info">Starting from July 1st, 2023, Reddit API will be pay-per-use for 3rd-party clients, which include Infinity for Reddit. The announcement from Reddit can be found here: %1$s\n\nIn order to survive this change, Infinity will become a subscription-only app after July 1st. You can learn more about the changes in this post: %2$s\n\nIt\'s required for you to update Infinity after July 1st so that you will get the new version with subscription options. None of the previous versions (including this one) will work after July 1st. But due to a tight timeline Reddit gave, the update may not be available immediately on July 1st since it requires proper testing. Thank you for your understanding!</string>
<string name="welcome_to_infinity">Welcome to Infinity for Reddit, your gateway to a whole new dimension of Reddit browsing!</string>
<string name="subscription_prompt">Before you dive into the countless possibilities this app offers,
I want to be upfront and transparent about a significant change I\'ve implemented to ensure the best possible service for you.
\n\nFrom now on, you will need a monthly subscription to access the Reddit API within Infinity for Reddit and
this is because Reddit has started charging for API access since July 1st, 2023.
\n\nAll the tiers work the same. If you want to support Infinity, you can subscribe to a higher tier.
Most of the money from the lowest tier goes to Reddit.
</string>
<string name="monthly">Monthly</string>
<string name="yearly">Yearly</string>
<string name="weekly">Weekly</string>
<string name="billing_error_billing_unavailable">Billing service unavailable on device.</string>
<string name="billing_error_developer_error">The developer made some errors. Not your fault.</string>
<string name="billing_error_error">Fatal error during the API action.</string>
<string name="billing_error_feature_not_supported">The requested feature is not supported by the Play Store on the current device.</string>
<string name="billing_error_item_already_owned">The purchase failed because the item is already owned.</string>
<string name="billing_error_item_unavailable">The requested product is not available for purchase.</string>
<string name="billing_error_network_error">A network error occurred during the operation.</string>
<string name="billing_error_service_disconnected">The app is not connected to the Play Store service via the Google Play Billing Library.</string>
<string name="billing_error_service_unavailable">The service is currently unavailable.</string>
<string name="billing_error_user_canceled">Transaction was canceled by the user.</string>
<string name="subscription_plan_description_monthly">Bronze</string>
<string name="subscription_plan_description_monthly_399">Silver</string>
<string name="subscription_plan_description_monthly_499">Gold - Perfect Choice!</string>
<string name="subscription_plan_description_monthly_699">Platinum</string>
<string name="subscription_plan_description_monthly_899">Diamond</string>
<string name="subscription_plan_description_monthly_999">Infinity</string>
<string name="acknowledge_purchase_failed">Cannot acknowledge purchase</string>
<string name="connect_to_billing_system_failed">Failed to connect to the billing system</string>
<string name="connecting_to_billing_system">Connecting to the billing system. Please wait.</string>
<string name="thank_you_for_subscription">Thank you for your subscription</string>
<string name="load_subscription_options">Load subscription options</string>
<string name="acknowledging_subscription">Acknowledging your subscription. Please wait.</string>
<string name="acknowledgement_purchase_failed_description">Oops, there was an error when acknowledging your purchase. If this problem persists for three days, you will automatically get a refund.\nDon\'t worry, you can still enjoy Infinity for Reddit.</string>
<string name="continue_to_app">Continue to app</string>
<string name="restore_subscription_purchase_details">Already paid for the subscription?</string>
<string name="restore_subscription_purchase">Restore subscription purchase</string>
<string name="important_info_title">Please re-login your account</string>
<string name="important_info">Infinity for Reddit with subscription uses a new API key from Reddit and you have to re-login to continue using the app.\n\nJust
open the navigation drawer and click your account header and select \"Add an account\" to login to Reddit using the same account again.
Otherwise, Infinity may not load posts at all. Sorry for the inconvenience.</string>
<string name="i_understand">I understand</string>
<string name="instance_url">Instance URL</string>
<string name="instance_url_hint">The URL of you preferred Lemmy instance with or without the https:// prefix</string>