From 9cdbc4b80b80368d42635144bc37b3ee2689f06b Mon Sep 17 00:00:00 2001
From: alansley <aclansley@gmail.com>
Date: Tue, 27 Aug 2024 09:50:51 +1000
Subject: [PATCH] Adjusted strings as per Rebecca's 'String Changes'
 spreadsheet

---
 .../securesms/groups/JoinCommunityFragment.kt          |  3 +--
 libsession/src/main/res/values-fa-rIR/strings.xml      |  4 ----
 libsession/src/main/res/values-fr-rFR/strings.xml      |  3 ---
 libsession/src/main/res/values-fr/strings.xml          |  3 ---
 libsession/src/main/res/values/strings.xml             | 10 ++++++----
 5 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/JoinCommunityFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/JoinCommunityFragment.kt
index 2137dc7f11..a968775ff1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/JoinCommunityFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/JoinCommunityFragment.kt
@@ -71,8 +71,7 @@ class JoinCommunityFragment : Fragment() {
             } catch (e: OpenGroupUrlParser.Error) {
                 when (e) {
                     is OpenGroupUrlParser.Error.MalformedURL, OpenGroupUrlParser.Error.NoRoom -> {
-                        val txt = Phrase.from(context, R.string.groupErrorJoin).put(GROUP_NAME_KEY, url).format().toString()
-                        return Toast.makeText(activity, txt, Toast.LENGTH_SHORT).show()
+                        return Toast.makeText(activity, context?.resources?.getString(R.string.communityJoinError), Toast.LENGTH_SHORT).show()
                     }
                     is OpenGroupUrlParser.Error.InvalidPublicKey, OpenGroupUrlParser.Error.NoPublicKey -> {
                         return Toast.makeText(activity, R.string.communityEnterUrlErrorInvalidDescription, Toast.LENGTH_SHORT).show()
diff --git a/libsession/src/main/res/values-fa-rIR/strings.xml b/libsession/src/main/res/values-fa-rIR/strings.xml
index 0eeb500432..16f7de23b9 100644
--- a/libsession/src/main/res/values-fa-rIR/strings.xml
+++ b/libsession/src/main/res/values-fa-rIR/strings.xml
@@ -219,11 +219,7 @@
     <string name="dismiss">رد کردن</string>
     <string name="appearancePrimaryColor">رنگ اولیه</string>
     <string name="emojiCategoryRecentlyUsed">اخیرا استفاده شده</string>
-    <string name="emojiCategorySmileys">شکلک‌ها و مردم</string>
-    <string name="emojiCategoryAnimals" comment="Heading for an emoji list's category">حیوانات و طبیعت</string>
-    <string name="emojiCategoryFood" comment="Heading for an emoji list's category">غذا و نوشیدنی</string>
     <string name="emojiCategoryActivities">فعالیت ها</string>
-    <string name="emojiCategoryTravel" comment="Heading for an emoji list's category">مسافرت و اماکن</string>
     <string name="emojiCategoryObjects">اشیاء</string>
     <string name="emojiCategorySymbols">نمادها</string>
     <string name="emojiCategoryFlags">پرچم ها</string>
diff --git a/libsession/src/main/res/values-fr-rFR/strings.xml b/libsession/src/main/res/values-fr-rFR/strings.xml
index 72bb52178d..2cb7a1e339 100644
--- a/libsession/src/main/res/values-fr-rFR/strings.xml
+++ b/libsession/src/main/res/values-fr-rFR/strings.xml
@@ -229,10 +229,7 @@
     <string name="appearancePrimaryColor">Couleur principale</string>
     <string name="emojiCategoryRecentlyUsed">Fréquemment Utilisés</string>
     <string name="emojiCategorySmileys">Émoticônes et personnes</string>
-    <string name="emojiCategoryAnimals" comment="Heading for an emoji list's category">Nature</string>
-    <string name="emojiCategoryFood" comment="Heading for an emoji list's category">Nourriture</string>
     <string name="emojiCategoryActivities">Activités</string>
-    <string name="emojiCategoryTravel" comment="Heading for an emoji list's category">Voyage</string>
     <string name="emojiCategoryObjects">Objets</string>
     <string name="emojiCategorySymbols">Symboles</string>
     <string name="emojiCategoryFlags">Drapeaux</string>
diff --git a/libsession/src/main/res/values-fr/strings.xml b/libsession/src/main/res/values-fr/strings.xml
index b3f9cd509e..18ab871ac1 100644
--- a/libsession/src/main/res/values-fr/strings.xml
+++ b/libsession/src/main/res/values-fr/strings.xml
@@ -228,10 +228,7 @@
     <string name="appearancePrimaryColor">Couleur principale</string>
     <string name="emojiCategoryRecentlyUsed">Fréquemment Utilisés</string>
     <string name="emojiCategorySmileys">Émoticônes et personnes</string>
-    <string name="emojiCategoryAnimals" comment="Heading for an emoji list's category">Nature</string>
-    <string name="emojiCategoryFood" comment="Heading for an emoji list's category">Nourriture</string>
     <string name="emojiCategoryActivities">Activités</string>
-    <string name="emojiCategoryTravel" comment="Heading for an emoji list's category">Voyage</string>
     <string name="emojiCategoryObjects">Objets</string>
     <string name="emojiCategorySymbols">Symboles</string>
     <string name="emojiCategoryFlags">Drapeaux</string>
diff --git a/libsession/src/main/res/values/strings.xml b/libsession/src/main/res/values/strings.xml
index ec978d4a7d..037ad1aca1 100644
--- a/libsession/src/main/res/values/strings.xml
+++ b/libsession/src/main/res/values/strings.xml
@@ -280,7 +280,7 @@ NOTE: Strings with blank lines have manually been replaced with '\n\n' - this wi
     <string name="deleteAfterLegacyDisappearingMessagesTheyChangedTimer"><b>{name}</b> set the disappearing message timer to <b>{time}</b></string>
     <string name="deleteAfterLegacyGroupsGroupCreation">Please wait while the group is created...</string>
     <string name="deleteAfterLegacyGroupsGroupUpdateErrorTitle">Failed to Update Group</string>
-    <string name="deleteAfterMessageDeletionStandardisationMessageDeletionForbidden">You don’t have permission to delete others’ messages</string>
+    <string name="deleteAfterMessageDeletionStandardisationMessageDeletionForbidden">You don\’t have permission to delete others\’ messages</string>
     <string name="deleteMessage">Delete Message</string>
     <string name="deleteMessageConfirm">Are you sure you want to delete this message?</string>
     <string name="deleteMessageDeleted">Message deleted</string>
@@ -425,11 +425,13 @@ NOTE: Strings with blank lines have manually been replaced with '\n\n' - this wi
     <string name="groupMemberNewHistoryTwo"><b>{name}</b> and <b>{other_name}</b> were invited to join the group. Chat history was shared.</string>
     <string name="groupMemberNewMultiple"><b>{name}</b> and <b>{count} others</b> were invited to join the group.</string>
     <string name="groupMemberNewTwo"><b>{name}</b> and <b>{other_name}</b> were invited to join the group.</string>
-    <string name="groupMemberNewYouHistory"> <b>{name}</b> was invited to join the group. Chat history was shared.</string>
+    <string name="groupMemberNewYouHistory"><b>{name}</b> was invited to join the group. Chat history was shared.</string>
     <string name="groupMemberNewYouHistoryMultiple"><b>You</b> and <b>{count} others</b> were invited to join the group. Chat history was shared.</string>
     <string name="groupMemberNewYouHistoryTwo"><b>You</b> and <b>{name}</b> were invited to join the group. Chat history was shared.</string>
-    <string name="groupMemberNewYouMultiple"><b>You</b> and <b>{count} others</b> joined the group.</string>
-    <string name="groupMemberNewYouOther"><b>You</b> and <b>{other_name}</b> joined the group.</string>
+    <string name="groupMemberNewYouMultiple"><b>You</b> and <b>{count} others</b> were invited to join the group.</string>
+    <string name="groupMemberNewYouTwo"><b>You</b> and <b>{name}</b> were invited to join the group.</string>
+    <string name="groupMemberYouAndMoreNew"><b>You</b> and <b>{count} others</b> joined the group.</string>
+    <string name="groupMemberYouAndOtherNew"><b>You</b> and <b>{other_name}</b> joined the group.</string>
     <string name="groupMemberTwoNew"><b>{name}</b> and <b>{other_name}</b> joined the group.</string>
     <string name="groupMemberYouLeft"><b>You</b> left the group.</string>
     <string name="groupMemberYouNew"><b>You</b> joined the group.</string>