rename setting string name

reader/src/main/res/layout/activity_reader_setting.xml

@@ -51,7 +51,7 @@
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/readingModeSelectView"
-                app:text="@string/viewer_setting_switch_smart_crop" />
+                app:text="@string/reader_setting_page_smart_crop" />
 
             <View
                 android:id="@+id/view_readerSetting_dividerSmartCropStatusBar"
@@ -69,7 +69,7 @@
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/view_readerSetting_dividerSmartCropStatusBar"
-                app:text="@string/viewer_setting_switch_show_state_bar" />
+                app:text="@string/reader_setting_status_bar" />
 
             <View
                 android:id="@+id/view_readerSetting_dividerStatusBarPageModeSelect"

reader/src/main/res/layout/view_reading_mode_select.xml

@@ -13,7 +13,7 @@
         android:layout_marginEnd="16dp"
         android:layout_marginStart="16dp"
         android:layout_marginTop="8dp"
-        android:text="@string/viewer_setting_page_background_and_display"
+        android:text="@string/reader_setting_page_theme"
         android:textColor="#030303"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent" />
@@ -26,7 +26,7 @@
         android:layout_marginLeft="16dp"
         android:layout_marginStart="16dp"
         android:background="#0000"
-        android:contentDescription="@string/viewer_setting_page_background_and_display"
+        android:contentDescription="@string/reader_setting_page_theme"
         android:src="@drawable/selector_day_mode"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tv_readingMode" />
@@ -39,7 +39,7 @@
         android:layout_marginLeft="24dp"
         android:layout_marginStart="24dp"
         android:background="#0000"
-        android:contentDescription="@string/viewer_setting_page_background_and_display"
+        android:contentDescription="@string/reader_setting_page_theme"
         android:src="@drawable/selector_lilac_mode"
         app:layout_constraintLeft_toRightOf="@+id/btn_readingMode_day"
         app:layout_constraintTop_toBottomOf="@+id/tv_readingMode" />
@@ -52,7 +52,7 @@
         android:layout_marginLeft="24dp"
         android:layout_marginStart="24dp"
         android:background="#0000"
-        android:contentDescription="@string/viewer_setting_page_background_and_display"
+        android:contentDescription="@string/reader_setting_page_theme"
         android:src="@drawable/selector_night_mode"
         app:layout_constraintLeft_toRightOf="@+id/btn_readingMode_lilac"
         app:layout_constraintTop_toBottomOf="@+id/tv_readingMode" />
@@ -74,7 +74,7 @@
         android:layout_marginLeft="24dp"
         android:layout_marginStart="24dp"
         android:background="#0000"
-        android:contentDescription="@string/viewer_setting_page_background_and_display"
+        android:contentDescription="@string/reader_setting_page_theme"
         android:src="@drawable/selector_sefia_mode"
         app:layout_constraintLeft_toRightOf="@+id/btn_readingMode_night"
         app:layout_constraintTop_toBottomOf="@+id/tv_readingMode" />

reader/src/main/res/layout/view_screen_setting.xml

@@ -11,7 +11,7 @@
         android:layout_height="24dp"
         android:layout_marginLeft="16dp"
         android:layout_marginStart="16dp"
-        android:text="@string/viewer_setting_screen_setting"
+        android:text="@string/reader_setting_screen_setting"
         android:textColor="#0077fd"
         app:layout_constraintLeft_toLeftOf="parent" />
 
@@ -22,6 +22,6 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tv_turnPageMode"
-        app:text="@string/viewer_setting_switch_screen_sleep" />
+        app:text="@string/reader_setting_screen_setting_sleep" />
 
 </android.support.constraint.ConstraintLayout>

reader/src/main/res/layout/view_toolbar_setting.xml

@@ -11,7 +11,7 @@
         android:layout_height="24dp"
         android:layout_marginLeft="16dp"
         android:layout_marginStart="16dp"
-        android:text="@string/viewer_setting_toolbar_display_setting"
+        android:text="@string/reader_setting_toolbar_visibility"
         android:textColor="#0077fd"
         app:layout_constraintLeft_toLeftOf="parent" />
 
