diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/BehaviourSettingsController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/BehaviourSettingsController.java index 471631f7..ece42a43 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/BehaviourSettingsController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/BehaviourSettingsController.java @@ -45,7 +45,7 @@ public class BehaviourSettingsController extends SettingsController { public void onCreate() { super.onCreate(); - navigation.setTitle(R.string.settings_screen_behaviour); + navigation.setTitle(R.string.settings_screen_behavior); setupLayout(); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/BrowseController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/BrowseController.java index a929ac51..d1ef97c4 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/BrowseController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/BrowseController.java @@ -135,7 +135,7 @@ public class BrowseController extends ThreadController implements overflowBuilder .withSubItem(ARCHIVE_ID, R.string.thread_view_archive, this::archiveClicked) - .withSubItem(R.string.action_order, this::orderClicked) + .withSubItem(R.string.action_sort, this::orderClicked) .withSubItem(R.string.action_open_browser, this::openBrowserClicked) .withSubItem(R.string.action_share, this::shareClicked) .build() @@ -196,7 +196,7 @@ public class BrowseController extends ThreadController implements } private void orderClicked(ToolbarMenuSubItem item) { - handleOrder(threadLayout.getPresenter()); + handleSorting(threadLayout.getPresenter()); } private void openBrowserClicked(ToolbarMenuSubItem item) { @@ -270,7 +270,7 @@ public class BrowseController extends ThreadController implements threadLayout.setPostViewMode(postViewMode); } - private void handleOrder(final ThreadPresenter presenter) { + private void handleSorting(final ThreadPresenter presenter) { List items = new ArrayList<>(); for (PostsFilter.Order order : PostsFilter.Order.values()) { int nameId = 0; diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/MainSettingsController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/MainSettingsController.java index a9183de1..c0d4ddd2 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/MainSettingsController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/MainSettingsController.java @@ -138,7 +138,7 @@ public class MainSettingsController extends SettingsController implements Settin new AppearanceSettingsController(context)))); general.add(new LinkSettingView(this, - R.string.settings_behaviour, R.string.settings_behaviour_description, + R.string.settings_behavior, R.string.settings_behavior_description, v -> navigationController.pushController( new BehaviourSettingsController(context)))); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/ViewThreadController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/ViewThreadController.java index 5fbd27aa..2bbfe838 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/ViewThreadController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/ViewThreadController.java @@ -88,8 +88,8 @@ public class ViewThreadController extends ThreadController implements ThreadLayo .withSubItem(R.string.action_reload, this::reloadClicked) .withSubItem(R.string.action_open_browser, this::openBrowserClicked) .withSubItem(R.string.action_share, this::shareClicked) - .withSubItem(R.string.action_up, this::upClicked) - .withSubItem(R.string.action_down, this::downClicked) + .withSubItem(R.string.action_scroll_to_top, this::upClicked) + .withSubItem(R.string.action_scroll_to_bottom, this::downClicked) .build() .build(); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/layout/ThreadListLayout.java b/Clover/app/src/main/java/org/floens/chan/ui/layout/ThreadListLayout.java index c1bc9b74..15863af4 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/layout/ThreadListLayout.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/layout/ThreadListLayout.java @@ -391,7 +391,8 @@ public class ThreadListLayout extends FrameLayout implements ReplyLayout.ReplyLa if (query != null) { int size = postAdapter.getDisplayList().size(); searchStatus.setText(getContext().getString(R.string.search_results, - size, getContext().getResources().getQuantityString(R.plurals.posts, size, size), query)); + getContext().getResources().getQuantityString(R.plurals.posts, size, size), + query)); } } diff --git a/Clover/app/src/main/res/values/strings.xml b/Clover/app/src/main/res/values/strings.xml index b2dc8442..7ad5bfd8 100644 --- a/Clover/app/src/main/res/values/strings.xml +++ b/Clover/app/src/main/res/values/strings.xml @@ -30,14 +30,14 @@ along with this program. If not, see . Grant Later - Clover is up to date + Clover is up-to-date Failed to check for updates. Install Downloading update Download failed Failed to move downloaded file to the Download directory. Retry update - Clover was not updated yet. Click retry to retry the install. + Clover was not updated yet. Tap \"retry\" to retry the install. retry Storage permission required @@ -52,8 +52,8 @@ Re-enable this permission in the app settings if you permanently disabled it." - post - posts + %d post + %d posts @@ -94,22 +94,22 @@ Re-enable this permission in the app settings if you permanently disabled it."%1$dR %2$dI Reload - Pin - Open in browser + Bookmark + Open in a browser Share Download album Search Image search Catalog mode Board mode - Top - Bottom - Order - Rename pin + Top + Bottom + Sort + Rename bookmark Rename Reply - Clover cannot open this link, opening in your browser. + Clover cannot open this link; it will open in your browser instead. Bump order Reply count @@ -119,12 +119,12 @@ Re-enable this permission in the app settings if you permanently disabled it."Latest reply Search - Found %1$d %2$s for "%3$s" + Found %1$s for \"%2$s\" Search subjects, comments, names and filenames - Open link? + Open this link? Open this thread? - No applications found to open link + No applications were found to open this link Confirm exit @@ -132,7 +132,7 @@ Re-enable this permission in the app settings if you permanently disabled it."404 Failed to show image Failed to show image, out of memory - Deepzoom loading failed + Failed to show image, deep-zoom loading failed Image not found Failed to open image Spoiler image @@ -145,7 +145,7 @@ Re-enable this permission in the app settings if you permanently disabled it."404 not found Tap to refresh Loading - Loading in %1$d + Loading in %1$ds Retry Archived Closed @@ -168,7 +168,7 @@ Re-enable this permission in the app settings if you permanently disabled it."No sites added Add a site here Add site - Add a site by its url or name + Add a site by its URL or name URL or name http://example.com %s added @@ -186,16 +186,16 @@ Re-enable this permission in the app settings if you permanently disabled it."Configure boards of %s No boards added - Removed \'%s\' + Removed \"%s\" %s added Select all - all boards + All boards Enabled Filter Action Pattern - Test pattern + Test the pattern Pattern Boards Types @@ -212,29 +212,29 @@ Re-enable this permission in the app settings if you permanently disabled it."Pick color Filter help - - If the pattern matches then the post can be hidden or highlighted.
- -

