style(strings): align player gesture string locations with feature branch

Author: SteveZMTstudios

app/src/main/res/values-zh-rCN/strings.xml

@@ -157,14 +157,14 @@
     <string name="settings_status_bar_lyrics_summary">启用魅族状态栏歌词（仅适用于部分设备）</string>
     <string name="settings_lyrics_ui">启用新歌词界面</string>
     <string name="lyric_widget_description">显示当前播放媒体歌词的小部件</string>
-    <string name="scroll_to_albums">滚动到专辑</string>
-    <string name="scroll_to_songs">滚动到歌曲</string>
-    <string name="expand_less">关闭</string>
-    <string name="skip_previous">跳到上一个</string>
     <string name="settings_rotate_cookie_button">旋转播放按钮</string>
     <string name="settings_rotate_cookie_button_summary">播放时让饼干样式的播放/暂停按钮细微地转动</string>
     <string name="settings_swipe_to_switch_track">手势切歌</string>
     <string name="settings_swipe_to_switch_track_summary">在播放器封面上左右滑动以切换上一曲/下一曲</string>
+    <string name="scroll_to_albums">滚动到专辑</string>
+    <string name="scroll_to_songs">滚动到歌曲</string>
+    <string name="expand_less">关闭</string>
+    <string name="skip_previous">跳到上一个</string>
     <string name="position_slider">位置滑块</string>
     <string name="settings_lyrics_ui_summary">实验性界面，显示逐字歌词，具有高级功能</string>
     <string name="back">返回</string>

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

@@ -239,10 +239,6 @@
     <string name="settings_title_bold">Bold title</string>
     <!-- Toggle in player UI settings to make song name bold. Subtext -->
     <string name="settings_title_bold_summary">Use bold title for full player</string>
-    <string name="settings_rotate_cookie_button">Rotate play button</string>
-    <string name="settings_rotate_cookie_button_summary">Subtly rotate the cookie-style play/pause button while playing</string>
-    <string name="settings_swipe_to_switch_track">Swipe to switch track</string>
-    <string name="settings_swipe_to_switch_track_summary">Swipe left or right on the album cover to switch tracks</string>
     <!-- Settings category about experimental features. Title -->
     <string name="settings_experimental_settings">Experimental</string>
     <!-- Settings category about experimental features. Subtext -->
@@ -406,6 +402,10 @@
     <string name="settings_always_skip_previous">Always skip to previous track</string>
     <!-- Settings toggle in behavior settings to always skip to previous track on previous button press. Subtext -->
     <string name="settings_always_skip_previous_summary">Directly switch to previous track when pressing previous button instead of seeking to start</string>
+    <string name="settings_rotate_cookie_button">Rotate play button</string>
+    <string name="settings_rotate_cookie_button_summary">Subtly rotate the cookie-style play/pause button while playing</string>
+    <string name="settings_swipe_to_switch_track">Swipe to switch track</string>
+    <string name="settings_swipe_to_switch_track_summary">Swipe left or right on the album cover to switch tracks</string>
     <!-- Context menu item to delete song/album/playlist -->
     <string name="delete">Delete</string>
     <!-- Dialog text to confirm user wants to delete a specific song or playlist with user defined name -->