diff --git a/.gitignore b/.gitignore
index a41dabf27..c4365f72a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,7 @@ __pycache__
 
 # other repos
 /dep/mac
+/android
 
 # UWP crap
 Generated Files
diff --git a/extras/android-translation/values-pt-rBR/strings.xml b/extras/android-translation/values-pt-rBR/strings.xml
index ec1a661e7..a75c6ebf5 100644
--- a/extras/android-translation/values-pt-rBR/strings.xml
+++ b/extras/android-translation/values-pt-rBR/strings.xml
@@ -358,8 +358,6 @@
     <string name="controller_settings_auto_fire_n_frequency">Auto disparo botão %d Frequência/Intervalo</string>
     <string name="controller_binding_auto_fire_n">Auto disparo %d</string>
     <string name="settings_category_cdrom">Configurações do CD-ROM</string>	
-    <string name="settings_cdrom_read_thread">Usar leitura assíncrona</string>	
-    <string name="settings_summary_read_thread">Reduz engasgos na emulação lendo / descomprimindo os arquivos da mídia de forma assíncrona.</string>
     <string name="settings_cdrom_load_image_patches">Aplicar modificações PPF</string>
     <string name="settings_summary_load_image_patches">Aplica automaticamente \'modificações\' em jogos quando presentes no mesmo diretório. no momento somente são aceitos modificações do tipo PPF.</string>
     <string name="menu_edit_game_directories_force_saf">Forçar armazenamento com escopo</string>
@@ -369,4 +367,5 @@
     <string name="memory_card_editor_undelete_success">Recuperar arquivo \'%s\'.</string>
     <string name="memory_card_editor_undelete_failed">Falha ao recuperar arquivo \'%s\'. o arquivo de salvamento já pode ter sido parcialmente sobescrito.</string>
     <string name="memory_card_editor_permanently_delete_confirm">Você tem certeza de que deseja excluir permanentemente o salvamento \'%s\'? essa ação não poderá ser desfeita.</string>
+    <string name="settings_cdrom_readahead">Async Readahead</string>
 </resources>
diff --git a/extras/android-translation/values-ru/strings.xml b/extras/android-translation/values-ru/strings.xml
index 0722c5870..d3a80b0f4 100644
--- a/extras/android-translation/values-ru/strings.xml
+++ b/extras/android-translation/values-ru/strings.xml
@@ -358,8 +358,6 @@
     	<string name="controller_settings_auto_fire_n_frequency">Частота/интервал турбо %d</string>
     	<string name="controller_binding_auto_fire_n">Турбо %d</string>
 	<string name="settings_category_cdrom">Настройки CD-ROM</string>
-        <string name="settings_cdrom_read_thread">Производить чтение в потоке (асинхронно)</string>
-        <string name="settings_summary_read_thread">Уменьшает задержки в эмуляции с помощью асинхронного чтения/распаковки данных диска в рабочем потоке.</string>
         <string name="settings_cdrom_load_image_patches">Применять патчи к образам</string>
         <string name="settings_summary_load_image_patches">Автоматически применять патчи к образам дисков при их наличии. В настоящее время поддерживается только формат PPF.</string>
         <string name="menu_edit_game_directories_force_saf">Вкл. Scoped Storage</string>
@@ -369,4 +367,5 @@
     	<string name="memory_card_editor_undelete_success">Восстановлено сохранение \'%s\'.</string>
     	<string name="memory_card_editor_undelete_failed">Не удалось восстановить сохранение \'%s\'. Данные могли быть частично перезаписаны.</string>
     	<string name="memory_card_editor_permanently_delete_confirm">Действительно удалить сохранение \'%s\' без возможности восстановления? Данное действие нельзя отменить.</string>
+    	<string name="settings_cdrom_readahead">Async Readahead</string>
 </resources>
diff --git a/extras/android-translation/values/arrays.xml b/extras/android-translation/values/arrays.xml
index a6d45f873..a55d74c23 100644
--- a/extras/android-translation/values/arrays.xml
+++ b/extras/android-translation/values/arrays.xml
@@ -530,4 +530,75 @@
         <item>9</item>
         <item>10</item>
     </string-array>
