From 8f46b79157532c4985c4bbed774fb9370ac0ed03 Mon Sep 17 00:00:00 2001
From: Floens <floens@gmail.com>
Date: Tue, 3 Jul 2018 21:26:37 +0200
Subject: [PATCH 1/3] strings: delete unused string entries

---
 .../floens/chan/core/presenter/ThreadPresenter.java  |  2 +-
 Clover/app/src/main/res/values/strings.xml           | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/Clover/app/src/main/java/org/floens/chan/core/presenter/ThreadPresenter.java b/Clover/app/src/main/java/org/floens/chan/core/presenter/ThreadPresenter.java
index 491c7d5c..53b01838 100644
--- a/Clover/app/src/main/java/org/floens/chan/core/presenter/ThreadPresenter.java
+++ b/Clover/app/src/main/java/org/floens/chan/core/presenter/ThreadPresenter.java
@@ -477,7 +477,7 @@ public class ThreadPresenter implements ChanThreadLoader.ChanLoaderCallback, Pos
 
         if (loadable.site.feature(Site.Feature.POST_DELETE) &&
                 databaseManager.getDatabaseSavedReplyManager().isSaved(post.board, post.no)) {
-            menu.add(new FloatingMenuItem(POST_OPTION_DELETE, R.string.delete));
+            menu.add(new FloatingMenuItem(POST_OPTION_DELETE, R.string.post_delete));
         }
 
         menu.add(new FloatingMenuItem(POST_OPTION_EXTRA, R.string.post_more));
diff --git a/Clover/app/src/main/res/values/strings.xml b/Clover/app/src/main/res/values/strings.xml
index 3ffed8b5..7c718b82 100644
--- a/Clover/app/src/main/res/values/strings.xml
+++ b/Clover/app/src/main/res/values/strings.xml
@@ -39,7 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <string name="delete">Delete</string>
     <string name="undo">Undo</string>
     <string name="save">Save</string>
-    <string name="next">Next</string>
 
     <string name="permission_app_settings">App settings</string>
     <string name="permission_grant">Grant</string>
@@ -108,10 +107,8 @@ Re-enable this permission in the app settings if you permanently disabled it."</
 
     <string name="card_stats">%1$dR %2$dI</string>
 
-    <string name="action_view_album">View album</string>
     <string name="action_reload">Reload</string>
     <string name="action_pin">Pin</string>
-    <string name="action_go_post">Go to post</string>
     <string name="action_open_browser">Open in browser</string>
     <string name="action_share">Share</string>
     <string name="action_download_album">Download album</string>
@@ -199,7 +196,6 @@ Re-enable this permission in the app settings if you permanently disabled it."</
 
     <string name="setup_board_title">Configure boards of %s</string>
     <string name="setup_board_empty">No boards added</string>
-    <string name="setup_board_add">Add board</string>
     <string name="setup_board_removed">Removed \'%s\'</string>
     <string name="setup_board_added">%s added</string>
     <string name="setup_board_select_all">Select all</string>
@@ -274,8 +270,6 @@ Re-enable this permission in the app settings if you permanently disabled it."</
     <string name="archive_title">%s archive</string>
     <string name="archive_error">Error loading archive</string>
 
-    <string name="drawer_board">Board</string>
-    <string name="drawer_catalog">Catalog</string>
     <string name="drawer_pinned">Bookmarked threads</string>
     <string name="drawer_pin_removed">Removed \'%1$s\'</string>
     <string name="drawer_pins_cleared">%1$s cleared</string>
@@ -359,17 +353,13 @@ Re-enable this permission in the app settings if you permanently disabled it."</
     <string name="album_download_none_checked">Please select images to download</string>
     <string name="album_download_confirm">%1$s will be downloaded to the folder %2$s</string>
 
-    <string name="album_view_screen">Album</string>
-
     <string name="report_screen">Report %1$s</string>
 
     <string name="image_save_notification_downloading">Downloading images</string>
     <string name="image_save_notification_cancel">Tap to cancel</string>
     <string name="image_save_saved">Image saved</string>
     <string name="image_save_as">Saved as %1$s</string>
-    <string name="image_save_succeeded">Saved image to</string>
     <string name="image_save_failed">Saving image failed</string>
-    <string name="image_save_directory_error">Cannot make save directory</string>
 
     <string name="drawer_sites">Setup sites</string>
     <string name="drawer_history">History</string>
@@ -544,8 +534,6 @@ Re-enable this permission in the app settings if you permanently disabled it."</
 "Permission to access storage is required for browsing files.
 
 Re-enable this permission in the app settings if you permanently disabled it."</string>