@@ -22,7 +22,7 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tv_toolbar_setting"
-        app:text="@string/viewer_setting_toolbar_display_setting_comment" />
+        app:text="@string/reader_setting_toolbar_visibility_annotation" />
 
     <com.kdanmobile.reader.screen.view.RowSwitchView
         android:id="@+id/rowSwitchView_show_BOTATool"
@@ -31,6 +31,6 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/rowSwitchView_show_commentTool"
-        app:text="@string/viewer_setting_toolbar_display_setting_bota" />
+        app:text="@string/reader_setting_toolbar_visibility_bota" />
 
 </android.support.constraint.ConstraintLayout>

reader/src/main/res/layout/view_turn_page_mode_select.xml

@@ -11,7 +11,7 @@
         android:layout_height="24dp"
         android:layout_marginLeft="16dp"
         android:layout_marginStart="16dp"
-        android:text="@string/viewer_setting_page_turn_mode"
+        android:text="@string/reader_setting_page_scroll_mode"
         android:textColor="#0077fd"
         app:layout_constraintLeft_toLeftOf="parent" />
 
@@ -28,14 +28,14 @@
             android:id="@+id/radioBtn_turnPageMode_horizontally"
             android:layout_width="wrap_content"
             android:layout_height="48dp"
-            android:text="@string/viewer_setting_page_turn_mode_horizontally"
+            android:text="@string/reader_setting_page_scroll_mode_vertical"
             app:layout_constraintLeft_toLeftOf="parent" />
 
         <RadioButton
             android:id="@+id/radioBtn_turnPageMode_vertically"
             android:layout_width="wrap_content"
             android:layout_height="48dp"
-            android:text="@string/viewer_setting_page_turn_mode_vertically"
+            android:text="@string/reader_setting_page_scroll_mode_horizontal"
             app:layout_constraintLeft_toLeftOf="parent" />
 
     </RadioGroup>
@@ -54,6 +54,6 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@id/view_turnPageModeView_dividerModeSwitch"
-        app:text="@string/viewer_setting_page_turn_button_visible" />
+        app:text="@string/reader_setting_switch_page_button" />
 
 </android.support.constraint.ConstraintLayout>

reader/src/main/res/values-de/strings.xml

@@ -29,7 +29,7 @@
     <string name="fileManager_thishi_search">Bitte geben Sie mindestens 3 Zeichen ein.</string>
 
     <string name="dialogAddBookmark_page">Seite</string>
-    <string name="viewer_setting_page_turn_mode">Durch Seiten scrollen</string>
-    <string name="viewer_setting_page_turn_mode_vertically">Vertikal</string>
-    <string name="viewer_setting_page_turn_mode_horizontally">Horizontal</string>
+    <string name="reader_setting_page_scroll_mode">Durch Seiten scrollen</string>
+    <string name="reader_setting_page_scroll_mode_horizontal">Vertikal</string>
+    <string name="reader_setting_page_scroll_mode_vertical">Horizontal</string>
 </resources>

reader/src/main/res/values-es/strings.xml

@@ -28,7 +28,7 @@
     <string name="fileManager_thishi_search">Por favor, introduce al menos 3 caracteres.</string>
 
     <string name="dialogAddBookmark_page">página</string>
-    <string name="viewer_setting_page_turn_mode">Desplace páginas</string>
-    <string name="viewer_setting_page_turn_mode_vertically">Verticalmente</string>
-    <string name="viewer_setting_page_turn_mode_horizontally">Horizontalmente</string>
+    <string name="reader_setting_page_scroll_mode">Desplace páginas</string>
+    <string name="reader_setting_page_scroll_mode_horizontal">Verticalmente</string>
+    <string name="reader_setting_page_scroll_mode_vertical">Horizontalmente</string>
 </resources>

reader/src/main/res/values-fr/strings.xml

@@ -28,7 +28,7 @@
     <string name="fileManager_thishi_search">Veuillez entrer au moins 3 caractères.</string>
 
     <string name="dialogAddBookmark_page">Page</string>
