diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 983a7f3d4..5dd9de4fa 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -97,10 +97,6 @@
     <!-- Gallery detail -->
     <string name="download">Descargar</string>
     <string name="read">Leer</string>
-    <plurals name="page_count">
-        <item quantity="one">%d páginas</item>
-        <item quantity="other">%d páginas</item>
-    </plurals>
     <string name="favored_times">\u2665 %d</string>
     <string name="rating_text">%1$s (%2$.2f, %3$d)</string>
     <string name="torrent_count">Torrent (%d)</string>
@@ -336,36 +332,8 @@
     <!-- Readable Time -->
     <string name="from_the_future">Desde el futuro</string>
     <string name="just_now">Ahora</string>
-    <plurals name="some_minutes_ago">
-        <item quantity="one">Hace un minuto</item>
-        <item quantity="other">Hace %d minutos</item>
-    </plurals>
-    <plurals name="some_hours_ago">
-        <item quantity="one">Hace una hora</item>
-        <item quantity="other">Hace %d horas</item>
-    </plurals>
     <string name="yesterday">Ayer</string>
     <string name="some_days_ago">Hace %d días atrás</string>
-    <plurals name="second">
-        <item quantity="one">segundo</item>
-        <item quantity="other">segundos</item>
-    </plurals>
-    <plurals name="minute">
-        <item quantity="one">minuto</item>
-        <item quantity="other">minutos</item>
-    </plurals>
-    <plurals name="hour">
-        <item quantity="one">hora</item>
-        <item quantity="other">horas</item>
-    </plurals>
-    <plurals name="day">
-        <item quantity="one">día</item>
-        <item quantity="other">días</item>
-    </plurals>
-    <plurals name="year">
-        <item quantity="one">año</item>
-        <item quantity="other">años</item>
-    </plurals>
     <string name="no_archives">Sin archivos</string>
     <string name="download_archive_started">Descarga de archivos iniciada</string>
     <string name="download_archive_failure">Error al descargar archivo</string>
@@ -399,4 +367,37 @@
     <string name="apply_tip">Toca la marca de verificación para guardar los cambios</string>
     <string name="dark_theme_follow_system">Sigue el sistema</string>
 
+    <plurals name="page_count">
+        <item quantity="one">%d páginas</item>
+        <item quantity="other">%d páginas</item>
+    </plurals>
+    <plurals name="some_minutes_ago">
+        <item quantity="one">Hace un minuto</item>
+        <item quantity="other">Hace %d minutos</item>
+    </plurals>
+    <plurals name="some_hours_ago">
+        <item quantity="one">Hace una hora</item>
+        <item quantity="other">Hace %d horas</item>
+    </plurals>
+    <plurals name="second">
+        <item quantity="one">segundo</item>
+        <item quantity="other">segundos</item>
+    </plurals>
+    <plurals name="minute">
+        <item quantity="one">minuto</item>
+        <item quantity="other">minutos</item>
+    </plurals>
+    <plurals name="hour">
+        <item quantity="one">hora</item>
+        <item quantity="other">horas</item>
+    </plurals>
+    <plurals name="day">
+        <item quantity="one">día</item>
+        <item quantity="other">días</item>
+    </plurals>
+    <plurals name="year">
+        <item quantity="one">año</item>
+        <item quantity="other">años</item>
+    </plurals>
+
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 5eef9e39a..80f0a2135 100755
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -105,10 +105,6 @@
     <!-- Gallery detail -->
     <string name="download">Télécharger</string>
     <string name="read">Lire</string>
-    <plurals name="page_count">
-        <item quantity="one">%d page</item>
-        <item quantity="other">%d pages</item>
-    </plurals>
     <string name="favored_times">\u2665 %d</string>
     <string name="rating_text">%1$s (%2$.2f, %3$d)</string>
     <string name="torrent_count">Torrent (%d)</string>
@@ -375,6 +371,30 @@
     <!-- Readable Time -->
     <string name="from_the_future">Du futur</string>
     <string name="just_now">En ce moment</string>
