Fix sort types in settings

Closes #25

app/src/main/java/eu/toldi/infinityforlemmy/activities/EditPostActivity.java

@@ -174,7 +174,7 @@ public class EditPostActivity extends BaseActivity implements UploadImageEnabled
 
         mGlide = Glide.with(this);
 
-        if (mPost.getUrl().matches(picturePattern)) {
+        if (mPost.getUrl() != null && mPost.getUrl().matches(picturePattern)) {
             loadImage();
         }
 

app/src/main/java/eu/toldi/infinityforlemmy/activities/MainActivity.java

@@ -1400,10 +1400,6 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
                 goToUser();
                 break;
             }
-            case FABMoreOptionsBottomSheetFragment.FAB_RANDOM: {
-                randomThing();
-                break;
-            }
             case FABMoreOptionsBottomSheetFragment.FAB_HIDE_READ_POSTS: {
                 if (sectionsPagerAdapter != null) {
                     sectionsPagerAdapter.hideReadPosts();

app/src/main/java/eu/toldi/infinityforlemmy/activities/SearchResultActivity.java

@@ -558,10 +558,6 @@ public class SearchResultActivity extends BaseActivity implements SortTypeSelect
                 goToUser();
                 break;
             }
-            case FABMoreOptionsBottomSheetFragment.FAB_RANDOM: {
-                random();
-                break;
-            }
             case FABMoreOptionsBottomSheetFragment.FAB_HIDE_READ_POSTS: {
                 if (sectionsPagerAdapter != null) {
                     sectionsPagerAdapter.hideReadPosts();

app/src/main/java/eu/toldi/infinityforlemmy/activities/SubscribedThingListingActivity.java

@@ -233,7 +233,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
         });
         sectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
         viewPager.setAdapter(sectionsPagerAdapter);
-        viewPager.setOffscreenPageLimit(3);
+        viewPager.setOffscreenPageLimit(1);
         if (viewPager.getCurrentItem() != 2) {
             fab.hide();
         }
@@ -358,7 +358,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
         }
 
         if (!(!forceLoad && mInsertMultiredditSuccess)) {
-            loadMultiReddits();
+            //loadMultiReddits();
         }
     }
 
@@ -412,7 +412,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
                                     public void success() {
                                         Toast.makeText(SubscribedThingListingActivity.this,
                                                 R.string.delete_multi_reddit_success, Toast.LENGTH_SHORT).show();
-                                        loadMultiReddits();
+                                        //loadMultiReddits();
                                     }
 
                                     @Override
@@ -439,7 +439,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
 
     @Subscribe
     public void onRefreshMultiRedditsEvent(RefreshMultiRedditsEvent event) {
-        loadMultiReddits();
+        //loadMultiReddits();
     }
 
     @Override
@@ -477,6 +477,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
         @Override
         public Fragment getItem(int position) {
             switch (position) {
+                default:
                 case 0: {
                     SubscribedSubredditsListingFragment fragment = new SubscribedSubredditsListingFragment();
                     Bundle bundle = new Bundle();
@@ -487,28 +488,12 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
                     fragment.setArguments(bundle);
                     return fragment;
                 }
-                case 1: {
-                    FollowedUsersListingFragment fragment = new FollowedUsersListingFragment();
-                    Bundle bundle = new Bundle();
-                    bundle.putString(FollowedUsersListingFragment.EXTRA_ACCOUNT_NAME, mAccountName == null ? "-" : mAccountName);
-                    bundle.putString(FollowedUsersListingFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
-                    fragment.setArguments(bundle);
-                    return fragment;
-                }
-                default: {
-                    MultiRedditListingFragment fragment = new MultiRedditListingFragment();
-                    Bundle bundle = new Bundle();
-                    bundle.putString(MultiRedditListingFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
-                    bundle.putString(MultiRedditListingFragment.EXTRA_ACCOUNT_NAME, mAccountName == null ? "-" : mAccountName);
-                    fragment.setArguments(bundle);
-                    return fragment;
-                }
             }
         }
 
         @Override
         public int getCount() {
-            return 3;
+            return 1;
         }
 
         @Override

app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewMultiRedditDetailActivity.java

@@ -946,10 +946,6 @@ public class ViewMultiRedditDetailActivity extends BaseActivity implements SortT
                 goToUser();
                 break;
             }
-            case FABMoreOptionsBottomSheetFragment.FAB_RANDOM: {
-                random();
-                break;
-            }
             case FABMoreOptionsBottomSheetFragment.FAB_HIDE_READ_POSTS: {
                 if (mFragment instanceof PostFragment) {
                     ((PostFragment) mFragment).hideReadPosts();

app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewSubredditDetailActivity.java

@@ -554,12 +554,9 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
                 creationTimeTextView.setText(subredditData.getCreatedUTC());
                 description = subredditData.getDescription();
 
-                if (hideSubredditDescription || description.equals("")) {
-                    descriptionTextView.setVisibility(View.GONE);
-                } else {
-                    descriptionTextView.setVisibility(View.VISIBLE);
-                    markwon.setMarkdown(descriptionTextView, description);
-                }
+
+                descriptionTextView.setVisibility(View.GONE);
+
 
                 if (subredditData.isNSFW()) {
                     if (nsfwWarningBuilder == null
@@ -1402,10 +1399,6 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
                 goToUser();
                 break;
             }
-            case FABMoreOptionsBottomSheetFragment.FAB_RANDOM: {
-                random();
-                break;
-            }
             case FABMoreOptionsBottomSheetFragment.FAB_HIDE_READ_POSTS: {
                 if (sectionsPagerAdapter != null) {
                     sectionsPagerAdapter.hideReadPosts();

app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewUserDetailActivity.java

@@ -1341,10 +1341,7 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
                 goToUser();
                 break;
             }
-            case FABMoreOptionsBottomSheetFragment.FAB_RANDOM: {
-                random();
-                break;
-            }
+
             case FABMoreOptionsBottomSheetFragment.FAB_HIDE_READ_POSTS: {
                 if (sectionsPagerAdapter != null) {
                     sectionsPagerAdapter.hideReadPosts();

app/src/main/java/eu/toldi/infinityforlemmy/adapters/MessageRecyclerViewAdapter.java

@@ -215,7 +215,7 @@ public class MessageRecyclerViewAdapter extends PagedListAdapter<CommentInteract
 
                     Intent intent = new Intent(mActivity, ViewUserDetailActivity.class);
                     intent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, message.getComment().getAuthor());
-                    intent.putExtra(ViewUserDetailActivity.EXTRA_QUALIFIED_USER_NAME_KEY, message.getComment().getCommunityQualifiedName());
+                    intent.putExtra(ViewUserDetailActivity.EXTRA_QUALIFIED_USER_NAME_KEY, message.getComment().getAuthorQualifiedName());
                     mActivity.startActivity(intent);
                 });
             }

app/src/main/java/eu/toldi/infinityforlemmy/adapters/navigationdrawer/AccountSectionRecyclerViewAdapter.java

@@ -24,8 +24,8 @@ public class AccountSectionRecyclerViewAdapter extends RecyclerView.Adapter<Recy
 
     private static final int VIEW_TYPE_MENU_GROUP_TITLE = 1;
     private static final int VIEW_TYPE_MENU_ITEM = 2;
-    private static final int ACCOUNT_SECTION_ITEMS = 5;
-    private static final int ANONYMOUS_ACCOUNT_SECTION_ITEMS = 3;
+    private static final int ACCOUNT_SECTION_ITEMS = 4;
+    private static final int ANONYMOUS_ACCOUNT_SECTION_ITEMS = 2;
 
     private BaseActivity baseActivity;
     private int inboxCount;
@@ -101,10 +101,6 @@ public class AccountSectionRecyclerViewAdapter extends RecyclerView.Adapter<Recy
                         drawableId = R.drawable.ic_subscritptions_bottom_app_bar_24dp;
                         break;
                     case 3:
-                        stringId = R.string.multi_reddit;
-                        drawableId = R.drawable.ic_multi_reddit_24dp;
-                        break;
-                    case 4:
                         setOnClickListener = false;
                         if (inboxCount > 0) {
                             ((MenuItemViewHolder) holder).menuTextView.setText(baseActivity.getString(R.string.inbox_with_count, inboxCount));
@@ -118,23 +114,21 @@ public class AccountSectionRecyclerViewAdapter extends RecyclerView.Adapter<Recy
                         });
                         break;
                     default:
-                        stringId = R.string.history;
-                        drawableId = R.drawable.ic_history_24dp;
-
+                        stringId = R.string.account_saved_thing_activity_label;
+                        drawableId = R.drawable.ic_outline_bookmarks_24dp;
+                        break;
                 }
             } else {
                 switch (position) {
+
                     case 1:
                         stringId = R.string.subscriptions;
                         drawableId = R.drawable.ic_subscritptions_bottom_app_bar_24dp;
                         break;
-                    case 2:
-                        stringId = R.string.multi_reddit;
-                        drawableId = R.drawable.ic_multi_reddit_24dp;
-                        break;
                     default:
-                        stringId = R.string.history;
-                        drawableId = R.drawable.ic_history_24dp;
+                        stringId = R.string.anonymous_account_instance;
+                        drawableId = R.drawable.ic_account_circle_24dp;
+                        break;
                 }
             }
 

app/src/main/java/eu/toldi/infinityforlemmy/adapters/navigationdrawer/NavigationDrawerRecyclerViewMergedAdapter.java

