From 42c2dbb1be940c95cb5985dc19b91221a4637541 Mon Sep 17 00:00:00 2001
From: Taras Smakula <tarassmakula@gmail.com>
Date: Fri, 22 Sep 2023 17:28:15 +0300
Subject: [PATCH] Fix res
---
app/src/main/res/values/strings.xml | 13 +------------
core/src/main/res/values/color.xml | 1 +
core/src/main/res/values/strings.xml | 13 +++++++++++++
gallery/src/main/res/values/strings.xml | 2 --
4 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 774423240..e0a3e4f0d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -26,17 +26,12 @@
<string name="create_new_group">Create new group</string>
<string name="create_new_circle">Create new circle</string>
<string name="create">Create</string>
- <string name="group_name">Group name</string>
- <string name="circle_name">Circle name</string>
- <string name="group_topic_optional">Group topic (optional)</string>
- <string name="group_topic">Group topic</string>
<string name="circles_created">Circles created</string>
<string name="private_circles">Private Circles</string>
<string name="log_out">Log out</string>
<string name="others">Others</string>
<string name="following_format">Following %d</string>
<string name="followed_by_format">Followed by %d</string>
- <string name="group_encryption_warning">NOTE: Group name, topic and cover image are not encrypted</string>
<string name="create_post">Create post</string>
<string name="create_poll">Create poll</string>
<string name="send">Send</string>
@@ -76,8 +71,6 @@
<string name="hundred">100</string>
<string name="severity_formatter">Severity: %d</string>
<string name="add_reaction">Add reaction</string>
- <string name="remove_from_this_circle_but_do_not_unfollow">Remove from this circle, but do not unfollow</string>
- <string name="unfollow_completely_remove_from_all_circles">Unfollow completely (remove from all circles)</string>
<string name="unfollow">Unfollow</string>
<string name="requested_to_follow_format">%s requested to follow</string>
<string name="requested_to_join">Requested to join</string>
@@ -120,11 +113,6 @@
<string name="add_link">Add link</string>
<string name="switch_user">Switch User</string>
<string name="search_people">Search people</string>
- <string name="circle_type">Circle type</string>
- <string name="public_type">Public</string>
- <string name="private_type">Private</string>
- <string name="public_circle_explanation">Other users can ask to join</string>
- <string name="private_circle_explanation">Accessible only by your invitation</string>
<string name="request_sent">Request sent</string>
<string name="wants_to_follow_you">wants to follow you</string>
<string name="notification_unknown_room_name">Room</string>
@@ -220,6 +208,7 @@
<string name="circles_empty_message">Create your first Circle</string>
<string name="people_empty_message">Members of Circles and Groups you are joined will be shown here</string>
<string name="creating_timeline">Creating timeline</string>
+ <string name="group_topic_optional">Group topic (optional)</string>
<string-array name="report_categories">
<item>@string/crude_language</item>
diff --git a/core/src/main/res/values/color.xml b/core/src/main/res/values/color.xml
index 26ce318f8..7f2f935af 100644
--- a/core/src/main/res/values/color.xml
+++ b/core/src/main/res/values/color.xml
@@ -7,6 +7,7 @@
<color name="purple_700">#FF3700B3</color>
<color name="teal_700">#FF018786</color>
<color name="black">#FF000000</color>
+ <color name="yellow">#FFCC00</color>
<color name="white">#FFFFFFFF</color>
<color name="red">#FF3B30</color>
<color name="divider_color">#ddd</color>
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 0ffe76b4e..d0667b3ea 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -132,4 +132,17 @@
<string name="requested_to_join_format">%s requested to join</string>
<string name="invited_by_format">Invited by %s</string>
<string name="circle_encryption_warning">NOTE: Circle name and cover image are not encrypted</string>
+ <string name="circle_name">Circle name</string>
+ <string name="circle_type">Circle type</string>
+ <string name="public_type">Public</string>
+ <string name="public_circle_explanation">Other users can ask to join</string>
+ <string name="private_type">Private</string>
+ <string name="private_circle_explanation">Accessible only by your invitation</string>
+ <string name="gallery_name">Gallery name</string>
+ <string name="gallery_encryption_warning">NOTE: Gallery name and cover image are not encrypted</string>
+ <string name="group_name">Group name</string>
+ <string name="group_encryption_warning">NOTE: Group name, topic and cover image are not encrypted</string>
+ <string name="group_topic">Group topic</string>
+ <string name="remove_from_this_circle_but_do_not_unfollow">Remove from this circle, but do not unfollow</string>
+ <string name="unfollow_completely_remove_from_all_circles">Unfollow completely (remove from all circles)</string>
</resources>
\ No newline at end of file
diff --git a/gallery/src/main/res/values/strings.xml b/gallery/src/main/res/values/strings.xml
index 62b06e9f7..6b0021488 100644
--- a/gallery/src/main/res/values/strings.xml
+++ b/gallery/src/main/res/values/strings.xml
@@ -14,8 +14,6 @@
<string name="compress_before_sending">Compress before sending</string>
<string name="backup_device_folders">Backup device folders</string>
<string name="backup_folders_hint">Choose folders to backup and view in your Gallery:</string>
- <string name="gallery_name">Gallery name</string>
- <string name="gallery_encryption_warning">NOTE: Gallery name and cover image are not encrypted</string>
<string name="create_new_gallery">Create new gallery</string>
<string name="photos_empty_message">Create your first Gallery</string>
--
GitLab