+    <string name="yesterday">Hier</string>
+    <string name="some_days_ago">Il y a %d jours</string>
+    <string name="no_archives">Aucun fiche archives</string>
+    <string name="download_archive_started">Téléchargement du fiche archives a commencé</string>
+    <string name="download_archive_failure">Téléchargement du fiche archives a échoué</string>
+    <string name="download_archive_failure_no_hath">Client H@H est nécessaire pour le téléchargement de fiches archives</string>
+    <string name="settings_privacy">Confidentialité</string>
+    <string name="settings_privacy_secure">Empêcher les captures d\'ecran</string>
+    <string name="settings_privacy_secure_summary">Quand cette option est activée, vous ne pouvez prendre aucune capture d\'écran de l\'application, et le systéme n\'affiche pas le contenu d\'écran dans le sélecteur de tâches.\n\nRedémarrage de l\'application est nécessaire pour appliquer le changement</string>
+    <string name="settings_advanced_app_language_title">Langue de l\'app (Language)</string>
+    <string name="app_language_system">Langue du système (défaut)</string>
+    <string name="settings_eh_identity_cookies_signed">Tout le monde peut utiliser les cookies de ce compte pour s\'y connecter.&lt;br&gt;&lt;b&gt;GARDEZ-LES BIEN !&lt;/b&gt;</string>
+    <string name="settings_eh_identity_cookies_guest">Vous ne vous êtes pas connecté.</string>
+    <string name="settings_eh_show_gallery_pages">Montrer les nombres des pages des galeries</string>
+    <string name="settings_eh_show_gallery_pages_summary">Montrer le nombre des pages des galerie dans la liste des galeries</string>
+    <string name="dark_theme">Thème sombre</string>
+    <string name="dark_theme_follow_system">Identique au système</string>
+    <string name="dark_theme_off">Toujours actif</string>
+    <string name="dark_theme_on">Toujours inactif</string>
+
+    <plurals name="page_count">
+        <item quantity="one">%d page</item>
+        <item quantity="other">%d pages</item>
+    </plurals>
     <plurals name="some_minutes_ago">
         <item quantity="one">Il y a %d minute</item>
         <item quantity="other">Il y a %d minutes</item>
@@ -383,8 +403,6 @@
         <item quantity="one">Il y a %d heure</item>
         <item quantity="other">Il y a %d heures</item>
     </plurals>
-    <string name="yesterday">Hier</string>
-    <string name="some_days_ago">Il y a %d jours</string>
     <plurals name="second">
         <item quantity="one">%d sec</item>
         <item quantity="other">secs</item>
@@ -405,22 +423,5 @@
         <item quantity="one">%d an</item>
         <item quantity="other">ans</item>
     </plurals>
-    <string name="no_archives">Aucun fiche archives</string>
-    <string name="download_archive_started">Téléchargement du fiche archives a commencé</string>
-    <string name="download_archive_failure">Téléchargement du fiche archives a échoué</string>
-    <string name="download_archive_failure_no_hath">Client H@H est nécessaire pour le téléchargement de fiches archives</string>
-    <string name="settings_privacy">Confidentialité</string>
-    <string name="settings_privacy_secure">Empêcher les captures d\'ecran</string>
-    <string name="settings_privacy_secure_summary">Quand cette option est activée, vous ne pouvez prendre aucune capture d\'écran de l\'application, et le systéme n\'affiche pas le contenu d\'écran dans le sélecteur de tâches.\n\nRedémarrage de l\'application est nécessaire pour appliquer le changement</string>
-    <string name="settings_advanced_app_language_title">Langue de l\'app (Language)</string>
-    <string name="app_language_system">Langue du système (défaut)</string>
-    <string name="settings_eh_identity_cookies_signed">Tout le monde peut utiliser les cookies de ce compte pour s\'y connecter.&lt;br&gt;&lt;b&gt;GARDEZ-LES BIEN !&lt;/b&gt;</string>
-    <string name="settings_eh_identity_cookies_guest">Vous ne vous êtes pas connecté.</string>
-    <string name="settings_eh_show_gallery_pages">Montrer les nombres des pages des galeries</string>
-    <string name="settings_eh_show_gallery_pages_summary">Montrer le nombre des pages des galerie dans la liste des galeries</string>
-    <string name="dark_theme">Thème sombre</string>
-    <string name="dark_theme_follow_system">Identique au système</string>
-    <string name="dark_theme_off">Toujours actif</string>
-    <string name="dark_theme_on">Toujours inactif</string>
 
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index dac465aeb..aba2bfde8 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -105,9 +105,6 @@
     <!-- Gallery detail -->
     <string name="download">ダウンロード</string>
     <string name="read">閲覧</string>