For tripcodes, names and IDs:

-

- It will match the given pattern exact.
- !Ep8pui8Vw2 will match the tripcode !Ep8pui8Vw2 but not Ep8pu. -

- -

For comments, subjects and filenames:

-

- These filters are pattern based, and have three modes:
-
- 1. The pattern foo bar will match text that has any of the words in it. It will match foo or bar, but not foobar. - Placing a * allows any character to be filled in: f*o will match both foo, foooo but not foobar
-
- 2. Quoting your pattern with \" like \"foo bar\" will match the text exact. - foo bar matches but foo does not.
-
- 3. Regular expressions. /^>implying/ for example. -

- ]]> + +If the pattern matches then the post can be hidden or highlighted.
+ +

For tripcodes, names and IDs:

+

+ It will match the given pattern exact.
+ !Ep8pui8Vw2 will match the tripcode !Ep8pui8Vw2 but not Ep8pu. +

+ +

For comments, subjects and filenames:

+

+ These filters are pattern based, and have three modes:
+
+ 1. The pattern foo bar will match text that has any of the words in it. It will match foo or bar, but not foobar. + Placing a * allows any character to be filled in: f*o will match both foo, foooo but not foobar
+
+ 2. Quoting your pattern with \" like \"foo bar\" will match the text exactly. + foo bar matches but foo does not.
+
+ 3. Regular expressions. /^>implying/ for example. +