-    <string name="viewer_setting_page_turn_mode">Défilement des Pages</string>
-    <string name="viewer_setting_page_turn_mode_vertically">Verticalement</string>
-    <string name="viewer_setting_page_turn_mode_horizontally">Horizontalement</string>
+    <string name="reader_setting_page_scroll_mode">Défilement des Pages</string>
+    <string name="reader_setting_page_scroll_mode_horizontal">Verticalement</string>
+    <string name="reader_setting_page_scroll_mode_vertical">Horizontalement</string>
 </resources>

reader/src/main/res/values-it/strings.xml

@@ -28,7 +28,7 @@
     <string name="fileManager_thishi_search">Si prega di inserire almeno 3 caratteri.</string>
 
     <string name="dialogAddBookmark_page">Pagina</string>
-    <string name="viewer_setting_page_turn_mode">Pagine di scorrimento</string>
-    <string name="viewer_setting_page_turn_mode_vertically">Verticalmente</string>
-    <string name="viewer_setting_page_turn_mode_horizontally">Orizzontalmente</string>
+    <string name="reader_setting_page_scroll_mode">Pagine di scorrimento</string>
+    <string name="reader_setting_page_scroll_mode_horizontal">Verticalmente</string>
+    <string name="reader_setting_page_scroll_mode_vertical">Orizzontalmente</string>
 </resources>

reader/src/main/res/values-ja/strings.xml

@@ -26,8 +26,8 @@
 
     <string name="fileManager_no_results">見つかりませんでした。</string>
     <string name="fileManager_thishi_search">少なくとも3文字入力して下さい。</string>
-    <string name="viewer_setting_page_turn_mode">ページをスクロールします</string>
-    <string name="viewer_setting_page_turn_mode_vertically">縦方向</string>
-    <string name="viewer_setting_page_turn_mode_horizontally">横方向</string>
+    <string name="reader_setting_page_scroll_mode">ページをスクロールします</string>
+    <string name="reader_setting_page_scroll_mode_horizontal">縦方向</string>
+    <string name="reader_setting_page_scroll_mode_vertical">横方向</string>
     <string name="dialogAddBookmark_page">ページ数：</string>
 </resources>

reader/src/main/res/values-ko/strings.xml

@@ -28,7 +28,7 @@
     <string name="fileManager_thishi_search">최소 3자 이상 입력해 주십시오.</string>
 
     <string name="dialogAddBookmark_page">페이지</string>
-    <string name="viewer_setting_page_turn_mode">페이지 스크롤</string>
-    <string name="viewer_setting_page_turn_mode_vertically">세로</string>
-    <string name="viewer_setting_page_turn_mode_horizontally">가로</string>
+    <string name="reader_setting_page_scroll_mode">페이지 스크롤</string>
+    <string name="reader_setting_page_scroll_mode_horizontal">세로</string>
+    <string name="reader_setting_page_scroll_mode_vertical">가로</string>
 </resources>

reader/src/main/res/values-pt/strings.xml

@@ -28,7 +28,7 @@
     <string name="fileManager_thishi_search">Por favor digite no mínimo 3 caracteres.</string>
 
     <string name="dialogAddBookmark_page">página</string>
-    <string name="viewer_setting_page_turn_mode">Páginas de rolagem</string>
-    <string name="viewer_setting_page_turn_mode_vertically">Verticalmente</string>
-    <string name="viewer_setting_page_turn_mode_horizontally">Horizontalmente</string>
+    <string name="reader_setting_page_scroll_mode">Páginas de rolagem</string>
+    <string name="reader_setting_page_scroll_mode_horizontal">Verticalmente</string>
+    <string name="reader_setting_page_scroll_mode_vertical">Horizontalmente</string>
 </resources>

reader/src/main/res/values-ru/strings.xml

@@ -28,7 +28,7 @@
     <string name="fileManager_thishi_search">Пожалуйста введите минимум 3 символа</string>
 
     <string name="dialogAddBookmark_page">страница</string>