-    <plurals name="page_count">
-        <item quantity="other">%dページ</item>
-    </plurals>
     <string name="favored_times">\u2665 %d</string>
     <string name="rating_text">%1$s (%2$.2f, %3$d)</string>
     <string name="torrent_count">トレント (%d)</string>
@@ -372,30 +369,8 @@
     <!-- Readable Time -->
     <string name="from_the_future">未来から</string>
     <string name="just_now">ただ今</string>
-    <plurals name="some_minutes_ago">
-        <item quantity="other">%d分前</item>
-    </plurals>
-    <plurals name="some_hours_ago">
-        <item quantity="other">%d時前</item>
-    </plurals>
     <string name="yesterday">昨日</string>
     <string name="some_days_ago">%d日前</string>
-
-    <plurals name="second">
-        <item quantity="other">秒</item>
-    </plurals>
-    <plurals name="minute">
-        <item quantity="other">分</item>
-    </plurals>
-    <plurals name="hour">
-        <item quantity="other">時</item>
-    </plurals>
-    <plurals name="day">
-        <item quantity="other">日</item>
-    </plurals>
-    <plurals name="year">
-        <item quantity="other">年</item>
-    </plurals>
     <string name="no_archives">圧縮パッケージなし</string>
     <string name="download_archive_started">圧縮パッケージのダウンロードを開始しました</string>
     <string name="download_archive_failure">圧縮パッケージをダウンロードできませんでした</string>
@@ -417,4 +392,29 @@
     <string name="settings_eh_show_gallery_pages">ギャラリーページ数を表示</string>
     <string name="settings_eh_show_gallery_pages_summary">リストにギャラリーのページの数量を表示します</string>
     <string name="dark_theme">暗いテーマ</string>
+
+    <plurals name="page_count">
+        <item quantity="other">%dページ</item>
+    </plurals>
+    <plurals name="some_minutes_ago">
+        <item quantity="other">%d分前</item>
+    </plurals>
+    <plurals name="some_hours_ago">
+        <item quantity="other">%d時前</item>
+    </plurals>
+    <plurals name="second">
+        <item quantity="other">秒</item>
+    </plurals>
+    <plurals name="minute">
+        <item quantity="other">分</item>
+    </plurals>
+    <plurals name="hour">
+        <item quantity="other">時</item>
+    </plurals>
+    <plurals name="day">
+        <item quantity="other">日</item>
+    </plurals>
+    <plurals name="year">
+        <item quantity="other">年</item>
+    </plurals>
 </resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 596b7d7a7..7942a36fc 100755
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -100,9 +100,6 @@
     <!-- Gallery detail -->
     <string name="download">다운로드</string>
     <string name="read">읽기</string>
-    <plurals name="page_count">
-        <item quantity="other">%d 페이지</item>
-    </plurals>
     <string name="torrent_count">토렌트 (%d)</string>
     <string name="share">공유</string>
     <string name="rate">평가</string>
@@ -347,14 +344,32 @@
     <!-- Readable Time -->
     <string name="from_the_future">미래에</string>
     <string name="just_now">방금</string>
+    <string name="yesterday">어제</string>
+    <string name="some_days_ago">%d일 전</string>
+    <string name="no_archives">아카이브 없음</string>
+    <string name="download_archive_started">아카이브 다운로드가 시작되었습니다.</string>
+    <string name="download_archive_failure">아카이브 다운로드에 실패했습니다.</string>
+    <string name="download_archive_failure_no_hath">아카이브를 다운로드하려면 H@H 클라이언트가 필요합니다.</string>
+    <string name="settings_privacy">개인 정보</string>
+    <string name="settings_privacy_secure">화면 캡처 허용 안 함</string>
+    <string name="settings_privacy_secure_summary">이 앱에서 스크린샷을 찍을 수 없게 하며, \"최근 앱\" 화면에서 앱의 내용을 보이지 않게 합니다.</string>
+
+    <string name="download_service">다운로드 서비스</string>
+    <string name="favorite_name">즐겨찾기</string>
+    <string name="dark_theme">어두운 테마</string>
+    <string name="dark_theme_follow_system">시스템 설정</string>
+    <string name="dark_theme_off">항상 꺼짐</string>
+    <string name="dark_theme_on">항상 켜짐</string>
+
+    <plurals name="page_count">
+        <item quantity="other">%d 페이지</item>
+    </plurals>
     <plurals name="some_minutes_ago">
         <item quantity="other">%d분 전</item>
     </plurals>
     <plurals name="some_hours_ago">
         <item quantity="other">%d시간 전</item>
     </plurals>
