Fix Lint error in translation

* Halfway through string translation

* Fixed up translation -- Ready for pull request

README.md

@@ -46,6 +46,12 @@ This project is being actively developed at [XDA Developers](http://forum.xda-de
 2. Write code
 3. Send Pull Requests
 
+##Building
+* Install Android Studio and the Android NDK
+* Run ‘git submodule update --init --recursive’ from within moonlight-android/
+* In moonlight-android/, create a file called ‘local.properties’. Add an ‘ndk.dir=’ property to the local.properties file and set it equal to your NDK directory.
+* Build the APK using Android Studio
+
 ##Authors
 
 * [Cameron Gutman](https://github.com/cgutman)  

app/build.gradle

@@ -5,14 +5,14 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "24.0.0"
+    buildToolsVersion "24.0.1"
 
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 24
 
-        versionName "4.6"
-        versionCode = 103
+        versionName "4.7"
+        versionCode = 104
     }
 
     productFlavors {

app/src/main/java/com/limelight/Game.java

@@ -241,7 +241,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         // Initialize the connection
         conn = new NvConnection(host, uniqueId, Game.this, config, PlatformBinding.getCryptoProvider(this));
         keybTranslator = new KeyboardTranslator(conn);
-        controllerHandler = new ControllerHandler(conn, this, prefConfig.multiController, prefConfig.deadzonePercentage);
+        controllerHandler = new ControllerHandler(this, conn, this, prefConfig.multiController, prefConfig.deadzonePercentage);
 
         InputManager inputManager = (InputManager) getSystemService(Context.INPUT_SERVICE);
         inputManager.registerInputDeviceListener(controllerHandler, null);

app/src/main/java/com/limelight/binding/input/ControllerHandler.java

@@ -1,24 +1,30 @@
 package com.limelight.binding.input;
 
+import android.content.Context;
 import android.hardware.input.InputManager;
 import android.os.SystemClock;
 import android.util.SparseArray;
 import android.view.InputDevice;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
+import android.widget.Toast;
 
 import com.limelight.LimeLog;
 import com.limelight.binding.input.driver.UsbDriverListener;
 import com.limelight.nvstream.NvConnection;
 import com.limelight.nvstream.input.ControllerPacket;
+import com.limelight.nvstream.input.MouseButtonPacket;
 import com.limelight.ui.GameGestures;
 import com.limelight.utils.Vector2d;
 
+import java.util.Timer;
+import java.util.TimerTask;
+
 public class ControllerHandler implements InputManager.InputDeviceListener, UsbDriverListener {
 
     private static final int MAXIMUM_BUMPER_UP_DELAY_MS = 100;
 
-    private static final int START_DOWN_TIME_KEYB_MS = 750;
+    private static final int START_DOWN_TIME_MOUSE_MODE_MS = 750;
 
     private static final int MINIMUM_BUTTON_DOWN_TIME_MS = 25;
 
@@ -34,6 +40,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
     private final SparseArray<UsbDeviceContext> usbDeviceContexts = new SparseArray<>();
 
     private final NvConnection conn;
+    private final Context activityContext;
     private final double stickDeadzone;
     private final InputDeviceContext defaultContext = new InputDeviceContext();
     private final GameGestures gestures;
@@ -42,7 +49,8 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
     private final boolean multiControllerEnabled;
     private short currentControllers;
 
-    public ControllerHandler(NvConnection conn, GameGestures gestures, boolean multiControllerEnabled, int deadzonePercentage) {
+    public ControllerHandler(Context activityContext, NvConnection conn, GameGestures gestures, boolean multiControllerEnabled, int deadzonePercentage) {
+        this.activityContext = activityContext;
         this.conn = conn;
         this.gestures = gestures;
         this.multiControllerEnabled = multiControllerEnabled;
@@ -395,6 +403,10 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
                 context.isServal = true;
                 context.ignoreBack = true;
             }
+            // The Xbox One S Bluetooth controller has some mappings that need fixing up
+            else if (devName.equals("Xbox Wireless Controller")) {
+                context.isXboxBtController = true;
+            }
         }
 
         LimeLog.info("Analog stick deadzone: "+context.leftStickDeadzoneRadius+" "+context.rightStickDeadzoneRadius);
@@ -462,7 +474,9 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         // device before we send it.
         for (int i = 0; i < inputDeviceContexts.size(); i++) {
             GenericControllerContext context = inputDeviceContexts.valueAt(i);
-            if (context.assignedControllerNumber && context.controllerNumber == controllerNumber) {
+            if (context.assignedControllerNumber &&
+                    context.controllerNumber == controllerNumber &&
+                    context.mouseEmulationActive == originalContext.mouseEmulationActive) {
                 inputMap |= context.inputMap;
                 leftTrigger |= maxByMagnitude(leftTrigger, context.leftTrigger);
                 rightTrigger |= maxByMagnitude(rightTrigger, context.rightTrigger);
@@ -474,7 +488,9 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         }
         for (int i = 0; i < usbDeviceContexts.size(); i++) {
             GenericControllerContext context = usbDeviceContexts.valueAt(i);
-            if (context.assignedControllerNumber && context.controllerNumber == controllerNumber) {
+            if (context.assignedControllerNumber &&
+                    context.controllerNumber == controllerNumber &&
+                    context.mouseEmulationActive == originalContext.mouseEmulationActive) {
                 inputMap |= context.inputMap;
                 leftTrigger |= maxByMagnitude(leftTrigger, context.leftTrigger);
                 rightTrigger |= maxByMagnitude(rightTrigger, context.rightTrigger);
@@ -494,10 +510,40 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             rightStickY |= maxByMagnitude(rightStickY, defaultContext.rightStickY);
         }
 
-        conn.sendControllerInput(controllerNumber, inputMap,
-                leftTrigger, rightTrigger,
-                leftStickX, leftStickY,
-                rightStickX, rightStickY);
+        if (originalContext.mouseEmulationActive) {
+            int changedMask = inputMap ^  originalContext.mouseEmulationLastInputMap;
+
+            boolean aDown = (inputMap & ControllerPacket.A_FLAG) != 0;
+            boolean bDown = (inputMap & ControllerPacket.B_FLAG) != 0;
+
+            originalContext.mouseEmulationLastInputMap = inputMap;
+
+            if ((changedMask & ControllerPacket.A_FLAG) != 0) {
+                if (aDown) {
+                    conn.sendMouseButtonDown(MouseButtonPacket.BUTTON_LEFT);
+                }
+                else {
+                    conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_LEFT);
+                }
+            }
+            if ((changedMask & ControllerPacket.B_FLAG) != 0) {
+                if (bDown) {
+                    conn.sendMouseButtonDown(MouseButtonPacket.BUTTON_RIGHT);
+                }
+                else {
+                    conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_RIGHT);
+                }
+            }
+
+            conn.sendControllerInput(controllerNumber,
+                    (short)0, (byte)0, (byte)0, (short)0, (short)0, (short)0, (short)0);
+        }
+        else {
+            conn.sendControllerInput(controllerNumber, inputMap,
+                    leftTrigger, rightTrigger,
+                    leftStickX, leftStickY,
+                    rightStickX, rightStickY);
+        }
     }
 
     // Return a valid keycode, 0 to consume, or -1 to not consume the event
@@ -558,6 +604,30 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
                     return KeyEvent.KEYCODE_BUTTON_START;
             }
         }
+        else if (context.isXboxBtController) {
+            switch (event.getScanCode()) {
+                case 306:
+                    return KeyEvent.KEYCODE_BUTTON_X;
+                case 307:
+                    return KeyEvent.KEYCODE_BUTTON_Y;
+                case 308:
+                    return KeyEvent.KEYCODE_BUTTON_L1;
+                case 309:
+                    return KeyEvent.KEYCODE_BUTTON_R1;
+                case 310:
+                    return KeyEvent.KEYCODE_BUTTON_SELECT;
+                case 311:
+                    return KeyEvent.KEYCODE_BUTTON_START;
+                case 312:
+                    return KeyEvent.KEYCODE_BUTTON_THUMBL;
+                case 313:
+                    return KeyEvent.KEYCODE_BUTTON_THUMBR;
+                case 139:
+                    return KeyEvent.KEYCODE_BUTTON_MODE;
+                default:
+                    // Other buttons are mapped correctly
+            }
+        }
 
         if (context.hatXAxis != -1 && context.hatYAxis != -1) {
             switch (event.getKeyCode()) {
@@ -731,6 +801,46 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         return true;
     }
 
+    private short scaleRawStickAxis(float stickValue) {
+        return (short)Math.pow(stickValue, 3);
+    }
+
+    private void sendEmulatedMouseEvent(short x, short y) {
+        Vector2d vector = new Vector2d();
+        vector.initialize(x, y);
+        vector.scalarMultiply(1 / 32766.0f);
+        vector.scalarMultiply(4);
+        if (vector.getMagnitude() > 0) {
+            // Move faster as the stick is pressed further from center
+            vector.scalarMultiply(Math.pow(vector.getMagnitude(), 2));
+            if (vector.getMagnitude() >= 1) {
+                conn.sendMouseMove((short)vector.getX(), (short)-vector.getY());
+            }
+        }
+    }
+
+    private void toggleMouseEmulation(final GenericControllerContext context) {
+        if (context.mouseEmulationTimer != null) {
+            context.mouseEmulationTimer.cancel();
+            context.mouseEmulationTimer = null;
+        }
+
+        context.mouseEmulationActive = !context.mouseEmulationActive;
+        Toast.makeText(activityContext, "Mouse emulation is: " + (context.mouseEmulationActive ? "ON" : "OFF"), Toast.LENGTH_SHORT).show();
+
+        if (context.mouseEmulationActive) {
+            context.mouseEmulationTimer = new Timer();
+            context.mouseEmulationTimer.schedule(new TimerTask() {
+                @Override
+                public void run() {
+                    // Send mouse movement events from analog sticks
+                    sendEmulatedMouseEvent(context.leftStickX, context.leftStickY);
+                    sendEmulatedMouseEvent(context.rightStickX, context.rightStickY);
+                }
+            }, 50, 50);
+        }
+    }
+
     public boolean handleButtonUp(KeyEvent event) {
         InputDeviceContext context = getContextForDevice(event.getDevice());
 
@@ -757,10 +867,8 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             break;
         case KeyEvent.KEYCODE_BUTTON_START:
         case KeyEvent.KEYCODE_MENU:
-            if (SystemClock.uptimeMillis() - context.startDownTime > ControllerHandler.START_DOWN_TIME_KEYB_MS) {
-                // FIXME: The stock keyboard doesn't have controller focus so isn't usable. I'm not enabling this shortcut
-                // until we have a custom keyboard or some other fix
-                //gestures.showKeyboard();
+            if (SystemClock.uptimeMillis() - context.startDownTime > ControllerHandler.START_DOWN_TIME_MOUSE_MODE_MS) {
+                toggleMouseEmulation(context);
             }
             context.inputMap &= ~ControllerPacket.PLAY_FLAG;
             break;
@@ -1027,6 +1135,10 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         public short rightStickY = 0x0000;
         public short leftStickX = 0x0000;
         public short leftStickY = 0x0000;
+
+        public boolean mouseEmulationActive;
+        public Timer mouseEmulationTimer;
+        public short mouseEmulationLastInputMap;
     }
 
     class InputDeviceContext extends GenericControllerContext {
@@ -1047,6 +1159,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
 
         public boolean isDualShock4;
         public boolean isXboxController;
+        public boolean isXboxBtController;
         public boolean isServal;
         public boolean backIsStart;
         public boolean modeIsSelect;

app/src/main/java/com/limelight/binding/input/capture/InputCaptureManager.java

@@ -15,14 +15,14 @@ public class InputCaptureManager {
             LimeLog.info("Using NVIDIA mouse capture extension");
             return new ShieldCaptureProvider(activity);
         }
-        else if (AndroidCaptureProvider.isCaptureProviderSupported()) {
-            LimeLog.info("Using Android N+ native mouse capture");
-            return new AndroidCaptureProvider(activity);
-        }
         else if (EvdevCaptureProvider.isCaptureProviderSupported()) {
             LimeLog.info("Using Evdev mouse capture");
             return new EvdevCaptureProvider(activity, rootListener);
         }
+        else if (AndroidCaptureProvider.isCaptureProviderSupported()) {
+            LimeLog.info("Using Android N+ native mouse capture");
+            return new AndroidCaptureProvider(activity);
+        }
         else {
             LimeLog.info("Mouse capture not available");
             return new NullCaptureProvider();

app/src/main/java/com/limelight/binding/input/driver/XboxOneController.java

@@ -62,6 +62,12 @@ public class XboxOneController extends AbstractXboxController {
         rightStickY = ~buffer.getShort() / 32767.0f;
     }
 
+    private void ackModeReport(byte seqNum) {
+        byte[] payload = {0x01, 0x20, seqNum, 0x09, 0x00, 0x07, 0x20, 0x02,
+                0x00, 0x00, 0x00, 0x00, 0x00};
+        connection.bulkTransfer(outEndpt, payload, payload.length, 3000);
+    }
+
     @Override
     protected boolean handleRead(ByteBuffer buffer) {
         switch (buffer.get())
@@ -72,7 +78,15 @@ public class XboxOneController extends AbstractXboxController {
                 return true;
 
             case 0x07:
-                buffer.position(buffer.position() + 3);
+                // The Xbox One S controller needs acks for mode reports otherwise
+                // it retransmits them forever.
+                if (buffer.get() == 0x30) {
+                    ackModeReport(buffer.get());
+                    buffer.position(buffer.position() + 1);
+                }
+                else {
+                    buffer.position(buffer.position() + 2);
+                }
                 setButtonFlag(ControllerPacket.SPECIAL_BUTTON_FLAG, buffer.get() & 0x01);
                 return true;
         }

app/src/main/java/com/limelight/binding/input/virtual_controller/VirtualController.java

@@ -60,7 +60,7 @@ public class VirtualController {
         frame_layout.addView(relative_layout);
 
         buttonConfigure = new Button(context);
-        buttonConfigure.setBackgroundResource(R.drawable.settings);
+        buttonConfigure.setBackgroundResource(R.drawable.ic_settings);
         buttonConfigure.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

app/src/main/java/com/limelight/grid/AppGridAdapter.java

@@ -26,7 +26,7 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
     private final CachedAppAssetLoader loader;
 
     public AppGridAdapter(Activity activity, boolean listMode, boolean small, ComputerDetails computer, String uniqueId) {
-        super(activity, listMode ? R.layout.simple_row : (small ? R.layout.app_grid_item_small : R.layout.app_grid_item), R.drawable.image_loading);
+        super(activity, listMode ? R.layout.simple_row : (small ? R.layout.app_grid_item_small : R.layout.app_grid_item));
 
         int dpi = activity.getResources().getDisplayMetrics().densityDpi;
         int dp;
@@ -51,9 +51,7 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
         this.loader = new CachedAppAssetLoader(computer, scalingDivisor,
                 new NetworkAssetLoader(context, uniqueId),
                 new MemoryAssetLoader(),
-                new DiskAssetLoader(context.getCacheDir()),
-                BitmapFactory.decodeResource(activity.getResources(),
-                        R.drawable.image_loading, options));
+                new DiskAssetLoader(context.getCacheDir()));
     }
 
     public void cancelQueuedOperations() {
@@ -103,11 +101,16 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
     public boolean populateOverlayView(ImageView overlayView, AppView.AppObject obj) {
         if (obj.app.getIsRunning()) {
             // Show the play button overlay
-            overlayView.setImageResource(R.drawable.play);
+            overlayView.setImageResource(R.drawable.ic_play);
             return true;
         }
 
         // No overlay
         return false;
     }
+
+    @Override
+    public boolean shouldShowProgressBar(AppView.AppObject obj) {
+        return true;
+    }
 }

app/src/main/java/com/limelight/grid/GenericGridAdapter.java

@@ -6,6 +6,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.limelight.R;
@@ -14,15 +15,13 @@ import java.util.ArrayList;
 
 public abstract class GenericGridAdapter<T> extends BaseAdapter {
     protected final Context context;
-    protected final int defaultImageRes;
     protected final int layoutId;
     protected final ArrayList<T> itemList = new ArrayList<>();
     protected final LayoutInflater inflater;
 
-    public GenericGridAdapter(Context context, int layoutId, int defaultImageRes) {
+    public GenericGridAdapter(Context context, int layoutId) {
         this.context = context;
         this.layoutId = layoutId;
-        this.defaultImageRes = defaultImageRes;
 
         this.inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
     }
@@ -49,6 +48,7 @@ public abstract class GenericGridAdapter<T> extends BaseAdapter {
     public abstract boolean populateImageView(ImageView imgView, T obj);
     public abstract boolean populateTextView(TextView txtView, T obj);
     public abstract boolean populateOverlayView(ImageView overlayView, T obj);
+    public abstract boolean shouldShowProgressBar(T obj);
 
     @Override
     public View getView(int i, View convertView, ViewGroup viewGroup) {
@@ -59,10 +59,19 @@ public abstract class GenericGridAdapter<T> extends BaseAdapter {
         ImageView imgView = (ImageView) convertView.findViewById(R.id.grid_image);
         ImageView overlayView = (ImageView) convertView.findViewById(R.id.grid_overlay);
         TextView txtView = (TextView) convertView.findViewById(R.id.grid_text);
+        ProgressBar prgView = (ProgressBar) convertView.findViewById(R.id.grid_spinner);
 
+        if (prgView != null) {
+            if (shouldShowProgressBar(itemList.get(i))) {
+                prgView.setVisibility(View.VISIBLE);
+            }
+            else {
+                prgView.setVisibility(View.INVISIBLE);
+            }
+        }
         if (imgView != null) {
             if (!populateImageView(imgView, itemList.get(i))) {
-                imgView.setImageResource(defaultImageRes);
+                imgView.setImageBitmap(null);
             }
         }
         if (!populateTextView(txtView, itemList.get(i))) {

app/src/main/java/com/limelight/grid/PcGridAdapter.java

@@ -14,7 +14,7 @@ import java.util.Comparator;
 public class PcGridAdapter extends GenericGridAdapter<PcView.ComputerObject> {
 
     public PcGridAdapter(Context context, boolean listMode, boolean small) {
-        super(context, listMode ? R.layout.simple_row : (small ? R.layout.pc_grid_item_small : R.layout.pc_grid_item), R.drawable.computer);
+        super(context, listMode ? R.layout.simple_row : (small ? R.layout.pc_grid_item_small : R.layout.pc_grid_item));
     }
 
     public void addComputer(PcView.ComputerObject computer) {
@@ -37,20 +37,20 @@ public class PcGridAdapter extends GenericGridAdapter<PcView.ComputerObject> {
 
     @Override
     public boolean populateImageView(ImageView imgView, PcView.ComputerObject obj) {
-        if (obj.details.reachability != ComputerDetails.Reachability.OFFLINE) {
+        if (obj.details.state == ComputerDetails.State.ONLINE) {
             imgView.setAlpha(1.0f);
         }
         else {
             imgView.setAlpha(0.4f);
         }
 
-        // Return false to use the default drawable
-        return false;
+        imgView.setImageResource(R.drawable.ic_computer);
+        return true;
     }
 
     @Override
     public boolean populateTextView(TextView txtView, PcView.ComputerObject obj) {
-        if (obj.details.reachability != ComputerDetails.Reachability.OFFLINE) {
+        if (obj.details.state == ComputerDetails.State.ONLINE) {
             txtView.setAlpha(1.0f);
         }
         else {
@@ -63,13 +63,17 @@ public class PcGridAdapter extends GenericGridAdapter<PcView.ComputerObject> {
 
     @Override
     public boolean populateOverlayView(ImageView overlayView, PcView.ComputerObject obj) {
-        if (obj.details.reachability == ComputerDetails.Reachability.UNKNOWN) {
-            // Still refreshing this PC so display the overlay
-            overlayView.setImageResource(R.drawable.image_loading);
+        if (obj.details.state == ComputerDetails.State.OFFLINE) {
+            overlayView.setImageResource(R.drawable.ic_pc_offline);
+            overlayView.setAlpha(0.4f);
             return true;
         }
-
-        // No overlay
         return false;
     }
+
+    @Override
+    public boolean shouldShowProgressBar(PcView.ComputerObject obj) {
+        // Still refreshing this PC so display the progress bar
+        return obj.details.reachability == ComputerDetails.Reachability.UNKNOWN;
+    }
 }

app/src/main/java/com/limelight/grid/assets/CachedAppAssetLoader.java

@@ -53,13 +53,13 @@ public class CachedAppAssetLoader {
 
     public CachedAppAssetLoader(ComputerDetails computer, double scalingDivider,
                                 NetworkAssetLoader networkLoader, MemoryAssetLoader memoryLoader,
-                                DiskAssetLoader diskLoader, Bitmap placeholderBitmap) {
+                                DiskAssetLoader diskLoader) {
         this.computer = computer;
         this.scalingDivider = scalingDivider;
         this.networkLoader = networkLoader;
         this.memoryLoader = memoryLoader;
         this.diskLoader = diskLoader;
-        this.placeholderBitmap = placeholderBitmap;
+        this.placeholderBitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888);
     }
 
     public void cancelBackgroundLoads() {
@@ -280,14 +280,14 @@ public class CachedAppAssetLoader {
         });
     }
 
-    public void populateImageView(NvApp app, ImageView view) {
+    public boolean populateImageView(NvApp app, ImageView view) {
         LoaderTuple tuple = new LoaderTuple(computer, app);
 
         // If there's already a task in progress for this view,
         // cancel it. If the task is already loading the same image,
         // we return and let that load finish.
         if (!cancelPendingLoad(tuple, view)) {
-            return;
+            return true;
         }
 
         // First, try the memory cache in the current context
@@ -296,7 +296,7 @@ public class CachedAppAssetLoader {
             // Show the bitmap immediately
             view.setAlpha(1.0f);
             view.setImageBitmap(bmp);
-            return;
+            return true;
         }
 
         // If it's not in memory, create an async task to load it. This task will be attached
@@ -308,6 +308,7 @@ public class CachedAppAssetLoader {
 
         // Run the task on our foreground executor
         task.executeOnExecutor(foregroundExecutor, tuple);
+        return false;
     }
 
     public class LoaderTuple {

app/src/main/res/drawable/ic_add.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="256dp"
+        android:height="256dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM17,13h-4v4h-2v-4L7,13v-2h4L11,7h2v4h4v2z"
+        android:fillColor="#FFFFFF"/>
+</vector>

app/src/main/res/drawable/ic_computer.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="512dp"
+        android:height="512dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M21,2L3,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h7v2L8,20v2h8v-2h-2v-2h7c1.1,0 2,-0.9 2,-2L23,4c0,-1.1 -0.9,-2 -2,-2zM21,16L3,16L3,4h18v12z"
+        android:fillColor="#FFFFFF"/>
+</vector>

app/src/main/res/drawable/ic_pc_offline.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="128dp"
+        android:height="128dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M23.64,7c-0.45,-0.34 -4.93,-4 -11.64,-4 -1.5,0 -2.89,0.19 -4.15,0.48L18.18,13.8 23.64,7zM17.04,15.22L3.27,1.44 2,2.72l2.05,2.06C1.91,5.76 0.59,6.82 0.36,7l11.63,14.49 0.01,0.01 0.01,-0.01 3.9,-4.86 3.32,3.32 1.27,-1.27 -3.46,-3.46z"
+        android:fillColor="#FFFFFF"/>
+</vector>

app/src/main/res/drawable/ic_play.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="128dp"
+        android:height="128dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10,16.5v-9l6,4.5 -6,4.5z"
+        android:fillColor="#FFFFFF"/>
+</vector>

app/src/main/res/drawable/ic_settings.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="256dp"
+        android:height="256dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"
+        android:fillColor="#FFFFFF"/>
+</vector>

app/src/main/res/layout-land/activity_pc_view.xml

@@ -15,18 +15,18 @@
         android:layout_centerInParent="true"
         android:layout_centerVertical="true"
         android:layout_centerHorizontal="true">
-        <ImageView
+        <ProgressBar
             android:id="@+id/pcs_loading"
             android:layout_width="75dp"
             android:layout_height="75dp"
-            android:src="@drawable/image_loading"/>
+            android:indeterminate="true"/>
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_toRightOf="@+id/pcs_loading"
             android:layout_toEndOf="@+id/pcs_loading"
-            android:layout_marginLeft="5dp"
-            android:layout_marginStart="5dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginStart="10dp"
             android:layout_centerVertical="true"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:gravity="center"
@@ -55,7 +55,7 @@
         android:layout_alignParentStart="true"
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
-        android:src="@drawable/settings"
+        android:src="@drawable/ic_settings"
         style="?android:attr/borderlessButtonStyle"/>
 
     <ImageButton
@@ -68,7 +68,7 @@
         android:layout_alignParentTop="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
-        android:src="@drawable/add_computer"
+        android:src="@drawable/ic_add"
         style="?android:attr/borderlessButtonStyle"/>
 
 </RelativeLayout>

app/src/main/res/layout-port/activity_pc_view.xml

@@ -15,18 +15,18 @@
         android:layout_centerInParent="true"
         android:layout_centerVertical="true"
         android:layout_centerHorizontal="true">
-        <ImageView
+        <ProgressBar
             android:id="@+id/pcs_loading"
             android:layout_width="75dp"
             android:layout_height="75dp"
-            android:src="@drawable/image_loading"/>
+            android:indeterminate="true"/>
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_toRightOf="@+id/pcs_loading"
             android:layout_toEndOf="@+id/pcs_loading"
-            android:layout_marginLeft="5dp"
-            android:layout_marginStart="5dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginStart="10dp"
             android:layout_centerVertical="true"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:gravity="center"
@@ -54,7 +54,7 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
-        android:src="@drawable/settings"
+        android:src="@drawable/ic_settings"
         style="?android:attr/borderlessButtonStyle"/>
     
     <ImageButton
@@ -66,7 +66,7 @@
         android:layout_alignParentTop="true"
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
-        android:src="@drawable/add_computer"
+        android:src="@drawable/ic_add"
         style="?android:attr/borderlessButtonStyle"/>
 
 </RelativeLayout>

app/src/main/res/layout/app_grid_item.xml

@@ -8,6 +8,14 @@
         android:layout_centerHorizontal="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content">
+        <ProgressBar
+            android:id="@+id/grid_spinner"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:layout_width="75dp"
+            android:layout_height="75dp"
+            android:indeterminate="true">
+        </ProgressBar>
         <ImageView
             android:id="@+id/grid_image"
             android:cropToPadding="false"

app/src/main/res/layout/app_grid_item_small.xml

@@ -8,6 +8,14 @@
         android:layout_centerHorizontal="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content">
+        <ProgressBar
+            android:id="@+id/grid_spinner"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:indeterminate="true">
+        </ProgressBar>
         <ImageView
             android:id="@+id/grid_image"
             android:cropToPadding="false"

app/src/main/res/layout/pc_grid_item.xml

@@ -10,23 +10,28 @@
         <ImageView
             android:id="@+id/grid_image"
             android:layout_centerHorizontal="true"
-            android:layout_width="150dp"
-            android:layout_height="100dp">
+            android:layout_width="125dp"
+            android:layout_height="125dp">
         </ImageView>
         <ImageView
             android:id="@+id/grid_overlay"
-            android:layout_marginTop="15dp"
-            android:layout_marginLeft="65dp"
-            android:layout_marginStart="65dp"
-            android:layout_marginRight="20dp"
-            android:layout_marginEnd="20dp"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="28dp"
             android:layout_width="50dp"
             android:layout_height="50dp">
         </ImageView>
+        <ProgressBar
+            android:id="@+id/grid_spinner"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="28dp"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:indeterminate="true">
+        </ProgressBar>
     </RelativeLayout>
     <TextView
         android:id="@+id/grid_text"
-        android:layout_width="150dp"
+        android:layout_width="125dp"
         android:layout_height="wrap_content"
         android:layout_below="@id/grid_image_layout"
         android:layout_marginTop="10dp"

app/src/main/res/layout/pc_grid_item_small.xml

@@ -10,23 +10,28 @@
         <ImageView
             android:id="@+id/grid_image"
             android:layout_centerHorizontal="true"
-            android:layout_width="100dp"
-            android:layout_height="67dp">
+            android:layout_width="75dp"
+            android:layout_height="75dp">
         </ImageView>
         <ImageView
             android:id="@+id/grid_overlay"
-            android:layout_marginTop="10dp"
-            android:layout_marginLeft="42dp"
-            android:layout_marginStart="42dp"
-            android:layout_marginRight="13dp"
-            android:layout_marginEnd="13dp"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="16dp"
             android:layout_width="33dp"
             android:layout_height="33dp">
         </ImageView>
+        <ProgressBar
+            android:id="@+id/grid_spinner"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="16dp"
+            android:layout_width="33dp"
+            android:layout_height="33dp"
+            android:indeterminate="true">
+        </ProgressBar>
     </RelativeLayout>
     <TextView
         android:id="@+id/grid_text"
-        android:layout_width="100dp"
+        android:layout_width="75dp"
         android:layout_height="wrap_content"
         android:layout_below="@id/grid_image_layout"
         android:layout_marginTop="10dp"

app/src/main/res/values-it/arrays.xml

@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string-array name="resolution_names">
-        <item>720p - 30 FPS</item>
-        <item>720p - 60 FPS</item>
-        <item>1080p - 30 FPS</item>
-        <item>1080p - 60 FPS</item>
-        <item>4K - 30 FPS</item>
-        <item>4K - 60 FPS</item>
-    </string-array>
-
     <string-array name="decoder_names">
         <item>Scegli decoder automaticamente</item>
         <item>Forza decoder software</item>

app/src/main/res/values-ja/arrays.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+    <string-array name="decoder_names">
+      <item>デコーダを自動選択</item>
+        <item>ソフトウェアデコードを強制</item>
+        <item>ハードウェアデコードを強制</item>
+    </string-array>
+
+    <string-array name="video_format_names">
+        <item>安定している場合にH.265を有効化</item>
+        <item>H.265を強制的に有効化(クラッシュする可能性があります)</item>
+        <item>H.265を無効化</item>
+    </string-array>
+</resources>

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

@@ -0,0 +1,127 @@
+<?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">コンピュータとペアリング</string>
+    <string name="pcview_menu_unpair_pc">ペアリングを解除r</string>
+    <string name="pcview_menu_send_wol">Wake-On-LANリクエストを送信する</string>
+    <string name="pcview_menu_delete_pc">コンピュータをリストから削除する</string>
+
+    <!-- Pair messages -->
+    <string name="pairing">ペアリング中</string>
+    <string name="pair_pc_offline">コンピュータはオフラインです</string>
+    <string name="pair_pc_ingame">現在このコンピュータはゲームを実行中のため、ペアリングする前にゲームを閉じる必要があります</string>
+    <string name="pair_pairing_title">ペアリング</string>
+    <string name="pair_pairing_msg">ペアリングしたいコンピュータのPINコードを入力してください:</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">GFEがMACアドレスを送信しなかったため、コンピュータを起動することができません</string>
+    <string name="wol_waking_pc">コンピュータを起動中</string>
+    <string name="wol_waking_msg">コンピュータが起動するまで数秒かかる可能性があります。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サービスが動作していません。しばらく待つか、Moonlightを再起動してください</string>
+    <string name="error_unknown_host">ホストが解決できません</string>
+    <string name="error_404">GFEがHTTP 404を返しました。コンピュータでサポートされているGPUが動作しているか確認してください。リモートデスクトップソフトウェアでもこのエラーが発生する可能性があります。コンピュータを再起動するか、GFEを再インストールしてください</string>
+
+    <!-- Start application messages -->
+    <string name="conn_establishing_title">接続を確立</string>
+    <string name="conn_establishing_msg">接続を開始</string>
+    <string name="conn_metered">警告: 現在使用中のネットワークは従量制課金接続です</string>
+    <string name="conn_client_latency"> デコードの平均待ち時間:</string>
+    <string name="conn_client_latency_hw">ハードウェアデコーダーの待ち時間</string>
+    <string name="conn_hardware_latency">ハードウェアデコーダーの平均待ち時間:</string>
+    <string name="conn_starting">開始</string>
+    <string name="conn_error_title">接続エラー</string>
+    <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アドレス</string>
+    <string name="searching_pc">コンピュータを検索中</string>
+    <string name="yes">はい</string>
+    <string name="no">いいえ</string>
+    <string name="lost_connection">コンピュータとの接続が失われました</string>
+
+    <!-- AppList activity -->
+    <string name="title_applist">ゲーム</string>
+    <string name="applist_menu_resume">セッションを続ける</string>
+    <string name="applist_menu_quit">セッションを終了する</string>
+    <string name="applist_menu_quit_and_start">現在のゲームを終了して新しいゲームを始める</string>
+    <string name="applist_menu_cancel">キャンセル</string>
+    <string name="applist_refresh_title">ゲームリスト</string>
+    <string name="applist_refresh_msg">ゲームリストを更新中</string>
+    <string name="applist_refresh_error_title">エラー</string>
+    <string name="applist_refresh_error_msg">ゲームリストの取得に失敗しました</string>
+    <string name="applist_quit_app">終了中</string>
+    <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">手動でコンピュータを追加する</string>
+    <string name="msg_add_pc">コンピュータに接続中</string>
+    <string name="addpc_fail">指定されたコンピュータに接続できませんでした。ファイアーウォールの設定を確認してください</string>
+    <string name="addpc_success">コンピュータの追加に成功しました</string>
+    <string name="addpc_unknown_host">コンピュータのアドレスが解決できません。コンピュータのアドレスを確認してください</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">Mbps</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_checkbox_51_surround">5.1chサラウンド</string>
+    <string name="summary_checkbox_51_surround">音声に問題が生じる場合はチェックを外してください。バージョン2.7以降のGFEが必要です</string>
+
+    <string name="category_gamepad_settings">ゲームコントローラ</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">XboxゲームコントローラをサポートしないデバイスでXboxゲームコントローラ用のドライバを有効にします</string>
+
+    <string name="category_on_screen_controls_settings">オンスクリーンコントローラ</string>
+    <string name="title_checkbox_show_onscreen_controls">オンスクリーンコントローラ</string>
+    <string name="summary_checkbox_show_onscreen_controls">タッチスクリーン上にオンスクリーンコントローラを表示します</string>
+
+    <string name="category_ui_settings">インターフェース</string>
+    <string name="title_language_list">言語</string>
+    <string name="summary_language_list">Moonlightで使用する言語</string>
+    <string name="title_checkbox_list_mode">リストメニュー</string>
+    <string name="summary_checkbox_list_mode">ゲームをグリッドではなく、リストで表示します</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">コンピュータで音声を再生</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>
+
+</resources>

app/src/main/res/values-nl/arrays.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="decoder_names">
+        <item>Selecteer Decoder Automatisch</item>
+        <item>Forceer Software Decoderen</item>
+        <item>Forceer Hardware Decoderen</item>
+    </string-array>
+</resources>

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

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- PC view menu entries -->
+    <string name="pcview_menu_app_list">Toon Spel Lijst</string>
+    <string name="pcview_menu_pair_pc">Koppel met PC</string>
+    <string name="pcview_menu_unpair_pc">Ontkoppen</string>
+    <string name="pcview_menu_send_wol">Stuur Wake-On-LAN aanvraag</string>
+    <string name="pcview_menu_delete_pc">Verwijder PC</string>
+
+    <!-- Pair messages -->
+    <string name="pairing">Koppelen…</string>
+    <string name="pair_pc_offline">Computer is onbereikbaar</string>
+    <string name="pair_pc_ingame">Computer is op dit moment in een spel. Sluit de spel voordat je koppelt.</string>
+    <string name="pair_pairing_title">Koppelen</string>
+    <string name="pair_pairing_msg">Voer de volgende PIN in op de doel PC:</string>
+    <string name="pair_incorrect_pin">Ongeldige PIN</string>
+    <string name="pair_fail">Koppelen mislukt</string>
+
+    <!-- WOL messages -->
+    <string name="wol_pc_online">Computer is online</string>
+    <string name="wol_no_mac">Het is niet mogelijk om de PC uit slaapstand te halen, omdat GFE geen MAC adres heeft verstuurd.</string>
+    <string name="wol_waking_pc">PC uit slaapstand halen…</string>
+    <string name="wol_waking_msg"> Het ken even duren voordat de PC reageert.
+	    Als dit niet gebeurt dan moet je de Wake-On-LAN instellingen controleren.
+    </string>
+    <string name="wol_fail">Wake-On-LAN packets versturen mislukt</string>
+
+    <!-- Unpair messages -->
+    <string name="unpairing">Ontkoppelen…</string>
+    <string name="unpair_success">Ontkoppeling succesvol</string>
+    <string name="unpair_fail">Ontkoppeling mislukt</string>
+    <string name="unpair_error">Apparaat niet gekoppeld</string>
+
+    <!-- Errors -->
+    <string name="error_pc_offline">Computer is offline</string>
+    <string name="error_manager_not_running">The ComputerManager service is niet gestart. Wacht een ogenblik of herstart de app.</string>
+    <string name="error_unknown_host">Host achterhalen mislukt.</string>
+    <string name="error_404">GFE geeft een HTTP 404 fout. Kijk na of de PC een ondersteunde GPU heeft.
+	    Remote desktop software kan soms ook voor deze fout zorgen. Probeer de computer opnieuw op te starten of GFE te herinstalleren.
+    </string>
+
+    <!-- Start application messages -->
+    <string name="conn_establishing_title">Verbinding maken</string>
+    <string name="conn_establishing_msg">Verbinding starten</string>
+    <string name="conn_metered">Waarschuwing: Dit internet verbinding bevat een datalimiet!</string>
+    <string name="conn_client_latency">Gemiddelde frame decoding reactietijd:</string>
+    <string name="conn_client_latency_hw">hardware decoder reactietijd:</string>
+    <string name="conn_hardware_latency">Gemiddelde hardware decoding reactietijd:</string>
+    <string name="conn_starting">Starten</string>
+    <string name="conn_error_title">Verbindingsprobleem</string>
+    <string name="conn_error_msg">Starten mislukt</string>
+    <string name="conn_terminated_title">Verbinding beëindigd</string>
+    <string name="conn_terminated_msg">De verbinding is beëindigd</string>
+
+    <!-- General strings -->
+    <string name="ip_hint">IP adres van GeForce PC</string>
+    <string name="searching_pc">Zoeken naar PCs…</string>
+    <string name="yes">Ja</string>
+    <string name="no">Nee</string>
+    <string name="lost_connection">Verbinding met PC verloren</string>
+
+    <!-- AppList activity -->
+    <string name="title_applist">Apps op</string>
+    <string name="applist_menu_resume">Hervat Sessie</string>
+    <string name="applist_menu_quit">Stop Sessie</string>
+    <string name="applist_menu_quit_and_start">Stop Huidige Spel en Start</string>
+    <string name="applist_menu_cancel">Annuleer</string>
+    <string name="applist_refresh_title">App Lijst</string>
+    <string name="applist_refresh_msg">Apps Verversen…</string>
+    <string name="applist_refresh_error_title">Fout</string>
+    <string name="applist_refresh_error_msg">App lijst ophalen mislukt</string>
+    <string name="applist_quit_app">Stoppen</string>
+    <string name="applist_quit_success">Succesvol gestopt.</string>
+    <string name="applist_quit_fail">Stoppen mislukt</string>
+    <string name="applist_quit_confirmation">Weet je het zeker dat je de app wilt sluiten? Alle niet-opgeslagen gegevens gaan verloren.</string>
+
+    <!-- Add computer manually activity -->
+    <string name="title_add_pc">Voeg handmatig PC toe</string>
+    <string name="msg_add_pc">Verbinding maken met PC…</string>
+    <string name="addpc_fail">Verbinden mislukt. Controleer of de benodigde poorten openstaan in de firewall.</string>
+    <string name="addpc_success">Computer toevoegen succesvol</string>
+    <string name="addpc_unknown_host">Adres achterhalen is mislukt. Controleer het ingevoerde adres op typfouten.</string>
+    <string name="addpc_enter_ip">IP-adres invoeren is verplicht.</string>
+
+    <!-- Preferences -->
+    <string name="category_basic_settings">Algemene Instellingen</string>
+    <string name="title_resolution_list">Selecteer resolutie en FPS doel</string>
+    <string name="summary_resolution_list">Instellingen te hoog zetten 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">Mbps</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>
+
+    <string name="category_gamepad_settings">Gamepad Instellingen</string>
+    <string name="title_checkbox_multi_controller">Multi-gamepad support</string>
+    <string name="summary_checkbox_multi_controller">Wanneer uitgevinkt, alle controllers verschijnen als één.</string>
+    <string name="title_seekbar_deadzone">Pas analoge dodezone aan.</string>
+    <string name="suffix_seekbar_deadzone">%</string>
+    <string name="title_checkbox_xb1_driver">Xbox One controller stuurprogramma</string>
+    <string name="summary_checkbox_xb1_driver">Gebruikt de ingebouwde USB stuurprogramma voor apparaten zonder Xbox One controller ondersteuning.</string>
+
+    <string name="category_ui_settings">UI Installingen</string>
+    <string name="title_language_list">Taal</string>
+    <string name="summary_language_list">Taal te gebruiken in Moonlight</string>
+    <string name="title_checkbox_list_mode">Gebruik lijsten in plaats van kolommen</string>
+    <string name="summary_checkbox_list_mode">Display apps and PCs in lists instead of grids</string>
+    <string name="title_checkbox_small_icon_mode">Gebruik kleine iconen</string>
+    <string name="summary_checkbox_small_icon_mode">Gebruik kleine iconen in kolom onderdelen zodat meer items tegelijk zichtbaar worden.</string>
+
+    <string name="category_host_settings">Host Instellingen</string>
+    <string name="title_checkbox_enable_sops">Optimaliseer spel instellingen</string>
+    <string name="summary_checkbox_enable_sops">Sta GFE toe om spel instellingen te veranderen voor een optimale stream</string>
+    <string name="title_checkbox_host_audio">Speel audio af op PC</string>
+    <string name="summary_checkbox_host_audio">Speel audio af op de computer en op dit apparaat</string>
+
+    <string name="category_advanced_settings">Geavanceerde Instellingen</string>
+</resources>

app/src/main/res/values-ru/arrays.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="decoder_names">
+        <item>Автоматический выбор декодера</item>
+        <item>Принудительное программное декодирование</item>
+        <item>Принудительное аппаратное декодирование</item>
+    </string-array>
+
+    <string-array name="video_format_names">
+        <item>Использовать H.265 только если безопасно</item>
+        <item>Всегда использовать H.265 если доступно</item>
+        <item>Никогда не использовать H.265</item>
+    </string-array>
+</resources>

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

@@ -0,0 +1,127 @@
+<?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>
+
+    <!-- Pair messages -->
+    <string name="pairing">Создание пары…</string>
+    <string name="pair_pc_offline">Компьютер выключен или находится не в сети</string>
+    <string name="pair_pc_ingame">Компьютер в данный момент находится в игре. Вы должны закрыть игру перед создание пары.</string>
+    <string name="pair_pairing_title">Создание пары</string>
+    <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>
+    <string name="wol_waking_pc">Пробуждение PC…</string>
+    <string name="wol_waking_msg">Пробуждение PC может занять несколько секунд.
+	    Если этого не происходит, удостоверьтесь что 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>
+    <string name="error_unknown_host">Не удалось найти хост</string>
+    <string name="error_404">GFE вернул ошибку HTTP 404. Убедитесь что ваш PC is испольщует поддерживаемый GPU.
+	    Использование программ для удалённого доступа также можнт вызывать эту ошибку. Попробуйте перезагрузить компьютер или переустановить GFE.
+    </string>
+
+    <!-- Start application messages -->
+    <string name="conn_establishing_title">Создание соединения.</string>
+    <string name="conn_establishing_msg">Подключение</string>
+    <string name="conn_metered">Внимание: Происходит измерение вашего сетевого соединения!</string>
+    <string name="conn_client_latency">Средняя задержка декодирования кадра: </string>
+    <string name="conn_client_latency_hw">задержка аппаратного декодирования:</string>
+    <string name="conn_hardware_latency">Средняя задержка апаратного декодирования:</string>
+    <string name="conn_starting">Запуск</string>
+    <string name="conn_error_title">Ошибка соединения</string>
+    <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">Поиск компьютеров…</string>
+    <string name="yes">Да</string>
+    <string name="no">Нет</string>
+    <string name="lost_connection">Потеряно соединение с PC</string>
+
+    <!-- AppList activity -->
+    <string name="title_applist">Приложения на</string>
+    <string name="applist_menu_resume">Возобновить сессию</string>
+    <string name="applist_menu_quit">Выйти из сессии</string>
+    <string name="applist_menu_quit_and_start">Выйти из текущей игры и запустить</string>
+    <string name="applist_menu_cancel">Отмена</string>
+    <string name="applist_refresh_title">Список приложений</string>
+    <string name="applist_refresh_msg">Обновление приложений…</string>
+    <string name="applist_refresh_error_title">Ошибка</string>
+    <string name="applist_refresh_error_msg">Ошибка при получении списка приложений</string>
+    <string name="applist_quit_app">Выход из</string>
+    <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>
+    <string name="addpc_fail">Не удалось подключиться к выбранному компьютеру. Удостоверьтесь, что необходимые порты разрешены в настройках брандмауэра.</string>
+    <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">Mbps</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_checkbox_51_surround">Включить объёмный звук 5.1</string>
+    <string name="summary_checkbox_51_surround">Отключите, если появляются аудио проблемы. Требуется GFE 2.7 или выше.</string>
+
+    <string name="category_gamepad_settings">Настройки Гемпада</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 One</string>
+    <string name="summary_checkbox_xb1_driver">Включить встроенный USB драйвер для устройств без встроенной поддержки контроллера от Xbox One.</string>
+
+    <string name="category_ui_settings">Настройки Интерфейса</string>
+    <string name="title_language_list">Язык</string>
+    <string name="summary_language_list">Язык, который будет использоваться в Moonlight</string>
+    <string name="title_checkbox_list_mode">Использовать списки вместо сеток.</string>
+    <string name="summary_checkbox_list_mode">Выводить приложения и компьютеры списком, вместо использования сетки.</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>
+
+</resources>

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

@@ -21,11 +21,17 @@
             <item>Default</item>
             <item>English</item>
             <item>Italiano</item>
+            <item>Japanese</item>
+            <item>Русский</item>
+            <item>Nederlands</item>
     </string-array>
     <string-array name="language_values" translatable="false">
             <item>default</item>
             <item>en</item>
             <item>it</item>
+            <item>ja</item>
+            <item>ru</item>
+            <item>nl</item>
     </string-array>
 
     <string-array name="decoder_names">

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

@@ -55,7 +55,7 @@
 
     <!-- General strings -->
     <string name="ip_hint">IP address of GeForce PC</string>
-    <string name="searching_pc">Searching for PCs…</string>
+    <string name="searching_pc">Searching for PCs with GeForce Experience running…</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
     <string name="lost_connection">Lost connection to PC</string>