+    <string-array name="settings_cdrom_readahead_entries">
+        <item>Disabled (Synchronous)</item>
+        <item>1 Sector (7 KB / 2 ms)</item>
+        <item>2 Sectors (13 KB / 4 ms)</item>
+        <item>3 Sectors (20 KB / 6 ms)</item>
+        <item>4 Sectors (27 KB / 8 ms)</item>
+        <item>5 Sectors (33 KB / 10 ms)</item>
+        <item>6 Sectors (40 KB / 12 ms)</item>
+        <item>7 Sectors (47 KB / 14 ms)</item>
+        <item>8 Sectors (53 KB / 16 ms)</item>
+        <item>9 Sectors (60 KB / 18 ms)</item>
+        <item>10 Sectors (67 KB / 20 ms)</item>
+        <item>11 Sectors (73 KB / 22 ms)</item>
+        <item>12 Sectors (80 KB / 24 ms)</item>
+        <item>13 Sectors (87 KB / 26 ms)</item>
+        <item>14 Sectors (93 KB / 28 ms)</item>
+        <item>15 Sectors (100 KB / 30 ms)</item>
+        <item>16 Sectors (107 KB / 32 ms)</item>
+        <item>17 Sectors (113 KB / 34 ms)</item>
+        <item>18 Sectors (120 KB / 36 ms)</item>
+        <item>19 Sectors (127 KB / 38 ms)</item>
+        <item>20 Sectors (133 KB / 40 ms)</item>
+        <item>21 Sectors (140 KB / 42 ms)</item>
+        <item>22 Sectors (147 KB / 44 ms)</item>
+        <item>23 Sectors (153 KB / 46 ms)</item>
+        <item>24 Sectors (160 KB / 48 ms)</item>
+        <item>25 Sectors (167 KB / 50 ms)</item>
+        <item>26 Sectors (173 KB / 52 ms)</item>
+        <item>27 Sectors (180 KB / 54 ms)</item>
+        <item>28 Sectors (187 KB / 56 ms)</item>
+        <item>29 Sectors (193 KB / 58 ms)</item>
+        <item>30 Sectors (200 KB / 60 ms)</item>
+        <item>31 Sectors (207 KB / 62 ms)</item>
+        <item>32 Sectors (213 KB / 64 ms)</item>
+    </string-array>
+    <string-array name="settings_cdrom_readahead_values">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
+        <item>11</item>
+        <item>12</item>
+        <item>13</item>
+        <item>14</item>
+        <item>15</item>
+        <item>16</item>
+        <item>17</item>
+        <item>18</item>
+        <item>19</item>
+        <item>20</item>
+        <item>21</item>
+        <item>22</item>
+        <item>23</item>
+        <item>24</item>
+        <item>25</item>
+        <item>26</item>
+        <item>27</item>
+        <item>28</item>
+        <item>29</item>
+        <item>30</item>
+        <item>31</item>
+        <item>32</item>
+    </string-array>
 </resources>
+
diff --git a/extras/android-translation/values/strings.xml b/extras/android-translation/values/strings.xml
index c3cb45b51..624932ceb 100644
--- a/extras/android-translation/values/strings.xml
+++ b/extras/android-translation/values/strings.xml
@@ -80,7 +80,7 @@
     <string name="settings_summary_osd_show_vps">Shows the number of frames (or v-syncs) displayed per second by the system in the top-right corner of the display.</string>
     <string name="settings_cdrom_read_speedup">CD-ROM Read Speedup</string>
     <string name="settings_summary_cdrom_read_speedup">Speeds up CD-ROM reads by the specified factor. Only applies to double-speed reads, and is ignored when audio is playing. May improve loading speeds in some games, at the cost of breaking others.</string>
-    <string name="settings_summary_console_fast_boot">Skips the BIOS shell/intro, booting directly into the game. Usually safe to enable, but some games break.</string>
+    <string name="settings_summary_console_fast_boot">Skips the BIOS shell/intro, booting directly into the game.</string>
     <string name="settings_msaa">Multisample Antialiasing</string>
     <string name="settings_true_color">True Color Rendering (24-bit, disables dithering)</string>
     <string name="settings_summary_true_color">This produces nicer looking gradients at the cost of making some colours look slightly different. Disabling the option also enables dithering. Most games are compatible with this option.</string>
