Version 9.8.6

Update common-c for initial GFE 3.22 compatibility
Version 9.8.5
2026-02-16 10:31:07 +00:00 · 2021-04-09 19:35:02 -05:00 · 2021-04-09 19:32:39 -05:00 · 2021-04-03 12:39:02 -05:00 · 2021-04-03 12:00:53 -05:00 · 2021-04-03 11:59:57 -05:00
68 changed files with 1159 additions and 328 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,48 @@
+---
+name: Bug report
+about: Follow the troubleshooting guide before reporting a bug
+
+---
+**READ ME FIRST!**
+If you're here because something basic is not working (like gamepad input, video, or similar), it's probably something specific to your setup, so make sure you've gone through the Troubleshooting Guide first: https://github.com/moonlight-stream/moonlight-docs/wiki/Troubleshooting
+
+If you still have trouble with basic functionality after following the guide, join our Discord server where there are many other volunteers who can help (or direct you back here if it looks like a Moonlight bug after all). https://moonlight-stream.org/discord
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Steps to reproduce**
+Any special steps that are required for the bug to appear.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem. If the issue is related to video glitching or poor quality, please include screenshots.
+
+**Affected games**
+List the games you've tried that exhibit the issue. To see if the issue is game-specific, try streaming Steam Big Picture with Moonlight and see if the issue persists there.
+
+**Other Moonlight clients**
+- Does the issue occur when using Moonlight on PC or iOS?
+
+**Moonlight settings (please complete the following information)**
+- Have any settings been adjusted from defaults?
+- If so, which settings have been changed?
+- Does the problem still occur after reverting settings back to default?
+
+**Gamepad-related issues (please complete if problem is gamepad-related)**
+- Do you have any gamepads connected to your host PC directly?
+- If gamepad input is not working, does it work if you use Moonlight's on-screen controls?
+- Does the problem still remain if you stream the desktop and use https://html5gamepad.com to test your gamepad?
+  - Instructions for streaming the desktop can be found here: https://github.com/moonlight-stream/moonlight-docs/wiki/Setup-Guide
+
+**Device details (please complete the following information)**
+ - Android version: [e.g. Android 10]
+ - Device model: [e.g. Samsung Galaxy S21]
+
+**Server PC details (please complete the following information)**
+ - OS: [e.g. Windows 10 1809]
+ - GeForce Experience version: [e.g. 3.16.0.140]
+ - Nvidia GPU driver: [e.g. 417.35]
+ - Antivirus and firewall software: [e.g. Windows Defender and Windows Firewall]
+
+**Additional context**
+Anything else you think may be relevant to the issue or special about your specific setup.
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1 @@
+blank_issues_enabled: false
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +0,0 @@
-language: android
-dist: trusty
-
-git:
-  depth: 1
-
-android:
-  components:
-    - tools
-    - platform-tools
-    - build-tools-30.0.0
-    - android-30
-
-before_install:
-  - sdkmanager --list
-
-install:
-  - yes | sdkmanager "ndk;21.0.6113669"
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # Moonlight Android