-    <string name="setting_save_folder">File save folder</string>
-    <string name="setting_save_folder_error_create_folder">Error creating save folder</string>
     <string name="setting_folder_pick_ok">Choose</string>
 
 

From fd2b2fb18336c995eff5ae421f3f3baf77c5d506 Mon Sep 17 00:00:00 2001
From: Floens <floens@gmail.com>
Date: Tue, 3 Jul 2018 21:30:36 +0200
Subject: [PATCH 2/3] strings: add translatable=false where needed.

---
 Clover/app/src/main/res/values/strings.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Clover/app/src/main/res/values/strings.xml b/Clover/app/src/main/res/values/strings.xml
index 7c718b82..c80df104 100644
--- a/Clover/app/src/main/res/values/strings.xml
+++ b/Clover/app/src/main/res/values/strings.xml
@@ -19,7 +19,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <!-- Defined in gradle flavor -->
     <!--<string name="app_name">Clover</string>-->
 
-    <string name="changelog_30001">
+    <!-- No need to update the changelog, we can't get it translated in time. -->
+    <string name="changelog_30001" translatable="false">
         <![CDATA[
             <h3>Clover was updated</h3>
             Clover was updated to v3.0.1<br>
@@ -142,7 +143,7 @@ Re-enable this permission in the app settings if you permanently disabled it."</
     <string name="action_confirm_exit_title">Confirm exit</string>
 
     <string name="thumbnail_load_failed_network">Error</string>
-    <string name="thumbnail_load_failed_server">404</string>
+    <string name="thumbnail_load_failed_server" translatable="false">404</string>
     <string name="image_preview_failed">Failed to show image</string>
     <string name="image_preview_failed_oom">Failed to show image, out of memory</string>
     <string name="image_failed_big_image">Deepzoom loading failed</string>
@@ -169,7 +170,7 @@ Re-enable this permission in the app settings if you permanently disabled it."</
     <string name="thread_pin_hint">Bookmark this thread</string>
     <string name="thread_view_archive">Archive</string>
 
-    <string name="thread_empty_setup_feature">&#128564;</string>
+    <string name="thread_empty_setup_feature" translatable="false">&#128564;</string>
     <string name="thread_empty_setup_title">Nothing to show</string>
     <string name="thread_empty_setup_body">Add a site to begin browsing</string>
     <string name="thread_empty_setup_hint">Add a site here</string>

From 25c105430d4c529be2f1685136a702a8d28a284c Mon Sep 17 00:00:00 2001
From: Floens <floens@gmail.com>
Date: Tue, 3 Jul 2018 22:30:20 +0200
Subject: [PATCH 3/3] strings: move chanlog to private strings

---
 Clover/app/src/main/res/values/private_strings.xml | 11 +++++++++++
 Clover/app/src/main/res/values/strings.xml         | 14 --------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/Clover/app/src/main/res/values/private_strings.xml b/Clover/app/src/main/res/values/private_strings.xml
index 7f91754d..a208e6fc 100644
--- a/Clover/app/src/main/res/values/private_strings.xml
+++ b/Clover/app/src/main/res/values/private_strings.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- No need to update the changelog, we can't get it translated in time. -->
+    <string name="changelog_30001" translatable="false">
+        <![CDATA[
+            <h3>Clover was updated</h3>
+            Clover was updated to v3.0.1<br>
+            <br>
+            <b>New in this version:</b><br>
+            Bug fixes.<br>
+        ]]>
+    </string>
+
     <string-array name="extra_abouts">
         <item>Donate to Clover development</item>
         <item>Give a PayPal or Bitcoin donation to the Clover developer</item>
diff --git a/Clover/app/src/main/res/values/strings.xml b/Clover/app/src/main/res/values/strings.xml
index c80df104..f41ab367 100644
--- a/Clover/app/src/main/res/values/strings.xml
+++ b/Clover/app/src/main/res/values/strings.xml
@@ -16,20 +16,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <resources>
-    <!-- Defined in gradle flavor -->
-    <!--<string name="app_name">Clover</string>-->
-
-    <!-- No need to update the changelog, we can't get it translated in time. -->
-    <string name="changelog_30001" translatable="false">
-        <![CDATA[
-            <h3>Clover was updated</h3>
-            Clover was updated to v3.0.1<br>
-            <br>
-            <b>New in this version:</b><br>
-            Bug fixes.<br>
-        ]]>
-    </string>
-
     <string name="cancel">Cancel</string>
     <string name="add">Add</string>
     <string name="close">Close</string>