-    <string name="yesterday">어제</string>
-    <string name="some_days_ago">%d일 전</string>
     <plurals name="second">
         <item quantity="other">초</item>
     </plurals>
@@ -370,18 +385,4 @@
     <plurals name="year">
         <item quantity="other">년</item>
     </plurals>
-    <string name="no_archives">아카이브 없음</string>
-    <string name="download_archive_started">아카이브 다운로드가 시작되었습니다.</string>
-    <string name="download_archive_failure">아카이브 다운로드에 실패했습니다.</string>
-    <string name="download_archive_failure_no_hath">아카이브를 다운로드하려면 H@H 클라이언트가 필요합니다.</string>
-    <string name="settings_privacy">개인 정보</string>
-    <string name="settings_privacy_secure">화면 캡처 허용 안 함</string>
-    <string name="settings_privacy_secure_summary">이 앱에서 스크린샷을 찍을 수 없게 하며, \"최근 앱\" 화면에서 앱의 내용을 보이지 않게 합니다.</string>
-
-    <string name="download_service">다운로드 서비스</string>
-    <string name="favorite_name">즐겨찾기</string>
-    <string name="dark_theme">어두운 테마</string>
-    <string name="dark_theme_follow_system">시스템 설정</string>
-    <string name="dark_theme_off">항상 꺼짐</string>
-    <string name="dark_theme_on">항상 켜짐</string>
 </resources>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 388f6f953..d7d24da34 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -53,10 +53,6 @@
     <string name="keyword_search">Nøkkelordssøk</string>
     <string name="search_sft">Etiketter</string>
     <string name="any">Ubegrenset</string>
-    <plurals name="page_count">
-        <item quantity="one">%d side</item>
-        <item quantity="other">%d sider</item>
-    </plurals>
     <string name="more_comment">Flere kommentarer</string>
     <string name="tag_vote_up">Stem opp</string>
     <string name="pref_grayscale">Gråskala</string>
@@ -186,6 +182,18 @@
     <string name="delete_search_history">Slett «%s» fra søkehistorikk\?</string>
     <string name="collections">Samlinger</string>
     <string name="tag_vote_down">Stem ned</string>
+    <string name="yesterday">I går</string>
+    <string name="some_days_ago">%d dager siden</string>
+    <string name="download_all">Alle</string>
+    <string name="action_save">Lagre</string>
+    <string name="settings_privacy">Personvern</string>
+    <string name="no_archives">Ingen arkiver</string>
+    <string name="action_save_to">Lagre i …</string>
+
+    <plurals name="page_count">
+        <item quantity="one">%d side</item>
+        <item quantity="other">%d sider</item>
+    </plurals>
     <plurals name="some_minutes_ago">
         <item quantity="one">Et minutt siden</item>
         <item quantity="other">%d minutter siden</item>
@@ -198,19 +206,14 @@
         <item quantity="one">Én time siden</item>
         <item quantity="other">%d timer siden</item>
     </plurals>
-    <string name="yesterday">I går</string>
-    <string name="some_days_ago">%d dager siden</string>
     <plurals name="hour">
         <item quantity="one">time</item>
         <item quantity="other">timer</item>
     </plurals>
-    <string name="download_all">Alle</string>
-    <string name="action_save">Lagre</string>
     <plurals name="second">
         <item quantity="one">sek</item>
         <item quantity="other">sek</item>
     </plurals>
-    <string name="settings_privacy">Personvern</string>
     <plurals name="day">
         <item quantity="one">dag</item>
         <item quantity="other">dager</item>
@@ -219,6 +222,4 @@
         <item quantity="one">år</item>
         <item quantity="other">år</item>
     </plurals>