@@ -17,8 +17,6 @@ import eu.toldi.infinityforlemmy.subscribedsubreddit.SubscribedSubredditData;
 public class NavigationDrawerRecyclerViewMergedAdapter {
     private HeaderSectionRecyclerViewAdapter headerSectionRecyclerViewAdapter;
     private AccountSectionRecyclerViewAdapter accountSectionRecyclerViewAdapter;
-    private RedditSectionRecyclerViewAdapter redditSectionRecyclerViewAdapter;
-    private PostSectionRecyclerViewAdapter postSectionRecyclerViewAdapter;
     private PreferenceSectionRecyclerViewAdapter preferenceSectionRecyclerViewAdapter;
     private FavoriteSubscribedSubredditsSectionRecyclerViewAdapter favoriteSubscribedSubredditsSectionRecyclerViewAdapter;
     private SubscribedSubredditsRecyclerViewAdapter subscribedSubredditsRecyclerViewAdapter;
@@ -49,10 +47,6 @@ public class NavigationDrawerRecyclerViewMergedAdapter {
                 });
         accountSectionRecyclerViewAdapter = new AccountSectionRecyclerViewAdapter(baseActivity, customThemeWrapper,
                 navigationDrawerSharedPreferences, accountName != null, itemClickListener);
-        redditSectionRecyclerViewAdapter = new RedditSectionRecyclerViewAdapter(baseActivity, customThemeWrapper,
-                navigationDrawerSharedPreferences, itemClickListener, accountName != null);
-        postSectionRecyclerViewAdapter = new PostSectionRecyclerViewAdapter(baseActivity, customThemeWrapper,
-                navigationDrawerSharedPreferences, accountName != null, itemClickListener);
         preferenceSectionRecyclerViewAdapter = new PreferenceSectionRecyclerViewAdapter(baseActivity, customThemeWrapper,
                 accountName, nsfwAndSpoilerSharedPreferences, navigationDrawerSharedPreferences, itemClickListener);
         favoriteSubscribedSubredditsSectionRecyclerViewAdapter = new FavoriteSubscribedSubredditsSectionRecyclerViewAdapter(
@@ -65,8 +59,6 @@ public class NavigationDrawerRecyclerViewMergedAdapter {
         mainPageConcatAdapter = new ConcatAdapter(
                 headerSectionRecyclerViewAdapter,
                 accountSectionRecyclerViewAdapter,
-                redditSectionRecyclerViewAdapter,
-                postSectionRecyclerViewAdapter,
                 preferenceSectionRecyclerViewAdapter,
                 favoriteSubscribedSubredditsSectionRecyclerViewAdapter,
                 subscribedSubredditsRecyclerViewAdapter);
@@ -78,8 +70,6 @@ public class NavigationDrawerRecyclerViewMergedAdapter {
 
     private void openAccountSection() {
         mainPageConcatAdapter.removeAdapter(accountSectionRecyclerViewAdapter);
-        mainPageConcatAdapter.removeAdapter(redditSectionRecyclerViewAdapter);
-        mainPageConcatAdapter.removeAdapter(postSectionRecyclerViewAdapter);
         mainPageConcatAdapter.removeAdapter(preferenceSectionRecyclerViewAdapter);
         mainPageConcatAdapter.removeAdapter(favoriteSubscribedSubredditsSectionRecyclerViewAdapter);
         mainPageConcatAdapter.removeAdapter(subscribedSubredditsRecyclerViewAdapter);
@@ -91,8 +81,6 @@ public class NavigationDrawerRecyclerViewMergedAdapter {
         mainPageConcatAdapter.removeAdapter(accountManagementSectionRecyclerViewAdapter);
 
         mainPageConcatAdapter.addAdapter(accountSectionRecyclerViewAdapter);
-        mainPageConcatAdapter.addAdapter(redditSectionRecyclerViewAdapter);
-        mainPageConcatAdapter.addAdapter(postSectionRecyclerViewAdapter);
         mainPageConcatAdapter.addAdapter(preferenceSectionRecyclerViewAdapter);
         mainPageConcatAdapter.addAdapter(favoriteSubscribedSubredditsSectionRecyclerViewAdapter);
         mainPageConcatAdapter.addAdapter(subscribedSubredditsRecyclerViewAdapter);

app/src/main/java/eu/toldi/infinityforlemmy/bottomsheetfragments/FABMoreOptionsBottomSheetFragment.java

@@ -24,7 +24,6 @@ public class FABMoreOptionsBottomSheetFragment extends LandscapeExpandedRoundedB
     public static final int FAB_OPTION_SEARCH = 4;
     public static final int FAB_OPTION_GO_TO_SUBREDDIT = 5;
     public static final int FAB_OPTION_GO_TO_USER = 6;
-    public static final int FAB_RANDOM = 7;
     public static final int FAB_HIDE_READ_POSTS = 8;
     public static final int FAB_FILTER_POSTS = 9;
     public static final int FAB_GO_TO_TOP = 10;
@@ -86,10 +85,6 @@ public class FABMoreOptionsBottomSheetFragment extends LandscapeExpandedRoundedB
             dismiss();
         });
 
-        binding.randomTextViewFabMoreOptionsBottomSheetFragment.setOnClickListener(view -> {
-            activity.fabOptionSelected(FAB_RANDOM);
-            dismiss();
-        });
 
         binding.filterPostsTextViewFabMoreOptionsBottomSheetFragment.setOnClickListener(view -> {
             activity.fabOptionSelected(FAB_FILTER_POSTS);

app/src/main/java/eu/toldi/infinityforlemmy/bottomsheetfragments/SearchPostSortTypeBottomSheetFragment.java

@@ -31,16 +31,12 @@ public class SearchPostSortTypeBottomSheetFragment extends LandscapeExpandedRoun
 
     public static final String EXTRA_CURRENT_SORT_TYPE = "ECST";
 
-    @BindView(R.id.relevance_type_text_view_search_sort_type_bottom_sheet_fragment)
-    TextView relevanceTypeTextView;
-    @BindView(R.id.hot_type_text_view_search_sort_type_bottom_sheet_fragment)
-    TextView hotTypeTextView;
     @BindView(R.id.top_type_text_view_search_sort_type_bottom_sheet_fragment)
     TextView topTypeTextView;
     @BindView(R.id.new_type_text_view_search_sort_type_bottom_sheet_fragment)
     TextView newTypeTextView;
-    @BindView(R.id.comments_type_text_view_search_sort_type_bottom_sheet_fragment)
-    TextView commentsTypeTextView;
+    @BindView(R.id.old_type_text_view_search_sort_type_bottom_sheet_fragment)
+    TextView oldTypeTextView;
     private BaseActivity activity;
     public SearchPostSortTypeBottomSheetFragment() {
         // Required empty public constructor
@@ -61,14 +57,12 @@ public class SearchPostSortTypeBottomSheetFragment extends LandscapeExpandedRoun
         ButterKnife.bind(this, rootView);
 
         String currentSortType = getArguments().getString(EXTRA_CURRENT_SORT_TYPE);
-        if (currentSortType.equals(SortType.Type.HOT.fullName)) {
-            hotTypeTextView.setCompoundDrawablesRelativeWithIntrinsicBounds(hotTypeTextView.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_round_check_circle_day_night_24dp), null);
-        } else if (currentSortType.equals(SortType.Type.TOP.fullName)) {
+        if (currentSortType.equals(SortType.Type.TOP.fullName)) {
             topTypeTextView.setCompoundDrawablesRelativeWithIntrinsicBounds(topTypeTextView.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_round_check_circle_day_night_24dp), null);
         } else if (currentSortType.equals(SortType.Type.NEW.fullName)) {
             newTypeTextView.setCompoundDrawablesRelativeWithIntrinsicBounds(newTypeTextView.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_round_check_circle_day_night_24dp), null);
         } else if (currentSortType.equals(SortType.Type.OLD.fullName)) {
-            commentsTypeTextView.setCompoundDrawablesRelativeWithIntrinsicBounds(commentsTypeTextView.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_round_check_circle_day_night_24dp), null);
+            oldTypeTextView.setCompoundDrawablesRelativeWithIntrinsicBounds(oldTypeTextView.getCompoundDrawablesRelative()[0], null, AppCompatResources.getDrawable(activity, R.drawable.ic_round_check_circle_day_night_24dp), null);
         }
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
@@ -76,15 +70,6 @@ public class SearchPostSortTypeBottomSheetFragment extends LandscapeExpandedRoun
             rootView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
         }
 
-        /*relevanceTypeTextView.setOnClickListener(view -> {
-            ((SortTypeSelectionCallback) activity).sortTypeSelected(SortType.Type.RELEVANCE.name());
-            dismiss();
-        });*/
-
-        hotTypeTextView.setOnClickListener(view -> {
-            ((SortTypeSelectionCallback) activity).sortTypeSelected(SortType.Type.HOT.name());
-            dismiss();
-        });
 
         topTypeTextView.setOnClickListener(view -> {
             ((SortTypeSelectionCallback) activity).sortTypeSelected(SortType.Type.TOP.name());
@@ -92,12 +77,12 @@ public class SearchPostSortTypeBottomSheetFragment extends LandscapeExpandedRoun
         });
 
         newTypeTextView.setOnClickListener(view -> {
-            ((SortTypeSelectionCallback) activity).sortTypeSelected(new SortType(SortType.Type.NEW));
+            ((SortTypeSelectionCallback) activity).sortTypeSelected(new SortType(SortType.Type.NEW,null));
             dismiss();
         });
 
-        commentsTypeTextView.setOnClickListener(view -> {
-            ((SortTypeSelectionCallback) activity).sortTypeSelected(SortType.Type.MOST_COMMENTS.name());
+        oldTypeTextView.setOnClickListener(view -> {
+            ((SortTypeSelectionCallback) activity).sortTypeSelected(new SortType(SortType.Type.OLD,null));
             dismiss();
         });
 

app/src/main/java/eu/toldi/infinityforlemmy/fragments/PostFragment.java

@@ -460,9 +460,9 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
             nameOfUsage = PostFilterUsage.NO_USAGE;
 
             String sort = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TYPE_SEARCH_POST, SortType.Type.TOP_ALL.value);
-            String sortTime = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TIME_SEARCH_POST, SortType.Time.ALL.name());
+            String sortTime = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TIME_SEARCH_POST, sort.equalsIgnoreCase(SortType.Type.TOP.value) ? SortType.Time.ALL.name() : null);
             SortType.Type st = SortType.Type.fromValue(sort);
-            sortType = new SortType(st == null ? SortType.Type.TOP_ALL : st, SortType.Time.valueOf(sortTime));
+            sortType = new SortType(st == null ? SortType.Type.TOP_ALL : st,sortTime != null ? SortType.Time.valueOf(sortTime) : null);
             postLayout = mPostLayoutSharedPreferences.getInt(SharedPreferencesUtils.POST_LAYOUT_SEARCH_POST, defaultPostLayout);
 
             mAdapter = new PostRecyclerViewAdapter(activity, this, mExecutor, mRetrofit.getRetrofit(), mGfycatRetrofit,
@@ -1385,6 +1385,8 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
                         mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TYPE_SEARCH_POST, sortType.getType().name()).apply();
                         if (sortType.getTime() != null) {
                             mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TIME_SEARCH_POST, sortType.getTime().name()).apply();
+                        }else {
+                            mSortTypeSharedPreferences.edit().remove(SharedPreferencesUtils.SORT_TIME_SEARCH_POST).apply();
                         }
                         break;
                     case PostPagingSource.TYPE_MULTI_REDDIT:

