Merge branch 'master' into android-core-control

Source/Android/res/values/arrays.xml

@@ -108,7 +108,19 @@
         <item>6</item>
         <item>7</item>
     </string-array>
-    
+
+    <!-- FSAA Preference -->
+    <string-array name="FSAAEntries" translatable="false">
+        <item>1x</item>
+        <item>2x</item>
+        <item>4x</item>
+    </string-array>
+    <string-array name="FSAAValues" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+
     <!-- Anisotropic Filtering Preference -->
     <string-array name="anisotropicFilteringEntries" translatable="false">
         <item>1x</item>

Source/Android/res/values/strings.xml

@@ -9,13 +9,12 @@
     <string name="drawer_close">Close navigation drawer</string>
 
     <!-- About Fragment -->
-    <string name="build_revision">Build Revision:</string>
-    <string name="supports_gles3">Supports OpenGL ES 3:</string>
+    <string name="build_revision">Build Revision</string>
+    <string name="supports_gles3">Supports OpenGL ES 3</string>
 
     <!-- Folder Browser -->
     <string name="current_dir">Current Dir: </string>
     <string name="parent_directory">Parent Directory</string>
-    <string name="folder">Folder</string>
     <string name="file_size">File Size: </string>
 
     <!-- Game List Activity -->
@@ -24,7 +23,6 @@
     <string name="game_list">Game List</string>
     <string name="browse_folder">Browse Folder</string>
     <string name="settings">Settings</string>
-    <string name="gamepad_config">Gamepad Config</string>
     <string name="about">About</string>
 
     <!-- Game List Fragment -->
@@ -44,7 +42,7 @@
     <!-- Input Config Fragment -->
     <string name="input_settings">Input</string>
     <string name="input_binding">Input Binding</string>
-    <string name="input_binding_descrip">Press or move an input to bind it to this control.</string>
+    <string name="input_binding_descrip">Press or move an input to bind it to %1$s.</string>
     <string name="button_a">Button A</string>
     <string name="button_b">Button B</string>
     <string name="button_start">Button Start</string>
@@ -65,7 +63,6 @@
     <string name="c_stick_right">C Stick Right</string>
     <string name="trigger_left">Trigger L</string>
     <string name="trigger_right">Trigger R</string>
-    <string name="press_button_to_config">Press button to configure %1$s</string>
 
     <!-- Preference Related -->
     <string name="interpreter">Interpreter</string>
@@ -77,6 +74,8 @@
     <string name="emu_core_to_use">Emulation core to use</string>
     <string name="dual_core">Dual Core</string>
     <string name="dual_core_descrip">Split workload to two CPU cores instead of one. Increases speed.</string>
+    <string name="fastmem">Fastmem</string>
+    <string name="fastmem_desc">Uses potentially unsafe optimizations for memory access.</string>
     <string name="video_settings">Video</string>
     <string name="software_renderer">Software Renderer</string>
     <string name="opengl_es3">OpenGL ES 3</string>
@@ -89,6 +88,8 @@
     <string name="enhancements">Enhancements</string>
     <string name="internal_resolution">Internal Resolution</string>
     <string name="internal_resolution_descrip">Specifies the resolution used to render at. A high resolution will improve visual quality a lot but is also quite heavy on performance and might cause glitches in certain games.</string>
+    <string name="FSAA">Full-scene Anti-aliasing</string>
+    <string name="FSAA_descrip">Reduces the amount of aliasing caused by rasterizing 3D graphics. This makes the rendered picture look less blocky. Heavily decreases emulation speed and sometimes causes issues.</string>
     <string name="anisotropic_filtering">Anisotropic Filtering</string>
     <string name="anisotropic_filtering_descrip">Enhances visual quality of textures that are at oblique viewing angles. Might cause issues in a small number of games.</string>
     <string name="scaled_efb_copy">Scaled EFB Copy</string>