-    <string name="no_archives">Ingen arkiver</string>
-    <string name="action_save_to">Lagre i …</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 4a40b124a..c596ec6e0 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -100,9 +100,6 @@
     <!-- Gallery detail -->
     <string name="download">ดาวน์โหลด</string>
     <string name="read">อ่าน</string>
-    <plurals name="page_count">
-        <item quantity="other">%d หน้า</item>
-    </plurals>
     <string name="favored_times">\u2665 %d</string>
     <string name="rating_text">%1$s (%2$.2f, %3$d)</string>
     <string name="torrent_count">Torrent (%d)</string>
@@ -362,14 +359,28 @@
     <!-- Readable Time -->
     <string name="from_the_future">จากอนาคต</string>
     <string name="just_now">เดี๋ยวนี้</string>
+    <string name="yesterday">เมื่อวาน</string>
+    <string name="some_days_ago">%d วันที่ผ่านมา</string>
+    <string name="no_archives">ยังไม่มีไฟล์บีบอัด</string>
+    <string name="download_archive_started">เริ่มการดาวน์โหลดบีบอัด</string>
+    <string name="download_archive_failure">การดาวน์โหลดไฟล์บีบอัดล้มเหลว</string>
+    <string name="download_archive_failure_no_hath">ต้องการ H@H client เพื่อโหลดไฟล์บีบอัด</string>
+    <string name="settings_privacy">ความเป็นส่วนตัว</string>
+    <string name="settings_privacy_secure">ป้องกันการบันทึกภาพหน้าจอ</string>
+    <string name="settings_privacy_secure_summary">ป้องกันเนื้อหาต่างๆของตัวแอปจากการถูกบันทึกหน้าจอ หรือถูกแสดงในหน้ารายการ \"แอพล่าสุด\" ตอนสลับหรือระหว่างสลับไปแอปอื่น.</string>
+
+    <string name="download_service">บริการดาวน์โหลด</string>
+    <string name="favorite_name">รายการโปรด</string>
+
+    <plurals name="page_count">
+        <item quantity="other">%d หน้า</item>
+    </plurals>
     <plurals name="some_minutes_ago">
         <item quantity="other">%d นาทีที่ผ่านมา</item>
     </plurals>
     <plurals name="some_hours_ago">
         <item quantity="other">%d ชั่วโมงที่ผ่านมา</item>
     </plurals>
-    <string name="yesterday">เมื่อวาน</string>
-    <string name="some_days_ago">%d วันที่ผ่านมา</string>
     <plurals name="second">
         <item quantity="other">วิ</item>
     </plurals>
@@ -385,14 +396,4 @@
     <plurals name="year">
         <item quantity="other">ปี</item>
     </plurals>
-    <string name="no_archives">ยังไม่มีไฟล์บีบอัด</string>
-    <string name="download_archive_started">เริ่มการดาวน์โหลดบีบอัด</string>
-    <string name="download_archive_failure">การดาวน์โหลดไฟล์บีบอัดล้มเหลว</string>
-    <string name="download_archive_failure_no_hath">ต้องการ H@H client เพื่อโหลดไฟล์บีบอัด</string>
-    <string name="settings_privacy">ความเป็นส่วนตัว</string>
-    <string name="settings_privacy_secure">ป้องกันการบันทึกภาพหน้าจอ</string>
-    <string name="settings_privacy_secure_summary">ป้องกันเนื้อหาต่างๆของตัวแอปจากการถูกบันทึกหน้าจอ หรือถูกแสดงในหน้ารายการ \"แอพล่าสุด\" ตอนสลับหรือระหว่างสลับไปแอปอื่น.</string>
-
-    <string name="download_service">บริการดาวน์โหลด</string>
-    <string name="favorite_name">รายการโปรด</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 4ffa49133..9c09fe5c5 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,7 +12,8 @@
   ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
-  --><resources>
+  -->
+<resources>
     <!-- Theme -->
     <string name="homepage">主页</string>
     <string name="subscription">订阅</string>
@@ -96,9 +96,6 @@
     <!-- Gallery detail -->
     <string name="download">下载</string>
     <string name="read">阅读</string>
-    <plurals name="page_count">
-        <item quantity="other">%d 页</item>
-    </plurals>
     <string name="favored_times">\u2665 %d</string>
     <string name="rating_text">%1$s (%2$.2f, %3$d)</string>
     <string name="torrent_count">种子 (%d)</string>