app/src/main/java/eu/toldi/infinityforlemmy/subreddit/ParseSubredditData.java

@@ -8,7 +8,12 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
+import java.util.Locale;
+import java.util.TimeZone;
 
 import eu.toldi.infinityforlemmy.utils.JSONUtils;
 
@@ -47,7 +52,11 @@ public class ParseSubredditData {
         }
 
         boolean removed = community.getBoolean("removed");
-        String published = community.getString("published");
+        String published_raw = community.getString("published");
+        String published = formatISOTime(published_raw);
+        if(published == null){
+            published = published_raw;
+        }
         String updated = "";
         if (!community.isNull("updated")) {
             updated = community.getString("updated");
@@ -170,4 +179,25 @@ public class ParseSubredditData {
             }
         }
     }
+
+    public static String formatISOTime(String isoTime) {
+        // Truncate the time to millisecond precision
+        String truncatedTime = isoTime.substring(0, 23);
+
+        SimpleDateFormat isoFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS", Locale.US);
+        isoFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+
+        try {
+            Date date = isoFormat.parse(truncatedTime);
+
+            // Set your desired output format here
+            SimpleDateFormat outputFormat = new SimpleDateFormat("MMM dd, yyyy HH:mm:ss", Locale.US);
+            outputFormat.setTimeZone(TimeZone.getDefault()); // Set to device's default timezone
+
+            return outputFormat.format(date);
+        } catch (ParseException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
 }

app/src/main/res/layout/fragment_fab_more_options_bottom_sheet.xml

@@ -144,25 +144,6 @@
             android:focusable="true"
             android:background="?attr/selectableItemBackground" />
 
-        <TextView
-            android:id="@+id/random_text_view_fab_more_options_bottom_sheet_fragment"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:paddingTop="16dp"
-            android:paddingBottom="16dp"
-            android:paddingStart="32dp"
-            android:paddingEnd="32dp"
-            android:text="@string/random"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="?attr/font_default"
-            android:fontFamily="?attr/font_family"
-            app:drawableStartCompat="@drawable/ic_random_24dp"
-            android:drawablePadding="48dp"
-            android:clickable="true"
-            android:focusable="true"
-            android:background="?attr/selectableItemBackground" />
-
         <TextView
             android:id="@+id/hide_read_posts_text_view_fab_more_options_bottom_sheet_fragment"
             android:layout_width="match_parent"

app/src/main/res/layout/fragment_search_post_sort_type_bottom_sheet.xml

@@ -11,43 +11,6 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/relevance_type_text_view_search_sort_type_bottom_sheet_fragment"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackground"
-            android:clickable="true"
-            android:drawableStart="@drawable/ic_best_24"
-            android:drawablePadding="48dp"
-            android:focusable="true"
-            android:fontFamily="?attr/font_family"
-            android:paddingStart="32dp"
-            android:paddingTop="16dp"
-            android:paddingEnd="32dp"
-            android:paddingBottom="16dp"
-            android:text="@string/sort_relevance"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="?attr/font_default"
-            app:drawableTint="?attr/primaryTextColor" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/hot_type_text_view_search_sort_type_bottom_sheet_fragment"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackground"
-            android:clickable="true"
-            android:drawableStart="@drawable/ic_hot_24"
-            android:drawablePadding="48dp"
-            android:focusable="true"
-            android:fontFamily="?attr/font_family"
-            android:paddingStart="32dp"
-            android:paddingTop="16dp"
-            android:paddingEnd="32dp"
-            android:paddingBottom="16dp"
-            android:text="@string/sort_hot"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="?attr/font_default"
-            app:drawableTint="?attr/primaryTextColor" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/top_type_text_view_search_sort_type_bottom_sheet_fragment"
@@ -88,7 +51,7 @@
             app:drawableTint="?attr/primaryTextColor" />
 
         <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/comments_type_text_view_search_sort_type_bottom_sheet_fragment"
+            android:id="@+id/old_type_text_view_search_sort_type_bottom_sheet_fragment"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
@@ -101,7 +64,7 @@
             android:paddingTop="16dp"
             android:paddingEnd="32dp"
             android:paddingBottom="16dp"
-            android:text="@string/sort_comments"
+            android:text="@string/sort_old"
             android:textColor="?attr/primaryTextColor"
             android:textSize="?attr/font_default"
             app:drawableTint="?attr/primaryTextColor" />

app/src/main/res/values-cs/strings.xml

@@ -380,8 +380,8 @@
     <string name="settings_email_summary">"docilealligator.app@gmail.com"</string>
     <string name="settings_reddit_account_title">"Reddit účet"</string>
     <string name="settings_reddit_account_summary">"u/Hostilenemy"</string>
-    <string name="settings_community_title">"Subreddit"</string>
-    <string name="settings_community_summary">"r/Infinity_For_Reddit"</string>
+    <string name="settings_community_title">Community</string>
+    <string name="settings_community_summary">!infinityforlemmy@lemdro.id</string>
     <string name="settings_share_title">"Sdílet"</string>
     <string name="settings_share_summary">"Pokud máte rádi tuto aplikaci, sdílejte ji s ostatními lidmi"</string>
     <string name="settings_version_title">"Infinity pro Reddit"</string>

app/src/main/res/values-de/strings.xml

@@ -17,14 +17,14 @@
     <string name="view_message_activity_label">"Posteingang"</string>
     <string name="settings_activity_label">"Einstellungen"</string>
     <string name="account_saved_thing_activity_label">"Gespeichert"</string>
-    <string name="create_multi_reddit_activity_label">"Multireddit erstellen"</string>
-    <string name="community_multiselection_activity_label">"Multireddits auswählen"</string>
+    <string name="create_multi_reddit_activity_label">Multicommunity erstellen</string>
+    <string name="community_multiselection_activity_label">Multicommunity auswählen</string>
     <string name="custom_theme_listing_activity_label">"Benutzerdefinierte Themen"</string>
     <string name="customize_theme_activity_label">"Thema anpassen"</string>
     <string name="customize_theme_activity_create_theme_label">"Thema erstellen"</string>
     <string name="theme_preview_activity_label">"Thema-Vorschau"</string>
-    <string name="edit_multi_reddit_activity_label">"Multireddit bearbeiten"</string>
-    <string name="selected_subeddits_activity_label">"Ausgewählte Subreddits"</string>
+    <string name="edit_multi_reddit_activity_label">Multicommunity bearbeiten</string>
+    <string name="selected_subeddits_activity_label">Ausgewählte Communities</string>
     <string name="report_activity_label">"Melden"</string>
     <string name="view_imgur_media_activity_image_label">"Bild %1$d/%2$d"</string>
     <string name="view_imgur_media_activity_video_label">"Video %1$d/%2$d"</string>
@@ -55,8 +55,8 @@
     <string name="action_edit_flair">"Flair bearbeiten"</string>
     <string name="action_change_post_layout">"Beitragslayout ändern"</string>
     <string name="action_save">"Speichern"</string>
-    <string name="action_edit_multi_reddit">"Multireddit bearbeiten"</string>
-    <string name="action_delete_multi_reddit">"Multireddit löschen"</string>
+    <string name="action_edit_multi_reddit">Multicommunity bearbeiten</string>
+    <string name="action_delete_multi_reddit">Multicommunity löschen</string>
     <string name="action_share">"Teilen"</string>
     <string name="action_preview">"Vorschau"</string>
     <string name="action_report">"Melden"</string>
@@ -83,7 +83,7 @@ Tippen für Neuversuch."</string>
     <string name="no_comments">"Keine Kommentare gefunden"</string>
     <string name="no_communities">"Keine Subreddits gefunden"</string>
     <string name="no_users">"Keine Benutzer gefunden"</string>
-    <string name="no_multi_reddits">"Keine Multireddits gefunden"</string>
+    <string name="no_multi_reddits">Keine Multicommunities gefunden</string>
     <string name="no_storage_permission">"Keine Speicherberechtigung, um diese Datei zu speichern"</string>
     <string name="load_comments_failed">"Fehler beim Laden der Kommentare.
 Tippen für Neuversuch."</string>
@@ -104,7 +104,7 @@ Tippen für Neuversuch."</string>
     <string name="since">"Seit:"</string>
     <string name="profile">"Profil"</string>
     <string name="subscriptions">"Abonnements"</string>
-    <string name="multi_reddit">"Multireddit"</string>
+    <string name="multi_reddit">Multicommunity</string>
     <string name="inbox">"Posteingang"</string>
     <string name="upvoted">"Upgevotet"</string>
     <string name="downvoted">"Downgevotet"</string>
@@ -117,7 +117,7 @@ Tippen für Neuversuch."</string>
     <string name="cannot_fetch_community_info">"Kann Subredddit-Info nicht abrufen"</string>
     <string name="cannot_fetch_user_info">"Kann Benutzer-Info nicht abrufen"</string>
     <string name="cannot_fetch_sidebar">"Kann Seitenleiste nicht abrufen"</string>
-    <string name="cannot_fetch_multireddit">"Kann Multireddit-Info nicht abrufen"</string>
+    <string name="cannot_fetch_multireddit">Kann Multicommunity-Info nicht abrufen</string>
     <string name="subscribe">"Abonnieren"</string>
     <string name="unsubscribe">"Deabonnieren"</string>
     <string name="subscribed">"Abonniert"</string>
@@ -171,9 +171,9 @@ Tippen für Neuversuch."</string>
     <string name="choose_a_communities">"Wähle ein Subreddit"</string>
     <string name="rules">"Regeln"</string>
     <string name="post_link_hint">"URL"</string>
-    <string name="communities">"Subreddits"</string>
+    <string name="communities">Communities</string>
     <string name="users">"Benutzer"</string>
-    <string name="multi_reddits">"Multireddits"</string>
+    <string name="multi_reddits">MultiCommunity</string>
     <string name="bottom_sheet_post_text">"Text"</string>
     <string name="bottom_sheet_post_link">"Link"</string>
     <string name="bottom_sheet_post_image">"Bild"</string>
@@ -408,10 +408,10 @@ Tippen für Neuversuch."</string>
     <string name="settings_rate_summary">"Gib mir eine 5-Stern-Bewertung und mach mich richtig glücklich"</string>
     <string name="settings_email_title">"E-Mail"</string>
     <string name="settings_email_summary">"docilealligator.app@gmail.com"</string>
-    <string name="settings_reddit_account_title">"Reddit-Konto"</string>
-    <string name="settings_reddit_account_summary">"u/Hostilenemy"</string>
-    <string name="settings_community_title">"Subreddit"</string>
-    <string name="settings_community_summary">"r/Infinity_For_Reddit"</string>
+    <string name="settings_reddit_account_title">Lemmy-Konto</string>
+    <string name="settings_reddit_account_summary">\@bazsalanszky@lemmy.toldi.eu</string>
+    <string name="settings_community_title">Community</string>
+    <string name="settings_community_summary">!infinityforlemmy@lemdro.id</string>
     <string name="settings_share_title">"Teilen"</string>
     <string name="settings_share_summary">"Teile diese App mit anderen Leuten, wenn sie dir gefällt"</string>
     <string name="settings_version_title">"Infinity For Reddit"</string>
@@ -434,10 +434,10 @@ Tippen für Neuversuch."</string>
     <string name="settings_tab_3_summary">"Reiter 3"</string>
     <string name="settings_tab_title">"Titel"</string>
     <string name="settings_tab_post_type">"Typ"</string>
-    <string name="settings_tab_community_name">"Subreddit-Name (ohne r/ Präfix)"</string>
+    <string name="settings_tab_community_name">Community-Name (ohne r/ Präfix)</string>
 
     <!-- Fuzzy -->
-    <string name="settings_tab_multi_reddit_name">"Multireddit-Name (/user/DeinBenutzername/m/DeinMultiredditName)"</string>
+    <string name="settings_tab_multi_reddit_name">Multicommunity-Name (/user/DeinBenutzername/m/DeinMulticommunityName)</string>
     <string name="settings_tab_username">"Benutzername (ohne u/ Präfix)"</string>
     <string name="no_developer_easter_egg">"Es gibt hier keine Entwickleroptionen"</string>
     <string name="no_link_available">"Konnte den Link nicht abrufen"</string>
@@ -475,8 +475,8 @@ Tippen für Neuversuch."</string>
     <string name="elapsed_time_months_ago">"%1$d Monate"</string>
     <string name="elapsed_time_a_year_ago">"1 Jahr"</string>
     <string name="elapsed_time_years_ago">"%1$d Jahre"</string>
-    <string name="error_getting_multi_reddit_data">"Fehler beim Abrufen der Multireddit-Daten"</string>
-    <string name="error_loading_multi_reddit_list">"Kann Multireddits nicht synchronisieren"</string>
+    <string name="error_getting_multi_reddit_data">Fehler beim Abrufen der Multicommunity-Daten</string>
+    <string name="error_loading_multi_reddit_list">Kann Multicommunities nicht synchronisieren</string>
     <string name="error_loading_subscriptions">"Kann Abonnements nicht synchronisieren"</string>
     <string name="share_this_app">"Schau dir Infinity for Reddit an, ein super Reddit-Client!
 https://play.google.com/store/apps/details?id=eu.toldi.infinityforlemmy"</string>
@@ -506,9 +506,9 @@ https://play.google.com/store/apps/details?id=eu.toldi.infinityforlemmy"</string
     <string name="multi_reddit_description_hint">"Beschreibung"</string>
     <string name="private_multi_reddit">"Privat"</string>
     <string name="no_multi_reddit_name">"Wo ist der Name?"</string>
-    <string name="create_multi_reddit_failed">"Kann dieses Multireddit nicht erstellen"</string>
-    <string name="duplicate_multi_reddit">"Dieses Multireddit existiert bereits"</string>
-    <string name="edit_multi_reddit_failed">"Kann dieses Multireddit nicht bearbeiten"</string>
+    <string name="create_multi_reddit_failed">Kann dieses Multicommunity nicht erstellen</string>
+    <string name="duplicate_multi_reddit">Dieses Multicommunity existiert bereits</string>
+    <string name="edit_multi_reddit_failed">Kann diese Multicommunity nicht bearbeiten</string>
     <string name="delete_multi_reddit_success">"Löschen erfolgreich"</string>
     <string name="delete_multi_reddit_failed">"Löschen fehlgeschlagen"</string>
     <string name="delete_multi_reddit_dialog_message">"Bist du sicher?"</string>
@@ -745,7 +745,7 @@ Basiere auf Indigo-AMOLED-Thema"</string>
     <!-- Fuzzy -->
     <string name="reset_all_settings_success">"Alle Einstellungen erfolgreich gelöscht"</string>
     <string name="username_preview">"u/Hostilenemy"</string>
-    <string name="community_preview">"r/Infinity_For_Reddit"</string>
+    <string name="community_preview">!infinityforlemmy@lemdro.id</string>
     <string name="primary_text_preview">"Primärer Text"</string>
     <string name="secondary_text_preview">"Sekundärer Text"</string>
     <string name="post_title_preview">"Dies ist ein Beitrag"</string>
@@ -756,8 +756,8 @@ Basiere auf Indigo-AMOLED-Thema"</string>
     <string name="author_flair_preview">"Autor-Flair"</string>
     <string name="comment_content_preview">"Ich habe für meine Freundin eine “Gute Besserung“-Karte besorgt.
 Sie ist nicht krank oder so, aber sie könnte sich definitiv bessern."</string>
-    <string name="edit_multi_reddit">"Multireddit bearbeiten"</string>
-    <string name="delete_multi_reddit">"Multireddit löschen"</string>
+    <string name="edit_multi_reddit">Multicommunity bearbeiten</string>
+    <string name="delete_multi_reddit">Multicommunity löschen</string>
     <string name="n_awards">"%1$d Auszeichnungen"</string>
     <string name="one_award">"1 Auszeichnung"</string>
     <string name="report">"Melden"</string>
@@ -822,7 +822,7 @@ Beispiel: DeinPasswort:123456"</string>
     <string name="settings_more_tabs_summary">"Mehr Reiter"</string>
     <string name="settings_more_tabs_info_summary">"Die folgenden Optionen zu aktivieren, kann zu ungewollten Verhalten führen:
 Reiter könnten den Inhalt verlieren, wenn zu anderen gewechselt wird. Selbes Verhalten wie beim Neuladen der Seite."</string>
-    <string name="settings_more_tabs_show_favorite_subscribed_communities_title">"Favoriten der abonnierten Subreddits anzeigen"</string>
+    <string name="settings_more_tabs_show_favorite_subscribed_communities_title">Favoriten der abonnierten Communities anzeigen</string>
     <string name="settings_more_tabs_show_subscribed_communities_title">"Abonnierte Subreddits anzeigen"</string>
     <string name="settings_download_location_title">"Downloadpfad"</string>
     <string name="settings_image_download_location_title">"Downloadpfad für Bilder"</string>
@@ -855,7 +855,7 @@ Reiter könnten den Inhalt verlieren, wenn zu anderen gewechselt wird. Selbes Ve
     <!-- Fuzzy -->
     <string name="settings_data_saving_mode_info_summary">"Im Datensparmodus:
 Vorschaubilder haben eine geringere Auflösung.
-Reddit-Videos haben eine geringere Auflösung.
+Lemmy-Videos haben eine geringere Auflösung.
 Automatisches Abspielen von Videos ist deaktiviert."</string>
     <string name="settings_translation_title">"Übersetzung"</string>
     <string name="settings_translation_summary">"Übersetze diese App auf POEditor. Danke an alle Beitragenden."</string>
@@ -933,10 +933,10 @@ Nachricht: %2$s"</string>
     <string name="filtered_posts_activity_subtitle">"Gefilterte Beiträge"</string>
     <string name="post_filter_preference_activity_label">"Beitragsfilter"</string>
     <string name="search_users_result_activity_label">"Benutzer"</string>
-    <string name="multireddit_selection_activity_label">"Wähle ein Multireddit"</string>
+    <string name="multireddit_selection_activity_label">Wähle eine Multicommunity</string>
     <string name="action_save_to_database">"In der Datenbank speichern"</string>
     <string name="action_read_all_messages">"Alle Nachrichten lesen"</string>
-    <string name="action_add_to_multireddit">"Zum Multireddit hinzufügen"</string>
+    <string name="action_add_to_multireddit">Zum Multicommunity hinzufügen</string>
     <string name="search_only_communities_hint">"Subreddits durchsuchen"</string>
     <string name="search_only_users_hint">"Benutzer durchsuchen"</string>
     <string name="post_type_gif">"GIF"</string>
@@ -995,19 +995,19 @@ Nachricht: %2$s"</string>
     <string name="post_filter_usage_user_all">"Benutzer"</string>
 
     <!-- This is inconsistant. Sometimes we call it Multireddit, other times MultiReddit. -->
-    <string name="post_filter_usage_multireddit">"Multireddit: %1$s"</string>
+    <string name="post_filter_usage_multireddit">Multicommunity: %1$s</string>
 
     <!-- This is inconsistant. Sometimes we call it Multireddit, other times MultiReddit. -->
-    <string name="post_filter_usage_multireddit_all">"Multireddit"</string>
+    <string name="post_filter_usage_multireddit_all">Multicommunity</string>
     <string name="post_filter_usage_search">"Suche"</string>
     <string name="community">"Subreddit"</string>
     <string name="user">"Benutzer"</string>
-    <string name="edit_post_filter_name_of_usage_info">"Leer lassen, um diesen Beitragsfilter auf alle Subreddits / Benutzer / Multireddits anzuwenden"</string>
+    <string name="edit_post_filter_name_of_usage_info">Leer lassen, um diesen Beitragsfilter auf alle Subreddits / Benutzer / Multicommunities anzuwenden</string>
     <string name="read_all_messages_time_limit">"Du machst das zu oft hintereinander. Versuche es später noch einmal. Dies ist eine Beschränkung der Reddit-API."</string>
     <string name="read_all_messages_success">"Alle Nachrichten erfolgreich als gelesen markiert"</string>
     <string name="read_all_messages_failed">"Kann nicht alle Nachrichten als gelesen markieren"</string>
-    <string name="add_community_or_user_to_multireddit_success">"%1$s wurde zu Multireddit %2$s hinzugefügt"</string>
-    <string name="add_community_or_user_to_multireddit_failed">"Konnte %1$s nicht zu Multireddit %2$s hinzufügen"</string>
+    <string name="add_community_or_user_to_multireddit_success">%1$s wurde zu Multicommunity %2$s hinzugefügt</string>
+    <string name="add_community_or_user_to_multireddit_failed">Konnte %1$s nicht zu Multicommunity %2$s hinzufügen</string>
     <string name="choose_a_user">"Wähle einen Benutzer"</string>
     <string name="settings_click_to_show_media_in_gallery_layout">"Antippen, um die Medien in der Galerie-Ansicht anzuzeigen"</string>
     <string name="settings_hide_post_type">"Beitragsart verstecken"</string>
@@ -1097,8 +1097,8 @@ Nachricht: %2$s"</string>
     <string name="settings_show_only_one_comment_level_indicator">"Nur einen Indikator für die Kommentarebene anzeigen"</string>
     <string name="save_comment">"Speichern"</string>
     <string name="unsave_comment">"Nicht mehr speichern"</string>
-    <string name="copy_multi_reddit_path">"Pfad des Multireddit kopieren"</string>
-    <string name="copy_multi_reddit_path_failed">"Pfad des Multireddit kann nicht kopiert werden"</string>
+    <string name="copy_multi_reddit_path">Pfad der Multicommunity kopieren</string>
+    <string name="copy_multi_reddit_path_failed">Pfad der Multicommunity kann nicht kopiert werden</string>
     <string name="crash_reports_deleted">"Absturzmeldungen werden gelöscht"</string>
     <string name="disable_nsfw_forever_message">"Wenn du diese Option aktivierst, wird NSFW dauerhaft deaktiviert, egal ob die NSFW-Option ein- oder ausgeschaltet ist. Diese Option ist irreversibel, wenn du NSFW wieder einschalten willst, müssen die Daten der App gelöscht werden.
 
@@ -1125,9 +1125,9 @@ Benenne diese Themen sonst neu."</string>
     <string name="settings_enable_material_you_summary">"Infinity Theme ihrem Hintergrund anpassen"</string>
     <string name="settings_apply_material_you_title">"Material You anwenden"</string>
     <string name="settings_apply_material_you_summary">"Sollte Infinity den Theme nicht gewechselt haben"</string>
-    <string name="settings_more_tabs_show_favorite_multireddits_title">"Multireddits Favoriten anzeigen"</string>
-    <string name="settings_more_tabs_show_multireddits_title">"Multireddits anzeigen"</string>
-    <string name="settings_collapse_reddit_section_title">"Sektion für Reddit zusammenklappen"</string>
+    <string name="settings_more_tabs_show_favorite_multireddits_title">Multicommunities Favoriten anzeigen</string>
+    <string name="settings_more_tabs_show_multireddits_title">Multicommunities anzeigen</string>
+    <string name="settings_collapse_reddit_section_title">Sektion für Lemmy zusammenklappen</string>
     <string name="settings_video_player_automatic_landscape_orientation">"Automatisch zum Querformat im Videospieler wechseln"</string>
     <string name="settings_remember_muting_option_in_post_feed">"Stummschalt-Option im Beitragsfeed merken"</string>
     <string name="link_post_layout_auto">"Automatisch"</string>
@@ -1190,7 +1190,7 @@ Antippen zum Wiederholen."</string>
     <string name="title_contains_strings_hint">"Titel: enthält Schlüsselwörter (key1,key2)"</string>
     <string name="title_contains_regex_hint">"Titel: enthält Regex"</string>
     <string name="contain_domains_hint">"Domains cont"</string>
-    <string name="anonymous_multireddit_no_community">"Dieses Multireddit hat kein Subreddit!"</string>
+    <string name="anonymous_multireddit_no_community">Dieses Multicommunity hat kein Subreddit!</string>
     <string name="error_fetching_v_redd_it_video_cannot_get_video_url">"Fehler beim Abrufen von v.redd.it video: Kann Video URL nicht finden"</string>
     <string name="contain_domain">"Diese Domain containen"</string>
     <string name="lock_screen_text">"Ruhig Brauner!!!"</string>
@@ -1256,13 +1256,13 @@ Antippen zum Wiederholen."</string>
     <string name="settings_show_fewer_toolbar_options_threshold_title">"Weniger Werkzeugleistenoptionen anzeigen"</string>
     <string name="settings_show_fewer_toolbar_options_threshold_summary">"Wert %1$d"</string>
     <string name="settings_show_author_avatar_title">"Autoravatar zeigen"</string>
-    <string name="settings_reddit_user_agreement_title">"Reddit Nutzungsbestimmungen "</string>
+    <string name="settings_reddit_user_agreement_title">"Lemmy Nutzungsbestimmungen "</string>
     <string name="settings_always_show_child_comment_count_title">"Immer die Anzahl von untergeordneten Kommentaren anzeigen"</string>
     <string name="settings_hide_upvote_ratio_title">"Upvoteverhaltnis verstecken"</string>
     <string name="settings_miscellaneous_dangerous_group_title">"Gefährlich"</string>
     <string name="settings_post_feed_max_resolution_warning_title">"Wert erhöhen um Vorschau in höherer Qualität zu zeigen, aber die App kann unerwartet abstürzen."</string>
     <string name="settings_post_feed_max_resolution_title">"Beitragsvorschau maximale Auflösung (Höhe * Breite)"</string>
-    <string name="settings_reddit_video_default_resolution">"Reddit Video Standardauflösung"</string>
+    <string name="settings_reddit_video_default_resolution">Lemmy Video Standardauflösung</string>
     <string name="select_a_ttf_font">"ttf Schriftart Datei auswählen"</string>
     <string name="unable_to_get_font_file">"Schriftart konnte nicht geladen werden"</string>
     <string name="unable_to_load_font">"Benutzerdefinierte Schriftart konnte nicht geladen werden"</string>

app/src/main/res/values-es/strings.xml

@@ -175,7 +175,7 @@ Toca para reintentar."</string>
     <string name="choose_a_communities">"Elige un subreddit"</string>
     <string name="rules">"Reglas"</string>
     <string name="post_link_hint">"URL"</string>
-    <string name="communities">"Subreddits"</string>
+    <string name="communities">Communities</string>
     <string name="users">"Usuarios"</string>
     <string name="multi_reddits">"Multireddits"</string>
     <string name="bottom_sheet_post_text">"Texto"</string>
@@ -401,7 +401,7 @@ Premio means prize, so it's better suited the first word instead of the second o
     <string name="settings_reddit_account_title">"Cuenta de Reddit"</string>
     <string name="settings_reddit_account_summary">"u/Hostilenemy"</string>
     <string name="settings_community_title">"Subreddit"</string>
-    <string name="settings_community_summary">"r/Infinity_For_Reddit"</string>
+    <string name="settings_community_summary">!infinityforlemmy@lemdro.id</string>
     <string name="settings_share_title">"Compartir"</string>
     <string name="settings_share_summary">"Si te gusta esta aplicación ¡Compártela!"</string>
     <string name="settings_version_title">"Infinity for Reddit"</string>

app/src/main/res/values-fr/strings.xml

@@ -177,9 +177,9 @@
     <string name="choose_a_communities">"Choisir une subreddit"</string>
     <string name="rules">"Règles"</string>
     <string name="post_link_hint">"URL"</string>
-    <string name="communities">"Subreddits"</string>
+    <string name="communities">Communities</string>
     <string name="users">"Utilisateurs"</string>
-    <string name="multi_reddits">"Multireddits"</string>
+    <string name="multi_reddits">MultiCommunity</string>
     <string name="bottom_sheet_post_text">"Texte"</string>
     <string name="bottom_sheet_post_link">"Lien"</string>
     <string name="bottom_sheet_post_image">"Image"</string>
@@ -439,8 +439,8 @@ peut ne pas fonctionner sur Android 11"</string>
     <string name="settings_email_summary">"docilealligator.app@gmail.com"</string>
     <string name="settings_reddit_account_title">"Compte Reddit"</string>
     <string name="settings_reddit_account_summary">"u/Hostilenemy"</string>
-    <string name="settings_community_title">"Subreddit"</string>
-    <string name="settings_community_summary">"r/Infinity_For_Reddit"</string>
+    <string name="settings_community_title">Community</string>
+    <string name="settings_community_summary">!infinityforlemmy@lemdro.id</string>
     <string name="settings_share_title">"Partager"</string>
     <string name="settings_share_summary">"Partagez cette application avec d'autres si vous l'appréciez"</string>
     <string name="settings_version_title">"Infinity Pour Reddit"</string>

app/src/main/res/values-hi/strings.xml

@@ -430,7 +430,7 @@ Behavior -->
     <string name="settings_reddit_account_title">"रैडिट खाता "</string>
     <string name="settings_reddit_account_summary">"u/Hostilenemy"</string>
     <string name="settings_community_title">"सबरैडिट "</string>
-    <string name="settings_community_summary">"r/Infinity_For_Reddit"</string>
+    <string name="settings_community_summary">!infinityforlemmy@lemdro.id</string>
     <string name="settings_share_title">"साझा करें "</string>
     <string name="settings_share_summary">"यदि आप इसका आनंद लेते हैं तो एप्प को अन्य लोगों के साथ साझा करें "</string>
     <string name="settings_version_title">"Infinity For Reddit"</string>

app/src/main/res/values-hr/strings.xml

@@ -400,7 +400,7 @@
     <string name="settings_reddit_account_title">"Reddit račun"</string>
     <string name="settings_reddit_account_summary">"u/Hostilenemy"</string>
     <string name="settings_community_title">"Podreddit"</string>
-    <string name="settings_community_summary">"r/Infinity_For_Reddit"</string>
+    <string name="settings_community_summary">!infinityforlemmy@lemdro.id</string>
     <string name="settings_share_title">"Dijeljenje"</string>
     <string name="settings_share_summary">"Ako Vam se aplikacija sviđa, podijelite ju s drugima"</string>
     <string name="settings_version_title">"Infinity For Reddit"</string>

app/src/main/res/values-hu/strings.xml

@@ -385,7 +385,7 @@
     <string name="settings_reddit_account_title">"Reddit fiók"</string>
     <string name="settings_reddit_account_summary">"u/Hostilenemy"</string>
     <string name="settings_community_title">"Közösség"</string>
-    <string name="settings_community_summary">"r/Infinity_For_Reddit"</string>
+    <string name="settings_community_summary">!infinityforlemmy@lemdro.id</string>
     <string name="settings_share_title">"Megosztás"</string>
     <string name="settings_share_summary">"Ha tetszik az app oszd meg másokkal is"</string>
     <string name="settings_version_title">"Infiniti Reddithez"</string>

app/src/main/res/values-it/strings.xml

@@ -164,9 +164,9 @@ Tocca per riprovare."</string>
     <string name="choose_a_communities">"Scegli un subreddit"</string>
     <string name="rules">"Regole"</string>
     <string name="post_link_hint">"URL"</string>
-    <string name="communities">"Subreddit"</string>
+    <string name="communities">Communities</string>
     <string name="users">"Utenti"</string>
-    <string name="multi_reddits">"MultiReddit"</string>
+    <string name="multi_reddits">MultiCommunity</string>
     <string name="bottom_sheet_post_text">"Testo"</string>
     <string name="bottom_sheet_post_link">"Link"</string>
     <string name="bottom_sheet_post_image">"Immagine"</string>
@@ -373,8 +373,8 @@ Tocca per riprovare."</string>
     <string name="settings_email_summary">"docilealligator.app@gmail.com"</string>
     <string name="settings_reddit_account_title">"Account Reddit"</string>
     <string name="settings_reddit_account_summary">"u/Hostilenemy"</string>
-    <string name="settings_community_title">"Subreddit"</string>
-    <string name="settings_community_summary">"r/Infinity_For_Reddit"</string>
+    <string name="settings_community_title">Community</string>
+    <string name="settings_community_summary">!infinityforlemmy@lemdro.id</string>
     <string name="settings_share_title">"Condividi"</string>
     <string name="settings_share_summary">"Condividi questa app con altre persone se la apprezzi"</string>
     <string name="settings_version_title">"Infinity For Reddit"</string>

app/src/main/res/values-ja/strings.xml

@@ -432,8 +432,8 @@
     <string name="settings_email_summary">"docilealligator.app@gmail.com"</string>
     <string name="settings_reddit_account_title">"Redditアカウント"</string>
     <string name="settings_reddit_account_summary">"u/Hostilenemy"</string>
-    <string name="settings_community_title">"Subreddit"</string>
-    <string name="settings_community_summary">"r/Infinity_For_Reddit"</string>
+    <string name="settings_community_title">Community</string>
+    <string name="settings_community_summary">!infinityforlemmy@lemdro.id</string>
     <string name="settings_share_title">"共有"</string>
     <string name="settings_share_summary">"このアプリが気に入ったようでしたら、ぜひ他の方々にもご紹介ください"</string>
     <string name="settings_version_title">"Infinity For Reddit"</string>

app/src/main/res/values-nl/strings.xml

@@ -166,9 +166,9 @@ Druk om opnieuw te proberen."</string>
     <string name="choose_a_communities">"Kies een subreddit"</string>
     <string name="rules">"Regels"</string>
     <string name="post_link_hint">"URL"</string>
-    <string name="communities">"Subreddits"</string>
+    <string name="communities">Communities</string>
     <string name="users">"Gebruikers"</string>
-    <string name="multi_reddits">"MultiReddits"</string>
+    <string name="multi_reddits">MultiCommunity</string>
     <string name="bottom_sheet_post_text">"Tekst"</string>
     <string name="bottom_sheet_post_link">"Link"</string>
     <string name="bottom_sheet_post_image">"Afbeelding"</string>
@@ -383,8 +383,8 @@ Druk om opnieuw te proberen."</string>
     <string name="settings_email_summary">"docilealligator.app@gmail.com"</string>
     <string name="settings_reddit_account_title">"Reddit-account"</string>
     <string name="settings_reddit_account_summary">"u/Hostilenemy"</string>
-    <string name="settings_community_title">"Subreddit"</string>
-    <string name="settings_community_summary">"r/Infinity_For_Reddit"</string>
+    <string name="settings_community_title">Community</string>
+    <string name="settings_community_summary">!infinityforlemmy@lemdro.id</string>
     <string name="settings_share_title">"Delen"</string>
     <string name="settings_share_summary">"Deel deze app met anderen als je hem graag gebruikt"</string>
     <string name="settings_version_title">"Infinity For Reddit"</string>

app/src/main/res/values-pl/strings.xml

@@ -378,8 +378,8 @@
     <string name="settings_email_summary">"docilealligator.app@gmail.com"</string>
     <string name="settings_reddit_account_title">"Konto Reddit"</string>
     <string name="settings_reddit_account_summary">"u/Hostilenemy"</string>
-    <string name="settings_community_title">"Subreddit"</string>
-    <string name="settings_community_summary">"r/Infinity_For_Reddit"</string>
+    <string name="settings_community_title">Community</string>
+    <string name="settings_community_summary">!infinityforlemmy@lemdro.id</string>
     <string name="settings_share_title">"Udostępnij"</string>
     <string name="settings_share_summary">"Udostępnij tą aplikację, jeśli ci się ona podoba"</string>
     <string name="settings_version_title">"Infinity For Reddit"</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -173,9 +173,9 @@ Toque para tentar novamente."</string>
     <string name="choose_a_communities">"Escolha um subreddit"</string>
     <string name="rules">"Regras"</string>
     <string name="post_link_hint">"URL"</string>
-    <string name="communities">"Subreddits"</string>
+    <string name="communities">Communities</string>
     <string name="users">"Usuários"</string>
-    <string name="multi_reddits">"Multireddits"</string>
+    <string name="multi_reddits">MultiCommunity</string>
     <string name="bottom_sheet_post_text">"Texto"</string>
     <string name="bottom_sheet_post_link">"Link"</string>
     <string name="bottom_sheet_post_image">"Imagem"</string>
@@ -382,8 +382,8 @@ Toque para tentar novamente."</string>
     <string name="settings_email_summary">"docilealligator.app@gmail.com"</string>
     <string name="settings_reddit_account_title">"Conta Reddit"</string>
     <string name="settings_reddit_account_summary">"u/Hostilenemy"</string>
-    <string name="settings_community_title">"Subreddit"</string>
-    <string name="settings_community_summary">"r/Infinity_For_Reddit"</string>
+    <string name="settings_community_title">Community</string>
+    <string name="settings_community_summary">!infinityforlemmy@lemdro.id</string>
     <string name="settings_share_title">"Compartilhar"</string>
     <string name="settings_share_summary">"Compartilhe esse App com outros se você está gostando dele"</string>
     <string name="settings_version_title">"Infinity For Reddit"</string>

app/src/main/res/values-pt/strings.xml

@@ -171,7 +171,7 @@ Toque para tentar novamente."</string>
     <string name="post_link_hint">"URL"</string>
     <string name="communities">"Comunidades"</string>
     <string name="users">"Utilizadores"</string>
-    <string name="multi_reddits">"MultiReddits"</string>
+    <string name="multi_reddits">MultiCommunity</string>
     <string name="bottom_sheet_post_text">"Texto"</string>
     <string name="bottom_sheet_post_link">"Ligação"</string>
     <string name="bottom_sheet_post_image">"Imagem"</string>
@@ -388,7 +388,7 @@ Toque para tentar novamente."</string>
     <string name="settings_reddit_account_title">"Conta do Reddit"</string>
     <string name="settings_reddit_account_summary">"u/Hostilenemy"</string>
     <string name="settings_community_title">"Comunidade"</string>
-    <string name="settings_community_summary">"r/Infinity_For_Reddit"</string>
+    <string name="settings_community_summary">!infinityforlemmy@lemdro.id</string>
     <string name="settings_share_title">"Partilhar"</string>
     <string name="settings_share_summary">"Se aprecia esta aplicação, partilhe-a com outros"</string>
     <string name="settings_version_title">"Infinity For Reddit"</string>

app/src/main/res/values-ro/strings.xml

@@ -402,8 +402,8 @@ Atinge pentru a reîncerca."</string>
     <string name="settings_email_summary">"docilealligator.app@gmail.com"</string>
     <string name="settings_reddit_account_title">"Cont Reddit"</string>
     <string name="settings_reddit_account_summary">"u/Hostilenemy"</string>
-    <string name="settings_community_title">"Subreddit"</string>
-    <string name="settings_community_summary">"r/Infinity_For_Reddit"</string>
+    <string name="settings_community_title">Community</string>
+    <string name="settings_community_summary">!infinityforlemmy@lemdro.id</string>
     <string name="settings_share_title">"Distribuie"</string>
     <string name="settings_share_summary">"Distribuie această aplicație altor persoane dacă îți place"</string>
     <string name="settings_version_title">"Infinit Pentru Reddit"</string>

app/src/main/res/values-ru/strings.xml

@@ -389,7 +389,7 @@
     <string name="settings_reddit_account_title">"Аккаунт Reddit"</string>
     <string name="settings_reddit_account_summary">"u/Hostilenemy"</string>
     <string name="settings_community_title">"Сабреддит"</string>
-    <string name="settings_community_summary">"r/Infinity_For_Reddit"</string>
+    <string name="settings_community_summary">!infinityforlemmy@lemdro.id</string>
     <string name="settings_share_title">"Поделиться"</string>
     <string name="settings_share_summary">"Поделитесь этим приложением с другими людьми, если оно вам нравится"</string>
     <string name="settings_version_title">"Infinity для Reddit"</string>

app/src/main/res/values-tr-rTR/strings.xml

@@ -396,7 +396,7 @@ Tekrar denemek için tıklayın."</string>
     <string name="settings_reddit_account_title">"Reddit Hesabı"</string>
     <string name="settings_reddit_account_summary">"u/Hostilenemy"</string>
     <string name="settings_community_title">"Subreddit"</string>
-    <string name="settings_community_summary">"r/Infinity_For_Reddit"</string>
+    <string name="settings_community_summary">!infinityforlemmy@lemdro.id</string>
     <string name="settings_share_title">"Paylaş"</string>
     <string name="settings_share_summary">"Bu uygulamayı beğendiyseniz başkalarıyla paylaşın"</string>
     <string name="settings_version_title">"Infinity For Reddit"</string>

app/src/main/res/values-uk/strings.xml

@@ -377,7 +377,7 @@
     <string name="settings_reddit_account_title">"Обліківка Reddit"</string>
     <string name="settings_reddit_account_summary">"u/Hostilenemy"</string>
     <string name="settings_community_title">"Сабредит"</string>
-    <string name="settings_community_summary">"r/Infinity_For_Reddit"</string>
+    <string name="settings_community_summary">!infinityforlemmy@lemdro.id</string>
     <string name="settings_share_title">"Поширте"</string>
     <string name="settings_share_summary">"Поділіться цим застосунком з іншими людьми, якщо він Вам подобається"</string>
     <string name="settings_version_title">"Infinity For Reddit"</string>

app/src/main/res/values-vi/strings.xml

@@ -390,7 +390,7 @@ Nhấn để thử lại."</string>
     <string name="settings_reddit_account_title">"Tài khoản Reddit"</string>
     <string name="settings_reddit_account_summary">"u/Hostilenemy"</string>
     <string name="settings_community_title">"Subreddit"</string>
-    <string name="settings_community_summary">"r/Infinity_For_Reddit"</string>
+    <string name="settings_community_summary">!infinityforlemmy@lemdro.id</string>
     <string name="settings_share_title">"Chia sẻ"</string>
     <string name="settings_share_summary">"Hãy chia sẻ ứng dụng này với người khác nếu bạn thích nó"</string>
     <string name="settings_version_title">"Infinity cho Reddit"</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -395,7 +395,7 @@
     <string name="settings_community_title">"版块"</string>
 
     <!-- 这个应该不做翻译为好，它是指示infinity社区位置的。在关于界面 -->
-    <string name="settings_community_summary">"r/Infinity_For_Reddit"</string>
+    <string name="settings_community_summary">!infinityforlemmy@lemdro.id</string>
     <string name="settings_share_title">"分享"</string>
     <string name="settings_share_summary">"如果您喜欢此应用，可以分享给其他人"</string>
     <string name="settings_version_title">"Infinity For Reddit"</string>

app/src/main/res/values/arrays.xml

@@ -501,47 +501,57 @@
     <string-array name="settings_subreddit_default_sort_type">
         <item>Hot</item>
         <item>New</item>
-        <item>Rising</item>
+        <item>Active</item>
         <item>Top</item>
-        <item>Controversial</item>
+        <item>Most Comments</item>
+        <item>New Comments</item>
     </string-array>
 
     <string-array name="settings_subreddit_default_sort_type_values">
         <item>HOT</item>
         <item>NEW</item>
-        <item>RISING</item>
+        <item>ACTIVE</item>
         <item>TOP</item>
-        <item>CONTROVERSIAL</item>
+        <item>MOSTCOMMENTS</item>
+        <item>NEWCOMMENTS</item>
     </string-array>
 
     <string-array name="settings_user_default_sort_type">
         <item>New</item>
-        <item>Hot</item>
+        <item>Old</item>
         <item>Top</item>
-        <item>Controversial</item>
     </string-array>
 
     <string-array name="settings_user_default_sort_type_values">
         <item>NEW</item>
-        <item>HOT</item>
+        <item>OLD</item>
         <item>TOP</item>
-        <item>CONTROVERSIAL</item>
     </string-array>
 
     <string-array name="settings_default_sort_time">
         <item>Hour</item>
+        <item>6 Hours</item>
+        <item>12 Hours</item>
         <item>Day</item>
         <item>Week</item>
         <item>Month</item>
+        <item>3 Months</item>
+        <item>6 Months</item>
+        <item>9 Months</item>
         <item>Year</item>
         <item>All Time</item>
     </string-array>
 
     <string-array name="settings_default_sort_time_values">
         <item>HOUR</item>
+        <item>6HOURS</item>
+        <item>12HOURS</item>
         <item>DAY</item>
         <item>WEEK</item>
         <item>MONTH</item>
+        <item>3MONTHS</item>
+        <item>6MONTHS</item>
+        <item>9MONTHS</item>
         <item>YEAR</item>
         <item>ALL</item>
     </string-array>

app/src/main/res/values/strings.xml

@@ -16,13 +16,13 @@
     <string name="view_message_activity_label">Inbox</string>
     <string name="settings_activity_label">Settings</string>
     <string name="account_saved_thing_activity_label">Saved</string>
-    <string name="create_multi_reddit_activity_label">Create Multireddit</string>
+    <string name="create_multi_reddit_activity_label">Create Multicommunity</string>
     <string name="community_multiselection_activity_label">Select Communities</string>
     <string name="custom_theme_listing_activity_label">Custom Themes</string>
     <string name="customize_theme_activity_label">Customize Theme</string>
     <string name="customize_theme_activity_create_theme_label">Create Theme</string>
     <string name="theme_preview_activity_label">Theme Preview</string>
-    <string name="edit_multi_reddit_activity_label">Edit Multireddit</string>
+    <string name="edit_multi_reddit_activity_label">Edit Multicommunity</string>
     <string name="selected_subeddits_activity_label">Selected Communities</string>
     <string name="report_activity_label">Report</string>
     <string name="view_imgur_media_activity_image_label">Image %1$d/%2$d</string>
@@ -38,7 +38,7 @@
     <string name="filtered_posts_activity_subtitle">Filtered Posts</string>
     <string name="post_filter_preference_activity_label">Post Filter</string>
     <string name="search_users_result_activity_label">Users</string>
-    <string name="multireddit_selection_activity_label">Select a Multireddit</string>
+    <string name="multireddit_selection_activity_label">Select a Multicommunity</string>
     <string name="post_gallery_activity_label">Gallery Post</string>
     <string name="trending_activity_label">Trending</string>
     <string name="wiki_activity_label">Wiki</string>
@@ -70,8 +70,8 @@
     <string name="action_edit_flair">Edit Flair</string>
     <string name="action_change_post_layout">Change Post Layout</string>
     <string name="action_save">Save</string>
-    <string name="action_edit_multi_reddit">Edit MultiReddit</string>
-    <string name="action_delete_multi_reddit">Delete Multireddit</string>
+    <string name="action_edit_multi_reddit">Edit Multicommunity</string>
+    <string name="action_delete_multi_reddit">Delete Multicommunity</string>
     <string name="action_share">Share</string>
     <string name="action_preview">Preview</string>
     <string name="action_report">Report</string>
@@ -84,7 +84,7 @@
     <string name="action_give_award">Give Award</string>
     <string name="action_save_to_database">Save to Database</string>
     <string name="action_read_all_messages">Read All Messages</string>
-    <string name="action_add_to_multireddit">Add to Multireddit</string>
+    <string name="action_add_to_multireddit">Add to Multicommuity</string>
     <string name="action_share_link">Share Link</string>
     <string name="action_copy_link">Copy Link</string>
     <string name="action_open_external_browser">Open in browser</string>
@@ -114,7 +114,7 @@
     <string name="no_comments">No comments found</string>
     <string name="no_communities">No communities found</string>
     <string name="no_users">No users found</string>
-    <string name="no_multi_reddits">No Multireddits found</string>
+    <string name="no_multi_reddits">No Multicommunities found</string>
     <string name="no_storage_permission">No storage permission to save this file</string>
     <string name="anonymous_homepage_not_implemented">Anonymous homepage is not implemented yet</string>
 
@@ -135,7 +135,7 @@
 
     <string name="profile">Profile</string>
     <string name="subscriptions">Subscriptions</string>
-    <string name="multi_reddit">Multireddit</string>
+    <string name="multi_reddit">Multicommuity</string>
     <string name="history">History</string>
     <string name="inbox">Inbox</string>
     <string name="inbox_with_count">Inbox (%1$,d)</string>
@@ -153,7 +153,7 @@
     <string name="invalid_response">Invalid response from the server</string>
     <string name="invalid_username_or_password">Invalid username or password</string>
     <string name="cannot_fetch_sidebar">Cannot fetch sidebar</string>
-    <string name="cannot_fetch_multireddit">Cannot fetch multireddit info</string>
+    <string name="cannot_fetch_multireddit">Cannot fetch multicommunity info</string>
 
     <string name="subscribe">Subscribe</string>
     <string name="unsubscribe">Unsubscribe</string>
@@ -226,7 +226,7 @@
 
     <string name="communities">Communities</string>
     <string name="users">Users</string>
-    <string name="multi_reddits">MultiReddits</string>
+    <string name="multi_reddits">MultiCommunity</string>
     <string name="posts">Posts</string>
     <string name="comments">Comments</string>
     <string name="about">About</string>
@@ -511,14 +511,14 @@
     <string name="settings_tab_3_summary">Tab 3</string>
     <string name="settings_more_tabs_summary">More Tabs</string>
     <string name="settings_more_tabs_info_summary">Enabling the following options will cause an unintended behaviour:\nTabs may lose all the content after switching to others. This is the same as refreshing the page.</string>
-    <string name="settings_more_tabs_show_favorite_multireddits_title">Show Favorite Multireddits</string>
-    <string name="settings_more_tabs_show_multireddits_title">Show Multireddits</string>
+    <string name="settings_more_tabs_show_favorite_multireddits_title">Show Favorite Multicommunities</string>
+    <string name="settings_more_tabs_show_multireddits_title">Show Multicommunities</string>
     <string name="settings_more_tabs_show_favorite_subscribed_communities_title">Show Favorite Subscribed Communities</string>
     <string name="settings_more_tabs_show_subscribed_communities_title">Show Subscribed Communities</string>
     <string name="settings_tab_title">Title</string>
     <string name="settings_tab_post_type">Type</string>
     <string name="settings_tab_community_name">Community Name (Without @ instance tag)</string>
-    <string name="settings_tab_multi_reddit_name">MultiReddit Path (/user/yourusername/m/yourmultiredditname) (only lowercase characters)</string>
+    <string name="settings_tab_multi_reddit_name">Multicommunity Path (/user/yourusername/m/yourmulticommunityname) (only lowercase characters)</string>
     <string name="settings_tab_username">Username (Without u/ prefix)</string>
     <string name="no_developer_easter_egg">There\'s no developer options here</string>
     <string name="settings_download_location_title">Download Location</string>
@@ -548,7 +548,7 @@
     <string name="settings_bottom_app_bar_option_4">Option 4</string>
     <string name="settings_bottom_app_bar_fab">Floating Action Button</string>
     <string name="settings_data_saving_mode">Data Saving Mode</string>
-    <string name="settings_data_saving_mode_info_summary">In data saving mode:\nPreview images are in lower resolution.\nReddit videos are in lower resolution.\nVideo autoplay is disabled.</string>
+    <string name="settings_data_saving_mode_info_summary">In data saving mode: Preview images are in lower resolution. Lemmy videos are in lower resolution. Video autoplay is disabled.</string>
     <string name="settings_translation_title">Translation</string>
     <string name="settings_translation_summary">Translate this app on POEditor. Thanks to all contributors.</string>
     <string name="settings_credits_national_flags">National Flags</string>
@@ -594,7 +594,7 @@
     <string name="settings_swipe_between_posts_title">Swipe Between Posts</string>
     <string name="settings_navigation_drawer_title">Navigation Drawer</string>
     <string name="settings_collapse_account_section_title">Collapse Account Section</string>
-    <string name="settings_collapse_reddit_section_title">Collapse Reddit Section</string>
+    <string name="settings_collapse_reddit_section_title">Collapse Lemmy Section</string>
     <string name="settings_collapse_post_section_title">Collapse Post Section</string>
     <string name="settings_collapse_preferences_section_title">Collapse Preferences Section</string>
     <string name="settings_collapse_favorite_communities_section_title">Collapse Favorite Communities Section</string>
@@ -639,13 +639,13 @@
     <string name="settings_show_fewer_toolbar_options_threshold_title">Show Fewer Toolbar Options Starting From</string>
     <string name="settings_show_fewer_toolbar_options_threshold_summary">Level %1$d</string>
     <string name="settings_show_author_avatar_title">Show Author Avatar</string>
-    <string name="settings_reddit_user_agreement_title">Reddit User Agreement</string>
+    <string name="settings_reddit_user_agreement_title">Lemmy User Agreement</string>
     <string name="settings_always_show_child_comment_count_title">Always Show the Number of Child Comments</string>
     <string name="settings_hide_upvote_ratio_title">Hide Upvote Ratio</string>
     <string name="settings_miscellaneous_dangerous_group_title">Dangerous</string>
     <string name="settings_post_feed_max_resolution_warning_title">Increase the value to show previews in higher resolution, but the app may crash unexpectedly.</string>
     <string name="settings_post_feed_max_resolution_title">Post Feed Preview Max Resolution (Width * Height)</string>
-    <string name="settings_reddit_video_default_resolution">Reddit Video Default Resolution</string>
+    <string name="settings_reddit_video_default_resolution">Lemmy Video Default Resolution</string>
     <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>
@@ -700,8 +700,8 @@
     <string name="elapsed_time_a_year_ago">1 Year</string>
     <string name="elapsed_time_years_ago">%1$d Years</string>
 
-    <string name="error_getting_multi_reddit_data">Error getting multireddit data</string>
-    <string name="error_loading_multi_reddit_list">Cannot sync multireddits</string>
+    <string name="error_getting_multi_reddit_data">Error getting multicommunity data</string>
+    <string name="error_loading_multi_reddit_list">Cannot sync multicommunities</string>
     <string name="error_loading_subscriptions">Cannot sync subscriptions</string>
 
     <string name="share_this_app">Check out Infinity for Lemmy, an awesome Lemmy client!\nhttps://play.google.com/store/apps/details?id=eu.toldi.infinityforlemmy</string>
@@ -742,9 +742,9 @@
     <string name="private_multi_reddit">Private</string>
     <string name="select_communities_and_users">Select Communities and Users</string>
     <string name="no_multi_reddit_name">Where is the name?</string>
-    <string name="create_multi_reddit_failed">Cannot create this multireddit</string>
-    <string name="duplicate_multi_reddit">This multireddit already exists</string>
-    <string name="edit_multi_reddit_failed">Cannot edit this multireddit</string>
+    <string name="create_multi_reddit_failed">Cannot create this multicommunity</string>
+    <string name="duplicate_multi_reddit">This multicommunity already exists</string>
+    <string name="edit_multi_reddit_failed">Cannot edit this multicommunity</string>
     <string name="delete_multi_reddit_success">Deleted successfully</string>
     <string name="delete_multi_reddit_failed">Delete failed</string>
     <string name="delete_multi_reddit_dialog_message">Are you sure?</string>
@@ -981,7 +981,7 @@
     <string name="reset_all_settings_success">Reset all settings successfully</string>
 
     <string name="username_preview">\@bazsalanszky@lemmy.toldi.eu</string>
-    <string name="community_preview">r/Infinity_For_Reddit</string>
+    <string name="community_preview">!infinityforlemmy@lemdro.id</string>
     <string name="primary_text_preview">Primary Text</string>
     <string name="secondary_text_preview">Secondary Text</string>
     <string name="post_title_preview">This is a post</string>
@@ -992,10 +992,10 @@
     <string name="author_flair_preview">Author Flair</string>
     <string name="comment_content_preview">I got my girlfriend a “Get better soon” card.\nShe\'s not ill or anything, but she could definitely get better.</string>
 
-    <string name="copy_multi_reddit_path">Copy Multireddit\'s Path</string>
-    <string name="copy_multi_reddit_path_failed">Unable to copy multireddit\'s path</string>
-    <string name="edit_multi_reddit">Edit Multireddit</string>
-    <string name="delete_multi_reddit">Delete Multireddit</string>
+    <string name="copy_multi_reddit_path">Copy Multicommunity\'s Path</string>
+    <string name="copy_multi_reddit_path_failed">Unable to copy multicommunity\'s path</string>
+    <string name="edit_multi_reddit">Edit Multicommunity</string>
+    <string name="delete_multi_reddit">Delete Multicommunity</string>
 
     <string name="n_awards">%1$,d Awards</string>
     <string name="one_award">1 Award</string>
@@ -1140,19 +1140,19 @@
     <string name="post_filter_usage_community_all">Community</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_multireddit">MultiReddit: %1$s</string>
-    <string name="post_filter_usage_multireddit_all">MultiReddit</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_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 / multireddits</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="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>
     <string name="read_all_messages_failed">Unable to read all messages</string>
 
-    <string name="add_community_or_user_to_multireddit_success">%1$s is added to multireddit %2$s</string>
-    <string name="add_community_or_user_to_multireddit_failed">Unable to add %1$s to multireddit %2$s</string>
+    <string name="add_community_or_user_to_multireddit_success">%1$s is added to multicommunity %2$s</string>
+    <string name="add_community_or_user_to_multireddit_failed">Unable to add %1$s to multicommunity %2$s</string>
 
     <string name="choose_a_user">Choose a user</string>
 
@@ -1162,7 +1162,7 @@
     <string name="vote">Vote</string>
 
     <string name="anonymous_front_page_no_subscriptions">Start by joining a community!</string>
-    <string name="anonymous_multireddit_no_community">This multireddit does not have 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="create_zip_in_destination_directory_failed">Could not create backup zip in the destination directory</string>