+]]>
Tripcode @@ -261,7 +261,7 @@ Re-enable this permission in the app settings if you permanently disabled it."Error loading archive Bookmarked threads - Removed \'%1$s\' + Removed \"%1$s\" %1$s cleared No bookmarks cleared. No bookmarks cleared. Hold to remove all. @@ -309,7 +309,12 @@ Re-enable this permission in the app settings if you permanently disabled it."Error deleting post WebM video error - The WebM video failed to play. This might be a problem with the hardware of your phone.\n\nYou can install an external media player that has a software decoder and enable \"Open videos external\" in the settings so that the video opens externally in a software decoding app. + +"The WebM video failed to play. This might be a problem with the hardware of your phone. + +A workaround is to use an external media player with a software decoder. +Enable \"Play videos with external player\" in the settings to play videos with an external player." + Don\'t show again Stop watching @@ -348,7 +353,7 @@ Re-enable this permission in the app settings if you permanently disabled it."Downloading images Tap to cancel Image saved - Saved as %1$s + Saved as \"%1$s\" Saving image failed Setup sites @@ -363,23 +368,23 @@ Re-enable this permission in the app settings if you permanently disabled it."Sites Appearance Theme, layout, fonts, etc. - Behaviour - Thread refresh, captcha, etc. + Behavior + Thread refresh, captcha, etc. Media Save location, auto loading, etc. Filters - Watching pinned threads + Watching bookmarked threads Off Thread watcher settings Settings - To watch pins for new posts, turn the thread watcher on. + To watch bookmarks for new posts, turn the thread watcher on. Enable in the background - Watch pins when Clover is in the background + Watch bookmarks when Clover is placed in the background Background update interval - The time between updates in the background + The interval between updates when placed in the background Notify about All posts @@ -390,8 +395,8 @@ Re-enable this permission in the app settings if you permanently disabled it."All posts Only posts quoting you - Heads-up notification on mentions - Show a heads-up notification on mentions + Heads-up notification on quotes + Show a heads-up notification when quoted Notification light None @@ -408,9 +413,11 @@ Re-enable this permission in the app settings if you permanently disabled it."About Check for updates Report crashes - Crash reporting creates reports of errors in Clover. - Crash reports do not collect any personally identifiable information. - Setting will be applied on next app start. + +"Crash reporting creates reports of errors in Clover. +Crash reports do not collect any personally identifiable information." + + Setting will be applied on the next app start. Released under the GNU GPLv3 license Tap to see license Open Source Licenses @@ -430,12 +437,12 @@ Re-enable this permission in the app settings if you permanently disabled it."Phone layout Slide mode Split mode - Catalog mode columns + Catalog mode column count Auto %1$d columns Never hide the toolbar - Enable the reply FAB - Disabling replaces it with a menu option + Enable the reply button + Disabling replaces the round button with a menu option Post @@ -447,10 +454,10 @@ Re-enable this permission in the app settings if you permanently disabled it."Show file info on posts Show filename on posts - - Behaviour + + Behavior - + General Auto refresh threads Confirm before exit @@ -458,26 +465,26 @@ Re-enable this permission in the app settings if you permanently disabled it."Clear all thread hides Cleared all thread hides - + Reply - Pin thread on post + Bookmark thread on post Default post name - + Text only mode Hide images when in board and thread view Reveal text spoilers - Makes the spoiler text appear clicked + Makes the spoiler text appear tapped Make everyone Anonymous Hide IDs - Show Anonymous username + Always show \"Anonymous\" name Reply buttons on the bottom Volume keys scroll content Tap the post number to reply Ask before opening links - + HTTP Proxy Enable proxy Proxy server address @@ -493,26 +500,28 @@ Re-enable this permission in the app settings if you permanently disabled it."Save images in a board folder Create a folder for each board to store images in Save original filename - Save the image with the filename the site assigned. - If disabled, save the image with the filename from the uploader. + +"Save the image with the filename the site assigned. +If disabled, save the image with the filename the uploader assigned." + Start videos muted If a video has audio, mute it by default. - Open videos external - Open videos in an external media player - Share url to image - Share the url to the image instead of the image itself + Play videos with external player + Play videos in an external media player app + Share URL to image + Share the URL to the image instead of the image itself Reveal image spoilers Always reveal spoiler thumbnails and images. Media loading - Auto load images + Automatically load images Always Wi-Fi only Never - Auto load videos + Automatically load videos @@ -521,14 +530,18 @@ 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." +Re-enable this permission in the app settings if you permanently disabled it." + Choose Up - Swipe to change the theme.\nTap the toolbar menu to change its color.\n - Click here to change the FAB color + +"Swipe to change the theme. +Tap the toolbar menu to change its color." + + Tap here to change the FAB color View logs @@ -546,13 +559,13 @@ Re-enable this permission in the app settings if you permanently disabled it."Loading… Connection error " - - Go here to reset your PIN.
-
- Don't have a 4chan Pass?
- Click here to learn more. - ]]> + +Go here to reset your PIN.
+
+Don't have a 4chan Pass?
+Tap here to learn more. +]]> "
Themes