@@ -400,29 +397,8 @@
     <!-- Readable Time -->
     <string name="from_the_future">来自未来</string>
     <string name="just_now">刚刚</string>
-    <plurals name="some_minutes_ago">
-        <item quantity="other">%d 分钟前</item>
-    </plurals>
-    <plurals name="some_hours_ago">
-        <item quantity="other">%d 小时前</item>
-    </plurals>
     <string name="yesterday">昨天</string>
     <string name="some_days_ago">%d 天前</string>
-    <plurals name="second">
-        <item quantity="other">秒</item>
-    </plurals>
-    <plurals name="minute">
-        <item quantity="other">分钟</item>
-    </plurals>
-    <plurals name="hour">
-        <item quantity="other">小时</item>
-    </plurals>
-    <plurals name="day">
-        <item quantity="other">天</item>
-    </plurals>
-    <plurals name="year">
-        <item quantity="other">年</item>
-    </plurals>
     <string name="no_archives">没有压缩包</string>
     <string name="download_archive_started">开始下载压缩包</string>
     <string name="download_archive_failure">无法下载压缩包</string>
@@ -613,4 +589,29 @@
     <string name="dark_theme_on">总是开启</string>
     <string name="pref_crop_borders">裁剪边缘</string>
     <!-- Tachiyomi Reader End-->
+
+    <plurals name="page_count">
+        <item quantity="other">%d 页</item>
+    </plurals>
+    <plurals name="some_minutes_ago">
+        <item quantity="other">%d 分钟前</item>
+    </plurals>
+    <plurals name="some_hours_ago">
+        <item quantity="other">%d 小时前</item>
+    </plurals>
+    <plurals name="second">
+        <item quantity="other">秒</item>
+    </plurals>
+    <plurals name="minute">
+        <item quantity="other">分钟</item>
+    </plurals>
+    <plurals name="hour">
+        <item quantity="other">小时</item>
+    </plurals>
+    <plurals name="day">
+        <item quantity="other">天</item>
+    </plurals>
+    <plurals name="year">
+        <item quantity="other">年</item>
+    </plurals>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 1b010abcf..e02c4a1bc 100755
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -110,9 +110,6 @@
     <!-- Gallery detail -->
     <string name="download">下載</string>
     <string name="read">閲讀</string>
-    <plurals name="page_count">
-        <item quantity="other">%d 頁</item>
-    </plurals>
     <string name="favored_times">\u2665 %d</string>
     <string name="rating_text">%1$s (%2$.2f, %3$d)</string>
     <string name="torrent_count">種子 (%d)</string>
@@ -397,30 +394,8 @@
     <!-- Readable Time -->
     <string name="from_the_future">來自未來</string>
     <string name="just_now">剛剛</string>
-    <plurals name="some_minutes_ago">
-        <item quantity="other">%d 分鐘前</item>
-    </plurals>
-    <plurals name="some_hours_ago">
-        <item quantity="other">%d 小時前</item>
-    </plurals>
     <string name="yesterday">昨天</string>
     <string name="some_days_ago">%d 天前</string>
-
-    <plurals name="second">
-        <item quantity="other">秒</item>
-    </plurals>
-    <plurals name="minute">
-        <item quantity="other">分鐘</item>
-    </plurals>
-    <plurals name="hour">
-        <item quantity="other">小時</item>
-    </plurals>
-    <plurals name="day">
-        <item quantity="other">天</item>
-    </plurals>
-    <plurals name="year">
-        <item quantity="other">年</item>
-    </plurals>
     <string name="no_archives">沒有壓縮包</string>
     <string name="download_archive_started">開始下載壓縮包</string>
     <string name="download_archive_failure">無法下載壓縮包</string>
@@ -517,4 +492,29 @@
     <string name="disabled_nav">停用</string>
     <!-- Tachiyomi Reader End-->
 