-    <string name="viewer_setting_page_turn_mode">Прокручивание страниц</string>
-    <string name="viewer_setting_page_turn_mode_vertically">Вертикально</string>
-    <string name="viewer_setting_page_turn_mode_horizontally">Горизонтально</string>
+    <string name="reader_setting_page_scroll_mode">Прокручивание страниц</string>
+    <string name="reader_setting_page_scroll_mode_horizontal">Вертикально</string>
+    <string name="reader_setting_page_scroll_mode_vertical">Горизонтально</string>
 </resources>

reader/src/main/res/values-zh-rTW/strings.xml

@@ -29,7 +29,7 @@
     <string name="fileManager_thishi_search">請至少輸入3個字元</string>
 
     <string name="dialogAddBookmark_page">頁數</string>
-    <string name="viewer_setting_page_turn_mode">翻頁設定</string>
-    <string name="viewer_setting_page_turn_mode_vertically">垂直滾動</string>
-    <string name="viewer_setting_page_turn_mode_horizontally">水平滾動</string>
+    <string name="reader_setting_page_scroll_mode">翻頁設定</string>
+    <string name="reader_setting_page_scroll_mode_horizontal">垂直滾動</string>
+    <string name="reader_setting_page_scroll_mode_vertical">水平滾動</string>
 </resources>

reader/src/main/res/values-zh/strings.xml

@@ -29,7 +29,7 @@
     <string name="fileManager_thishi_search">请至少输入3个字符</string>
 
     <string name="dialogAddBookmark_page">页码</string>
-    <string name="viewer_setting_page_turn_mode">翻页设置</string>
-    <string name="viewer_setting_page_turn_mode_vertically">垂直滚动</string>
-    <string name="viewer_setting_page_turn_mode_horizontally">水平滚动</string>
+    <string name="reader_setting_page_scroll_mode">翻页设置</string>
+    <string name="reader_setting_page_scroll_mode_horizontal">垂直滚动</string>
+    <string name="reader_setting_page_scroll_mode_vertical">水平滚动</string>
 </resources>

reader/src/main/res/values/strings.xml

@@ -35,18 +35,18 @@
     <string name="dialogAddBookmark_page">page</string>
 
     <!--viewer setting-->
-    <string name="viewer_setting_page_background_and_display">Page Background And Display</string>
-    <string name="viewer_setting_switch_smart_crop">Smart Crop Mode</string>
-    <string name="viewer_setting_switch_show_state_bar">Show State Bar</string>
-    <string name="viewer_setting_page_turn_mode">Scroll Pages</string>
-    <string name="viewer_setting_page_turn_mode_horizontally">Horizontally</string>
-    <string name="viewer_setting_page_turn_mode_vertically">Vertically</string>
-    <string name="viewer_setting_page_turn_button_visible">Show turn page button</string>
-    <string name="viewer_setting_screen_setting">Screen Setting</string>
-    <string name="viewer_setting_switch_screen_sleep">Screen Sleep Setting Enable</string>
-    <string name="viewer_setting_toolbar_display_setting">Toolbar Display Setting</string>
-    <string name="viewer_setting_toolbar_display_setting_comment">Display Comment Tool</string>
-    <string name="viewer_setting_toolbar_display_setting_bota">Display BOTA tool</string>
+    <string name="reader_setting_page_theme">Page Background And Display</string>
+    <string name="reader_setting_page_smart_crop">Smart Crop Mode</string>
+    <string name="reader_setting_status_bar">Show State Bar</string>
+    <string name="reader_setting_page_scroll_mode">Scroll Pages</string>
+    <string name="reader_setting_page_scroll_mode_vertical">Horizontally</string>
+    <string name="reader_setting_page_scroll_mode_horizontal">Vertically</string>
+    <string name="reader_setting_switch_page_button">Show turn page button</string>
+    <string name="reader_setting_screen_setting">Screen Setting</string>
+    <string name="reader_setting_screen_setting_sleep">Screen Sleep Setting Enable</string>
+    <string name="reader_setting_toolbar_visibility">Toolbar Display Setting</string>
+    <string name="reader_setting_toolbar_visibility_annotation">Display Comment Tool</string>
+    <string name="reader_setting_toolbar_visibility_bota">Display BOTA tool</string>
 
     <string name="contextMenu_textbox_style">Style</string>