From 33d4e05e968692b2a45f6f4d22e7b31a2cfe3f7c Mon Sep 17 00:00:00 2001
From: LucasGGamerM <LucasGGamerM@protonmail.com>
Date: Tue, 26 Sep 2023 11:08:54 -0300
Subject: [PATCH] refactor(translations): remove blocks/mutes strings in favor
 of blocked accounts/muted accounts strings

---
 .../fragments/account_list/BlocksListFragment.java        | 3 +--
 .../android/fragments/account_list/MutesListFragment.java | 2 +-
 mastodon/src/main/res/menu/profile_own.xml                | 4 ++--
 mastodon/src/main/res/values-pt-rBR/strings_mo.xml        | 4 ++--
 mastodon/src/main/res/values/strings_mo.xml               | 8 ++++----
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BlocksListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BlocksListFragment.java
index 47f493cf7..f13f6e359 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BlocksListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BlocksListFragment.java
@@ -6,7 +6,6 @@ import android.os.Bundle;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
 import org.joinmastodon.android.api.requests.accounts.GetAccountBlocks;
-import org.joinmastodon.android.api.requests.accounts.GetAccountMutes;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.ui.viewholders.AccountViewHolder;
 
@@ -15,7 +14,7 @@ public class BlocksListFragment extends AccountRelatedAccountListFragment{
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
-		setTitle(R.string.mo_blocked_account);
+		setTitle(R.string.mo_blocked_accounts);
 	}
 
 	@Override
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/MutesListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/MutesListFragment.java
index a1d2ea36a..64acdaef2 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/MutesListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/MutesListFragment.java
@@ -14,7 +14,7 @@ public class MutesListFragment extends AccountRelatedAccountListFragment{
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
-		setTitle(R.string.mo_muted_account);
+		setTitle(R.string.mo_muted_accounts);
 	}
 
 	@Override
diff --git a/mastodon/src/main/res/menu/profile_own.xml b/mastodon/src/main/res/menu/profile_own.xml
index e9606f768..e72ebaa4c 100644
--- a/mastodon/src/main/res/menu/profile_own.xml
+++ b/mastodon/src/main/res/menu/profile_own.xml
@@ -8,7 +8,7 @@
 	<item android:id="@+id/manage_user_lists" android:title="@string/sk_your_lists" android:icon="@drawable/ic_fluent_people_24_regular"/>
 	<item android:id="@+id/favorites" android:title="@string/your_favorites" android:icon="@drawable/ic_fluent_star_24_regular" android:showAsAction="always"/>
 	<item android:id="@+id/scheduled" android:title="@string/sk_unsent_posts" android:icon="@drawable/ic_fluent_folder_open_24_regular" android:showAsAction="always"/>
-	<item android:id="@+id/mutes" android:title="@string/mo_mutes" android:icon="@drawable/ic_fluent_speaker_off_24_regular"/>
-	<item android:id="@+id/blocks" android:title="@string/mo_blocks" android:icon="@drawable/ic_fluent_shield_24_regular"/>
+	<item android:id="@+id/mutes" android:title="@string/mo_muted_accounts" android:icon="@drawable/ic_fluent_speaker_off_24_regular"/>
+	<item android:id="@+id/blocks" android:title="@string/mo_blocked_accounts" android:icon="@drawable/ic_fluent_shield_24_regular"/>
 	<item android:id="@+id/share" android:title="@string/share_user" android:icon="@drawable/ic_fluent_share_24_regular"/>
 </menu>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values-pt-rBR/strings_mo.xml b/mastodon/src/main/res/values-pt-rBR/strings_mo.xml
index 644d07505..02c6b4106 100644
--- a/mastodon/src/main/res/values-pt-rBR/strings_mo.xml
+++ b/mastodon/src/main/res/values-pt-rBR/strings_mo.xml
@@ -91,8 +91,8 @@
     <string name="mo_unmuting">Dessilenciando…</string>
     <string name="mo_unmute_hashtag">Dessilenciar hashtag</string>
     <string name="mo_confirm_to_unmute_hashtag">Você tem certeza que quer dessilenciar esta hashtag\?</string>
-    <string name="mo_blocked_account">Contas bloqueadas</string>
-    <string name="mo_muted_account">Contas silenciadas</string>
+    <string name="mo_blocked_accounts">Contas bloqueadas</string>
+    <string name="mo_muted_accounts">Contas silenciadas</string>
     <string name="mo_blocks">Usuários bloqueados</string>
     <string name="mo_mute_hashtag">Silenciar hashtag</string>
     <string name="mo_confirm_to_mute_hashtag">Você tem certeza que quer silenciar esta hashtag\?</string>
diff --git a/mastodon/src/main/res/values/strings_mo.xml b/mastodon/src/main/res/values/strings_mo.xml
index 2418982d2..181dad99c 100644
--- a/mastodon/src/main/res/values/strings_mo.xml
+++ b/mastodon/src/main/res/values/strings_mo.xml
@@ -112,8 +112,8 @@
 	<string name="mo_show_media_preview">Show media preview in timelines</string>
 
 <!--	Temporary Strings. They exist in strings_sk.xml, but are not available on Megalodon's weblate-->
-	<string name="mo_muted_account">Muted accounts</string>
-	<string name="mo_mutes">Mutes</string>
-	<string name="mo_blocked_account">Blocked accounts</string>
-	<string name="mo_blocks">Blocks</string>
+	<string name="mo_muted_accounts">Muted accounts</string>
+<!--	<string name="mo_mutes">Mutes</string>-->
+	<string name="mo_blocked_accounts">Blocked accounts</string>
+<!--	<string name="mo_blocks">Blocks</string>-->
 </resources>
\ No newline at end of file