+    <plurals name="page_count">
+        <item quantity="other">%d 頁</item>
+    </plurals>
+    <plurals name="some_minutes_ago">
+        <item quantity="other">%d 分鐘前</item>
+    </plurals>
+    <plurals name="some_hours_ago">
+        <item quantity="other">%d 小時前</item>
+    </plurals>
+    <plurals name="second">
+        <item quantity="other">秒</item>
+    </plurals>
+    <plurals name="minute">
+        <item quantity="other">分鐘</item>
+    </plurals>
+    <plurals name="hour">
+        <item quantity="other">小時</item>
+    </plurals>
+    <plurals name="day">
+        <item quantity="other">天</item>
+    </plurals>
+    <plurals name="year">
+        <item quantity="other">年</item>
+    </plurals>
+
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index ceb0c298b..4cec3b363 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,7 +12,8 @@
   ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
-  --><resources>
+  -->
+<resources>
     <!-- Theme -->
     <string name="homepage">首頁</string>
     <string name="subscription">訂閱</string>
@@ -96,9 +96,6 @@
     <!-- Gallery detail -->
     <string name="download">下載</string>
     <string name="read">閱讀</string>
-    <plurals name="page_count">
-        <item quantity="other">%d 頁</item>
-    </plurals>
     <string name="favored_times">\u2665 %d</string>
     <string name="rating_text">%1$s (%2$.2f, %3$d)</string>
     <string name="torrent_count">種子 (%d)</string>
@@ -303,7 +300,7 @@
     <string name="settings_eh_show_gallery_pages_summary">在圖庫列表中顯示頁數</string>
     <string name="settings_eh_show_gallery_comments">顯示畫廊評論</string>
     <string name="settings_eh_show_gallery_comments_summary">在畫廊詳情頁中顯示評論</string>
-     <string name="settings_eh_show_gallery_comment_threshold">評論分數閥值</string>
+    <string name="settings_eh_show_gallery_comment_threshold">評論分數閥值</string>
     <string name="settings_eh_show_gallery_comment_threshold_summary">隱藏小於或等於設定分數的評論（-101 為停用）</string>
     <string name="settings_eh_show_tag_translations">顯示標籤翻譯</string>
     <string name="settings_eh_show_tag_translations_summary">顯示翻譯後的標籤而非原始文字（需花費時間來下載資料檔案）</string>
@@ -399,29 +396,8 @@
     <!-- Readable Time -->
     <string name="from_the_future">來自未來</string>
     <string name="just_now">剛剛</string>
-    <plurals name="some_minutes_ago">
-        <item quantity="other">%d 分鐘前</item>
-    </plurals>
-    <plurals name="some_hours_ago">
-        <item quantity="other">%d 小時前</item>
-    </plurals>
     <string name="yesterday">昨天</string>
     <string name="some_days_ago">%d 天前</string>
-    <plurals name="second">
-        <item quantity="other">秒</item>
-    </plurals>
-    <plurals name="minute">
-        <item quantity="other">分鐘</item>
-    </plurals>
-    <plurals name="hour">
-        <item quantity="other">小時</item>
-    </plurals>
-    <plurals name="day">
-        <item quantity="other">天</item>
-    </plurals>
-    <plurals name="year">
-        <item quantity="other">年</item>
-    </plurals>
     <string name="no_archives">沒有壓縮檔</string>
     <string name="download_archive_started">開始下載壓縮檔</string>
     <string name="download_archive_failure">下載失敗</string>
@@ -507,7 +483,7 @@
     <string name="update_frequency_weekly">每週</string>
     <string name="update_frequency_biweekly">每兩週</string>
     <string name="update_frequency_monthly">每月</string>
-     <string name="update_failed">更新失败：%s</string>
+    <string name="update_failed">更新失败：%s</string>
     <string name="new_version_available">有新版本可用！</string>
     <string name="already_latest_version">已是最新版本</string>
     <string name="permission_denied">沒有權限</string>
@@ -610,4 +586,29 @@
     <string name="dark_theme_on">總是開啟</string>
     <string name="pref_crop_borders">邊緣裁剪</string>
     <!-- Tachiyomi Reader End-->
+
+    <plurals name="page_count">
+        <item quantity="other">%d 頁</item>
+    </plurals>
+    <plurals name="some_minutes_ago">
+        <item quantity="other">%d 分鐘前</item>
+    </plurals>
+    <plurals name="some_hours_ago">
+        <item quantity="other">%d 小時前</item>
+    </plurals>
+    <plurals name="second">
+        <item quantity="other">秒</item>
+    </plurals>
+    <plurals name="minute">
+        <item quantity="other">分鐘</item>
+    </plurals>
+    <plurals name="hour">
+        <item quantity="other">小時</item>
+    </plurals>
+    <plurals name="day">
+        <item quantity="other">天</item>
+    </plurals>
+    <plurals name="year">
+        <item quantity="other">年</item>
+    </plurals>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fe6b91f9e..e93f14d58 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,7 +12,8 @@
   ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