-[![Travis CI Status](https://travis-ci.org/moonlight-stream/moonlight-android.svg?branch=master)](https://travis-ci.org/moonlight-stream/moonlight-android)
+[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/232a8tadrrn8jv0k/branch/master?svg=true)](https://ci.appveyor.com/project/cgutman/moonlight-android/branch/master)
+[![Translation Status](https://hosted.weblate.org/widgets/moonlight/-/moonlight-android/svg-badge.svg)](https://hosted.weblate.org/projects/moonlight/moonlight-android/)

 [Moonlight for Android](https://moonlight-stream.org) is an open source implementation of NVIDIA's GameStream, as used by the NVIDIA Shield.

@@ -9,7 +10,7 @@ whether in your own home or over the internet.

 Moonlight also has a [PC client](https://github.com/moonlight-stream/moonlight-qt) and [iOS/tvOS client](https://github.com/moonlight-stream/moonlight-ios).

-Check out [the Moonlight wiki](https://github.com/moonlight-stream/moonlight-docs/wiki) for more detailed project information, setup guide, or troubleshooting steps.
+You can follow development on our [Discord server](https://moonlight-stream.org/discord) and help translate Moonlight into your language on [Weblate](https://hosted.weblate.org/projects/moonlight/moonlight-android/).

 ## Downloads
 * [Google Play Store](https://play.google.com/store/apps/details?id=com.limelight)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,14 +1,16 @@
 apply plugin: 'com.android.application'

 android {
+    ndkVersion "22.1.7171670"
+
    compileSdkVersion 30

    defaultConfig {
        minSdkVersion 16
        targetSdkVersion 30

-        versionName "9.7.1"
-        versionCode = 241
+        versionName "9.8.6"
+        versionCode = 257
    }

    flavorDimensions "root"
@@ -65,7 +67,6 @@ android {
            applicationIdSuffix ".debug"

            minifyEnabled true
-            useProguard false
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
        release {
@@ -114,10 +115,10 @@ android {
 }

 dependencies {
-    implementation 'org.bouncycastle:bcprov-jdk15on:1.64'
-    implementation 'org.bouncycastle:bcpkix-jdk15on:1.64'
+    implementation 'org.bouncycastle:bcprov-jdk15on:1.66'
+    implementation 'org.bouncycastle:bcpkix-jdk15on:1.66'
    implementation 'org.jcodec:jcodec:0.2.3'
-    implementation 'com.squareup.okhttp3:okhttp:3.12.10'
+    implementation 'com.squareup.okhttp3:okhttp:3.12.12'
    implementation 'com.squareup.okio:okio:1.17.5'
    implementation 'org.jmdns:jmdns:3.5.5'
 }
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -64,6 +64,7 @@

        <activity
            android:name=".PcView"
+            android:exported="true"
            android:resizeableActivity="true"
            android:configChanges="mcc|mnc|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection">
            <intent-filter>
@@ -126,6 +127,15 @@
            <meta-data
                android:name="android.support.PARENT_ACTIVITY"
                android:value="com.limelight.AppView" />
+
+            <!-- Special metadata for NVIDIA Shield devices to prevent input buffering
+                 and most importantly, opt out of mouse acceleration while streaming -->
+            <meta-data
+                android:name="com.nvidia.immediateInput"
+                android:value="true" />
+            <meta-data
+                android:name="com.nvidia.rawCursorInput"
+                android:value="true" />
        </activity>

        <service
--- a/app/src/main/java/com/limelight/AppView.java
+++ b/app/src/main/java/com/limelight/AppView.java
@@ -113,7 +113,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                        return;
                    }

-                    appGridAdapter.updateHiddenApps(hiddenAppIds);
+                    appGridAdapter.updateHiddenApps(hiddenAppIds, true);

                    // Now make the binder visible. We must do this after appGridAdapter
                    // is set to prevent us from reaching updateUiWithServerinfo() and
@@ -314,7 +314,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                Service.BIND_AUTO_CREATE);
    }

-    private void updateHiddenApps() {
+    private void updateHiddenApps(boolean hideImmediately) {
        HashSet<String> hiddenAppIdStringSet = new HashSet<>();

        for (Integer hiddenAppId : hiddenAppIds) {
@@ -326,7 +326,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                .putStringSet(uuidString, hiddenAppIdStringSet)
                .apply();

-        appGridAdapter.updateHiddenApps(hiddenAppIds);
+        appGridAdapter.updateHiddenApps(hiddenAppIds, hideImmediately);
    }

    private void populateAppGridWithCache() {
@@ -386,9 +386,12 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
    @Override
    public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
        super.onCreateContextMenu(menu, v, menuInfo);
-        
+
        AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
        AppObject selectedApp = (AppObject) appGridAdapter.getItem(info.position);
+
+        menu.setHeaderTitle(selectedApp.app.getAppName());
+
        if (lastRunningAppId != 0) {
            if (lastRunningAppId == selectedApp.app.getAppId()) {
                menu.add(Menu.NONE, START_OR_RESUME_ID, 1, getResources().getString(R.string.applist_menu_resume));
@@ -481,7 +484,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                    // Transitioning shown to hidden
                    hiddenAppIds.add(app.app.getAppId());
                }
-                updateHiddenApps();
+                updateHiddenApps(false);
                return true;

            case CREATE_SHORTCUT_ID:
--- a/app/src/main/java/com/limelight/Game.java
+++ b/app/src/main/java/com/limelight/Game.java
@@ -598,6 +598,10 @@ public class Game extends Activity implements SurfaceHolder.Callback,
    public void onWindowFocusChanged(boolean hasFocus) {
        super.onWindowFocusChanged(hasFocus);

+        // We can't guarantee the state of modifiers keys which may have
+        // lifted while focus was not on us. Clear the modifier state.
+        this.modifierFlags = 0;
+
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
            // Capture is lost when focus is lost, so it must be requested again
            // when focus is regained.
@@ -630,6 +634,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
        // On M, we can explicitly set the optimal display mode
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
            Display.Mode bestMode = display.getMode();
+            boolean isNativeResolutionStream = PreferenceConfiguration.isNativeResolution(prefConfig.width, prefConfig.height);
            boolean refreshRateIsGood = isRefreshRateGoodMatch(bestMode.getRefreshRate());
            for (Display.Mode candidate : display.getSupportedModes()) {
                boolean refreshRateReduced = candidate.getRefreshRate() < bestMode.getRefreshRate();
@@ -641,14 +646,15 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                LimeLog.info("Examining display mode: "+candidate.getPhysicalWidth()+"x"+
                        candidate.getPhysicalHeight()+"x"+candidate.getRefreshRate());

-                if (candidate.getPhysicalWidth() > 4096) {
+                if (candidate.getPhysicalWidth() > 4096 && prefConfig.width <= 4096) {
                    // Avoid resolutions options above 4K to be safe
                    continue;
                }

                // On non-4K streams, we force the resolution to never change unless it's above
-                // 60 FPS, which may require a resolution reduction due to HDMI bandwidth limitations.
-                if (prefConfig.width < 3840 && prefConfig.fps <= 60) {
+                // 60 FPS, which may require a resolution reduction due to HDMI bandwidth limitations,
+                // or it's a native resolution stream.
+                if (prefConfig.width < 3840 && prefConfig.fps <= 60 && !isNativeResolutionStream) {
                    if (display.getMode().getPhysicalWidth() != candidate.getPhysicalWidth() ||
                            display.getMode().getPhysicalHeight() != candidate.getPhysicalHeight()) {
                        continue;
@@ -994,8 +1000,14 @@ public class Game extends Activity implements SurfaceHolder.Callback,
        return false;
    }

-    private static byte getModifierState(KeyEvent event) {
-        byte modifier = 0;
+    // We cannot simply use modifierFlags for all key event processing, because
+    // some IMEs will not generate real key events for pressing Shift. Instead
+    // they will simply send key events with isShiftPressed() returning true,
+    // and we will need to send the modifier flag ourselves.
+    private byte getModifierState(KeyEvent event) {
+        // Start with the global modifier state to ensure we cover the case
+        // detailed in https://github.com/moonlight-stream/moonlight-android/issues/840
+        byte modifier = getModifierState();
        if (event.isShiftPressed()) {
            modifier |= KeyboardPacket.MODIFIER_SHIFT;
        }
@@ -1076,7 +1088,6 @@ public class Game extends Activity implements SurfaceHolder.Callback,
            byte modifiers = getModifierState(event);
            if (KeyboardTranslator.needsShift(event.getKeyCode())) {
                modifiers |= KeyboardPacket.MODIFIER_SHIFT;
-                conn.sendKeyboardInput((short) 0x8010, KeyboardPacket.KEY_DOWN, modifiers);
            }
            conn.sendKeyboardInput(translated, KeyboardPacket.KEY_DOWN, modifiers);
        }
@@ -1142,9 +1153,6 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                modifiers |= KeyboardPacket.MODIFIER_SHIFT;
            }
            conn.sendKeyboardInput(translated, KeyboardPacket.KEY_UP, modifiers);
-            if (KeyboardTranslator.needsShift(event.getKeyCode())) {
-                conn.sendKeyboardInput((short) 0x8010, KeyboardPacket.KEY_UP, getModifierState(event));
-            }
        }

        return true;
@@ -1185,6 +1193,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
        {
            // This case is for mice and non-finger touch devices
            if (event.getSource() == InputDevice.SOURCE_MOUSE ||
+                    event.getSource() == InputDevice.SOURCE_TOUCHPAD ||
                    event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE ||
                    (event.getPointerCount() >= 1 &&
                            (event.getToolType(0) == MotionEvent.TOOL_TYPE_MOUSE ||
@@ -1549,11 +1558,16 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                    }

                    String dialogText = getResources().getString(R.string.conn_error_msg) + " " + stage +" (error "+errorCode+")";
+
+                    if (portFlags != 0) {
+                        dialogText += "\n\n" + getResources().getString(R.string.check_ports_msg) + "\n" +
+                                MoonBridge.stringifyPortFlags(portFlags, "\n");
+                    }
+
                    if (portTestResult != MoonBridge.ML_TEST_RESULT_INCONCLUSIVE && portTestResult != 0)  {
                        dialogText += "\n\n" + getResources().getString(R.string.nettest_text_blocked);
                    }

-
                    Dialog.displayDialog(Game.this, getResources().getString(R.string.conn_error_title), dialogText, true);
                }
            }
@@ -1564,8 +1578,8 @@ public class Game extends Activity implements SurfaceHolder.Callback,
    public void connectionTerminated(final int errorCode) {
        // Perform a connection test if the failure could be due to a blocked port
        // This does network I/O, so don't do it on the main thread.
-        final int portTestResult = MoonBridge.testClientConnectivity(ServerHelper.CONNECTION_TEST_SERVER,
-                443, MoonBridge.getPortFlagsFromTerminationErrorCode(errorCode));
+        final int portFlags = MoonBridge.getPortFlagsFromTerminationErrorCode(errorCode);
+        final int portTestResult = MoonBridge.testClientConnectivity(ServerHelper.CONNECTION_TEST_SERVER,443, portFlags);

        runOnUiThread(new Runnable() {
            @Override
@@ -1596,12 +1610,26 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                                    message = getResources().getString(R.string.no_video_received_error);
                                    break;

+                                case MoonBridge.ML_ERROR_NO_VIDEO_FRAME:
+                                    message = getResources().getString(R.string.no_frame_received_error);
+                                    break;
+
+                                case MoonBridge.ML_ERROR_UNEXPECTED_EARLY_TERMINATION:
+                                case MoonBridge.ML_ERROR_PROTECTED_CONTENT:
+                                    message = getResources().getString(R.string.early_termination_error);
+                                    break;
+
                                default:
                                    message = getResources().getString(R.string.conn_terminated_msg);
                                    break;
                            }
                        }

+                        if (portFlags != 0) {
+                            message += "\n\n" + getResources().getString(R.string.check_ports_msg) + "\n" +
+                                    MoonBridge.stringifyPortFlags(portFlags, "\n");
+                        }
+
                        Dialog.displayDialog(Game.this, getResources().getString(R.string.conn_terminated_title),
                                message, true);
                    }
--- a/app/src/main/java/com/limelight/PcView.java
+++ b/app/src/main/java/com/limelight/PcView.java
@@ -109,7 +109,6 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
        }
    }

-    private final static int APP_LIST_ID = 1;
    private final static int PAIR_ID = 2;
    private final static int UNPAIR_ID = 3;
    private final static int WOL_ID = 4;
@@ -318,6 +317,25 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
        AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
        ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(info.position);

+        // Add a header with PC status details
+        menu.clearHeader();
+        String headerTitle = computer.details.name + " - ";
+        switch (computer.details.state)
+        {
+            case ONLINE:
+                headerTitle += getResources().getString(R.string.pcview_menu_header_online);
+                break;
+            case OFFLINE:
+                menu.setHeaderIcon(R.drawable.ic_pc_offline);
+                headerTitle += getResources().getString(R.string.pcview_menu_header_offline);
+                break;
+            case UNKNOWN:
+                headerTitle += getResources().getString(R.string.pcview_menu_header_unknown);
+                break;
+        }
+
+        menu.setHeaderTitle(headerTitle);
+
        // Inflate the context menu
        if (computer.details.state == ComputerDetails.State.OFFLINE ||
            computer.details.state == ComputerDetails.State.UNKNOWN) {
@@ -332,8 +350,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                menu.add(Menu.NONE, QUIT_ID, 2, getResources().getString(R.string.applist_menu_quit));
            }

-            menu.add(Menu.NONE, APP_LIST_ID, 3, getResources().getString(R.string.pcview_menu_app_list));
-            menu.add(Menu.NONE, FULL_APP_LIST_ID, 4, getResources().getString(R.string.pcview_menu_full_app_list));
+            menu.add(Menu.NONE, FULL_APP_LIST_ID, 4, getResources().getString(R.string.pcview_menu_app_list));
        }

        menu.add(Menu.NONE, TEST_NETWORK_ID, 5, getResources().getString(R.string.pcview_menu_test_network));
@@ -594,8 +611,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                return true;

            case FULL_APP_LIST_ID:
-            case APP_LIST_ID:
-                doAppList(computer.details, false, item.getItemId() == FULL_APP_LIST_ID);
+                doAppList(computer.details, false, true);
                return true;

            case RESUME_ID:
--- a/app/src/main/java/com/limelight/binding/input/ControllerHandler.java
+++ b/app/src/main/java/com/limelight/binding/input/ControllerHandler.java
@@ -40,6 +40,12 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD

    private static final int MINIMUM_BUTTON_DOWN_TIME_MS = 25;

+    private static final int EMULATING_SPECIAL = 0x1;
+    private static final int EMULATING_SELECT = 0x2;
+
+    private static final int EMULATED_SPECIAL_UP_DELAY_MS = 100;
+    private static final int EMULATED_SELECT_UP_DELAY_MS = 30;
+
    private final Vector2d inputVector = new Vector2d();

    private final SparseArray<InputDeviceContext> inputDeviceContexts = new SparseArray<>();
@@ -101,6 +107,8 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
        defaultContext.rightStickDeadzoneRadius = (float) stickDeadzone;
        defaultContext.leftTriggerAxis = MotionEvent.AXIS_BRAKE;
        defaultContext.rightTriggerAxis = MotionEvent.AXIS_GAS;
+        defaultContext.hatXAxis = MotionEvent.AXIS_HAT_X;
+        defaultContext.hatYAxis = MotionEvent.AXIS_HAT_Y;
        defaultContext.controllerNumber = (short) 0;
        defaultContext.assignedControllerNumber = true;
        defaultContext.external = false;
@@ -188,6 +196,28 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
            return true;
        }

+        // HACK for https://issuetracker.google.com/issues/163120692
+        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.R) {
+            if (device.getId() == -1) {
+                // This "virtual" device could be input from any of the attached devices.
+                // Look to see if any gamepads are connected.
+                int[] ids = InputDevice.getDeviceIds();
+                for (int id : ids) {
+                    InputDevice dev = InputDevice.getDevice(id);
+                    if (dev == null) {
+                        // This device was removed during enumeration
+                        continue;
+                    }
+
+                    // If there are any gamepad devices connected, we'll
+                    // report that this virtual device is a gamepad.
+                    if (hasJoystickAxes(dev) || hasGamepadButtons(dev)) {
+                        return true;
+                    }
+                }
+            }
+        }
+
        // Otherwise, we'll try anything that claims to be a non-alphabetic keyboard
        return device.getKeyboardType() != InputDevice.KEYBOARD_TYPE_ALPHABETIC;
    }
@@ -461,6 +491,14 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
            context.vibrator = dev.getVibrator();
        }

+        // Detect if the gamepad has Mode and Select buttons according to the Android key layouts.
+        // We do this first because other codepaths below may override these defaults.
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            boolean[] buttons = dev.hasKeys(KeyEvent.KEYCODE_BUTTON_MODE, KeyEvent.KEYCODE_BUTTON_SELECT, KeyEvent.KEYCODE_BACK, 0);
+            context.hasMode = buttons[0];
+            context.hasSelect = buttons[1] || buttons[2];
+        }
+
        context.leftStickXAxis = MotionEvent.AXIS_X;
        context.leftStickYAxis = MotionEvent.AXIS_Y;
        if (getMotionRangeForJoystickAxis(dev, context.leftStickXAxis) != null &&
@@ -519,6 +557,10 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
                    // The old DS4 driver uses RX and RY for triggers
                    context.leftTriggerAxis = MotionEvent.AXIS_RX;
                    context.rightTriggerAxis = MotionEvent.AXIS_RY;
+
+                    // DS4 has Select and Mode buttons (possibly mapped non-standard)
+                    context.hasSelect = true;
+                    context.hasMode = true;
                }
                else {
                    // If it's not a non-standard DS4 controller, it's probably an Xbox controller or
@@ -600,6 +642,8 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
                context.backIsStart = true;
                context.modeIsSelect = true;
                context.triggerDeadzone = 0.30f;
+                context.hasSelect = true;
+                context.hasMode = false;
            }
        }

@@ -617,6 +661,8 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
                    if (!hasStartKey[0] && !hasStartKey[1]) {
                        context.backIsStart = true;
                        context.modeIsSelect = true;
+                        context.hasSelect = true;
+                        context.hasMode = false;
                    }
                }

@@ -625,14 +671,26 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
                context.triggerDeadzone = 0.30f;
            }
            // SHIELD controllers will use small stick deadzones
-            else if (devName.contains("SHIELD")) {
+            else if (devName.contains("SHIELD") || devName.contains("NVIDIA Controller")) {
                context.leftStickDeadzoneRadius = 0.07f;
                context.rightStickDeadzoneRadius = 0.07f;
+
+                // The big Nvidia button on the Shield controllers acts like a Search button. It
+                // summons the Google Assistant on the Shield TV. On my Pixel 4, it seems to do
+                // nothing, so we can hijack it to act like a mode button.
+                if (devName.contains("NVIDIA Controller v01.03") || devName.contains("NVIDIA Controller v01.04")) {
+                    context.searchIsMode = true;
+                    context.hasMode = true;
+                }
            }
            // The Serval has a couple of unknown buttons that are start and select. It also has
            // a back button which we want to ignore since there's already a select button.
            else if (devName.contains("Razer Serval")) {
                context.isServal = true;
+
+                // Serval has Select and Mode buttons (possibly mapped non-standard)
+                context.hasMode = true;
+                context.hasSelect = true;
            }
            // The Xbox One S Bluetooth controller has some mappings that need fixing up.
            // However, Microsoft released a firmware update with no change to VID/PID
@@ -643,6 +701,10 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
            else if (devName.equals("Xbox Wireless Controller")) {
                if (gasRange == null) {
                    context.isNonStandardXboxBtController = true;
+
+                    // Xbox One S has Select and Mode buttons (possibly mapped non-standard)
+                    context.hasMode = true;
+                    context.hasSelect = true;
                }
            }
        }
@@ -665,6 +727,13 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
            return null;
        }

+        // HACK for https://issuetracker.google.com/issues/163120692
+        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.R) {
+            if (event.getDeviceId() == -1) {
+                return defaultContext;
+            }
+        }
+
        // Return the existing context if it exists
        InputDeviceContext context = inputDeviceContexts.get(event.getDeviceId());
        if (context != null) {
@@ -826,7 +895,10 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
            return KeyEvent.KEYCODE_BUTTON_MODE;
        }

-        if ((context.vendorId == 0x057e && context.productId == 0x2009) || // Switch Pro controller
+        // This mapping was adding in Android 10, then changed based on
+        // kernel changes (adding hid-nintendo) in Android 11. If we're
+        // on anything newer than Pie, just use the built-in mapping.
+        if ((context.vendorId == 0x057e && context.productId == 0x2009 && Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) || // Switch Pro controller
                (context.vendorId == 0x0f0d && context.productId == 0x00c1)) { // HORIPAD for Switch
            switch (event.getScanCode()) {
                case 0x130:
@@ -1018,6 +1090,10 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
            // Emulate the select button with mode
            return KeyEvent.KEYCODE_BUTTON_SELECT;
        }
+        else if (context.searchIsMode && keyCode == KeyEvent.KEYCODE_SEARCH) {
+            // Emulate the mode button with search
+            return KeyEvent.KEYCODE_BUTTON_MODE;
+        }

        return keyCode;
    }
@@ -1416,6 +1492,41 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
            return false;
        }

+        // Check if we're emulating the select button
+        if ((context.emulatingButtonFlags & ControllerHandler.EMULATING_SELECT) != 0)
+        {
+            // If either start or LB is up, select comes up too
+            if ((context.inputMap & ControllerPacket.PLAY_FLAG) == 0 ||
+                (context.inputMap & ControllerPacket.LB_FLAG) == 0)
+            {
+                context.inputMap &= ~ControllerPacket.BACK_FLAG;
+
+                context.emulatingButtonFlags &= ~ControllerHandler.EMULATING_SELECT;
+
+                try {
+                    Thread.sleep(EMULATED_SELECT_UP_DELAY_MS);
+                } catch (InterruptedException ignored) {}
+            }
+        }
+
+        // Check if we're emulating the special button
+        if ((context.emulatingButtonFlags & ControllerHandler.EMULATING_SPECIAL) != 0)
+        {
+            // If either start or select and RB is up, the special button comes up too
+            if ((context.inputMap & ControllerPacket.PLAY_FLAG) == 0 ||
+                ((context.inputMap & ControllerPacket.BACK_FLAG) == 0 &&
+                 (context.inputMap & ControllerPacket.RB_FLAG) == 0))
+            {
+                context.inputMap &= ~ControllerPacket.SPECIAL_BUTTON_FLAG;
+
+                context.emulatingButtonFlags &= ~ControllerHandler.EMULATING_SPECIAL;
+
+                try {
+                    Thread.sleep(EMULATED_SPECIAL_UP_DELAY_MS);
+                } catch (InterruptedException ignored) {}
+            }
+        }
+
        sendControllerInputPacket(context);

        if (context.pendingExit && context.inputMap == 0) {
@@ -1444,6 +1555,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD

        switch (keyCode) {
        case KeyEvent.KEYCODE_BUTTON_MODE:
+            context.hasMode = true;
            context.inputMap |= ControllerPacket.SPECIAL_BUTTON_FLAG;
            break;
        case KeyEvent.KEYCODE_BUTTON_START:
@@ -1455,6 +1567,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
            break;
        case KeyEvent.KEYCODE_BACK:
        case KeyEvent.KEYCODE_BUTTON_SELECT:
+            context.hasSelect = true;
            context.inputMap |= ControllerPacket.BACK_FLAG;
            break;
        case KeyEvent.KEYCODE_DPAD_LEFT:
@@ -1535,6 +1648,43 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
            context.pendingExit = true;
        }

+        // Start+LB acts like select for controllers with one button
+        if (!context.hasSelect) {
+            if (context.inputMap == (ControllerPacket.PLAY_FLAG | ControllerPacket.LB_FLAG) ||
+                    (context.inputMap == ControllerPacket.PLAY_FLAG &&
+                            SystemClock.uptimeMillis() - context.lastLbUpTime <= MAXIMUM_BUMPER_UP_DELAY_MS))
+            {
+                context.inputMap &= ~(ControllerPacket.PLAY_FLAG | ControllerPacket.LB_FLAG);
+                context.inputMap |= ControllerPacket.BACK_FLAG;
+
+                context.emulatingButtonFlags |= ControllerHandler.EMULATING_SELECT;
+            }
+        }
+
+        // If there is a physical select button, we'll use Start+Select as the special button combo
+        // otherwise we'll use Start+RB.
+        if (!context.hasMode) {
+            if (context.hasSelect) {
+                if (context.inputMap == (ControllerPacket.PLAY_FLAG | ControllerPacket.BACK_FLAG)) {
+                    context.inputMap &= ~(ControllerPacket.PLAY_FLAG | ControllerPacket.BACK_FLAG);
+                    context.inputMap |= ControllerPacket.SPECIAL_BUTTON_FLAG;
+
+                    context.emulatingButtonFlags |= ControllerHandler.EMULATING_SPECIAL;
+                }
+            }
+            else {
+                if (context.inputMap == (ControllerPacket.PLAY_FLAG | ControllerPacket.RB_FLAG) ||
+                        (context.inputMap == ControllerPacket.PLAY_FLAG &&
+                                SystemClock.uptimeMillis() - context.lastRbUpTime <= MAXIMUM_BUMPER_UP_DELAY_MS))
+                {
+                    context.inputMap &= ~(ControllerPacket.PLAY_FLAG | ControllerPacket.RB_FLAG);
+                    context.inputMap |= ControllerPacket.SPECIAL_BUTTON_FLAG;
+
+                    context.emulatingButtonFlags |= ControllerHandler.EMULATING_SPECIAL;
+                }
+            }
+        }
+
        // We don't need to send repeat key down events, but the platform
        // sends us events that claim to be repeats but they're from different
        // devices, so we just send them all and deal with some duplicates.
@@ -1676,10 +1826,15 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
        public boolean isServal;
        public boolean backIsStart;
        public boolean modeIsSelect;
+        public boolean searchIsMode;
        public boolean ignoreBack;
        public boolean hasJoystickAxes;
        public boolean pendingExit;

+        public int emulatingButtonFlags = 0;
+        public boolean hasSelect;
+        public boolean hasMode;
+
        // Used for OUYA bumper state tracking since they force all buttons
        // up when the OUYA button goes down. We watch the last time we get
        // a bumper up and compare that to our maximum delay when we receive
--- a/app/src/main/java/com/limelight/binding/input/capture/AndroidNativePointerCaptureProvider.java
+++ b/app/src/main/java/com/limelight/binding/input/capture/AndroidNativePointerCaptureProvider.java
@@ -38,23 +38,31 @@ public class AndroidNativePointerCaptureProvider extends AndroidPointerIconCaptu

    @Override
    public boolean eventHasRelativeMouseAxes(MotionEvent event) {
-        return event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE;
+        // SOURCE_MOUSE_RELATIVE is how SOURCE_MOUSE appears when our view has pointer capture.
+        // SOURCE_TOUCHPAD will have relative axes populated iff our view has pointer capture.
+        // See https://developer.android.com/reference/android/view/View#requestPointerCapture()
+        return event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE ||
+                (event.getSource() == InputDevice.SOURCE_TOUCHPAD && targetView.hasPointerCapture());
    }

    @Override
    public float getRelativeAxisX(MotionEvent event) {
-        float x = event.getX();
+        int axis = (event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE) ?
+                MotionEvent.AXIS_X : MotionEvent.AXIS_RELATIVE_X;
+        float x = event.getAxisValue(axis);
        for (int i = 0; i < event.getHistorySize(); i++) {
-            x += event.getHistoricalX(i);
+            x += event.getHistoricalAxisValue(axis, i);
        }
        return x;
    }

    @Override
    public float getRelativeAxisY(MotionEvent event) {
-        float y = event.getY();
+        int axis = (event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE) ?
+                MotionEvent.AXIS_Y : MotionEvent.AXIS_RELATIVE_Y;
+        float y = event.getAxisValue(axis);
        for (int i = 0; i < event.getHistorySize(); i++) {
-            y += event.getHistoricalY(i);
+            y += event.getHistoricalAxisValue(axis, i);
        }
        return y;
    }
--- a/app/src/main/java/com/limelight/binding/input/driver/Xbox360Controller.java
+++ b/app/src/main/java/com/limelight/binding/input/driver/Xbox360Controller.java
@@ -26,6 +26,7 @@ public class Xbox360Controller extends AbstractXboxController {
            0x0f0d, // Hori
            0x1038, // SteelSeries
            0x11c9, // Nacon
+            0x1209, // Ardwiino
            0x12ab, // Unknown
            0x1430, // RedOctane
            0x146b, // BigBen
@@ -33,8 +34,11 @@ public class Xbox360Controller extends AbstractXboxController {
            0x15e4, // Numark
            0x162e, // Joytech
            0x1689, // Razer Onza
+            0x1949, // Lab126 (Amazon Luna)
            0x1bad, // Harmonix
+            0x20d6, // PowerA
            0x24c6, // PowerA
+            0x2f24, // GameSir
    };

    public static boolean canClaimDevice(UsbDevice device) {
@@ -66,8 +70,8 @@ public class Xbox360Controller extends AbstractXboxController {

    @Override
    protected boolean handleRead(ByteBuffer buffer) {
-        if (buffer.limit() < 14) {
-            LimeLog.severe("Read too small: "+buffer.limit());
+        if (buffer.remaining() < 14) {
+            LimeLog.severe("Read too small: "+buffer.remaining());
            return false;
        }

--- a/app/src/main/java/com/limelight/binding/input/driver/XboxOneController.java
+++ b/app/src/main/java/com/limelight/binding/input/driver/XboxOneController.java
@@ -21,7 +21,9 @@ public class XboxOneController extends AbstractXboxController {
            0x0e6f, // Unknown
            0x0f0d, // Hori
            0x1532, // Razer Wildcat
+            0x20d6, // PowerA
            0x24c6, // PowerA
+            0x2e24, // Hyperkin
    };

    private static final byte[] FW2015_INIT = {0x05, 0x20, 0x00, 0x01, 0x00};
@@ -101,11 +103,21 @@ public class XboxOneController extends AbstractXboxController {
        switch (buffer.get())
        {
            case 0x20:
+                if (buffer.remaining() < 17) {
+                    LimeLog.severe("XBone button/axis read too small: "+buffer.remaining());
+                    return false;
+                }
+
                buffer.position(buffer.position()+3);
                processButtons(buffer);
                return true;

            case 0x07:
+                if (buffer.remaining() < 4) {
+                    LimeLog.severe("XBone mode read too small: "+buffer.remaining());
+                    return false;
+                }
+
                // The Xbox One S controller needs acks for mode reports otherwise
                // it retransmits them forever.
                if (buffer.get() == 0x30) {
--- a/app/src/main/java/com/limelight/binding/input/touch/RelativeTouchContext.java
+++ b/app/src/main/java/com/limelight/binding/input/touch/RelativeTouchContext.java
@@ -18,9 +18,12 @@ public class RelativeTouchContext implements TouchContext {
    private boolean cancelled;
    private boolean confirmedMove;
    private boolean confirmedDrag;
+    private boolean confirmedScroll;
    private Timer dragTimer;
    private double distanceMoved;
    private double xFactor, yFactor;
+    private int pointerCount;
+    private int maxPointerCountInGesture;

    private final NvConnection conn;
    private final int actionIndex;
@@ -33,6 +36,8 @@ public class RelativeTouchContext implements TouchContext {
    private static final int TAP_TIME_THRESHOLD = 250;
    private static final int DRAG_TIME_THRESHOLD = 650;

+    private static final int SCROLL_SPEED_DIVISOR = 20;
+
    public RelativeTouchContext(NvConnection conn, int actionIndex,
                                int referenceWidth, int referenceHeight, View view)
    {
@@ -59,8 +64,18 @@ public class RelativeTouchContext implements TouchContext {

    private boolean isTap()
    {
-        long timeDelta = SystemClock.uptimeMillis() - originalTouchTime;
+        if (confirmedDrag || confirmedMove || confirmedScroll) {
+            return false;
+        }

+        // If this input wasn't the last finger down, do not report
+        // a tap. This ensures we don't report duplicate taps for each
+        // finger on a multi-finger tap gesture
+        if (actionIndex + 1 != maxPointerCountInGesture) {
+            return false;
+        }
+
+        long timeDelta = SystemClock.uptimeMillis() - originalTouchTime;
        return isWithinTapBounds(lastTouchX, lastTouchY) && timeDelta <= TAP_TIME_THRESHOLD;
    }

@@ -83,13 +98,17 @@ public class RelativeTouchContext implements TouchContext {

        originalTouchX = lastTouchX = eventX;
        originalTouchY = lastTouchY = eventY;
-        originalTouchTime = SystemClock.uptimeMillis();
-        cancelled = confirmedDrag = confirmedMove = false;
-        distanceMoved = 0;

-        if (actionIndex == 0) {
-            // Start the timer for engaging a drag
-            startDragTimer();
+        if (isNewFinger) {
+            maxPointerCountInGesture = pointerCount;
+            originalTouchTime = SystemClock.uptimeMillis();
+            cancelled = confirmedDrag = confirmedMove = confirmedScroll = false;
+            distanceMoved = 0;
+
+            if (actionIndex == 0) {
+                // Start the timer for engaging a drag
+                startDragTimer();
+            }
        }

        return true;
@@ -128,6 +147,9 @@ public class RelativeTouchContext implements TouchContext {
    }

    private synchronized void startDragTimer() {
+        // Cancel any existing drag timers
+        cancelDragTimer();
+
        dragTimer = new Timer(true);
        dragTimer.schedule(new TimerTask() {
            @Override
@@ -183,21 +205,33 @@ public class RelativeTouchContext implements TouchContext {
        }
    }

+    private void checkForConfirmedScroll() {
+        // Enter scrolling mode if we've already left the tap zone
+        // and we have 2 fingers on screen. Leave scroll mode if
+        // we no longer have 2 fingers on screen
+        confirmedScroll = (actionIndex == 0 && pointerCount == 2 && confirmedMove);
+    }
+
    @Override
    public boolean touchMoveEvent(int eventX, int eventY)
    {
+        if (cancelled) {
+            return true;
+        }
+
        if (eventX != lastTouchX || eventY != lastTouchY)
        {
+            checkForConfirmedMove(eventX, eventY);
+            checkForConfirmedScroll();
+
            // We only send moves and drags for the primary touch point
            if (actionIndex == 0) {
-                checkForConfirmedMove(eventX, eventY);
-
                int deltaX = eventX - lastTouchX;
                int deltaY = eventY - lastTouchY;

                // Scale the deltas based on the factors passed to our constructor
-                deltaX = (int)Math.round((double)Math.abs(deltaX) * xFactor);
-                deltaY = (int)Math.round((double)Math.abs(deltaY) * yFactor);
+                deltaX = (int) Math.round((double) Math.abs(deltaX) * xFactor);
+                deltaY = (int) Math.round((double) Math.abs(deltaY) * yFactor);

                // Fix up the signs
                if (eventX < lastTouchX) {
@@ -207,6 +241,16 @@ public class RelativeTouchContext implements TouchContext {
                    deltaY = -deltaY;
                }

+                if (pointerCount == 2) {
+                    if (confirmedScroll) {
+                        deltaY /= SCROLL_SPEED_DIVISOR;
+
+                        conn.sendMouseHighResScroll((short) deltaY);
+                    }
+                } else {
+                    conn.sendMouseMove((short) deltaX, (short) deltaY);
+                }
+
                // If the scaling factor ended up rounding deltas to zero, wait until they are
                // non-zero to update lastTouch that way devices that report small touch events often
                // will work correctly
@@ -216,8 +260,6 @@ public class RelativeTouchContext implements TouchContext {
                if (deltaY != 0) {
                    lastTouchY = eventY;
                }
-
-                conn.sendMouseMove((short)deltaX, (short)deltaY);
            }
            else {
                lastTouchX = eventX;
@@ -247,5 +289,11 @@ public class RelativeTouchContext implements TouchContext {
    }

    @Override
-    public void setPointerCount(int pointerCount) {}
+    public void setPointerCount(int pointerCount) {
+        this.pointerCount = pointerCount;
+
+        if (pointerCount > maxPointerCountInGesture) {
+            maxPointerCountInGesture = pointerCount;
+        }
+    }
 }
--- a/app/src/main/java/com/limelight/binding/input/virtual_controller/AnalogStick.java
+++ b/app/src/main/java/com/limelight/binding/input/virtual_controller/AnalogStick.java
@@ -8,6 +8,7 @@ import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
+import android.os.SystemClock;
 import android.view.MotionEvent;

 import java.util.ArrayList;
@@ -270,7 +271,7 @@ public class AnalogStick extends VirtualControllerElement {
        // We also release the deadzone if the user keeps the stick pressed for a bit to allow
        // them to make precise movements.
        stick_state = (stick_state == STICK_STATE.MOVED_ACTIVE ||
-                System.currentTimeMillis() - timeLastClick > timeoutDeadzone ||
+                SystemClock.uptimeMillis() - timeLastClick > timeoutDeadzone ||
                movement_radius > radius_dead_zone) ?
                STICK_STATE.MOVED_ACTIVE : STICK_STATE.MOVED_IN_DEAD_ZONE;

@@ -311,7 +312,7 @@ public class AnalogStick extends VirtualControllerElement {
                stick_state = STICK_STATE.MOVED_IN_DEAD_ZONE;
                // check for double click
                if (lastClickState == CLICK_STATE.SINGLE &&
-                        timeLastClick + timeoutDoubleClick > System.currentTimeMillis()) {
+                        timeLastClick + timeoutDoubleClick > SystemClock.uptimeMillis()) {
                    click_state = CLICK_STATE.DOUBLE;
                    notifyOnDoubleClick();
                } else {
@@ -319,7 +320,7 @@ public class AnalogStick extends VirtualControllerElement {
                    notifyOnClick();
                }
                // reset last click timestamp
-                timeLastClick = System.currentTimeMillis();
+                timeLastClick = SystemClock.uptimeMillis();
                // set item pressed and update
                setPressed(true);
                break;
--- a/app/src/main/java/com/limelight/binding/input/virtual_controller/DigitalButton.java
+++ b/app/src/main/java/com/limelight/binding/input/virtual_controller/DigitalButton.java
@@ -177,6 +177,15 @@ public class DigitalButton extends VirtualControllerElement {
            listener.onClick();
        }

+        if (timerLongClick != null) {
+            timerLongClick.cancel();
+            timerLongClick = null;
+        }
+        if (longClickTimerTask != null) {
+            longClickTimerTask.cancel();
+            longClickTimerTask = null;
+        }
+
        timerLongClick = new Timer();
        longClickTimerTask = new TimerLongClickTimerTask();
        timerLongClick.schedule(longClickTimerTask, timerLongClickTimeout);
@@ -200,9 +209,11 @@ public class DigitalButton extends VirtualControllerElement {
        // We may be called for a release without a prior click
        if (timerLongClick != null) {
            timerLongClick.cancel();
+            timerLongClick = null;
        }
        if (longClickTimerTask != null) {
            longClickTimerTask.cancel();
+            longClickTimerTask = null;
        }
    }

--- a/app/src/main/java/com/limelight/binding/video/MediaCodecDecoderRenderer.java
+++ b/app/src/main/java/com/limelight/binding/video/MediaCodecDecoderRenderer.java
@@ -20,6 +20,7 @@ import android.media.MediaFormat;
 import android.media.MediaCodec.BufferInfo;
 import android.media.MediaCodec.CodecException;
 import android.os.Build;
+import android.os.SystemClock;
 import android.util.Range;
 import android.view.SurfaceHolder;

@@ -109,8 +110,10 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
            if (!MediaCodecHelper.decoderIsWhitelistedForHevc(decoderInfo.getName(), meteredNetwork)) {
                LimeLog.info("Found HEVC decoder, but it's not whitelisted - "+decoderInfo.getName());

-                // HDR implies HEVC forced on, since HEVCMain10HDR10 is required for HDR
-                if (prefs.videoFormat == PreferenceConfiguration.FORCE_H265_ON || requestedHdr) {
+                // HDR implies HEVC forced on, since HEVCMain10HDR10 is required for HDR.
+                // > 4K streaming also requires HEVC, so force it on there too.
+                if (prefs.videoFormat == PreferenceConfiguration.FORCE_H265_ON || requestedHdr ||
+                        prefs.width > 4096 || prefs.height > 4096) {
                    LimeLog.info("Forcing H265 enabled despite non-whitelisted decoder");
                }
                else {
@@ -249,6 +252,11 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
                return -1;
            }

+            if (width > 4096 || height > 4096) {
+                LimeLog.severe("> 4K streaming only supported on HEVC");
+                return -1;
+            }
+
            // These fixups only apply to H264 decoders
            needsSpsBitstreamFixup = MediaCodecHelper.decoderNeedsSpsBitstreamRestrictions(selectedDecoderName);
            needsBaselineSpsHack = MediaCodecHelper.decoderNeedsBaselineSpsHack(selectedDecoderName);
@@ -410,7 +418,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
            //
            if (initialException != null) {
                // This isn't the first time we've had an exception processing video
-                if (System.currentTimeMillis() - initialExceptionTimestamp >= EXCEPTION_REPORT_DELAY_MS) {
+                if (SystemClock.uptimeMillis() - initialExceptionTimestamp >= EXCEPTION_REPORT_DELAY_MS) {
                    // It's been over 3 seconds and we're still getting exceptions. Throw the original now.
                    if (!reportedCrash) {
                        reportedCrash = true;
@@ -427,7 +435,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
                else {
                    initialException = new RendererException(this, e);
                }
-                initialExceptionTimestamp = System.currentTimeMillis();
+                initialExceptionTimestamp = SystemClock.uptimeMillis();
            }
        }
    }
@@ -630,14 +638,14 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
    @SuppressWarnings("deprecation")
    @Override
    public int submitDecodeUnit(byte[] decodeUnitData, int decodeUnitLength, int decodeUnitType,
-                                int frameNumber, long receiveTimeMs) {
+                                int frameNumber, long receiveTimeMs, long enqueueTimeMs) {
        if (stopping) {
            // Don't bother if we're stopping
            return MoonBridge.DR_OK;
        }

        if (lastFrameNumber == 0) {
-            activeWindowVideoStats.measurementStartTimestamp = System.currentTimeMillis();
+            activeWindowVideoStats.measurementStartTimestamp = SystemClock.uptimeMillis();
        } else if (frameNumber != lastFrameNumber && frameNumber != lastFrameNumber + 1) {
            // We can receive the same "frame" multiple times if it's an IDR frame.
            // In that case, each frame start NALU is submitted independently.
@@ -649,7 +657,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
        lastFrameNumber = frameNumber;

        // Flip stats windows roughly every second
-        if (System.currentTimeMillis() >= activeWindowVideoStats.measurementStartTimestamp + 1000) {
+        if (SystemClock.uptimeMillis() >= activeWindowVideoStats.measurementStartTimestamp + 1000) {
            if (prefs.enablePerfOverlay) {
                VideoStats lastTwo = new VideoStats();
                lastTwo.add(lastWindowVideoStats);
@@ -682,7 +690,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
            globalVideoStats.add(activeWindowVideoStats);
            lastWindowVideoStats.copy(activeWindowVideoStats);
            activeWindowVideoStats.clear();
-            activeWindowVideoStats.measurementStartTimestamp = System.currentTimeMillis();
+            activeWindowVideoStats.measurementStartTimestamp = SystemClock.uptimeMillis();
        }

        activeWindowVideoStats.totalFramesReceived++;
@@ -691,11 +699,13 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
        int inputBufferIndex;
        ByteBuffer buf;

-        long timestampUs = System.nanoTime() / 1000;
+        long timestampUs = enqueueTimeMs * 1000;

        if (!FRAME_RENDER_TIME_ONLY) {
-            // Count time from first packet received to decode start
-            activeWindowVideoStats.totalTimeMs += (timestampUs / 1000) - receiveTimeMs;
+            // Count time from first packet received to enqueue time as receive time
+            // We will count DU queue time as part of decoding, because it is directly
+            // caused by a slow decoder.
+            activeWindowVideoStats.totalTimeMs += enqueueTimeMs - receiveTimeMs;
        }

        if (timestampUs <= lastTimestampUs) {
--- a/app/src/main/java/com/limelight/binding/video/MediaCodecHelper.java
+++ b/app/src/main/java/com/limelight/binding/video/MediaCodecHelper.java
@@ -40,6 +40,8 @@ public class MediaCodecHelper {
    private static final List<String> blacklisted59FpsDecoderPrefixes;
    private static final List<String> qualcommDecoderPrefixes;

+    public static final boolean IS_EMULATOR = Build.HARDWARE.equals("ranchu") || Build.HARDWARE.equals("cheets");
+
    private static boolean isLowEndSnapdragon = false;
    private static boolean isAdreno620 = false;
    private static boolean initialized = false;
@@ -78,7 +80,7 @@ public class MediaCodecHelper {

        // Blacklist software decoders that don't support H264 high profile,
        // but exclude the official AOSP and CrOS emulator from this restriction.
-        if (!Build.HARDWARE.equals("ranchu") && !Build.HARDWARE.equals("cheets")) {
+        if (!IS_EMULATOR) {
            blacklistedDecoderPrefixes.add("omx.google");
            blacklistedDecoderPrefixes.add("AVCDecoder");
        }
@@ -124,7 +126,7 @@ public class MediaCodecHelper {
        whitelistedHevcDecoders = new LinkedList<>();

        // Allow software HEVC decoding in the official AOSP emulator
-        if (Build.HARDWARE.equals("ranchu") && Build.BRAND.equals("google")) {
+        if (Build.HARDWARE.equals("ranchu")) {
            whitelistedHevcDecoders.add("omx.google");
        }

@@ -153,9 +155,15 @@ public class MediaCodecHelper {
            whitelistedHevcDecoders.add("omx.mtk");
        }

+        // Amlogic requires 1 reference frame for HEVC to avoid hanging. Since it's been years
+        // since GFE added support for maxNumReferenceFrames, we'll just enable all Amlogic SoCs
+        // running Android 9 or later. HEVC is much lower latency than H.264 on Sabrina (S905X2).
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            whitelistedHevcDecoders.add("omx.amlogic");
+        }
+
        // These theoretically have good HEVC decoding capabilities (potentially better than
        // their AVC decoders), but haven't been tested enough
-        //whitelistedHevcDecoders.add("omx.amlogic");
        //whitelistedHevcDecoders.add("omx.rk");

        // Let's see if HEVC decoders are finally stable with C2
@@ -580,7 +588,7 @@ public class MediaCodecHelper {
    private static boolean isCodecBlacklisted(MediaCodecInfo codecInfo) {
        // Use the new isSoftwareOnly() function on Android Q
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            if (codecInfo.isSoftwareOnly()) {
+            if (!IS_EMULATOR && codecInfo.isSoftwareOnly()) {
                LimeLog.info("Skipping software-only decoder: "+codecInfo.getName());
                return true;
            }
--- a/app/src/main/java/com/limelight/binding/video/VideoStats.java
+++ b/app/src/main/java/com/limelight/binding/video/VideoStats.java
@@ -1,5 +1,7 @@
 package com.limelight.binding.video;

+import android.os.SystemClock;
+
 class VideoStats {

    long decoderTimeMs;
@@ -24,7 +26,7 @@ class VideoStats {
            this.measurementStartTimestamp = other.measurementStartTimestamp;
        }

-        assert other.measurementStartTimestamp <= this.measurementStartTimestamp;
+        assert other.measurementStartTimestamp >= this.measurementStartTimestamp;
    }

    void copy(VideoStats other) {
@@ -50,7 +52,7 @@ class VideoStats {
    }

    VideoStatsFps getFps() {
-        float elapsed = (System.currentTimeMillis() - this.measurementStartTimestamp) / (float) 1000;
+        float elapsed = (SystemClock.uptimeMillis() - this.measurementStartTimestamp) / (float) 1000;

        VideoStatsFps fps = new VideoStatsFps();
        if (elapsed > 0) {
--- a/app/src/main/java/com/limelight/computers/ComputerManagerService.java
+++ b/app/src/main/java/com/limelight/computers/ComputerManagerService.java
@@ -4,8 +4,10 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.io.StringReader;
 import java.net.Inet4Address;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Socket;
+import java.net.UnknownHostException;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
@@ -38,6 +40,7 @@ import android.net.NetworkCapabilities;
 import android.os.Binder;
 import android.os.Build;
 import android.os.IBinder;
+import android.os.SystemClock;

 import org.xmlpull.v1.XmlPullParserException;

@@ -134,6 +137,18 @@ public class ComputerManagerService extends Service {
                dbManager.updateComputer(existingComputer);
            }
            else {
+                try {
+                    // If the active address is a site-local address (RFC 1918),
+                    // then use STUN to populate the external address field if
+                    // it's not set already.
+                    if (details.remoteAddress == null) {
+                        InetAddress addr = InetAddress.getByName(details.activeAddress);
+                        if (addr.isSiteLocalAddress()) {
+                            populateExternalAddress(details);
+                        }
+                    }
+                } catch (UnknownHostException ignored) {}
+
                dbManager.updateComputer(details);
            }
        }
@@ -162,7 +177,7 @@ public class ComputerManagerService extends Service {
                                LimeLog.warning(tuple.computer.name + " is offline (try " + offlineCount + ")");
                                offlineCount++;
                            } else {
-                                tuple.lastSuccessfulPollMs = System.currentTimeMillis();
+                                tuple.lastSuccessfulPollMs = SystemClock.elapsedRealtime();
                                offlineCount = 0;
                            }
                        }
@@ -193,7 +208,7 @@ public class ComputerManagerService extends Service {
            synchronized (pollingTuples) {
                for (PollingTuple tuple : pollingTuples) {
                    // Enforce the poll data TTL
-                    if (System.currentTimeMillis() - tuple.lastSuccessfulPollMs > POLL_DATA_TTL_MS) {
+                    if (SystemClock.elapsedRealtime() - tuple.lastSuccessfulPollMs > POLL_DATA_TTL_MS) {
                        LimeLog.info("Timing out polled state for "+tuple.computer.name);
                        tuple.computer.state = ComputerDetails.State.UNKNOWN;
                    }
--- a/app/src/main/java/com/limelight/grid/AppGridAdapter.java
+++ b/app/src/main/java/com/limelight/grid/AppGridAdapter.java
@@ -48,19 +48,28 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
        updateLayoutWithPreferences(context, prefs);
    }

-    public void updateHiddenApps(Set<Integer> newHiddenAppIds) {
+    public void updateHiddenApps(Set<Integer> newHiddenAppIds, boolean hideImmediately) {
        this.hiddenAppIds.clear();
        this.hiddenAppIds.addAll(newHiddenAppIds);

-        // Reconstruct the itemList with the new hidden app set
-        itemList.clear();
-        for (AppView.AppObject app : allApps) {
-            app.isHidden = hiddenAppIds.contains(app.app.getAppId());
+        if (hideImmediately) {
+            // Reconstruct the itemList with the new hidden app set
+            itemList.clear();
+            for (AppView.AppObject app : allApps) {
+                app.isHidden = hiddenAppIds.contains(app.app.getAppId());

-            if (!app.isHidden || showHiddenApps) {
-                itemList.add(app);
+                if (!app.isHidden || showHiddenApps) {
+                    itemList.add(app);
+                }
            }
        }
+        else {
+            // Just update the isHidden state to show the correct UI indication
+            for (AppView.AppObject app : allApps) {
+                app.isHidden = hiddenAppIds.contains(app.app.getAppId());
+            }
+        }
+
        notifyDataSetChanged();
    }

--- a/app/src/main/java/com/limelight/nvstream/NvConnection.java
+++ b/app/src/main/java/com/limelight/nvstream/NvConnection.java
@@ -115,7 +115,17 @@ public class NvConnection {
        //
        
        // Check for a supported stream resolution
-        if (context.streamConfig.getHeight() >= 2160 && !h.supports4K(serverInfo)) {
+        if ((context.streamConfig.getWidth() > 4096 || context.streamConfig.getHeight() > 4096) &&
+                (h.getServerCodecModeSupport(serverInfo) & 0x200) == 0) {
+            context.connListener.displayMessage("Your host PC does not support streaming at resolutions above 4K.");
+            return false;
+        }
+        else if ((context.streamConfig.getWidth() > 4096 || context.streamConfig.getHeight() > 4096) &&
+                !context.streamConfig.getHevcSupported()) {
+            context.connListener.displayMessage("Your streaming device must support H.265 to stream at resolutions above 4K.");
+            return false;
+        }
+        else if (context.streamConfig.getHeight() >= 2160 && !h.supports4K(serverInfo)) {
            // Client wants 4K but the server can't do it
            context.connListener.displayTransientMessage("You must update GeForce Experience to stream in 4K. The stream will be 1080p.");
            
--- a/app/src/main/java/com/limelight/nvstream/av/video/VideoDecoderRenderer.java
+++ b/app/src/main/java/com/limelight/nvstream/av/video/VideoDecoderRenderer.java
@@ -10,7 +10,7 @@ public abstract class VideoDecoderRenderer {
    // This is called once for each frame-start NALU. This means it will be called several times
    // for an IDR frame which contains several parameter sets and the I-frame data.
    public abstract int submitDecodeUnit(byte[] decodeUnitData, int decodeUnitLength, int decodeUnitType,
-                                         int frameNumber, long receiveTimeMs);
+                                         int frameNumber, long receiveTimeMs, long enqueueTimeMs);
    
    public abstract void cleanup();

--- a/app/src/main/java/com/limelight/nvstream/http/NvHTTP.java
+++ b/app/src/main/java/com/limelight/nvstream/http/NvHTTP.java
@@ -227,7 +227,7 @@ public class NvHTTP {
                break;
            case (XmlPullParser.TEXT):
                if (currentTag.peek().equals(tagname)) {
-                    return xpp.getText().trim();
+                    return xpp.getText();
                }
                break;
            }
@@ -557,11 +557,11 @@ public class NvHTTP {
            case (XmlPullParser.TEXT):
                NvApp app = appList.getLast();
                if (currentTag.peek().equals("AppTitle")) {
-                    app.setAppName(xpp.getText().trim());
+                    app.setAppName(xpp.getText());
                } else if (currentTag.peek().equals("ID")) {
-                    app.setAppId(xpp.getText().trim());
+                    app.setAppId(xpp.getText());
                } else if (currentTag.peek().equals("IsHdrSupported")) {
-                    app.setHdrSupported(xpp.getText().trim().equals("1"));
+                    app.setHdrSupported(xpp.getText().equals("1"));
                }
                break;
            }
--- a/app/src/main/java/com/limelight/nvstream/jni/MoonBridge.java
+++ b/app/src/main/java/com/limelight/nvstream/jni/MoonBridge.java
@@ -35,6 +35,9 @@ public class MoonBridge {

    public static final int ML_ERROR_GRACEFUL_TERMINATION = 0;
    public static final int ML_ERROR_NO_VIDEO_TRAFFIC = -100;
+    public static final int ML_ERROR_NO_VIDEO_FRAME = -101;
+    public static final int ML_ERROR_UNEXPECTED_EARLY_TERMINATION = -102;
+    public static final int ML_ERROR_PROTECTED_CONTENT = -103;

    public static final int ML_PORT_INDEX_TCP_47984 = 0;
    public static final int ML_PORT_INDEX_TCP_47989 = 1;
@@ -147,11 +150,11 @@ public class MoonBridge {
    }

    public static int bridgeDrSubmitDecodeUnit(byte[] decodeUnitData, int decodeUnitLength,
-                                               int decodeUnitType,
-                                               int frameNumber, long receiveTimeMs) {
+                                               int decodeUnitType, int frameNumber,
+                                               long receiveTimeMs, long enqueueTimeMs) {
        if (videoRenderer != null) {
            return videoRenderer.submitDecodeUnit(decodeUnitData, decodeUnitLength,
-                    decodeUnitType, frameNumber, receiveTimeMs);
+                    decodeUnitType, frameNumber, receiveTimeMs, enqueueTimeMs);
        }
        else {
            return DR_OK;
@@ -292,13 +295,11 @@ public class MoonBridge {

    public static native int testClientConnectivity(String testServerHostName, int referencePort, int testFlags);

-    public static native int getPortFromPortFlagIndex(int portFlagIndex);
-
-    public static native String getProtocolFromPortFlagIndex(int portFlagIndex);
-
    public static native int getPortFlagsFromStage(int stage);

    public static native int getPortFlagsFromTerminationErrorCode(int errorCode);

+    public static native String stringifyPortFlags(int portFlags, String separator);
+
    public static native void init();
 }
--- a/app/src/main/java/com/limelight/preferences/PreferenceConfiguration.java
+++ b/app/src/main/java/com/limelight/preferences/PreferenceConfiguration.java
@@ -83,6 +83,7 @@ public class PreferenceConfiguration {
    public static final String RES_1080P = "1920x1080";
    public static final String RES_1440P = "2560x1440";
    public static final String RES_4K = "3840x2160";
+    public static final String RES_NATIVE = "Native";

    public int width, height, fps;
    public int bitrate;
@@ -108,6 +109,30 @@ public class PreferenceConfiguration {
    public boolean touchscreenTrackpad;
    public MoonBridge.AudioConfiguration audioConfiguration;

+    public static boolean isNativeResolution(int width, int height) {
+        // It's not a native resolution if it matches an existing resolution option
+        if (width == 640 && height == 360) {
+            return false;
+        }
+        else if (width == 854 && height == 480) {
+            return false;
+        }
+        else if (width == 1280 && height == 720) {
+            return false;
+        }
+        else if (width == 1920 && height == 1080) {
+            return false;
+        }
+        else if (width == 2560 && height == 1440) {
+            return false;
+        }
+        else if (width == 3840 && height == 2160) {
+            return false;
+        }
+
+        return true;
+    }
+
    private static String convertFromLegacyResolutionString(String resString) {
        if (resString.equalsIgnoreCase("360p")) {
            return RES_360P;
--- a/app/src/main/java/com/limelight/preferences/SeekBarPreference.java
+++ b/app/src/main/java/com/limelight/preferences/SeekBarPreference.java
@@ -14,6 +14,8 @@ import android.widget.LinearLayout;
 import android.widget.SeekBar;
 import android.widget.TextView;

+import java.util.Locale;
+
 // Based on a Stack Overflow example: http://stackoverflow.com/questions/1974193/slider-on-my-preferencescreen
 public class SeekBarPreference extends DialogPreference
 {
@@ -30,6 +32,8 @@ public class SeekBarPreference extends DialogPreference
    private final int maxValue;
    private final int minValue;
    private final int stepSize;
+    private final int keyStepSize;
+    private final int divisor;
    private int currentValue;

    public SeekBarPreference(Context context, AttributeSet attrs) {
@@ -59,6 +63,8 @@ public class SeekBarPreference extends DialogPreference
        maxValue = attrs.getAttributeIntValue(ANDROID_SCHEMA_URL, "max", 100);
        minValue = attrs.getAttributeIntValue(SEEKBAR_SCHEMA_URL, "min", 1);
        stepSize = attrs.getAttributeIntValue(SEEKBAR_SCHEMA_URL, "step", 1);
+        divisor = attrs.getAttributeIntValue(SEEKBAR_SCHEMA_URL, "divisor", 1);
+        keyStepSize = attrs.getAttributeIntValue(SEEKBAR_SCHEMA_URL, "keyStep", 0);
    }

    @Override
@@ -101,7 +107,14 @@ public class SeekBarPreference extends DialogPreference
                    return;
                }

-                String t = String.valueOf(value);
+                String t;
+                if (divisor != 1) {
+                    float floatValue = roundedValue / (float)divisor;
+                    t = String.format((Locale)null, "%.1f", floatValue);
+                }
+                else {
+                    t = String.valueOf(value);
+                }
                valueText.setText(suffix == null ? t : t.concat(suffix.length() > 1 ? " "+suffix : suffix));
            }

@@ -119,6 +132,9 @@ public class SeekBarPreference extends DialogPreference
        }

        seekBar.setMax(maxValue);
+        if (keyStepSize != 0) {
+            seekBar.setKeyProgressIncrement(keyStepSize);
+        }
        seekBar.setProgress(currentValue);

        return layout;
@@ -128,6 +144,9 @@ public class SeekBarPreference extends DialogPreference
    protected void onBindDialogView(View v) {
        super.onBindDialogView(v);
        seekBar.setMax(maxValue);
+        if (keyStepSize != 0) {
+            seekBar.setKeyProgressIncrement(keyStepSize);
+        }
        seekBar.setProgress(currentValue);
    }

--- a/app/src/main/java/com/limelight/preferences/StreamSettings.java
+++ b/app/src/main/java/com/limelight/preferences/StreamSettings.java
@@ -25,8 +25,11 @@ import com.limelight.LimeLog;
 import com.limelight.PcView;
 import com.limelight.R;
 import com.limelight.binding.video.MediaCodecHelper;
+import com.limelight.utils.Dialog;
 import com.limelight.utils.UiHelper;

+import java.util.Arrays;
+
 public class StreamSettings extends Activity {
    private PreferenceConfiguration previousPrefs;

@@ -65,6 +68,7 @@ public class StreamSettings extends Activity {
    }

    public static class SettingsFragment extends PreferenceFragment {
+        private int nativeResolutionStartIndex = Integer.MAX_VALUE;

        private void setValue(String preferenceKey, String value) {
            ListPreference pref = (ListPreference) findPreference(preferenceKey);
@@ -72,6 +76,37 @@ public class StreamSettings extends Activity {
            pref.setValue(value);
        }

+        private void addNativeResolutionEntry(int nativeWidth, int nativeHeight) {
+            ListPreference pref = (ListPreference) findPreference(PreferenceConfiguration.RESOLUTION_PREF_STRING);
+
+            String newName = getResources().getString(R.string.resolution_prefix_native) + " ("+nativeWidth+"x"+nativeHeight+")";
+            String newValue = nativeWidth+"x"+nativeHeight;
+
+            CharSequence[] values = pref.getEntryValues();
+
+            // Check if the native resolution is already present
+            for (CharSequence value : values) {
+                if (newValue.equals(value.toString())) {
+                    // It is present in the default list, so don't add it again
+                    return;
+                }
+            }
+
+            CharSequence[] newEntries = Arrays.copyOf(pref.getEntries(), pref.getEntries().length + 1);
+            CharSequence[] newValues = Arrays.copyOf(values, values.length + 1);
+
+            // Add the new native option
+            newEntries[newEntries.length - 1] = newName;
+            newValues[newValues.length - 1] = newValue;
+
+            pref.setEntries(newEntries);
+            pref.setEntryValues(newValues);
+
+            if (newValues.length - 1 < nativeResolutionStartIndex) {
+                nativeResolutionStartIndex = newValues.length - 1;
+            }
+        }
+
        private void removeValue(String preferenceKey, String value, Runnable onMatched) {
            int matchingCount = 0;

@@ -108,8 +143,6 @@ public class StreamSettings extends Activity {
            pref.setEntryValues(entryValues);
        }

-
-
        private void resetBitrateToDefault(SharedPreferences prefs, String res, String fps) {
            if (res == null) {
                res = prefs.getString(PreferenceConfiguration.RESOLUTION_PREF_STRING, PreferenceConfiguration.DEFAULT_RESOLUTION);
@@ -200,6 +233,8 @@ public class StreamSettings extends Activity {
                    int width = Math.max(candidate.getPhysicalWidth(), candidate.getPhysicalHeight());
                    int height = Math.min(candidate.getPhysicalWidth(), candidate.getPhysicalHeight());

+                    addNativeResolutionEntry(width, height);
+
                    if ((width >= 3840 || height >= 2160) && maxSupportedResW < 3840) {
                        maxSupportedResW = 3840;
                    }
@@ -299,6 +334,12 @@ public class StreamSettings extends Activity {
                    // Never remove 720p
                }
            }
+            else {
+                Display display = getActivity().getWindowManager().getDefaultDisplay();
+                int width = Math.max(display.getWidth(), display.getHeight());
+                int height = Math.min(display.getWidth(), display.getHeight());
+                addNativeResolutionEntry(width, height);
+            }

            if (!PreferenceConfiguration.readPreferences(this.getActivity()).unlockFps) {
                // We give some extra room in case the FPS is rounded down
@@ -408,6 +449,25 @@ public class StreamSettings extends Activity {
                    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(SettingsFragment.this.getActivity());
                    String valueStr = (String) newValue;

+                    // Detect if this value is the native resolution option
+                    CharSequence[] values = ((ListPreference)preference).getEntryValues();
+                    boolean isNativeRes = true;
+                    for (int i = 0; i < values.length; i++) {
+                        // Look for a match prior to the start of the native resolution entries
+                        if (valueStr.equals(values[i].toString()) && i < nativeResolutionStartIndex) {
+                            isNativeRes = false;
+                            break;
+                        }
+                    }
+
+                    // If this is native resolution, show the warning dialog
+                    if (isNativeRes) {
+                        Dialog.displayDialog(getActivity(),
+                                getResources().getString(R.string.title_native_res_dialog),
+                                getResources().getString(R.string.text_native_res_dialog),
+                                false);
+                    }
+
                    // Write the new bitrate value
                    resetBitrateToDefault(prefs, valueStr, null);

--- a/app/src/main/java/com/limelight/utils/ServerHelper.java
+++ b/app/src/main/java/com/limelight/utils/ServerHelper.java
@@ -101,11 +101,7 @@ public class ServerHelper {
                }
                else {
                    dialogSummary = parent.getResources().getString(R.string.nettest_text_failure);
-                    for (int i = 0; i < 32; i++) {
-                        if ((ret & (1 << i)) != 0) {
-                            dialogSummary += MoonBridge.getProtocolFromPortFlagIndex(i) + " " + MoonBridge.getPortFromPortFlagIndex(i) + "\n";
-                        }
-                    }
+                    dialogSummary += MoonBridge.stringifyPortFlags(ret, "\n");
                }

                Dialog.displayDialog(parent,
--- a/app/src/main/java/com/limelight/utils/TvChannelHelper.java
+++ b/app/src/main/java/com/limelight/utils/TvChannelHelper.java
@@ -77,8 +77,18 @@ public class TvChannelHelper {
                return;
            }

-            Uri channelUri = context.getContentResolver().insert(
-                    TvContract.Channels.CONTENT_URI, builder.toContentValues());
+            Uri channelUri;
+
+            try {
+                channelUri = context.getContentResolver().insert(
+                        TvContract.Channels.CONTENT_URI, builder.toContentValues());
+            } catch (IllegalArgumentException e) {
+                // This can happen on HarmonyOS devices which report to
+                // support Leanback APIs, yet don't implement this URI
+                e.printStackTrace();
+                return;
+            }
+
            if (channelUri != null) {
                long id = ContentUris.parseId(channelUri);
                updateChannelIcon(id);
@@ -144,8 +154,15 @@ public class TvChannelHelper {
                return;
            }

-            context.getContentResolver().insert(TvContract.PreviewPrograms.CONTENT_URI,
-                    builder.toContentValues());
+            try {
+                context.getContentResolver().insert(TvContract.PreviewPrograms.CONTENT_URI,
+                        builder.toContentValues());
+            } catch (IllegalArgumentException e) {
+                // This can happen on HarmonyOS devices which report to
+                // support Leanback APIs, yet don't implement this URI
+                e.printStackTrace();
+                return;
+            }

            TvContract.requestChannelBrowsable(context, channelId);
        }
--- a/app/src/main/jni/moonlight-core/callbacks.c
+++ b/app/src/main/jni/moonlight-core/callbacks.c
@@ -79,7 +79,7 @@ Java_com_limelight_nvstream_jni_MoonBridge_init(JNIEnv *env, jclass clazz) {
    BridgeDrStartMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeDrStart", "()V");
    BridgeDrStopMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeDrStop", "()V");
    BridgeDrCleanupMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeDrCleanup", "()V");
-    BridgeDrSubmitDecodeUnitMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeDrSubmitDecodeUnit", "([BIIIJ)I");
+    BridgeDrSubmitDecodeUnitMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeDrSubmitDecodeUnit", "([BIIIJJ)I");
    BridgeArInitMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeArInit", "(III)I");
    BridgeArStartMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeArStart", "()V");
    BridgeArStopMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeArStop", "()V");
@@ -157,7 +157,8 @@ int BridgeDrSubmitDecodeUnit(PDECODE_UNIT decodeUnit) {

            ret = (*env)->CallStaticIntMethod(env, GlobalBridgeClass, BridgeDrSubmitDecodeUnitMethod,
                                              DecodedFrameBuffer, currentEntry->length, currentEntry->bufferType,
-                                              decodeUnit->frameNumber, (jlong)decodeUnit->receiveTimeMs);
+                                              decodeUnit->frameNumber, (jlong)decodeUnit->receiveTimeMs,
+                                              (jlong)decodeUnit->enqueueTimeMs);
            if ((*env)->ExceptionCheck(env)) {
                // We will crash here
                (*JVM)->DetachCurrentThread(JVM);
@@ -178,7 +179,7 @@ int BridgeDrSubmitDecodeUnit(PDECODE_UNIT decodeUnit) {
    ret = (*env)->CallStaticIntMethod(env, GlobalBridgeClass, BridgeDrSubmitDecodeUnitMethod,
                                       DecodedFrameBuffer, offset, BUFFER_TYPE_PICDATA,
                                       decodeUnit->frameNumber,
-                                       (jlong)decodeUnit->receiveTimeMs);
+                                       (jlong)decodeUnit->receiveTimeMs, (jlong)decodeUnit->enqueueTimeMs);
    if ((*env)->ExceptionCheck(env)) {
        // We will crash here
        (*JVM)->DetachCurrentThread(JVM);
--- a/app/src/main/jni/moonlight-core/moonlight-common-c
+++ b/app/src/main/jni/moonlight-core/moonlight-common-c
--- a/app/src/main/jni/moonlight-core/simplejni.c
+++ b/app/src/main/jni/moonlight-core/simplejni.c
@@ -115,17 +115,6 @@ Java_com_limelight_nvstream_jni_MoonBridge_testClientConnectivity(JNIEnv *env, j
    return ret;
 }

-JNIEXPORT jint JNICALL
-Java_com_limelight_nvstream_jni_MoonBridge_getPortFromPortFlagIndex(JNIEnv *env, jclass clazz, jint portFlagIndex) {
-    return LiGetPortFromPortFlagIndex(portFlagIndex);
-}
-
-JNIEXPORT jstring JNICALL
-Java_com_limelight_nvstream_jni_MoonBridge_getProtocolFromPortFlagIndex(JNIEnv *env, jclass clazz, jint portFlagIndex) {
-    int protocol = LiGetProtocolFromPortFlagIndex(portFlagIndex);
-    return (*env)->NewStringUTF(env, protocol == IPPROTO_TCP ? "TCP" : "UDP");
-}
-
 JNIEXPORT jint JNICALL
 Java_com_limelight_nvstream_jni_MoonBridge_getPortFlagsFromStage(JNIEnv *env, jclass clazz, jint stage) {
    return LiGetPortFlagsFromStage(stage);
@@ -134,4 +123,15 @@ Java_com_limelight_nvstream_jni_MoonBridge_getPortFlagsFromStage(JNIEnv *env, jc
 JNIEXPORT jint JNICALL
 Java_com_limelight_nvstream_jni_MoonBridge_getPortFlagsFromTerminationErrorCode(JNIEnv *env, jclass clazz, jint errorCode) {
    return LiGetPortFlagsFromTerminationErrorCode(errorCode);
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_limelight_nvstream_jni_MoonBridge_stringifyPortFlags(JNIEnv *env, jclass clazz, jint portFlags, jstring separator) {
+    const char* separatorStr = (*env)->GetStringUTFChars(env, separator, NULL);
+    char outputBuffer[512];
+
+    LiStringifyPortFlags(portFlags, separatorStr, outputBuffer, sizeof(outputBuffer));
+
+    (*env)->ReleaseStringUTFChars(env, separator, separatorStr);
+    return (*env)->NewStringUTF(env, outputBuffer);
 }
--- a/app/src/main/res/values-ckb/strings.xml
+++ b/app/src/main/res/values-ckb/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,188 +1,225 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
+    <string name="app_label" translatable="false">Moonlight</string>
+    <string name="app_label_root" translatable="false">Moonlight (Root)</string>
    <!-- Shortcut strings -->
-    <string name="scut_deleted_pc">PC gelöscht</string>
-    <string name="scut_not_paired">PC nicht verbunden</string>
-    <string name="scut_pc_not_found">PC nicht gefunden</string>
-    <string name="scut_invalid_uuid">Angegebener PC ist unzulässig</string>
+    <string name="scut_deleted_pc">Host gelöscht</string>
+    <string name="scut_not_paired">Host nicht gekoppelt</string>
+    <string name="scut_pc_not_found">Host nicht gefunden</string>
+    <string name="scut_invalid_uuid">Angegebener Host ist ungültig</string>
    <string name="scut_invalid_app_id">Angegebene App ist unzulässig</string>
-
    <!-- Help strings -->
    <string name="help_loading_title">Hilfsanzeige</string>
-    <string name="help_loading_msg">Lade Hilfesanzeige…</string>
-
+    <string name="help_loading_msg">Hilfe wird geladen…</string>
    <!-- PC view menu entries -->
-    <string name="pcview_menu_app_list">Spiele List anzeigen</string>
-    <string name="pcview_menu_pair_pc">Mit PC verbinden</string>
-    <string name="pcview_menu_unpair_pc">Verbindung beenden</string>
+    <string name="pcview_menu_app_list">Alle Apps anzeigen</string>
+    <string name="pcview_menu_pair_pc">Mit Host koppeln</string>
+    <string name="pcview_menu_unpair_pc">Kopplung trennen</string>
    <string name="pcview_menu_send_wol">Wake-On-LAN Anfrage senden</string>
-    <string name="pcview_menu_delete_pc">PC löschen</string>
+    <string name="pcview_menu_delete_pc">Host löschen</string>
+    <string name="pcview_menu_test_network">Netzwerkverbindung testen</string>
    <string name="pcview_menu_details">Details anzeigen</string>
-
+    <!-- Network test strings -->
+    <string name="nettest_title_waiting">Netzwerkverbindung wird getestet</string>
+    <string name="nettest_text_waiting">Moonlight testet Ihre Netzwerkverbindung, um festzustellen, ob NVIDIA GameStream blockiert ist.
+\n
+\nDies kann einige Sekunden dauern…</string>
+    <string name="nettest_title_done">Netzwerktest abgeschlossen</string>
+    <string name="nettest_text_success">Dein Netzwerk scheint Moonlight nicht zu blockieren. Wenn du weiterhin Probleme mit der Verbindung hast, überprüfe die Firewall-Einstellungen deines Hosts
+\n
+\nWenn du versuchst, über das Internet zu streamen, installiere das Moonlight Internet Hosting Tool auf deinem Host und führe den mitgelieferten Internet-Streaming-Tester aus, um die Internetverbindung des Hosts zu überprüfen.</string>
+    <string name="nettest_text_inconclusive">Der Netzwerktest konnte nicht durchgeführt werden, da keiner der Verbindungstestserver von Moonlight erreichbar war. Überprüfe deine Internetverbindung oder versuche es später noch einmal.</string>
+    <string name="nettest_text_failure">Die aktuelle Netzwerkverbindung deines Geräts scheint Moonlight zu blockieren. Das Streaming über das Internet funktioniert möglicherweise nicht, während du mit diesem Netzwerk verbunden bist.
+\n
+\nFolgende Netzwerkports wurden blockiert:
+\n</string>
+    <string name="nettest_text_blocked">Die aktuelle Netzwerkverbindung deines Geräts blockiert Moonlight. Das Streaming über das Internet funktioniert möglicherweise nicht, während du mit diesem Netzwerk verbunden bist.</string>
    <!-- Pair messages -->
-    <string name="pairing">Verbinden…</string>
-    <string name="pair_pc_offline">Computer ist offline</string>
-    <string name="pair_pc_ingame">Am Computer ist bereits ein Spiel aktiv. Sie müssen das Spiel beenden bevor sie sich koppeln können.</string>
-    <string name="pair_pairing_title">Verbinden</string>
-    <string name="pair_pairing_msg">Bitte geben sie folgenden PIN auf ihrem PC ein:</string>
+    <string name="pairing">Koppeln…</string>
+    <string name="pair_pc_offline">Host ist offline</string>
+    <string name="pair_pc_ingame">Auf dem Host ist bereits eine App aktiv. Du musst die App vor dem koppeln beenden.</string>
+    <string name="pair_pairing_title">Koppeln</string>
+    <string name="pair_pairing_msg">Bitte gebe folgenden PIN auf deinem Host ein:</string>
    <string name="pair_incorrect_pin">PIN inkorrekt</string>
-    <string name="pair_fail">Verbindung fehlgeschlagen</string>
-    <string name="pair_already_in_progress">Verbindungsaufbau rebreits im gange</string>
-
+    <string name="pair_fail">Koppeln fehlgeschlagen</string>
+    <string name="pair_already_in_progress">Koppeln bereits im Gange</string>
    <!-- WOL messages -->
-    <string name="wol_pc_online">Computer ist online</string>
-    <string name="wol_no_mac">PC konnte nicht geweckt werden, da GFE keine MAC-Adresse gesendet hat.</string>
-    <string name="wol_waking_pc">PC wird geweckt…</string>
-    <string name="wol_waking_msg">Es kann einige Momente dauert ihren PC zu wecken.
-        Sollte dies fehlschlagen stellen sie bitte sicher, dass Wake-On-LAN korrekt konfiguriert ist.
-    </string>
-    <string name="wol_fail">Sender der Wake-On-LAN Pakete ist fehlgeschlagen</string>
-
+    <string name="wol_pc_online">Host ist online</string>
+    <string name="wol_no_mac">Host konnte nicht aufgeweckt werden, da GFE keine MAC-Adresse gesendet hat</string>
+    <string name="wol_waking_pc">Host wird aufgeweckt…</string>
+    <string name="wol_waking_msg">Es kann einige Momente dauern deinen Host aufzuwecken. Sollte dies fehlschlagen, stelle bitte sicher, dass Wake-On-LAN korrekt konfiguriert ist.</string>
+    <string name="wol_fail">Senden der Wake-On-LAN Pakete ist fehlgeschlagen</string>
    <!-- Unpair messages -->
-    <string name="unpairing">Trenne Verbindung…</string>
-    <string name="unpair_success">Verbindung erfolgreich getrennt</string>
-    <string name="unpair_fail">Trennung der Verbindung fehlgeschlagen</string>
-    <string name="unpair_error">Gerät wurde nicht verbunden</string>
-
+    <string name="unpairing">Trenne Kopplung…</string>
+    <string name="unpair_success">Kopplung erfolgreich getrennt</string>
+    <string name="unpair_fail">Trennung der Kopplung fehlgeschlagen</string>
+    <string name="unpair_error">Gerät wurde nicht gekoppelt</string>
    <!-- Errors -->
-    <string name="error_pc_offline">Computer ist offline</string>
-    <string name="error_manager_not_running">Der ComputerManager Service läuft nicht. Bitte warten sie ein paar Sekunden oder starten sie Die App neu.</string>
-    <string name="error_unknown_host">Host konnte nicht aufgelößt werden.</string>
-    <string name="error_404">GFE ist auf einen HTTP 404 Fehler gestoßen. Stellen sie sicher, dass die GPU ihres PCs unterstützt wird.
-	  Die verwendung von Remote-Desktop Software kann ebenso diesen Fehler verursachen. Starten sie ihren Computer neu oder reinstallieren sie GFE.
-    </string>
-    <string name="title_decoding_error">Video Decoder ist gecrashed</string>
-    <string name="message_decoding_error">Moonlight ist wegen einer Inkompatibilität zu dem Video-Decoder ihres Gerätes gecrasht. Stellen sie sicher, dass GeForce Experience Version auf ihrem PC auf dem neuesten Stand ist. Sollten weiterin Crashes auftreten, versuchen sie ihre Stream Einstellungen zu justieren.</string>
+    <string name="error_pc_offline">Host ist offline</string>
+    <string name="error_manager_not_running">Der ComputerManager Dienst läuft nicht. Bitte warte ein paar Sekunden oder starte die App neu.</string>
+    <string name="error_unknown_host">Hostname konnte nicht aufgelöst werden</string>
+    <string name="error_404">GFE ist auf einen HTTP 404 Fehler gestoßen. Stelle sicher, dass die GPU deines Hosts unterstützt wird. Die Verwendung von Remote-Desktop Software kann ebenso diesen Fehler verursachen. Starte deinen Host neu oder installiere GFE neu.</string>
+    <string name="title_decoding_error">Video Dekodierer ist abgestürzt</string>
+    <string name="message_decoding_error">Moonlight ist wegen einer Inkompatibilität zu dem Video Dekodierer deines Gerätes abgestürzt. Stelle sicher, dass die GeForce Experience Version auf deinem Host auf dem neuesten Stand ist. Sollten weiterin Abstürze auftreten, versuche deine Streaming Einstellungen zu ändern.</string>
    <string name="title_decoding_reset">Video Einstellungen zurücksetzen</string>
-    <string name="message_decoding_reset">Der Video-Decoder ihres Geärts ist wiederholt mit den ausgewählten Einstellungen gecrasht. Ihre streaming einstellungen wurden zurückgesetzt.</string>
+    <string name="message_decoding_reset">Der Video Dekodierer deines Geräts ist wiederholt mit den ausgewählten Einstellungen abgestürzt. Deine Streamingeinstellungen wurden zurückgesetzt.</string>
    <string name="error_usb_prohibited">USB Zugriff ist administrativ unterbunden. Bitte überprüfen sie ihre Knox oder MDM Einstellungen.</string>
-    <string name="unable_to_pin_shortcut">Die zur Zeit aktive Launcher App ünterstützt das erstellen angehefteter Shortcuts nicht.</string>
-
+    <string name="unable_to_pin_shortcut">Deine momentane Launcher App ünterstützt das erstellen angehefteter Shortcuts nicht.</string>
+    <string name="video_decoder_init_failed">Der Video Dekodierer konnte nicht initialisiert werden. Dein Gerät unterstützt möglicherweise die gewählte Auflösung oder Framerate nicht.</string>
+    <string name="no_video_received_error">Kein Video vom Host empfangen.</string>
+    <string name="no_frame_received_error">Deine Netzwerkverbindung funktioniert nicht gut. Reduziere die Einstellung der Videobitrate oder benutze eine schnellere Verbindung.</string>
    <!-- Start application messages -->
    <string name="conn_establishing_title">Verbindung herstellen</string>
    <string name="conn_establishing_msg">Verbindung starten</string>
-    <string name="conn_metered">Warnung: Das Datentransfairvolument ihrer Netzwerkverbindung ist limitiert!</string>
+    <string name="conn_metered">Warnung: Das Datentransfervolumen deiner Netzwerkverbindung ist limitiert!</string>
    <string name="conn_client_latency">Durchschnittliche Frame-Dekodierungslatenz:</string>
    <string name="conn_client_latency_hw">Hardware-Dekodierungslatenz:</string>
    <string name="conn_hardware_latency">Durchschnittliche Hardware-Dekodierungslatenz:</string>
-    <string name="conn_starting">Startet</string>
-    <string name="conn_error_title">Verbindingsfehler</string>
+    <string name="conn_starting">Starten</string>
+    <string name="conn_error_title">Verbindungsfehler</string>
    <string name="conn_error_msg">Start fehlgeschlagen</string>
    <string name="conn_terminated_title">Verbindung beendet</string>
-    <string name="conn_terminated_msg">Die verbinding wurde beendet</string>
-
+    <string name="conn_terminated_msg">Die Verbindung wurde beendet</string>
    <!-- General strings -->
-    <string name="ip_hint">IP-Adresse des GeForce PCs</string>
-    <string name="searching_pc">Suche nach PCs wo GeForce Experience aktiv ist…</string>
+    <string name="ip_hint">IP-Adresse des GeForce Host</string>
+    <string name="searching_pc">Suche nach Hosts auf denen GeForce Experience aktiv ist…
+\n
+\nStelle sicher, dass GameStream in den GeForce Experience SHIELD-Einstellungen aktiviert ist.</string>
    <string name="yes">Ja</string>
    <string name="no">Nein</string>
-    <string name="lost_connection">Verbindung zum PC verloren</string>
+    <string name="lost_connection">Verbindung zum Host verloren</string>
    <string name="title_details">Details</string>
    <string name="help">Hilfe</string>
-    <string name="delete_pc_msg">Sind sie sicher, dass sie diesen PC löschen möchten?</string>
-    <string name="slow_connection_msg">Langsame Verbindung zum PC\nReduzieren sie die Bitrate</string>
-    <string name="poor_connection_msg">Sehr langsame Verbindung zum PC</string>
-    <string name="perf_overlay_text">Videodimensionen: %1$s\nDecoder: %2$s\nGeschätzte PC Bildwiederholrate: %3$.2f FPS\nBildwiederholrate der Netzwerkübertragung: %4$.2f FPS\nWiedergabe-Bildwiederholungsrate: %5$.2f FPS\nWegen Netzwerkübertraung ausgelassene Frames: %6$.2f%%\nDurchschnittliche Übertragunsdauer: %7$.2f ms\nDurchschnittliche decoding dauer: %8$.2f ms</string>
-
+    <string name="delete_pc_msg">Bist du sicher, dass du diesen Host löschen möchtest\?</string>
+    <string name="slow_connection_msg">Langsame Verbindung zum Host
+\nReduziere die Bitrate</string>
+    <string name="poor_connection_msg">Sehr langsame Verbindung zum Host</string>
+    <string name="perf_overlay_text">Videodimensionen: %1$s
+\nDecoder: %2$s
+\nGeschätzte Host Bildwiederholrate: %3$.2f FPS
+\nBildwiederholrate der Netzwerkübertragung: %4$.2f FPS
+\nWiedergabe-Bildwiederholungsrate: %5$.2f FPS
+\nWegen Netzwerkübertragung ausgelassene Frames: %6$.2f%%
+\nDurchschnittliche Übertragungsdauer: %7$.2f ms
+\nDurchschnittliche Dekodierungszeit: %8$.2f ms</string>
    <!-- AppList activity -->
-    <string name="applist_connect_msg">Verbinde mit PC…</string>
-    <string name="applist_menu_resume">Sitzung Wiederherstellen</string>
-    <string name="applist_menu_quit">Sitzung Beenden</string>
-    <string name="applist_menu_quit_and_start">Aktuelles Spiel beenden und Starte</string>
+    <string name="applist_connect_msg">Verbinde mit Host…</string>
+    <string name="applist_menu_resume">Sitzung wiederherstellen</string>
+    <string name="applist_menu_quit">Sitzung beenden</string>
+    <string name="applist_menu_quit_and_start">Aktuelle App beenden und starten</string>
    <string name="applist_menu_cancel">Abbrechen</string>
    <string name="applist_menu_details">Details anzeigen</string>
    <string name="applist_menu_scut">Shortcut erstellen</string>
    <string name="applist_menu_tv_channel">Zu Kanal hinzufügen</string>
+    <string name="applist_menu_hide_app">App ausblenden</string>
    <string name="applist_refresh_title">App Liste</string>
-    <string name="applist_refresh_msg">Aktualisiere Apps…</string>
+    <string name="applist_refresh_msg">Apps aktualisieren…</string>
    <string name="applist_refresh_error_title">Fehler</string>
-    <string name="applist_refresh_error_msg">Abfrage der App-Liste fehlgeschlagen</string>
+    <string name="applist_refresh_error_msg">Die App-Liste konnte nicht geladen werden</string>
    <string name="applist_quit_app">Beenden</string>
-    <string name="applist_quit_success">Erfolgreich Beendet</string>
+    <string name="applist_quit_success">Erfolgreich beendet</string>
    <string name="applist_quit_fail">Beenden fehlgeschlagen</string>
-    <string name="applist_quit_confirmation">Sind sie sicher, dass die die laufende App schließen möchten? Ungespeicherte Daten gehen verloren.</string>
+    <string name="applist_quit_confirmation">Bist du sicher, dass du die laufende App schließen möchtest\? Ungespeicherte Daten gehen verloren.</string>
    <string name="applist_details_id">App ID:</string>
-
    <!-- Add computer manually activity -->
-    <string name="title_add_pc">PC manuell hinzufügen</string>
-    <string name="msg_add_pc">Verbinde zum PC…</string>
-    <string name="addpc_fail">Verbindung fehlgeschlagen. Stellen sie sicher, dass die benötigten ports von einer Firewall gefiltert werden.</string>
-    <string name="addpc_success">Computer erfolgreich hinzugefügt</string>
-    <string name="addpc_unknown_host">Auflößen der PC-Adresse fehlgeschlagen. Stellen sie sicher, dass die Adresse keine Tippfehler beinhaltet.</string>
-    <string name="addpc_enter_ip">Sie müssen eine IP-Addresse eingeben.</string>
-    <string name="addpc_wrong_sitelocal">Diese Adresse sieht falsch aus. Sie müssen die öffentliche IP-Adresse ihreres Routers benutzen um über das Internet zu streamen.</string>
-
+    <string name="title_add_pc">Host manuell hinzufügen</string>
+    <string name="msg_add_pc">Verbinde zum Host…</string>
+    <string name="addpc_fail">Verbindung fehlgeschlagen. Stelle sicher, dass die benötigten Ports von deiner Firewall nicht gesperrt sind.</string>
+    <string name="addpc_success">Host erfolgreich hinzugefügt</string>
+    <string name="addpc_unknown_host">Auflösen der Hostadresse fehlgeschlagen. Stelle sicher, dass die Adresse keine Tippfehler beinhaltet.</string>
+    <string name="addpc_enter_ip">Du musst eine IP-Adresse eingeben</string>
+    <string name="addpc_wrong_sitelocal">Diese Adresse sieht falsch aus. Du musst die öffentliche IP-Adresse deines Routers benutzen, um übers Internet zu Streamen.</string>
    <!-- Preferences -->
    <string name="category_basic_settings">Allgemeine Einstellungen</string>
    <string name="title_resolution_list">Videoauflösung</string>
-    <string name="summary_resolution_list">Ehöhen für klarere Bilder. Reduzieren für flüssigere Darstellung auf langsameren Geräten und Netzwerken.</string>
-    <string name="title_fps_list">Bildwiederholungsrate</string>
+    <string name="summary_resolution_list">Erhöhen für klarere Bilder. Reduzieren für flüssigere Darstellung auf langsameren Geräten und Netzwerken.</string>
+    <string name="title_fps_list">Video Framerate</string>
    <string name="summary_fps_list">Erhöhen für einen gleichmäßigeren Video-Stream. Verringern um auf langsameren Geräten eine bessere Performance zu erzielen.</string>
-    <string name="title_seekbar_bitrate">Video bitrate</string>
+    <string name="title_seekbar_bitrate">Video Bitrate</string>
    <string name="summary_seekbar_bitrate">Erhöhen für einen schärferen Video-Stream. Verringern um auf langsameren Geräten eine bessere Performance zu erzielen.</string>
-    <string name="suffix_seekbar_bitrate">Kbps</string>
-    <string name="title_unlock_fps">Alle Bildwiederholungsraten freigeben</string>
-    <string name="summary_unlock_fps">Streaming mit 90 oder 120 FPS reduziert gegebenfalls die Latenz auf High-End Geräten, für jedoch zu Crashes oder Lag auf Geräten die dies nicht untersützen können.</string>
-    <string name="title_checkbox_stretch_video">Video auf den ganzen Bildschirm ausdehnen</string>
-    <string name="title_checkbox_disable_warnings">Warnhinweise deaktivieren</string>
-    <string name="summary_checkbox_disable_warnings">Verbindungswarnungen nicht als Overlay wärend des Streamens anzeigen</string>
-    <string name="title_checkbox_enable_pip">Bild-in-Bild Überwachungsmodus aktivieren</string>
-    <string name="summary_checkbox_enable_pip">Stream auch während des Multitaskings anzeigen (ohne Steuerung)</string>
-
+    <string name="suffix_seekbar_bitrate_mbps">Mbps</string>
+    <string name="title_checkbox_stretch_video">Video auf Vollbildschirm strecken</string>
    <string name="category_audio_settings">Audio Einstellungen</string>
-
-    <string name="category_input_settings">Eingabe Einstellungen</string>
-    <string name="title_checkbox_multi_controller">Automatische GamePad-Erkennung</string>
-    <string name="summary_checkbox_multi_controller">Abwählen dieser Option erzwingt dass immer ein GamePad present ist</string>
+    <string name="title_audio_config_list">Surround Sound Konfiguration </string>
+    <string name="summary_audio_config_list">Aktivieren von 5.1- oder 7.1-Surround-Sound für Heimkinosysteme</string>
+    <string name="category_input_settings">Controller Einstellungen</string>
+    <string name="title_checkbox_touchscreen_trackpad">Touchscreen als Trackpad</string>
+    <string name="summary_checkbox_touchscreen_trackpad">Wenn aktiviert, verhält sich der Touchscreen wie ein Trackpad. Wenn es deaktiviert ist, steuert der Touchscreen den Mauszeiger direkt.</string>
+    <string name="title_checkbox_multi_controller">Automatische Controller Erkennung</string>
+    <string name="summary_checkbox_multi_controller">Abwählen dieser Option erzwingt dass immer ein Controller präsent ist</string>
    <string name="title_checkbox_vibrate_fallback">Vibrationsemulation aktivieren</string>
-    <string name="summary_checkbox_vibrate_fallback">Lässt das Gerät vibrieren falls das GamePad keine Vibration unterstütz</string>
-    <string name="title_seekbar_deadzone">Tot Bereich des Analogsticks</string>
+    <string name="summary_checkbox_vibrate_fallback">Lässt das Gerät vibrieren falls der Controller keine Vibration unterstützt</string>
+    <string name="title_seekbar_deadzone">Deadzone des Analogsticks</string>
    <string name="suffix_seekbar_deadzone">%</string>
-    <string name="title_checkbox_xb1_driver">Xbox 360/One GamePad Treiber</string>
-    <string name="summary_checkbox_xb1_driver">Aktiviert eingebauten USB Treiber für Geräte die keinen Xbox GamePad-Unterstützung haben</string>
-    <string name="title_checkbox_usb_bind_all">Android GamePad Unterstütung überlagern</string>
-    <string name="summary_checkbox_usb_bind_all">Erzwingt die Vernwedung von Moonlight\'s USB Treiber für alle Xbox kompatiblen GamePads</string>
-    <string name="title_checkbox_mouse_emulation">Maus Emulation via GamePad</string>
+    <string name="title_checkbox_xb1_driver">Xbox 360/One Controller Treiber</string>
+    <string name="summary_checkbox_xb1_driver">Aktiviert den eingebauten USB Treiber für Geräte die keine Xbox-Controller Unterstützung haben</string>
+    <string name="title_checkbox_usb_bind_all">Android Controller Unterstützung überschreiben</string>
+    <string name="summary_checkbox_usb_bind_all">Erzwingt die Verwendung von Moonlights USB Treiber für alle Xbox kompatiblen Controller</string>
+    <string name="title_checkbox_mouse_emulation">Maus Emulation via Controller</string>
    <string name="summary_checkbox_mouse_emulation">Langes gedrückt halten der Start-Taste wechselt in den Maus Modus</string>
    <string name="title_checkbox_mouse_nav_buttons">Vor- und Zurück-Tasten aktivieren</string>
    <string name="summary_checkbox_mouse_nav_buttons">Aktivierung dieser Option kann auf fehleranfälligen Geräten Rechts-Clicks verunmöglichen</string>
-
-    <string name="category_on_screen_controls_settings">On-Screen Steuerungseinstellungen</string>
-    <string name="title_checkbox_show_onscreen_controls">Zeige On-Screen Steuerung</string>
-    <string name="summary_checkbox_show_onscreen_controls">Zeige virtuelle Steuerelemente als Overlay auf dem Touchscreen</string>
+    <string name="title_checkbox_flip_face_buttons">Tasten umkehren</string>
+    <string name="summary_checkbox_flip_face_buttons">Kehrt die Tasten A/B und X/Y für Controller und Bildschirmsteuerung um</string>
+    <string name="category_on_screen_controls_settings">On-Screen-Controller Einstellungen</string>
+    <string name="title_checkbox_show_onscreen_controls">On-Screen-Controller einblenden</string>
+    <string name="summary_checkbox_show_onscreen_controls">Blendet einen virtuellen Controller als Overlay auf dem Touchscreen ein</string>
    <string name="title_checkbox_vibrate_osc">Vibrationen aktivieren</string>
-    <string name="summary_checkbox_vibrate_osc">Vibrieren als haptisches Feedback für die On-Screen Steuerelemente</string>
-    <string name="title_only_l3r3">Nur L3 und R3 anzeigen</string>
-    <string name="summary_only_l3r3">Alle virtuellen Steuerelemente außer L3 und R3 verbregen.</string>
-    <string name="title_reset_osc">Gespeicherte On-Screen Steuerungelemente zurücksetzen</string>
-    <string name="summary_reset_osc">Alle On-Screen Steuerelemente auf ihre Vorgabegröße und Position zurück setzen</string>
-    <string name="dialog_title_reset_osc">Layout Zurücksetzen</string>
-    <string name="dialog_text_reset_osc">Sind sie sicher, dass sie das gepseicherte on-screen Layout der Steuerelemte löschen wollen?</string>
-    <string name="toast_reset_osc_success">On-Screen Steuerelemente wurden zurückgesetzt</string>
-
+    <string name="summary_checkbox_vibrate_osc">Vibrieren als haptisches Feedback für den On-Screen-Controller</string>
+    <string name="title_only_l3r3">Nur L3 und R3 einblenden</string>
+    <string name="summary_only_l3r3">Alle virtuellen Tasten außer L3 und R3 ausblenden</string>
+    <string name="title_reset_osc">Gespeichertes On-Screen-Controller Layout zurücksetzen</string>
+    <string name="summary_reset_osc">Größe und Position der On-Screen-Controllertasten zurücksetzen</string>
+    <string name="dialog_title_reset_osc">Layout zurücksetzen</string>
+    <string name="dialog_text_reset_osc">Bist du sicher, dass du das gespeicherte On-Screen-Controllertsten Layout löschen willst\?</string>
+    <string name="toast_reset_osc_success">On-Screen-Controller wurde zurückgesetzt</string>
+    <string name="title_osc_opacity">Transparenz der On-Screen-Controllertasten ändern</string>
+    <string name="summary_osc_opacity">On-Screen-Controllertasten auf dem Bildschirm mehr/weniger transparent machen</string>
+    <string name="suffix_osc_opacity">%</string>
+    <string name="dialog_title_osc_opacity">Transparenz ändern</string>
    <string name="category_ui_settings">UI Einstellungen</string>
+    <string name="title_checkbox_enable_pip">Aktivieren des Bild-in-Bild Modus</string>
+    <string name="summary_checkbox_enable_pip">Ermöglicht die Anzeige (aber nicht die Steuerung) des Streams während des Multitasking</string>
    <string name="title_language_list">Sprache</string>
    <string name="summary_language_list">Sprache die Moonlight verwenden soll</string>
-    <string name="title_checkbox_small_icon_mode">Verwende kleine Icons</string>
-    <string name="summary_checkbox_small_icon_mode">Verwende kleine Icons in der Rasteransicht, um mehr gleichzeitig anzeigen zu können</string>
-
+    <string name="title_checkbox_small_icon_mode">Verwende kleine Cover</string>
+    <string name="summary_checkbox_small_icon_mode">Verwende kleine Cover in der Rasteransicht, um mehr gleichzeitig anzeigen zu können</string>
    <string name="category_host_settings">Host Einstellungen</string>
    <string name="title_checkbox_enable_sops">Spieleinstellungen optimieren</string>
-    <string name="summary_checkbox_enable_sops">GFE erlauben die die Spieleinstellungen zu optimieren.</string>
-    <string name="title_checkbox_host_audio">Audio auf dem PC wiedergeben</string>
-    <string name="summary_checkbox_host_audio">Audio auf dem PC und auf diesem Gerät wiedergeben</string>
-
+    <string name="summary_checkbox_enable_sops">GFE erlauben, die Spieleinstellungen für ein optimales Streaming zu ändern</string>
+    <string name="title_checkbox_host_audio">Audio auf dem Host wiedergeben</string>
+    <string name="summary_checkbox_host_audio">Audio auf dem Host und auf diesem Gerät wiedergeben</string>
    <string name="category_advanced_settings">Erweiterte Einstellungen</string>
    <string name="title_disable_frame_drop">Nie Frames Überspringen</string>
-    <string name="summary_disable_frame_drop">Kann potentiell das Mikro-Ruckeln auf einigen Geräten reduzieren, allerdings erhöt dies gleichzeitig die Latenz</string>
-    <string name="title_video_format">Ändere H.265 Einstellungen</string>
-    <string name="summary_video_format">H.265 verringerd die Video-Bandbreitenanforderung, funktioniert allerdings nur auf sehr neuen Geräten</string>
+    <string name="title_unlock_fps">Alle möglichen Framerates freischalten</string>
+    <string name="summary_unlock_fps">Streaming mit 90 oder 120 FPS kann die Latenz auf High-End-Geräten verringern, kann aber bei Geräten, die dies nicht unterstützen, zu stottern oder Instabilität führen</string>
+    <string name="title_checkbox_disable_warnings">Warnhinweise deaktivieren</string>
+    <string name="summary_checkbox_disable_warnings">On-Screen Warnmeldungen während des Streaming deaktivieren</string>
+    <string name="summary_disable_frame_drop">Kann das Mikro-Ruckeln auf einigen Geräten reduzieren, allerdings erhöht dies gleichzeitig die Latenz</string>
+    <string name="title_video_format">H265 Einstellungen ändern</string>
+    <string name="summary_video_format">H265 verringert die Video-Bandbreitenanforderung, funktioniert allerdings nur auf sehr neuen Geräten</string>
    <string name="title_enable_hdr">HDR aktivieren (experimentell)</string>
-    <string name="summary_enable_hdr">HDR-Streaming sofern dies von der PC GPU unterstützt wird. HDR erfordert eine GPU der GTX 1000 Serie oder neuer.</string>
+    <string name="summary_enable_hdr">HDR-Streaming sofern dies von der Host-GPU unterstützt wird. HDR erfordert eine GPU der GTX 1000 Serie oder neuer.</string>
    <string name="title_enable_perf_overlay">Performance Overlay aktivieren</string>
-    <string name="summary_enable_perf_overlay">Leistungsmerkmale während des Streamens in Echtzeit einblenden.</string>
-    <string name="suffix_osc_opacity">%</string>
-    <string name="dialog_title_osc_opacity">Transparenz</string>
-
-</resources>
+    <string name="summary_enable_perf_overlay">Leistungsmerkmale während des Streamens in Echtzeit einblenden</string>
+    <string name="title_enable_post_stream_toast">Zeige Latenz-Informationen nach dem Streaming</string>
+    <string name="summary_enable_post_stream_toast">Anzeige einer Informationsmeldung über die Latenz nach dem Ende des Streams</string>
+    <string name="resolution_prefix_native">Nativ</string>
+    <string name="text_native_res_dialog">Native Auflösungsmodi werden von GeForce Experience nicht offiziell unterstützt, daher wird es die Auflösung deines Host-Displays nicht selbst einstellen. Du musst sie manuell im Spiel setzen.
+\n
+\nWenn du eine benutzerdefinierte Auflösung in der NVIDIA Systemsteuerung erstellst, um die Auflösung deines Geräts anzupassen, stelle bitte sicher, dass du die Warnung von NVIDIA bezüglich möglicher Monitorschäden, PC-Instabilität und anderer potenzieller Probleme gelesen und verstanden hast.
+\n
+\nWir sind nicht verantwortlich für Probleme, die aus der Erstellung einer angepassten Auflösung auf deinem PC resultieren.
+\n
+\nSchließlich kann es sein, dass dein Gerät oder dein Host das Streaming in nativer Auflösung nicht unterstützt. Wenn es auf deinem Gerät nicht funktioniert, hast du leider Pech gehabt.</string>
+    <string name="title_native_res_dialog">Native Auflösungswarnung</string>
+    <string name="check_ports_msg">Überprüfe deine Firewall und Portweiterleitungsregeln für folgende(n) Port(s):</string>
+    <string name="early_termination_error">Beim Starten des Streams auf deinem Host ist etwas schief gelaufen.
+\n
+\nStelle sicher, dass du keine DRM-geschützten Inhalte auf deinem Host geöffnet hast. Du kannst auch versuchen, deinen Host neu zu starten.
+\n
+\nWenn das Problem weiterhin besteht, versuche deinen GPU-Treiber und GeForce Experience neu zu installieren.</string>
+    <string name="pcview_menu_header_unknown">Aktualisiere</string>
+    <string name="pcview_menu_header_offline">Offline</string>
+    <string name="pcview_menu_header_online">Online</string>
+</resources>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -88,7 +88,6 @@
    <string name="summary_resolution_list">Establecer unos valores demasiado altos puede causar lag o cierres inesperados</string>
    <string name="title_seekbar_bitrate">Seleccionar bitrate de vídeo</string>
    <string name="summary_seekbar_bitrate">Usa bitrate bajo para reducir "parpadeo". Incrementa el bitrate para mayor calidad de imagen.</string>
-    <string name="suffix_seekbar_bitrate">Kbps</string>
    <string name="title_checkbox_stretch_video">Ajustar vídeo a pantalla completa</string>
    <string name="title_checkbox_disable_warnings">Desactivar mensajes de advertencia</string>
    <string name="summary_checkbox_disable_warnings">Desactivar mensajes de advertencia en pantalla durante la transmisión</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    
    <!-- Shortcut strings -->
    <string name="scut_deleted_pc">PC supprimé</string>
    <string name="scut_not_paired">PC non appairé</string>
    <string name="scut_pc_not_found">PC non trouvé</string>
    <string name="scut_invalid_uuid">Le PC fourni n\'est pas valide</string>
    <string name="scut_invalid_app_id">L\'application fournie n\'est pas valide</string>
-
    <!-- Help strings -->
    <string name="help_loading_title">Visionneuse d\'aide</string>
    <string name="help_loading_msg">Chargement de la page d\'aide…</string>
-
    <!-- PC view menu entries -->
    <string name="pcview_menu_app_list">Afficher la liste des jeux</string>
    <string name="pcview_menu_pair_pc">Appairer avec PC</string>
@@ -19,7 +16,14 @@
    <string name="pcview_menu_send_wol">Envoyer la requête Wake-On-LAN</string>
    <string name="pcview_menu_delete_pc">Supprimer PC</string>
    <string name="pcview_menu_details">Voir les détails</string>
-
+    <!-- Network test strings -->
+    <string name="nettest_title_waiting">Test de la connexion réseau</string>
+    <string name="nettest_text_waiting">Moonlight teste votre connexion réseau pour déterminer si NVIDIA GameStream est bloqué.\n\nCela peut prendre quelques secondes.</string>
+    <string name="nettest_title_done">Test du réseau terminé</string>
+    <string name="nettest_text_success">Votre réseau ne semble pas bloquer Moonlight. Si vous avez encore de la difficulté à vous connecter, vérifiez les paramètres du pare-feu de votre PC.\n\nSi vous essayez de diffuser sur Internet, installez l\'outil d\'hébergement Internet Moonlight sur votre PC et exécutez le testeur de streaming Internet inclus pour vérifier la connexion Internet de votre PC.</string>
+    <string name="nettest_text_inconclusive">Le test réseau n’a pas pu être effectué car aucun des serveurs de test de connexion Moonlight n’était accessible. Vérifiez votre connexion Internet ou réessayez plus tard.</string>
+    <string name="nettest_text_failure">La connexion réseau actuelle de votre appareil semble bloquer Moonlight. Le streaming sur Internet peut ne pas fonctionner lorsqu’il est connecté à ce réseau.\n\nLes ports réseau suivants ont été bloqués:\n</string>
+    <string name="nettest_text_blocked">La connexion réseau actuelle de votre appareil bloque Moonlight. Le streaming sur Internet peut ne pas fonctionner lorsqu’il est connecté à ce réseau.</string>
    <!-- Pair messages -->
    <string name="pairing">Appariement…</string>
    <string name="pair_pc_offline">L\'ordinateur est hors ligne</string>
@@ -29,7 +33,6 @@
    <string name="pair_incorrect_pin">Code PIN incorrect</string>
    <string name="pair_fail">Échec de l\'appariement</string>
    <string name="pair_already_in_progress">Appariement déjà en cours</string>
-
    <!-- WOL messages -->
    <string name="wol_pc_online">L\'ordinateur est en ligne</string>
    <string name="wol_no_mac">Impossible de réveiller le PC car GFE n\'a pas envoyé d\'adresse MAC</string>
@@ -38,13 +41,11 @@
        Si ce n\'est pas le cas, assurez-vous qu\'il est correctement configuré pour Wake-On-LAN.
    </string>
    <string name="wol_fail">Échec de l\'envoi des paquets Wake-On-LAN</string>
-
    <!-- Unpair messages -->
    <string name="unpairing">Désappariage…</string>
    <string name="unpair_success">Désapparié avec succès</string>
    <string name="unpair_fail">Échec de désappariement</string>
    <string name="unpair_error">Le périphérique n\'a pas été appareillé</string>
-
    <!-- Errors -->
    <string name="error_pc_offline">L\'ordinateur est déconnecté</string>
    <string name="error_manager_not_running">Le service ComputerManager n\'est pas en cours d\'exécution. Veuillez patienter quelques secondes ou redémarrer l\'application.</string>
@@ -58,7 +59,6 @@
    <string name="message_decoding_reset">Le décodeur vidéo de votre appareil continue de planter avec les paramètres de diffusion sélectionnés. Vos paramètres de diffusion ont été réinitialisés par défaut.</string>
    <string name="error_usb_prohibited">L\'accès USB est interdit par votre appareil. Vérifiez vos paramètres Knox ou MDM.</string>
    <string name="unable_to_pin_shortcut">Votre lanceur actuel ne permet pas de créer des raccourcis épinglés.</string>
-
    <!-- Start application messages -->
    <string name="conn_establishing_title">Établissement de la connexion</string>
    <string name="conn_establishing_msg">Démarrage de la connection</string>
@@ -71,7 +71,6 @@
    <string name="conn_error_msg">Impossible de démarrer</string>
    <string name="conn_terminated_title">Connexion terminée</string>
    <string name="conn_terminated_msg">La connexion a été interrompue</string>
-
    <!-- General strings -->
    <string name="ip_hint">Adresse IP de GeForce PC</string>
    <string name="searching_pc">Recherche de PC avec GameStream en cours…\n\n
@@ -85,7 +84,6 @@
    <string name="slow_connection_msg">Connexion lente au PC\nRéduisez votre débit</string>
    <string name="poor_connection_msg">Mauvaise connexion au PC</string>
    <string name="perf_overlay_text">Video dimensions: %1$s\nDécodeur: %2$s\nEstimation de la fréquence d\'images de l\'ordinateur hôte: %3$.2f FPS\nFréquence d\'images entrantes du réseau: %4$.2f FPS\nTaux de rendu: %5$.2f FPS\nImages envoyé par votre connexion réseau: %6$.2f%%\nTemps moyen de réception: %7$.2f ms\nTemps de décodage moyen: %8$.2f ms</string>
-
    <!-- AppList activity -->
    <string name="applist_connect_msg">Connexion au PC…</string>
    <string name="applist_menu_resume">Reprise de la session</string>
@@ -104,7 +102,6 @@
    <string name="applist_quit_fail">Échec de la fermeture</string>
    <string name="applist_quit_confirmation">Voulez-vous vraiment quitter l\'application en cours d\'exécution? Toutes les données non enregistrées seront perdues.</string>
    <string name="applist_details_id">ID app:</string>
-
    <!-- Add computer manually activity -->
    <string name="title_add_pc">Ajouter un PC manuellement</string>
    <string name="msg_add_pc">Connexion au PC…</string>
@@ -113,7 +110,6 @@
    <string name="addpc_unknown_host">Impossible de résoudre l\'adresse du PC. Assurez-vous que vous n\'avez pas fait une faute de frappe dans l\'adresse.</string>
    <string name="addpc_enter_ip">Vous devez entrer une adresse IP</string>
    <string name="addpc_wrong_sitelocal">Cette adresse ne semble pas correcte. Vous devez utiliser l\'adresse IP publique de votre routeur pour la diffusion en continu sur Internet..</string>
-
    <!-- Preferences -->
    <string name="category_basic_settings">Paramètres de base</string>
    <string name="title_resolution_list">Résolution vidéo</string>
@@ -122,20 +118,16 @@
    <string name="summary_fps_list">Augmenter pour un flux vidéo plus lisse. Diminution pour de meilleures performances sur les périphériques bas de gamme.</string>
    <string name="title_seekbar_bitrate">Sélectionnez le bitrate vidéo à obtenir</string>
    <string name="summary_seekbar_bitrate">Bitrate inférieur pour réduire la saccade. Augmentez le bitrate pour augmenter la qualité de l\'image.</string>
-    <string name="suffix_seekbar_bitrate">Kbps</string>
-    <string name="title_unlock_fps">Débloquer tous les taux d\'images possibles</string>
-    <string name="summary_unlock_fps">La diffusion en continu à 90 ou 120 FPS peut réduire la latence sur les périphériques haut de gamme, mais peut provoquer des retards ou des blocages sur les périphériques qui ne peuvent \pas le prendre en charge</string>
    <string name="title_checkbox_stretch_video">Étirez la vidéo en plein écran</string>
    <string name="title_checkbox_disable_warnings">Désactiver les messages d\'avertissement</string>
-    <string name="summary_checkbox_disable_warnings">Désactiver les messages d\'avertissement de connexion à l\'écran pendant le streaming</string>
    <string name="title_checkbox_enable_pip">Activer le mode observateur dans l\'image</string>
    <string name="summary_checkbox_enable_pip">Permet de visualiser le flux (sans le contrôleur) tout en multitâche</string>
-
    <string name="category_audio_settings">Paramètres audio</string>
    <string name="title_audio_config_list">Configuration son surround</string>
    <string name="summary_audio_config_list">Activer le son surround 5.1 ou 7.1 pour les systèmes home cinéma</string>
-
    <string name="category_input_settings">Paramètres d\'entrée</string>
+    <string name="title_checkbox_touchscreen_trackpad">Utilisez l\'écran tactile comme trackpad</string>
+    <string name="summary_checkbox_touchscreen_trackpad">S\'il est activé, l\'écran tactile agit comme un trackpad. S\'il est désactivé, l\'écran tactile contrôle directement le curseur de la souris.</string>
    <string name="title_checkbox_multi_controller">Prise en charge de plusieurs contrôleurs</string>
    <string name="summary_checkbox_multi_controller">Lorsqu\'elle n\'est pas cochée, tous les contrôleurs sont regroupés</string>
    <string name="title_checkbox_vibrate_fallback">Emuler support vibration de secours</string>
@@ -150,7 +142,8 @@
    <string name="summary_checkbox_mouse_emulation">Appuyez longuement sur le bouton Start pour faire basculer la manette de jeu en mode souris.</string>
    <string name="title_checkbox_mouse_nav_buttons">Activer les boutons de la souris arrière et avant</string>
    <string name="summary_checkbox_mouse_nav_buttons">L\' activation de cette option peut entraîner un clic droit sur certains périphériques.</string>
-
+    <string name="title_checkbox_flip_face_buttons">Boutons de face inversé</string>
+    <string name="summary_checkbox_flip_face_buttons">Commute les boutons de face A/B et X/Y pour les manettes de jeu et les commandes à l\'écran</string>
    <string name="category_on_screen_controls_settings">Paramètres des contrôles à l\'écran</string>
    <string name="title_checkbox_show_onscreen_controls">Afficher les commandes à l\'écran</string>
    <string name="summary_checkbox_show_onscreen_controls">Afficher la superposition du contrôleur virtuel sur l\'écran tactile</string>
@@ -167,21 +160,21 @@
    <string name="summary_osc_opacity">Rendre les contrôles à l\'écran plus/moins transparents</string>
    <string name="dialog_title_osc_opacity">Modifiez l\'opacité</string>
    <string name="suffix_osc_opacity">%</string>
-
    <string name="category_ui_settings">Paramètres de l\'interface utilisateur</string>
    <string name="title_language_list">Langue</string>
    <string name="summary_language_list">Langue à utiliser pour Moonlight</string>
    <string name="title_checkbox_small_icon_mode">Utiliser des petites icônes</string>
    <string name="summary_checkbox_small_icon_mode">Utilisez les petites icônes dans les éléments de la grille pour permettre plus d\'éléments à l\'écran</string>
-
    <string name="category_host_settings">Paramètres de l\'hôte</string>
    <string name="title_checkbox_enable_sops">Optimiser les paramètres de jeu</string>
    <string name="summary_checkbox_enable_sops">Autoriser GFE à modifier les paramètres de jeu pour une diffusion optimale</string>
    <string name="title_checkbox_host_audio">Jouer l\'audio sur le PC</string>
    <string name="summary_checkbox_host_audio">Lire l\'audio de l\'ordinateur et de ce périphérique</string>
-
    <string name="category_advanced_settings">Réglages avancés</string>
-    <string name="title_disable_frame_drop">Désactiver la suppression d\'image</string>
+    <string name="title_unlock_fps">Débloquez toutes les fréquences d\'images possibles</string>
+    <string name="summary_unlock_fps">Le streaming à 90 ou 120 FPS peut réduire la latence sur les appareils haut de gamme, mais peut entraîner un décalage ou une instabilité sur les appareils qui ne peuvent pas le prendre en charge</string>
+    <string name="summary_checkbox_disable_warnings">Désactiver les messages d\'avertissement de connexion à l\'écran pendant la diffusion</string>
+    <string name="title_disable_frame_drop">Ne jamais laisser tomber les frames</string>
    <string name="summary_disable_frame_drop">Peut réduire les micro-saccades sur certains appareils, mais peut augmenter la latence</string>
    <string name="title_video_format">Modifier les paramètres H.265</string>
    <string name="summary_video_format">H.265 réduit les besoins en bande passante vidéo mais nécessite un périphérique très récent</string>
@@ -189,5 +182,12 @@
    <string name="summary_enable_hdr">Diffuser du HDR lorsque le jeu et le processeur graphique du PC le prennent en charge. HDR nécessite un GPU série GTX 1000 ou une version ultérieure.</string>
    <string name="title_enable_perf_overlay">Activer la superposition de performance</string>
    <string name="summary_enable_perf_overlay">Afficher une superposition à l\'écran avec des informations de performance en temps réel pendant la lecture en continu</string>
-
-</resources>
+    <string name="title_enable_post_stream_toast">Afficher le message de latence après la diffusion en continu</string>
+    <string name="summary_enable_post_stream_toast">Afficher un message d’informations de latence après la fin du flux</string>
+    <string name="no_video_received_error">Aucune vidéo reçue depuis l\'hôte.</string>
+    <string name="video_decoder_init_failed">Le décodeur vidéo n\'a pas pu démarrer. Vérifiez que votre appareil supporte la résolution ou la fréquence d\'images choisie.</string>
+    <string name="pcview_menu_test_network">Tester la connection réseau</string>
+    <string name="pcview_menu_header_unknown">Actualisation</string>
+    <string name="pcview_menu_header_offline">Hors ligne</string>
+    <string name="pcview_menu_header_online">En ligne</string>
+</resources>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -105,7 +105,6 @@
    <string name="summary_resolution_list">Valori troppo elevati possono causare lag o crash</string>
    <string name="title_seekbar_bitrate">Velocità di trasmissione video</string>
    <string name="summary_seekbar_bitrate">Abbassa la velocità di trasmissione per ridurre lo stuttering; alzala per migliorare la qualità dell\'immagine</string>
-    <string name="suffix_seekbar_bitrate">Kbps</string>
    <string name="title_checkbox_stretch_video">Forza video a schermo intero</string>
    <string name="title_checkbox_disable_warnings">Disabilita messaggi di warning</string>
    <string name="summary_checkbox_disable_warnings">Disabilita i messaggi di warning sullo schermo durante lo streaming</string>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -84,7 +84,6 @@
    <string name="summary_resolution_list">品質が高いほどラグとクラッシュが発生しやすくなります</string>
    <string name="title_seekbar_bitrate">映像のビットレート</string>
    <string name="summary_seekbar_bitrate">ビットレートを低くすればカクつきが抑制され、高くすれば画質が向上します</string>
-    <string name="suffix_seekbar_bitrate">Kbps</string>
    <string name="title_checkbox_stretch_video">映像を全画面に拡大</string>
    <string name="title_checkbox_disable_warnings">警告を無効化</string>
    <string name="summary_checkbox_disable_warnings">ストリーミング中に画面に警告メッセージを表示しない</string>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -99,7 +99,6 @@
    <string name="summary_resolution_list">세팅 값이 자신의 PC 성능보다 너무 높으면 렉이나 깨짐을 유발할 수 있습니다.</string>
    <string name="title_seekbar_bitrate">비트레이트 타겟 지정</string>
    <string name="summary_seekbar_bitrate">낮은 비트레이트는 끊김을 줄이고, 높은 비트레이트는 품질을 높입니다.</string>
-    <string name="suffix_seekbar_bitrate">Kbps</string>
    <string name="title_checkbox_stretch_video">전체 화면으로 렌더링 스크린 늘이기</string>
    <string name="title_checkbox_disable_warnings">경고 메세지 끄기</string>
    <string name="summary_checkbox_disable_warnings">화면 상의 연결 경고 메세지를 스트리밍 중에 비활성화합니다.</string>
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="title_checkbox_multi_controller">Automatisk oppdaging av spillkontroller</string>
+    <string name="title_checkbox_touchscreen_trackpad">Bruk denne pekeskjermen som pekeflate</string>
+    <string name="title_checkbox_stretch_video">Strekk video til hele skjermen</string>
+    <string name="title_seekbar_bitrate">Video-bitrate</string>
+    <string name="title_fps_list">Videobilderammetakt</string>
+    <string name="applist_quit_confirmation">Er du sikker på at du vil avslutte det kjørende programmet\? All ulagret data vil gå tapt.</string>
+    <string name="applist_refresh_msg">Gjenoppfrisker programmer …</string>
+    <string name="perf_overlay_text">Videooppløsning: %1$s
+\nDekoder: %2$s
+\nAntatt bilderammetakt på verts-PC: %3$.2f BPS
+\nInnkommende bilderammetakt fra nettverket: %4$.2f BPS
+\nOpptegningsbilderammetakt: %5$.2f BPS
+\nBilderammer droppet av din nettverkstilknytning: %6$.2f%%
+\nGjennomsnittlig mottakstid: %7$.2f ms
+\nGjennomsnittlig dekodingstid: %8$.2f ms</string>
+    <string name="lost_connection">Mistet tilknytning til PC</string>
+    <string name="searching_pc">Søker etter PC-er med GameStream kjørende …
+\n
+\nForsikre deg om at GameStream er påslått i GeForce Experience SHEILD-innstillingene.</string>
+    <string name="conn_starting">Starter</string>
+    <string name="conn_hardware_latency">Gjennomsnittlig latens for maskinvarerammedekoding:</string>
+    <string name="conn_client_latency_hw">maskinvaredekoderlatens:</string>
+    <string name="conn_client_latency">Gjennomsnittlig latens for bilderammedekoding:</string>
+    <string name="check_ports_msg">Sjekk om din brannmur og portvideresendingsreglene for port(ene):</string>
+    <string name="early_termination_error">Noe gikk galt på din verts-PC under oppstart av strømmen.
+\n
+\nForsikre deg om at du ikke har noe DRM-beskyttet innhold åpent på din PC. Du kan også prøve å starte din verts-PC på ny.
+\n
+\nHvis problemet vedvarer, kan du prøve å reinstallere skjermkortsdriverne og GeForce Experience.</string>
+    <string name="no_frame_received_error">Din nettverkstilkobling fungerer ikke så godt. Reduser videobitraten fra dens innstilling, eller prøv en raskere tilknytning.</string>
+    <string name="no_video_received_error">Fikk ingen video fra verten.</string>
+    <string name="unable_to_pin_shortcut">Din nåværende oppstarter tillater ikke opprettelse av festede snarveier.</string>
+    <string name="title_decoding_error">Videodekoderen krasjet</string>
+    <string name="error_unknown_host">Klarte ikke å utlede vertsadresse</string>
+    <string name="unpair_error">Enheten ble ikke parret</string>
+    <string name="unpair_fail">Klarte ikke å oppheve parring</string>
+    <string name="unpair_success">Parring opphevet</string>
+    <string name="unpairing">Opphever parring …</string>
+    <string name="wol_fail">Klarte ikke å sende Wake-On-LAN-pakker</string>
+    <string name="wol_waking_msg">Det kan ta et par sekunder før PC-en din våkner. Hvis den ikke gjør det må du sjekke at den er satt opp riktig for Wake-On-LAN.</string>
+    <string name="wol_no_mac">Kunne ikke vekke opp PC fordi GFE ikke sendte en MAC-adresse</string>
+    <string name="pair_already_in_progress">Parring allerede underveis</string>
+    <string name="pair_fail">Parring mislyktes</string>
+    <string name="pair_pairing_msg">Skriv inn følgende PIN på mål-PC-en:</string>
+    <string name="pair_pairing_title">Parring</string>
+    <string name="pair_pc_ingame">Datamaskinen er for øyeblikket i et spill. Du må lukke spillet før parring.</string>
+    <string name="pairing">Parrer …</string>
+    <string name="nettest_title_done">Nettverkstest fullført</string>
+    <string name="title_seekbar_deadzone">Dødsonejustering for analogstikke</string>
+    <string name="title_checkbox_xb1_driver">Driver for Xbox 360/One USB-spillkontroller</string>
+    <string name="title_video_format">Endre H.265-innstillinger</string>
+    <string name="title_disable_frame_drop">Aldri forkast bilderammer</string>
+    <string name="title_checkbox_disable_warnings">Skru av advarselsmeldinger</string>
+    <string name="title_unlock_fps">Lås opp alle mulige bilderammetakter</string>
+    <string name="category_advanced_settings">Avanserte innstillinger</string>
+    <string name="title_checkbox_host_audio">Spill lyd på PC</string>
+    <string name="title_checkbox_enable_sops">Optimaliser spillinnstillinger</string>
+    <string name="category_host_settings">Vertsinnstillinger</string>
+    <string name="summary_language_list">Språk brukt i Moonlight</string>
+    <string name="title_language_list">Språk</string>
+    <string name="category_ui_settings">Grensesnittsinnstillinger</string>
+    <string name="suffix_osc_opacity">%</string>
+    <string name="dialog_title_osc_opacity">Endre dekkevne</string>
+    <string name="dialog_title_reset_osc">Tilbakestill oppsett</string>
+    <string name="summary_only_l3r3">Skjul alle virtuelle knapper unntatt L3 og R3</string>
+    <string name="title_only_l3r3">Kun vis L3 og R3</string>
+    <string name="title_checkbox_vibrate_osc">Skru på vibrering</string>
+    <string name="title_checkbox_mouse_emulation">Museemulering via spillkontroller</string>
+    <string name="suffix_seekbar_deadzone">%</string>
+    <string name="category_input_settings">Inndatainnstillinger</string>
+    <string name="title_audio_config_list">Kringlydsoppsett</string>
+    <string name="category_audio_settings">Lydinnstillinger</string>
+    <string name="title_resolution_list">Videooppløsning</string>
+    <string name="category_basic_settings">Grunnleggende innstillinger</string>
+    <string name="addpc_enter_ip">Du må skrive inn en IP-adresse</string>
+    <string name="addpc_success">Datamaskin tillagt</string>
+    <string name="msg_add_pc">Kobler til PC-en …</string>
+    <string name="title_add_pc">Legg til PC manuelt</string>
+    <string name="applist_details_id">Program-ID:</string>
+    <string name="applist_quit_fail">Klarte ikke å avslutte</string>
+    <string name="applist_quit_success">Avsluttet</string>
+    <string name="applist_quit_app">Avslutter …</string>
+    <string name="applist_refresh_error_msg">Klarte ikke å hente programliste</string>
+    <string name="applist_refresh_error_title">Feil</string>
+    <string name="applist_refresh_title">Programliste</string>
+    <string name="applist_menu_hide_app">Skjul prgram</string>
+    <string name="applist_menu_tv_channel">Legg til i kanal</string>
+    <string name="applist_menu_scut">Opprett snarvei</string>
+    <string name="applist_menu_details">Vis detaljer</string>
+    <string name="applist_menu_cancel">Avbryt</string>
+    <string name="applist_menu_quit_and_start">Avslutt nåværende spill og start</string>
+    <string name="applist_menu_quit">Avslutt økt</string>
+    <string name="applist_menu_resume">Fortsett økt</string>
+    <string name="applist_connect_msg">Kobler til PC …</string>
+    <string name="poor_connection_msg">Dårlig tilknytning til PC</string>
+    <string name="slow_connection_msg">Vis tilkobling til PC
+\nReduser bitraten din</string>
+    <string name="delete_pc_msg">Er du sikker på at du vil slette denne PC-en\?</string>
+    <string name="help">Hjelp</string>
+    <string name="title_details">Detaljer</string>
+    <string name="no">Nei</string>
+    <string name="yes">Ja</string>
+    <string name="ip_hint">IP-adresse for GeForce PC</string>
+    <string name="conn_terminated_msg">Tilkoblingen ble avsluttet</string>
+    <string name="conn_terminated_title">Tilkobling avsluttet</string>
+    <string name="conn_error_msg">Klarte ikke å starte</string>
+    <string name="conn_error_title">Tilkoblingsfeil</string>
+    <string name="conn_metered">Advarsel: Din aktive nettverkstilknytning er kvotebasert.</string>
+    <string name="conn_establishing_msg">Starter tilkobling</string>
+    <string name="conn_establishing_title">Etablerer tilkobling</string>
+    <string name="error_pc_offline">Datamaskinen er frakoblet</string>
+    <string name="wol_waking_pc">Vekker opp PC …</string>
+    <string name="wol_pc_online">Datamaskinen er tilkoblet</string>
+    <string name="pair_incorrect_pin">Feil PIN</string>
+    <string name="pair_pc_offline">Datamaskinen er frakoblet</string>
+    <string name="nettest_title_waiting">Testing av nettverkstilkobling</string>
+    <string name="pcview_menu_details">Vis detaljer</string>
+    <string name="pcview_menu_test_network">Test nettverkstilkobling</string>
+    <string name="pcview_menu_delete_pc">Slett PC</string>
+    <string name="pcview_menu_send_wol">Send Wake-On-LAN-forespørsel</string>
+    <string name="pcview_menu_app_list">Vis alle programmer</string>
+    <string name="pcview_menu_header_unknown">Oppdaterer</string>
+    <string name="pcview_menu_header_offline">Frakoblet</string>
+    <string name="pcview_menu_header_online">Tilkoblet</string>
+    <string name="help_loading_msg">Laster inn hjelpeside …</string>
+    <string name="help_loading_title">Hjelpeviser</string>
+    <string name="scut_invalid_app_id">Angitt program er ikke gyldig</string>
+    <string name="scut_invalid_uuid">Angitt PC er ikke gyldig</string>
+    <string name="scut_pc_not_found">PC ikke funnet</string>
+    <string name="scut_deleted_pc">PC slettet</string>
+    <string name="summary_checkbox_mouse_emulation">Å lang-trykke «Start»-knappen veksler spillkontroller til musemodus</string>
+    <string name="title_checkbox_usb_bind_all">Overstyr systemspesifikk kontrollerstøtte</string>
+    <string name="summary_checkbox_xb1_driver">Skrur på en innebygd USB-driver for enheter uten systemspesifikk Xbox-kontrollerstøtte</string>
+    <string name="summary_checkbox_vibrate_fallback">Vibrerer din kontroller for å emulere vibrasjon, hvis din kontroller støtter det</string>
+    <string name="title_checkbox_vibrate_fallback">Vibrasjonsemulering</string>
+    <string name="summary_checkbox_touchscreen_trackpad">Får pekeskjermen til å oppføre seg som en pekeflate. Ellers kontrolleres pekeskjermen musen direkte.</string>
+    <string name="title_decoding_reset">Tilbakestilling av videoinnstillinger</string>
+    <string name="message_decoding_error">Moonlight har krasjet som følge av inkompabilitet med denne enhetens videodekoder. Forsikre deg om at GeForce Experience er oppdatert til seneste versjon på din PC. Prøv å justere strømmingsinnstillingene hvis problemet vedvarer.</string>
+    <string name="error_404">GFE returnerte en HTTP-404-feil. Forsikre deg om at PC-en kjører et støttet skjermkort. Bruk av fjernskrivebordsprogramvare kan også forårsake denne feilen. Prøv å starte maskinen på ny, eller å reinstallere GFE.</string>
+    <string name="error_manager_not_running">ComputerManager-tjenesten kjører ikke. Vent noen sekunder eller start programmet på ny.</string>
+    <string name="nettest_text_blocked">Nettverkstilkoblingen på din enhet ser ut til å blokkere Moonlight. Strømming over Internett vil muligens ikke fungere tilkoblet gjennom dette nettverket.</string>
+    <string name="nettest_text_failure">Nettverkstilkoblingen på din enhet ser ut til å blokkere Moonlight. Strømming over Internett vil muligens ikke fungere når tilkoblet gjennom dette nettverket.
+\n
+\nFølgende nettverksporter ble blokkert:
+\n</string>
+    <string name="nettest_text_inconclusive">Nettverkstesten kunne ikke utføres fordi ingen av Moonlight sine tilkoblingstesttjenere kunne nås. Sjekk din tilkobling til Internett og prøv igjen senere.</string>
+    <string name="summary_enable_perf_overlay">Viser ytelsesinfo i sanntid under strømming</string>
+    <string name="title_enable_perf_overlay">Vis ytelsesstatistikk under strømming</string>
+    <string name="summary_enable_hdr">Strøm HDR når spillet og PC-ens skjermkort støtter det. HDR krever GTX 1000-eller nyere.</string>
+    <string name="summary_checkbox_enable_pip">Tillater strømmen å vises (men ikke kontrolleres) under fleroppgaveløsning</string>
+    <string name="title_checkbox_enable_pip">Skru på bilde-i-bilde-observatørmodus</string>
+    <string name="title_reset_osc">Tøm lagret oppsett for innstillingskontroller som vises på skjermen</string>
+    <string name="summary_checkbox_vibrate_osc">Vibrerer din enhet for innstillingskontroller som vises på skjermen</string>
+    <string name="summary_checkbox_show_onscreen_controls">Vis virtuelle innstillingskontroller for innstillinger i overleggslag på pekeskjermen</string>
+    <string name="title_checkbox_show_onscreen_controls">Vis innstillingskontroller på skjermen</string>
+    <string name="category_on_screen_controls_settings">Innstillinger for innstillingskontroller som vises på skjermen</string>
+    <string name="summary_checkbox_usb_bind_all">Bruk Moonlight sin USB-driver for alle støttede spillkontrollere, selv når systemspesifikk kontrollerstøtte er tilgjengelig</string>
+    <string name="summary_audio_config_list">Skru på for 5,1- eller 7,1-kringlyd for hjemmekinosystemer</string>
+    <string name="summary_seekbar_bitrate">Øk for bedret bildekvalitet. Senk for bedre ytelse på trege tilkoblinger.</string>
+    <string name="summary_fps_list">Øk for jevnere videostrøm. Senk for bedre ytelse på trege enheter.</string>
+    <string name="video_decoder_init_failed">Klarte ikke å starte videodekoder. Enheten din støtter kanskje ikke valgt oppløsning eller bilderammetakt.</string>
+    <string name="error_usb_prohibited">USB-tilgang har blitt forbudt av din enhetsadministrator. Sjekk dine Knox- eller MDM-innstillinger.</string>
+    <string name="message_decoding_reset">Strømmingsinnstilinger tilbakestilt til forvalg som følge av at enhetens videodekoder fortsatte å krasje.</string>
+    <string name="summary_resolution_list">Øk for å forbedre bildeklarhet. Senk for bedre ytelse på svakere enheter og tregere nettverk.</string>
+    <string name="addpc_wrong_sitelocal">Den adressen ser ikke riktig ut. Du må bruke den offentlige IP-adressen for ruteren din for strømming over Internett.</string>
+    <string name="addpc_unknown_host">Kunne ikke utlede adresse tilhørende PC. Forsikre deg om at du ikke har skrevet den inn feil.</string>
+    <string name="addpc_fail">Kunne ikke koble til angitt datamaskin. Forsikre deg om at påkrevde porter er tillatt gjennom brannmuren.</string>
+    <string name="summary_enable_post_stream_toast">Vis en informasjonsmelding om latens etter at strømmen sluttføres</string>
+    <string name="title_enable_post_stream_toast">Vis latensmelding etter strømming</string>
+    <string name="title_enable_hdr">Skru på HDR (eksperimentelt)</string>
+    <string name="summary_video_format">H.265 senker båndbreddekravene, men krever en nyere enhet</string>
+    <string name="summary_disable_frame_drop">Kan redusere mikro-hakking på noen enheter, men kan øke latens</string>
+    <string name="summary_checkbox_disable_warnings">Skru av visning av tilkoblingsadvarsler på skjermen under strømming</string>
+    <string name="summary_unlock_fps">Strømming i 90 eller 120 BPS kan redusere latens på flaggskipsenheter, men kan forårsake forsinkelser eller ustabilitet på enheter som ikke klarer det.</string>
+    <string name="summary_checkbox_host_audio">Spill lyd fra datamaskinen og denne enheten</string>
+    <string name="summary_checkbox_enable_sops">Tillat GFE å endre spill-innstillinger for optimal strømming</string>
+    <string name="summary_checkbox_small_icon_mode">Mindre bilder for omslagskunst i programrutenettet lar deg se flere programmer på skjermen</string>
+    <string name="title_checkbox_small_icon_mode">Bruk liten omslagskunst</string>
+    <string name="summary_osc_opacity">Gjør innstillingskontroller som vises på skjermen mer/mindre gjennomsiktige</string>
+    <string name="title_osc_opacity">Endre dekkevne for innstillingskontroller som vises på skjermen</string>
+    <string name="toast_reset_osc_success">Innstillingskontroller som vises på skjermen tilbakestilt til forvalg</string>
+    <string name="dialog_text_reset_osc">Er du sikker på at du vil slette oppsettet ditt for innstillingskontroller som vises på skjermen\?</string>
+    <string name="summary_reset_osc">Tilbakestiller alle innstillingskontroller som vises på skjermen til forvalgt størrelse og posisjon</string>
+    <string name="summary_checkbox_mouse_nav_buttons">Å skru på dette ødelegger for høyreklikking på noen enheter</string>
+    <string name="title_checkbox_mouse_nav_buttons">Skru på museknapper for forover og tilbake</string>
+    <string name="suffix_seekbar_bitrate_mbps">Mbps</string>
+    <string name="nettest_text_success">Det ser ikke ut til at nettverket ditt blokkerer Moonlight. Hvis du fremdeles har problemer bør du sjekke PC-ens brannmursinnstillinger.
+\n
+\nHvis du prøver å strømme over Internett, kan du installere Moonlight Internett-vertstjeningsverktøyet på din PC og kjøre den inkluderte Internett-strømmingstesteren for å sjekke PC-ens tilkobling til Internett.</string>
+    <string name="nettest_text_waiting">Moonlight tester din nettverksforbindelse for å fastsette hvorvidt NVIDIA GameStream er blokkert.
+\n
+\nDette kan ta noen sekunder …</string>
+    <string name="pcview_menu_unpair_pc">Opphev parring</string>
+    <string name="pcview_menu_pair_pc">Parr med PC</string>
+    <string name="scut_not_paired">PC ikke parret</string>
+    <string name="summary_checkbox_flip_face_buttons">Veksler A/B og X/Y-knapper for spillkontrollere, og innstillingskontroller som vises på skjermen</string>
+    <string name="text_native_res_dialog">Innebygd oppløsningsmodus støttes ikke offisielt av GeForce Experience, så det vil ikke sette skjermoppløsning for verten på egenhånd. Du vil måtte sette det manuelt inne i spillet.
+\n
+\nHvis du velger å opprette en egendefinert oppløsning i NVIDIA-kontrollpanelet for å samsvare med enhetsoppløsningen må du forsikre deg om at du har lest og forstått NVIDIA sin advarsel om mulig skjermskade, PC-instabilitet, og andre potensielle problemer.
+\n
+\nVi er ikke ansvarlige for noen problemer som oppstår ved å lage en egendefinert oppløsning på din PC.
+\n
+\nDet kan hende din enhet eller verts-PC ikke støtter strømming i egentlig oppløsning. Hvis det ikke fungerer på din enhet er det dessverre ingenting du kan gjøre.</string>
+    <string name="summary_checkbox_multi_controller">Å fjerne dette valget påtvinger tilkoblet spillkontroller</string>
+    <string name="resolution_prefix_native">Innebygd</string>
+    <string name="title_native_res_dialog">Advarsel om innebygd oppløsning</string>
+    <string name="title_checkbox_flip_face_buttons">Veksle diamantknapper</string>
+</resources>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -88,7 +88,6 @@
  <string name="summary_resolution_list">Te hoge instellingen kunnen crashes en haperingen veroorzaken.</string>
  <string name="title_seekbar_bitrate">Selecteer doel video bitsnelheid</string>
  <string name="summary_seekbar_bitrate">Verlaag bitsnelheid om haperingen te verminderen. Verhoog de bitsnelheid voor een betere videokwaliteit.</string>
-  <string name="suffix_seekbar_bitrate">Kbps</string>
  <string name="title_checkbox_stretch_video">Rek video uit tot volledig scherm</string>
  <string name="title_checkbox_disable_warnings">Verberg waarschuwingsberichten</string>
  <string name="summary_checkbox_disable_warnings">Verberg on-screen verbindingswaarschuwingen tijdens het streamen</string>
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -120,7 +120,6 @@
    <string name="summary_fps_list">Crește-o pentru a îmbunătăți fluiditatea imaginilor. Descrește-o pentru dispozitive neperformante sau conexiune slabă.</string>
    <string name="title_seekbar_bitrate">Rata de biți</string>
    <string name="summary_seekbar_bitrate">Crește-o pentru a îmbunătăți calitatea imaginilor. Descrește-o pentru dispozitive neperformante sau conexiune slabă.</string>
-    <string name="suffix_seekbar_bitrate">Kbps</string>
    <string name="title_unlock_fps">Deblochează toate ratele de cadre posibile</string>
    <string name="summary_unlock_fps">Fluxul video de rate mai mari poate reduce latența folosind dispozitive performante, dar poate introduce erori daca nu sunt suportate.</string>
    <string name="title_checkbox_stretch_video">Întindeți video pe ecranul complet</string>
--- a/app/src/main/res/values-ru/arrays.xml
+++ b/app/src/main/res/values-ru/arrays.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string-array name="audio_config_names">
+        <item>Стерео</item>
+        <item>5.1 Объёмный звук</item>
+        <item>7.1 Объёмный звук</item>
+    </string-array>
+
    <string-array name="decoder_names">
        <item>Автоматический выбор декодера</item>
        <item>Принудительное программное декодирование</item>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
    <!-- PC view menu entries -->
    <string name="pcview_menu_app_list">Посмотреть список игр</string>
    <string name="pcview_menu_pair_pc">Создать пару с PC</string>
    <string name="pcview_menu_unpair_pc">Разорвать пару</string>
    <string name="pcview_menu_send_wol">Отправить Wake-On-LAN запрос</string>
    <string name="pcview_menu_delete_pc">Удалить PC</string>
-
+    <!-- Network test strings -->
+    <string name="nettest_title_waiting">Тестирование Сетевого Подключения</string>
+    <string name="nettest_text_waiting">Moonlight тестирует ваше сетевое подключение, чтобы определить, заблокирован ли NVIDIA GameStream.\n\nЭто может занять некоторое время…</string>
+    <string name="nettest_title_done">Тестирование Подключения Завершено</string>
+    <string name="nettest_text_success">Ваша сеть не блокирует Moonlight. Если у вас всё ещё есть проблемы с соединением, проверьте настройки брандмауэра на компьютере.\n\nЕсли вы пытаетесь транслировать через интернет, установите Moonlight Internet Hosting Tool на ваш компьютер и запустите установленный Internet Streaming Tester, чтобы проверить Интернет-соединение на вашем компьютере.</string>
+    <string name="nettest_text_inconclusive">Тестирование подключения не может быть выполнено, потому что сервера тестирования подключения Moonlight не доступны. Проверьте ваше Интернет-соединение или повторите попытку позже.</string>
+    <string name="nettest_text_failure">Похоже, что текущее сетевое подключение вашего устройства блокирует Moonlight. Трансляция через Интернет может не работать при подключении к этой сети.\n\nСледующие сетевые порты были заблокированы:\n</string>
    <!-- Pair messages -->
    <string name="pairing">Создание пары…</string>
    <string name="pair_pc_offline">Компьютер выключен или находится не в сети</string>
@@ -16,7 +21,6 @@
    <string name="pair_pairing_msg">Пожалуйста введите этот PIN на PC:</string>
    <string name="pair_incorrect_pin">Неправильный PIN</string>
    <string name="pair_fail">Создание пары не удалось</string>
-
    <!-- WOL messages -->
    <string name="wol_pc_online">Компьютер в сети</string>
    <string name="wol_no_mac">Невозможно разбудить PC потому что GFE не отправило MAC адрес</string>
@@ -25,13 +29,11 @@
 	    Если этого не происходит, удостоверьтесь что Wake-On-LAN настроен правильно.
    </string>
    <string name="wol_fail">Ошибка при отправке Wake-On-LAN пакетов</string>
-
    <!-- Unpair messages -->
    <string name="unpairing">Разрыв пары…</string>
    <string name="unpair_success">Разрыв пары закончился успешно</string>
    <string name="unpair_fail">Разрыв пары не удался</string>
    <string name="unpair_error">Устройство не было спарено</string>
-
    <!-- Errors -->
    <string name="error_pc_offline">Компьютер выключен или находится не в сети</string>
    <string name="error_manager_not_running">Сервис ComputerManager не запущен. Пожалуйста, подождите несколько секунд или перезапустите приложение.</string>
@@ -39,7 +41,6 @@
    <string name="error_404">GFE вернул ошибку HTTP 404. Убедитесь что Ваш PC использует поддерживаемый GPU.
 	    Использование программ для удалённого доступа также может вызывать эту ошибку. Попробуйте перезагрузить компьютер или переустановить GFE.
    </string>
-
    <!-- Start application messages -->
    <string name="conn_establishing_title">Создание соединения</string>
    <string name="conn_establishing_msg">Подключение</string>
@@ -52,7 +53,6 @@
    <string name="conn_error_msg">Запуск не удался</string>
    <string name="conn_terminated_title">Соединение прекращено</string>
    <string name="conn_terminated_msg">Подключение было прервано</string>
-
    <!-- General strings -->
    <string name="ip_hint">IP-адрес компьютера с GeForce</string>
    <string name="searching_pc">Поиск компьютеров с запущенным GameStream…\n\n
@@ -60,7 +60,6 @@
    <string name="yes">Да</string>
    <string name="no">Нет</string>
    <string name="lost_connection">Потеряно соединение с PC</string>
-
    <!-- AppList activity -->
    <string name="applist_menu_resume">Возобновить сессию</string>
    <string name="applist_menu_quit">Выйти из сессии</string>
@@ -75,7 +74,6 @@
    <string name="applist_quit_success">Выход произошёл успешно из</string>
    <string name="applist_quit_fail">Ошибка при выходе</string>
    <string name="applist_quit_confirmation">Вы уверены, что хотите выйти из запущенного приложения? Все несохраненные данные будут потеряны.</string>
-
    <!-- Add computer manually activity -->
    <string name="title_add_pc">Добавление PC вручную</string>
    <string name="msg_add_pc">Соединение с PC…</string>
@@ -83,39 +81,36 @@
    <string name="addpc_success">Компьютер добавлен успешно</string>
    <string name="addpc_unknown_host">Не удалось найти PC по указанному адресу. Убедитесь, что Вы не совершили ошибок во время его написания.</string>
    <string name="addpc_enter_ip">Вы должны ввести IP адрес</string>
-
    <!-- Preferences -->
    <string name="category_basic_settings">Общие Настройки</string>
    <string name="title_resolution_list">Выберите разрешение и частоту кадров</string>
    <string name="summary_resolution_list">Выбор слишком высокого значеня для своего устройства может вызвать тормоза или вылеты</string>
    <string name="title_seekbar_bitrate">Выберите битрейт видео</string>
    <string name="summary_seekbar_bitrate">Низкий битрейт уменьшит зависания. Увеличение битрейта улучшит качество изображения.</string>
-    <string name="suffix_seekbar_bitrate">Kbps</string>
    <string name="title_checkbox_stretch_video">Растягивать видео на весь экран</string>
    <string name="title_checkbox_disable_warnings">Отключить сообщения с предупреждениями</string>
    <string name="summary_checkbox_disable_warnings">Выключить экранные предупреждения о соединении во время трансляции</string>
-
    <string name="category_audio_settings">Аудио Настройки</string>
-
+    <string name="title_audio_config_list">Настройка объёмного звука</string>
+    <string name="summary_audio_config_list">Включить объёмный звук 5.1 или 7.1 для систем домашнего кинотеатра</string>
    <string name="title_checkbox_multi_controller">Поддержка нескольких контроллеров</string>
    <string name="summary_checkbox_multi_controller">Когда отключена, все контроллеры определяются как один</string>
    <string name="title_seekbar_deadzone">Регулировать мертвую зону аналогового стика</string>
    <string name="suffix_seekbar_deadzone">%</string>
    <string name="title_checkbox_xb1_driver">Драйвер контроллеров Xbox 360/One</string>
    <string name="summary_checkbox_xb1_driver">Включить встроенный USB драйвер для устройств без собственной поддержки контроллеров Xbox</string>
-
+    <string name="title_checkbox_flip_face_buttons">Перевернуть кнопки A/B и X/Y</string>
+    <string name="summary_checkbox_flip_face_buttons">Меняет местами кнопки A/B и X/Y на геймпадах и экранных кнопках</string>
    <string name="category_ui_settings">Настройки Интерфейса</string>
    <string name="title_language_list">Язык</string>
    <string name="summary_language_list">Язык, который будет использоваться в Moonlight</string>
    <string name="title_checkbox_small_icon_mode">Использовать маленькие иконки</string>
    <string name="summary_checkbox_small_icon_mode">Использовать маленькие иконки в сетке для отображения большего числа элементов на экране</string>
-
    <string name="category_host_settings">Настройки Хоста</string>
    <string name="title_checkbox_enable_sops">Оптимизировать игровые настройки</string>
    <string name="summary_checkbox_enable_sops">Разрешить GFE изменять настройки игр для оптимальной трансляции</string>
    <string name="title_checkbox_host_audio">Проигрывать звук на PC</string>
    <string name="summary_checkbox_host_audio">Проигрывать звук на компьютере и текущем устройстве</string>
-
    <string name="category_advanced_settings">Расширенные Настройки</string>
    <string name="title_video_format">Изменить настройки H.265</string>
    <string name="summary_video_format">H.265 снижает требования к пропускной способности, но требует очень нового устройства</string>
@@ -124,6 +119,8 @@
    <string name="summary_checkbox_show_onscreen_controls">Отображать оверлей виртуального контроллера на сенсорном экране</string>
    <string name="title_only_l3r3">Показывать только L3 и R3</string>
    <string name="summary_only_l3r3">Скрывать все экранные кнопки кроме L3 и R3</string>
+    <string name="summary_osc_opacity">Сделать экранные кнопки более/менее прозрачными</string>
+    <string name="dialog_title_osc_opacity">Изменить прозрачность</string>
    <string name="scut_deleted_pc">PC удален</string>
    <string name="scut_not_paired">PC не сопряжен</string>
    <string name="help_loading_title">Просмотр Помощи</string>
@@ -152,12 +149,15 @@
    <string name="summary_disable_frame_drop">Может уменьшить микрозависания на некоторых устройствах, но также увеличить задержку</string>
    <string name="title_enable_hdr">Включить HDR (Экспериментально)</string>
    <string name="summary_enable_hdr">Транслировать в HDR если игра и GPU компьютера поддерживают это. HDR требует видеокарты GTX 1000 серии или более новой.</string>
-
+    <string name="title_enable_post_stream_toast">Показывать отчёт о задержке после трансляции</string>
+    <string name="summary_enable_post_stream_toast">Отобразить сообщение с информацией о задержке после окончания трансляции.</string>
    <string name="title_checkbox_vibrate_osc">Включить вибрацию</string>
    <string name="title_fps_list">Частота кадров</string>
    <string name="applist_menu_details">Детали</string>
    <string name="applist_menu_scut">Создать ярлык</string>
    <string name="category_input_settings">Настройки ввода</string>
+    <string name="title_checkbox_touchscreen_trackpad">Использовать сенсор как тачпад</string>
+    <string name="summary_checkbox_touchscreen_trackpad">Если включено, сенсор выступает в роли тачпада. Если отключено, сенсор напрямую контролирует курсор мыши.</string>
    <string name="delete_pc_msg">Вы уверены что хотите удалить этот PC?</string>
    <string name="pcview_menu_details">Детали</string>
    <string name="poor_connection_msg">Слабое соединение с PC</string>
@@ -180,4 +180,10 @@
    <string name="scut_invalid_uuid">Указанный PC недействителен</string>
    <string name="scut_invalid_app_id">Указанное приложение недействительно</string>
    <string name="suffix_osc_opacity">%</string>
-</resources>
+    <string name="suffix_seekbar_bitrate_mbps">Мб/с</string>
+    <string name="applist_menu_hide_app">Скрыть приложение</string>
+    <string name="pcview_menu_test_network">Тестовое подключение к сети</string>
+    <string name="pcview_menu_header_unknown">Обновление</string>
+    <string name="pcview_menu_header_offline">Оффлайн</string>
+    <string name="pcview_menu_header_online">Онлайн</string>
+</resources>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -90,7 +90,6 @@
    <string name="summary_resolution_list">Вибір занадто високого значеня для свого пристрою може викликати гальма або вильоти</string>
    <string name="title_seekbar_bitrate">Виберіть бітрейт відео</string>
    <string name="summary_seekbar_bitrate">Низький бітрейт зменшить зависання. Збільшення бітрейта поліпшить якість зображення.</string>
-    <string name="suffix_seekbar_bitrate">Kbps</string>
    <string name="title_checkbox_stretch_video">Розтягувати відео на весь екран</string>
    <string name="title_checkbox_disable_warnings">Відключити повідомлення з попередженнями</string>
    <string name="summary_checkbox_disable_warnings">Вимкнути екранні попередження про з\'єднання під час трансляції</string>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -122,7 +122,6 @@
    <string name="summary_fps_list"> 高帧数提升视频流流畅度。 \n 低帧数提升在低端设备中的串流体验。</string>													   																																	
    <string name="title_seekbar_bitrate"> 视频码率 </string>
    <string name="summary_seekbar_bitrate"> 高码率提升图像质量。 \n 低码率提升在较慢网络中的串流体验。 </string>
-    <string name="suffix_seekbar_bitrate">Kbps</string>
    <string name="title_unlock_fps"> 解锁所有可用帧数 </string>
    <string name="summary_unlock_fps"> 以90或120帧串流可能会减少在高端设备上的网络延迟，但会在不支持的设备上造成卡顿或崩溃。 </string>																																																														   
    <string name="title_checkbox_stretch_video"> 将画面拉伸至全屏 </string>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -122,7 +122,6 @@
    <string name="summary_fps_list"> 高幀數提升視頻流流暢度。 \n 低幀數提升在低端設備中的串流體驗。</string>													   																																	
    <string name="title_seekbar_bitrate"> 視頻碼率 </string>
    <string name="summary_seekbar_bitrate"> 高碼率提升圖像品質。 \n 低碼率提升在較慢網路中的串流體驗。 </string>
-    <string name="suffix_seekbar_bitrate">Kbps</string>
    <string name="title_unlock_fps"> 解鎖所有可用幀數 </string>
    <string name="summary_unlock_fps"> 以90或120幀串流可能會減少在高端設備上的網路延遲，但會在不支援的設備上造成卡頓或崩潰。 </string>																																																														   
    <string name="title_checkbox_stretch_video"> 將畫面拉伸至全屏 </string>
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -8,6 +8,8 @@
        <item>1440p</item>
        <item>4K</item>
    </string-array>
+
+    <!-- Keep this in sync with PreferenceConfiguration.isNativeResolution()! -->
    <string-array name="resolution_values" translatable="false">
        <item>640x360</item>
        <item>854x480</item>
@@ -56,6 +58,7 @@
        <item>Deutsch</item>
        <item>Română</item>
        <item>Українська</item>
+        <item>Norwegian Bokmål</item>
    </string-array>
    <string-array name="language_values" translatable="false">
        <item>default</item>
@@ -72,6 +75,7 @@
        <item>de</item>
        <item>ro</item>
        <item>uk</item>
+        <item>nb-NO</item>
    </string-array>

    <string-array name="decoder_names">
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,8 +15,10 @@
    <string name="help_loading_msg">Loading help page…</string>

    <!-- PC view menu entries -->
-    <string name="pcview_menu_app_list">View Apps</string>
-    <string name="pcview_menu_full_app_list">View Hidden Apps</string>
+    <string name="pcview_menu_header_online">Online</string>
+    <string name="pcview_menu_header_offline">Offline</string>
+    <string name="pcview_menu_header_unknown">Refreshing</string>
+    <string name="pcview_menu_app_list">View All Apps</string>
    <string name="pcview_menu_pair_pc">Pair with PC</string>
    <string name="pcview_menu_unpair_pc">Unpair</string>
    <string name="pcview_menu_send_wol">Send Wake-On-LAN request</string>
@@ -72,7 +74,10 @@
    <string name="error_usb_prohibited">USB access is prohibited by your device administrator. Check your Knox or MDM settings.</string>
    <string name="unable_to_pin_shortcut">Your current launcher does not allow for creating pinned shortcuts.</string>
    <string name="video_decoder_init_failed">Video decoder failed to initialize. Your device may not support the selected resolution or frame rate.</string>
-    <string name="no_video_received_error">No video received from host. Check the host PC\'s firewall and port forwarding rules.</string>
+    <string name="no_video_received_error">No video received from host.</string>
+    <string name="no_frame_received_error">Your network connection isn\'t performing well. Reduce your video bitrate setting or try a faster connection.</string>
+    <string name="early_termination_error">Something went wrong on your host PC when starting the stream.\n\nMake sure you don\'t have any DRM-protected content open on your host PC. You can also try restarting your host PC.\n\nIf the issue persists, try reinstalling your GPU drivers and GeForce Experience.</string>
+    <string name="check_ports_msg">Check your firewall and port forwarding rules for port(s):</string>

    <!-- Start application messages -->
    <string name="conn_establishing_title">Establishing Connection</string>
@@ -134,12 +139,15 @@
    <string name="category_basic_settings">Basic Settings</string>
    <string name="title_resolution_list">Video resolution</string>
    <string name="summary_resolution_list">Increase to improve image clarity. Decrease for better performance on lower end devices and slower networks.</string>
+    <string name="title_native_res_dialog">Native Resolution Warning</string>
+    <string name="text_native_res_dialog">Native resolution modes are not officially supported by GeForce Experience, so it will not set your host display resolution itself. You will need to set it manually while in game.\n\nIf you choose to create a custom resolution in NVIDIA Control Panel to match your device resolution, please ensure you have read and understood NVIDIA\'s warning regarding possible monitor damage, PC instability, and other potential problems.\n\nWe are not responsible for any problems resulting from creating a custom resolution on your PC.\n\nFinally, your device or host PC may not support streaming at native resolution. If it doesn\'t work on your device, you\'re just out of luck unfortunately.</string>
    <string name="title_fps_list">Video frame rate</string>
    <string name="summary_fps_list">Increase for a smoother video stream. Decrease for better performance on lower end devices.</string>
    <string name="title_seekbar_bitrate">Video bitrate</string>
    <string name="summary_seekbar_bitrate">Increase for better image quality. Decrease to improve performance on slower connections.</string>
-    <string name="suffix_seekbar_bitrate">Kbps</string>
+    <string name="suffix_seekbar_bitrate_mbps">Mbps</string>
    <string name="title_checkbox_stretch_video">Stretch video to full-screen</string>
+    <string name="resolution_prefix_native">Native</string>

    <string name="category_audio_settings">Audio Settings</string>
    <string name="title_audio_config_list">Surround sound configuration</string>
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -22,10 +22,12 @@
            android:key="seekbar_bitrate_kbps"
            android:dialogMessage="@string/summary_seekbar_bitrate"
            seekbar:min="500"
+            android:max="150000"
            seekbar:step="500"
-            android:max="100000"
+            seekbar:keyStep="1000"
+            seekbar:divisor="1000"
            android:summary="@string/summary_seekbar_bitrate"
-            android:text="@string/suffix_seekbar_bitrate"
+            android:text="@string/suffix_seekbar_bitrate_mbps"
            android:title="@string/title_seekbar_bitrate" />
        <CheckBoxPreference
            android:key="checkbox_stretch_video"
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -0,0 +1,18 @@
+version: 0.0.0.{build}
+
+clone_depth: 1
+
+image: Visual Studio 2019
+
+before_build:
+  - 'git submodule update --init --recursive'
+  - 'mklink /D C:\android-sdk "C:\Program Files (x86)\Android\android-sdk"'
+  - 'set ANDROID_HOME=C:\android-sdk'
+
+build_script:
+  - gradlew.bat build connectedCheck
+
+after_build:
+  - 'appveyor PushArtifact app\build\reports\lint-results.html'
+
+deploy: off
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
        google()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
    }
 }

--- a/fastlane/metadata/android/en-US/changelogs/242.txt
+++ b/fastlane/metadata/android/en-US/changelogs/242.txt
@@ -0,0 +1,4 @@
+- Hiding games now only takes effect after returning to the app list
+- Display a warning if the connection is too unstable to stream
+- Increase maximum bitrate to 150 Mbps for Ethernet-connected devices
+- Update Russian and French translations
--- a/fastlane/metadata/android/en-US/changelogs/243.txt
+++ b/fastlane/metadata/android/en-US/changelogs/243.txt
@@ -0,0 +1 @@
+- Improved connection reliability
--- a/fastlane/metadata/android/en-US/changelogs/244.txt
+++ b/fastlane/metadata/android/en-US/changelogs/244.txt
@@ -0,0 +1 @@
+- Improved performance on Google TV Chromecast and other newer Amlogic devices by using HEVC by default
--- a/fastlane/metadata/android/en-US/changelogs/245.txt
+++ b/fastlane/metadata/android/en-US/changelogs/245.txt
@@ -0,0 +1,3 @@
+- Gamepad button combos to emulate missing Select and Guide buttons have been reintroduced
+- For gamepads without a Select button, LB+Start will trigger the Select button and RB+Start will trigger the Guide button
+- For gamepads with a Select button, Start+Select will trigger the Guide button
--- a/fastlane/metadata/android/en-US/changelogs/246.txt
+++ b/fastlane/metadata/android/en-US/changelogs/246.txt
@@ -0,0 +1 @@
+- Enabled raw mouse input on the Nvidia Shield TV to avoid mouse acceleration
--- a/fastlane/metadata/android/en-US/changelogs/247.txt
+++ b/fastlane/metadata/android/en-US/changelogs/247.txt
@@ -0,0 +1 @@
+- Fixed missing video or audio when streaming over some Internet connections
--- a/fastlane/metadata/android/en-US/changelogs/251.txt
+++ b/fastlane/metadata/android/en-US/changelogs/251.txt
@@ -0,0 +1,4 @@
+- Added the option to stream at your device's native resolution
+- Added 2 finger scrolling in touchpad mode
+- Added additional troubleshooting information when a connection fails
+- Minor UI tweaks and crash fixes
--- a/fastlane/metadata/android/en-US/changelogs/252.txt
+++ b/fastlane/metadata/android/en-US/changelogs/252.txt
@@ -0,0 +1,3 @@
+- Added support for multiple native resolution options
+- Improve accuracy of decoder latency reports for very slow decoders
+- Minor UI improvements
--- a/fastlane/metadata/android/en-US/changelogs/253.txt
+++ b/fastlane/metadata/android/en-US/changelogs/253.txt
@@ -0,0 +1,2 @@
+- Add a workaround for the Android 11 gamepad bug when Accessibility features are enabled
+- See https://issuetracker.google.com/issues/163120692 for more details
--- a/fastlane/metadata/android/en-US/changelogs/254.txt
+++ b/fastlane/metadata/android/en-US/changelogs/254.txt
@@ -0,0 +1,2 @@
+- Fixed mapping of Nintendo Switch Pro controller on Android 11
+- Fixed handling of multiple input devices with different modifier states
--- a/fastlane/metadata/android/en-US/changelogs/255.txt
+++ b/fastlane/metadata/android/en-US/changelogs/255.txt
@@ -0,0 +1,2 @@
+- Fixed typing upper-case letters with the software keyboard
+- Improved device compatibility with the built-in USB Xbox gamepad driver
--- a/fastlane/metadata/android/en-US/changelogs/256.txt
+++ b/fastlane/metadata/android/en-US/changelogs/256.txt
@@ -0,0 +1,3 @@
+- Added Amazon Luna wired controller support in the built-in Xbox USB driver
+- Added support for AMF-encoded HEVC streams from servers like Sunshine and OpenStream
+- Norwegian Bokmål translation from Weblate community
--- a/fastlane/metadata/android/en-US/changelogs/257.txt
+++ b/fastlane/metadata/android/en-US/changelogs/257.txt
@@ -0,0 +1 @@
+- Initial compatibility with GeForce Experience 3.22
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu May 28 11:41:09 PDT 2020
+#Mon Oct 12 13:42:18 CDT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
Author	SHA1	Message	Date
Cameron Gutman	fe704af62f	Version 9.8.6	2021-04-09 19:35:02 -05:00
Cameron Gutman	e74517543d	Update common-c for initial GFE 3.22 compatibility	2021-04-09 19:32:39 -05:00
Cameron Gutman	81c815840d	Version 9.8.5	2021-04-03 12:39:02 -05:00
Cameron Gutman	e9cd63dc5f	Removed deprecated ProGuard option	2021-04-03 12:00:53 -05:00
Cameron Gutman	1ae8f67d93	Add Norwegian Bokmål option to the language list	2021-04-03 11:59:57 -05:00
Cameron Gutman	daa1e10333	Merge remote-tracking branch 'origin/weblate'	2021-04-03 11:47:27 -05:00
Cameron Gutman	a8a356e703	Add Amazon Luna support in Xbox 360 driver	2021-04-03 11:45:02 -05:00
Rener kaka	ca440cc5dd	Added translation using Weblate (Kurdish (Central))	2021-04-02 21:11:43 +02:00
Øyvind Heddeland Instefjord	95a9fb4f62	Translated using Weblate (Norwegian Bokmål) Currently translated at 90.1% (164 of 182 strings) Translation: Moonlight Game Streaming/moonlight-android Translate-URL: https://hosted.weblate.org/projects/moonlight/moonlight-android/nb_NO/	2021-04-01 17:26:57 +02:00
Cameron Gutman	7db9e27112	Update NDK to r22b	2021-03-31 20:07:08 -05:00
Cameron Gutman	03bcdbe3f7	Update moonlight-common-c to pick up AMF HEVC parsing fix	2021-03-31 20:06:53 -05:00
Cameron Gutman	f0762a6213	Version 9.8.4	2021-03-21 21:51:54 -05:00
Allan Nordhøy	67fbc6b3ad	Translated using Weblate (Norwegian Bokmål) Currently translated at 88.4% (161 of 182 strings) Translation: Moonlight Game Streaming/moonlight-android Translate-URL: https://hosted.weblate.org/projects/moonlight/moonlight-android/nb_NO/	2021-03-21 10:37:10 +01:00
Jorys Paulin	d9662d7396	Translated using Weblate (French) Currently translated at 95.6% (174 of 182 strings) Translation: Moonlight Game Streaming/moonlight-android Translate-URL: https://hosted.weblate.org/projects/moonlight/moonlight-android/fr/	2021-03-21 10:37:10 +01:00
Nedelcu Constantin Marius Nedelcu	5ccbbf259d	Translated using Weblate (Norwegian Bokmål) Currently translated at 87.3% (159 of 182 strings) Translation: Moonlight Game Streaming/moonlight-android Translate-URL: https://hosted.weblate.org/projects/moonlight/moonlight-android/nb_NO/	2021-03-21 06:29:37 +01:00
Allan Nordhøy	179c2f8723	Translated using Weblate (Norwegian Bokmål) Currently translated at 87.3% (159 of 182 strings) Translation: Moonlight Game Streaming/moonlight-android Translate-URL: https://hosted.weblate.org/projects/moonlight/moonlight-android/nb_NO/	2021-03-21 06:29:36 +01:00
Allan Nordhøy	c76e0a40a7	Translated using Weblate (Norwegian Bokmål) Currently translated at 59.3% (108 of 182 strings) Translation: moonlight/moonlight-android Translate-URL: https://hosted.weblate.org/projects/moonlight/moonlight-android/nb_NO/	2021-03-21 02:34:36 +01:00
Artem	03407e528f	Translated using Weblate (Russian) Currently translated at 94.5% (172 of 182 strings) Translation: moonlight/moonlight-android Translate-URL: https://hosted.weblate.org/projects/moonlight/moonlight-android/ru/	2021-03-21 02:34:36 +01:00
reloxx13	0c41d742cf	Translated using Weblate (German) Currently translated at 100.0% (182 of 182 strings) Translation: moonlight/moonlight-android Translate-URL: https://hosted.weblate.org/projects/moonlight/moonlight-android/de/	2021-03-21 02:34:36 +01:00
Allan Nordhøy	ed2f471a4e	Added translation using Weblate (Norwegian Bokmål)	2021-03-21 02:34:36 +01:00
Cameron Gutman	04efec101e	Sync Xbox driver VIDs with Linux 5.11	2021-03-20 18:49:34 -05:00
Cameron Gutman	a6c69012cc	Add Weblate link and badge	2021-03-20 18:15:40 -05:00
Cameron Gutman	0045c54d8e	Reapply a portion of `1d3e42f` that should not have been reverted	2021-03-20 11:11:12 -05:00
Cameron Gutman	45436c006f	Cancel a pending drag timer before setting a new one	2021-03-20 11:04:34 -05:00
Cameron Gutman	cc183c0da8	Cancel a pending timer before setting a new one	2021-03-20 10:59:47 -05:00
Cameron Gutman	523f1df98b	Remove superfluous simulated shift key up/down events Setting the shift modifier flag alone is sufficient for current GFE versions	2021-03-20 10:38:15 -05:00
Cameron Gutman	5843dff278	Apply new fix for #840	2021-03-20 10:24:06 -05:00
Cameron Gutman	7f24f47978	Revert "Use a global set of modifier flags rather than per-device flags" This reverts commit `1d3e42f92e`.	2021-03-20 10:08:58 -05:00
Cameron Gutman	b1f9fd459e	Update NDK to r22	2021-03-20 10:07:08 -05:00
Cameron Gutman	48988eb785	Update AGP to 4.1.3	2021-03-20 10:06:51 -05:00
Cameron Gutman	0045a885b9	Migrate to AppVeyor	2021-03-03 19:56:20 -06:00
Cameron Gutman	0b57f60454	Migrate from travis-ci.org to travis-ci.com	2021-03-03 01:54:20 -06:00
Cameron Gutman	f0857c7da2	Add issue template	2021-03-03 01:41:13 -06:00
Cameron Gutman	15faa2e841	Version 9.8.3	2021-03-02 18:48:12 -06:00
Cameron Gutman	da103f7197	Don't use our built-in Switch Pro mapping on Android 10+	2021-02-28 16:35:17 -06:00
Cameron Gutman	1d3e42f92e	Use a global set of modifier flags rather than per-device flags Fixes #840	2021-02-28 11:26:35 -06:00
Cameron Gutman	20ced841dd	Handle pointer capture on SOURCE_TOUCHPAD devices	2021-02-27 15:48:37 -06:00
Cameron Gutman	54ebd0a796	Fix streaming in the Android 12 emulator	2021-02-27 15:46:59 -06:00
Cameron Gutman	e636a7171b	Add explicit android:exported value for Android 12	2021-02-27 15:46:23 -06:00
Cameron Gutman	e8f847065b	Version 9.8.2	2021-01-31 21:08:12 -06:00
Cameron Gutman	1c806bb572	Only use the virtual device as a gamepad if at least one gamepad is present	2021-01-31 19:42:41 -06:00
Cameron Gutman	963133598f	Add hack to work around https://issuetracker.google.com/issues/163120692	2021-01-31 19:29:57 -06:00
Cameron Gutman	fedaa74c47	Update AGP to 4.1.2	2021-01-31 19:28:42 -06:00
Cameron Gutman	e322baf1d7	Version 9.8.1	2021-01-09 19:42:45 -06:00
Cameron Gutman	173a07cb59	Update ENet	2021-01-09 19:25:21 -06:00
Cameron Gutman	364afff860	Allow display resolution adjustment when streaming at a native resolution	2021-01-09 19:24:21 -06:00
Cameron Gutman	1b59e61b8e	Include PC name in the PC context menu header	2020-12-31 16:42:26 -06:00
Cameron Gutman	b1f453f7ba	Charge time spent in the decode unit queue to the decoder rather than receive time	2020-12-31 16:35:49 -06:00
Cameron Gutman	175e842feb	Support multiple native resolution options	2020-12-30 16:29:07 -06:00
Cameron Gutman	d7a9a37a0e	Version 9.8	2020-12-30 13:08:49 -06:00
Cameron Gutman	836b9240de	Make native resolution warning more stern	2020-12-30 12:52:05 -06:00
Cameron Gutman	bdac2df4b9	Fixed crash if we get a short read from the Xbox One controller	2020-12-24 11:59:33 -06:00
Cameron Gutman	57b507ad50	Use the game title as the context menu header	2020-12-24 11:50:59 -06:00
Cameron Gutman	35201b69f6	Add specific error text for an early termination	2020-12-24 11:32:10 -06:00
Cameron Gutman	0d138c26e9	Remove the native option if it duplicates a pre-existing resolution	2020-12-23 16:49:18 -06:00
Cameron Gutman	b4a7393dca	Normalize resolution orientation on pre-M devices	2020-12-23 16:46:07 -06:00
Cameron Gutman	d86092df1a	Update AGP to 4.1.1	2020-12-23 16:23:15 -06:00
Cameron Gutman	b392d7f8e3	Add option to stream at device native resolution Fixes #155	2020-12-23 16:17:06 -06:00
Cameron Gutman	7cc7953879	Display failing ports when the connection is unsuccessful	2020-12-23 14:30:24 -06:00
Cameron Gutman	7b26852a1f	Use LiStringifyPortFlags() instead of coding it ourselves	2020-12-23 14:19:19 -06:00
Cameron Gutman	f26b384697	Add a PC menu header to show PC status	2020-12-13 13:05:36 -06:00
Cameron Gutman	ab0531aa76	Update moonlight-common-c submodule	2020-12-07 20:07:48 -06:00
Cameron Gutman	6873720d81	Fix build	2020-11-28 17:50:26 -06:00
Cameron Gutman	1e30c4a219	Remove "View Apps" and change "View Hidden Apps" to "View All Apps"	2020-11-28 17:28:17 -06:00
Cameron Gutman	0a0e3ff970	Don't trim XML strings We should display the apps exactly as reported in GFE.	2020-11-21 17:09:34 -06:00
Cameron Gutman	5c42fd86a6	Update moonlight-common-c to avoid QoS on IPv6	2020-11-21 17:06:15 -06:00
Cameron Gutman	16cc829906	Fix some incorrect tap behavior on right clicks	2020-11-10 15:27:48 -06:00
Cameron Gutman	829e7cf33c	Allow 2 finger scrolling in relative mode	2020-11-10 15:12:17 -06:00
Cameron Gutman	02bfa90417	Ignore movement from cancelled touches	2020-11-10 15:09:51 -06:00
Daniel	0b2466cf26	fixed some german typos in the UI (#894 ) * fixed some german typos * added more translations from english * correct order * typo * typos	2020-11-10 10:48:57 -06:00
Cameron Gutman	9d8df04c5c	Catch IllegalArgumentException when trying to insert an entry to TvContract.Channels.CONTENT_URI HarmonyOS has FEATURE_LEANBACK but doesn't support this URI	2020-11-10 10:46:39 -06:00
Cameron Gutman	34a1697d50	Revert "Fix crash on HarmonyOS due to broken TV content provider APIs" This reverts commit `ce0b19605a`.	2020-11-10 10:44:41 -06:00
Cameron Gutman	17cf711c3d	Don't check brand when whitelisting ranchu for HEVC HarmonyOS also uses "ranchu" as the hardware name, but doesn't use "google" as the brand name	2020-11-08 20:40:59 -06:00
Cameron Gutman	ce0b19605a	Fix crash on HarmonyOS due to broken TV content provider APIs Fixes #883	2020-11-08 20:39:47 -06:00
Cameron Gutman	35bd9ecda3	Version 9.7.7	2020-10-28 21:14:26 -05:00
Cameron Gutman	ca89849dd2	Update moonlight-common-c with QoS fix	2020-10-28 20:58:21 -05:00
Cameron Gutman	ac1cb6d56b	Version 9.7.6	2020-10-25 12:44:26 -05:00
Cameron Gutman	dfbffea0fc	Disable mouse acceleration on Nvidia Shield TV devices	2020-10-25 12:18:27 -05:00
Cameron Gutman	7ae9c993f1	Version 9.7.5	2020-10-19 23:10:22 -05:00
Cameron Gutman	91d739f8d6	Use the Nvidia button on Shield controllers as a Guide button	2020-10-18 21:14:53 -05:00
Cameron Gutman	f0c625d85c	Only emulate buttons that aren't physically present	2020-10-18 21:07:43 -05:00
Cameron Gutman	b5f5e73076	Revert "Remove button emulation" This reverts commit `092830ed07`.	2020-10-18 20:45:11 -05:00
Cameron Gutman	1fb5eff7f1	Update dependencies	2020-10-18 20:38:13 -05:00
Cameron Gutman	5116cfd141	Fix inverted assert condition	2020-10-18 20:08:55 -05:00
Cameron Gutman	e53a1f90b0	Correct some callers of time functions that expect monotonic clocks	2020-10-18 20:05:09 -05:00
Cameron Gutman	766c9628b0	Update moonlight-common-c with MTU test	2020-10-17 21:55:38 -05:00
Cameron Gutman	6a4abdd74c	Update to AGP 4.1.0	2020-10-17 21:54:31 -05:00
Cameron Gutman	fc8bc5ba1e	Version 9.7.4	2020-10-09 20:06:39 -05:00
Cameron Gutman	0fde5d44c0	Enable HEVC for all Amlogic decoders on API 28+	2020-10-06 21:40:18 -05:00
Cameron Gutman	dc6b5a3d49	Update AGP to 4.0.2	2020-10-06 21:35:31 -05:00
Cameron Gutman	396522f249	Version 9.7.3	2020-09-07 11:50:03 -07:00
Cameron Gutman	86ab39e4ca	Update moonlight-common-c for increased connection reliability	2020-09-06 18:18:41 -07:00
Cameron Gutman	a4c9cb0e55	Version 9.7.2	2020-09-05 10:53:04 -07:00
Cameron Gutman	e6c6feac10	Remove suffix_seekbar_bitrate string	2020-09-04 15:23:32 -07:00
Cameron Gutman	ca0aee58ab	Bump bitrate max to 150 Mbps	2020-09-04 15:15:44 -07:00
Cameron Gutman	6391f2c43d	Use a 1 Mbps key increment for bitrate	2020-09-04 15:14:30 -07:00
Cameron Gutman	32171bb70c	Display bitrate in Mbps	2020-09-04 15:11:24 -07:00
Cameron Gutman	fd6675a3a3	Populate the external IP address when a PC is added manually using an RFC 1918 IPv4 address	2020-08-30 18:39:25 -07:00
bubuleur	9d883978a8	Mise à jour langue française (#865 ) * Mise à jour langue française * Update strings.xml * Update strings.xml * Update French * Update \'	2020-08-30 13:32:05 -07:00
Cameron Gutman	1aae65575c	Add warning if no key frames can be received in 10 seconds	2020-08-29 21:27:44 -07:00
Udalov Nikita	c5d58e1aab	Update Russian translations (#872 ) * Update Russian translations	2020-08-29 19:17:45 -07:00
Cameron Gutman	56394471fa	Don't hide games immediately	2020-08-11 18:47:01 -07:00
				`@@ -0,0 +1 @@`
				`- Improved performance on Google TV Chromecast and other newer Amlogic devices by using HEVC by default`
				`@@ -0,0 +1 @@`
				`- Enabled raw mouse input on the Nvidia Shield TV to avoid mouse acceleration`
				`@@ -0,0 +1 @@`
				`- Fixed missing video or audio when streaming over some Internet connections`
				`@@ -0,0 +1 @@`
				`- Initial compatibility with GeForce Experience 3.22`