@@ -127,7 +127,7 @@
     <string name="android_progress_callback_no">No</string>
     <string name="emulation_activity_error">Error</string>
     <string name="emulation_activity_ok">OK</string>
-    <string name="emulation_activity_import_patch_codes">Import Patch Codes...</string>
+    <string name="emulation_activity_import_patch_codes">Import</string>
     <string name="emulation_activity_patch_on">(ON)</string>
     <string name="emulation_activity_patch_off">(OFF)</string>
     <string name="emulation_activity_choose_patch_code_file">Choose Patch Code File</string>
@@ -358,8 +358,6 @@
     <string name="controller_settings_auto_fire_n_frequency">Auto Fire %d Frequency/Interval</string>
     <string name="controller_binding_auto_fire_n">Auto Fire %d</string>
     <string name="settings_category_cdrom">CD-ROM Settings</string>
-    <string name="settings_cdrom_read_thread">Use Read Thread (Asynchronous)</string>
-    <string name="settings_summary_read_thread">Reduces hitches in emulation by reading/decompressing CD data asynchronously on a worker thread.</string>
     <string name="settings_cdrom_load_image_patches">Apply Image Patches</string>
     <string name="settings_summary_load_image_patches">Automatically applies patches to disc images when they are present, currently only PPF is supported.</string>
     <string name="menu_edit_game_directories_force_saf">Force Scoped Storage</string>
@@ -369,4 +367,24 @@
     <string name="memory_card_editor_undelete_success">Undeleted save \'%s\'.</string>
     <string name="memory_card_editor_undelete_failed">Failed to undelete save \'%s\'. The save may already be partially overwritten.</string>
     <string name="memory_card_editor_permanently_delete_confirm">Are you sure you want to permanently delete the save \'%s\'? You cannot recover the save afterwards.</string>
+    <string name="settings_cdrom_readahead">Async Readahead</string>
+    <string name="settings_category_rewinding">Rewinding</string>
+    <string name="settings_rewind_enable">Enable Rewinding</string>
+    <string name="settings_summary_rewind_enable">Enables rewinding via touchscreen button/hotkey. Very high hardware requirements, do not use on low end devices.</string>
+    <string name="settings_rewind_save_frequency">Save Frequency</string>
+    <string name="settings_summary_rewind_save_frequency">A rewind save will created each time this interval lapses.</string>
+    <string name="settings_rewind_save_count">Save Count</string>
+    <string name="settings_summary_rewind_save_count">This number of saves (or frames) will be kept for rewinding.</string>
+    <string name="emulation_activity_add_patch_code">Add</string>
+    <string name="emulation_activity_patch_code_warning">Using patch codes can have unpredictable effects on games, causing crashes, graphical glitches, and corrupted saves. By using patch codes, you agree that it is an unsupported configuration, and we will not provide you with any assistance when games break.\n\nSome codes persist through save states even after being disabled, please remember to reset/reboot the game after turning off any codes.\n\nAre you sure you want to continue?</string>
+    <string name="emulation_activity_patch_code_warning_dont_ask_again">Don\'t ask again</string>
+    <string name="add_patch_code_empty">Code name and body must not be empty.</string>
+    <string name="add_patch_code_success">Patch code \'%s\' added.</string>
+    <string name="add_patch_code_failure">Failed to add patch code, there may already be a code with this name, or the code is invalid.</string>
+    <string name="add_patch_code_help_text">Enter the patch code (usually a series of numbers) in Gameshark format below, or choose a file to import codes from.</string>
+    <string name="add_patch_code_code_name">Code Name</string>
+    <string name="add_patch_code_code_body">Code Body</string>
+    <string name="add_patch_code_import_from_file">Import From File</string>
+    <string name="add_patch_code_cancel">Cancel</string>
+    <string name="add_patch_code_add">Add</string>
 </resources>