-  --><resources>
+  -->
+<resources>
     <string name="app_name" translatable="false">EhViewer</string>
     <string name="site_e" translatable="false">e-hentai</string>
     <string name="site_ex" translatable="false">exhentai</string>
@@ -104,7 +104,7 @@
     <string name="search_sp_err1">The page range maximum cannot be below 10</string>
     <string name="search_sp_err2">The page range must be at least 20</string>
     <!-- A placeholder for other languages -->
-    <string name="search_sp_suffix"/>
+    <string name="search_sp_suffix" />
     <string name="search_sf">Disable default filters for:</string>
     <string name="search_sfl">Language</string>
     <string name="search_sfu">Uploader</string>
@@ -136,10 +136,6 @@
     <!-- Gallery detail -->
     <string name="download">Download</string>
     <string name="read">Read</string>
-    <plurals name="page_count">
-        <item quantity="one">%d page</item>
-        <item quantity="other">%d pages</item>
-    </plurals>
     <string name="favored_times">\u2665 %d</string>
     <string name="rating_text">%1$s (%2$.2f, %3$d)</string>
     <string name="torrent_count">Torrent (%d)</string>
@@ -458,36 +454,8 @@
     <!-- Readable Time -->
     <string name="from_the_future">From the future</string>
     <string name="just_now">Just now</string>
-    <plurals name="some_minutes_ago">
-        <item quantity="one">A minute ago</item>
-        <item quantity="other">%d minutes ago</item>
-    </plurals>
-    <plurals name="some_hours_ago">
-        <item quantity="one">An hour ago</item>
-        <item quantity="other">%d hours ago</item>
-    </plurals>
     <string name="yesterday">Yesterday</string>
     <string name="some_days_ago">%d days ago</string>
-    <plurals name="second">
-        <item quantity="one">sec</item>
-        <item quantity="other">secs</item>
-    </plurals>
-    <plurals name="minute">
-        <item quantity="one">min</item>
-        <item quantity="other">mins</item>
-    </plurals>
-    <plurals name="hour">
-        <item quantity="one">hour</item>
-        <item quantity="other">hours</item>
-    </plurals>
-    <plurals name="day">
-        <item quantity="one">day</item>
-        <item quantity="other">days</item>
-    </plurals>
-    <plurals name="year">
-        <item quantity="one">year</item>
-        <item quantity="other">years</item>
-    </plurals>
     <string name="no_archives">No Archives</string>
     <string name="download_archive_started">Archive download started</string>
     <string name="download_archive_failure">Failed to download archive</string>
@@ -676,4 +644,37 @@
     <string name="dark_theme_off">Always off</string>
     <string name="dark_theme_on">Always on</string>
     <!-- Tachiyomi Reader End-->
+
+    <plurals name="page_count">
+        <item quantity="one">%d page</item>
+        <item quantity="other">%d pages</item>
+    </plurals>
+    <plurals name="some_minutes_ago">
+        <item quantity="one">A minute ago</item>
+        <item quantity="other">%d minutes ago</item>
+    </plurals>
+    <plurals name="some_hours_ago">
+        <item quantity="one">An hour ago</item>
+        <item quantity="other">%d hours ago</item>
+    </plurals>
+    <plurals name="second">
+        <item quantity="one">sec</item>
+        <item quantity="other">secs</item>
+    </plurals>
+    <plurals name="minute">
+        <item quantity="one">min</item>
+        <item quantity="other">mins</item>
+    </plurals>
+    <plurals name="hour">
+        <item quantity="one">hour</item>
+        <item quantity="other">hours</item>
+    </plurals>
+    <plurals name="day">
+        <item quantity="one">day</item>
+        <item quantity="other">days</item>
+    </plurals>
+    <plurals name="year">
+        <item quantity="one">year</item>
+        <item quantity="other">years</item>
+    </plurals>
 </resources>