mirror of
https://github.com/moonlight-stream/moonlight-android.git
synced 2026-04-17 22:10:09 +00:00
Merge branch 'NewUI-prepare-for-translation' into NewUI
Conflicts: app/src/main/java/com/limelight/PcView.java
This commit is contained in:
Cameron Gutman
@@ -42,7 +42,7 @@
|
||||
android:layout_centerVertical="true"
|
||||
android:textAppearance="?android:attr/textAppearanceLarge"
|
||||
android:gravity="center"
|
||||
android:text="Searching for PCs on the network..."/>
|
||||
android:text="@string/searching_pc"/>
|
||||
</RelativeLayout>
|
||||
</RelativeLayout>
|
||||
|
||||
@@ -68,4 +68,4 @@
|
||||
android:src="@drawable/add_computer"
|
||||
style="?android:attr/borderlessButtonStyle"/>
|
||||
|
||||
</RelativeLayout>
|
||||
</RelativeLayout>
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
android:layout_centerVertical="true"
|
||||
android:textAppearance="?android:attr/textAppearanceLarge"
|
||||
android:gravity="center"
|
||||
android:text="Searching for PCs on the network..."/>
|
||||
android:text="@string/searching_pc"/>
|
||||
</RelativeLayout>
|
||||
</RelativeLayout>
|
||||
|
||||
@@ -68,4 +68,4 @@
|
||||
android:src="@drawable/add_computer"
|
||||
style="?android:attr/borderlessButtonStyle"/>
|
||||
|
||||
</RelativeLayout>
|
||||
</RelativeLayout>
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
<item>1080p 30 FPS</item>
|
||||
<item>1080p 60 FPS</item>
|
||||
</string-array>
|
||||
<string-array name="resolution_values">
|
||||
<string-array name="resolution_values" translatable="false">
|
||||
<item>720p30</item>
|
||||
<item>720p60</item>
|
||||
<item>1080p30</item>
|
||||
@@ -14,13 +14,13 @@
|
||||
</string-array>
|
||||
|
||||
<string-array name="decoder_names">
|
||||
<item>Force Software Decoding</item>
|
||||
<item>Auto-select Decoder</item>
|
||||
<item>Force Software Decoding</item>
|
||||
<item>Force Hardware Decoding</item>
|
||||
</string-array>
|
||||
<string-array name="decoder_values">
|
||||
<item>software</item>
|
||||
<string-array name="decoder_values" translatable="false">
|
||||
<item>auto</item>
|
||||
<item>software</item>
|
||||
<item>hardware</item>
|
||||
</string-array>
|
||||
</resources>
|
||||
</resources>
|
||||
|
||||
@@ -1,12 +1,87 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
<!-- Context menu entries -->
|
||||
<string name="pcview_menu_app_list">View Game List</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>
|
||||
<string name="pcview_menu_delete_pc">Delete PC</string>
|
||||
|
||||
<!-- Pair messages -->
|
||||
<string name="pairing">Pairing...</string>
|
||||
<string name="pair_pc_offline">Computer is offline</string>
|
||||
<string name="pair_pc_ingame">Computer is currently in a game. You must close the game before pairing.</string>
|
||||
<string name="pair_pairing_title">Pairing</string>
|
||||
<string name="pair_pairing_msg">Please enter the following PIN on the target PC:</string>
|
||||
<string name="pair_incorrect_pin">Incorrect PIN</string>
|
||||
<string name="pair_fail">Pairing failed</string>
|
||||
<string name="pair_success">Paired successfully</string>
|
||||
|
||||
<!-- WOL messages -->
|
||||
<string name="wol_pc_online">Computer is online</string>
|
||||
<string name="wol_no_mac">Unable to wake PC because GFE didn\'t send a MAC address</string>
|
||||
<string name="wol_waking_pc">Waking PC...</string>
|
||||
<string name="wol_waking_msg">It may take a few seconds for your PC to wake up.
|
||||
If it doesn\'t, make sure it'\s configured properly for Wake-On-LAN.
|
||||
</string>
|
||||
<string name="wol_fail">Failed to send Wake-On-LAN packets</string>
|
||||
|
||||
<!-- Unpair messages -->
|
||||
<string name="unpairing">Unpairing...</string>
|
||||
<string name="unpair_success">Unpaired successfully</string>
|
||||
<string name="unpair_fail">Failed to unpair</string>
|
||||
<string name="unpair_error">Device was not paired</string>
|
||||
|
||||
<!-- Errors -->
|
||||
<string name="error_pc_offline">Computer is offline</string>
|
||||
<string name="error_manager_not_running">The ComputerManager service is not running. Please wait a few seconds or restart the app.</string>
|
||||
<string name="error_unknown_host">Failed to resolve host</string>
|
||||
<string name="error_404">GFE returned an HTTP 404 error. Make sure your PC is running a supported GPU.
|
||||
Using remote desktop software can also cause this error. Try rebooting your machine or reinstalling GFE.
|
||||
</string>
|
||||
|
||||
<!-- Start application messages -->
|
||||
<string name="conn_establishing_title">Establishing Connection</string>
|
||||
<string name="conn_establishing_msg">Starting connection</string>
|
||||
<string name="conn_metered">Warning: Your active network connection is metered!</string>
|
||||
<string name="conn_client_latency">Average client-side frame latency:</string>
|
||||
<string name="conn_client_latency_hw">hardware decoder latency:</string>
|
||||
<string name="conn_hardware_latency">Average hardware decoder latency:</string>
|
||||
<string name="conn_starting">Starting</string>
|
||||
<string name="conn_error_title">Connection Error</string>
|
||||
<string name="conn_error_msg">Fail starting</string>
|
||||
<string name="conn_terminated_title">Connection Terminated</string>
|
||||
<string name="conn_terminated_msg">The connection was terminated</string>
|
||||
|
||||
<!-- Add computer manually messages -->
|
||||
<string name="addpc_fail">Unable to connect to the specified computer. Make sure the required ports are allowed through the firewall.</string>
|
||||
<string name="addpc_success">Successfully added computer</string>
|
||||
<string name="addpc_unknown_host">Unable to resolve PC address. Make sure you didn\'t make a typo in the address.</string>
|
||||
<string name="addpc_enter_ip">You must enter an IP address</string>
|
||||
|
||||
<!-- General strings -->
|
||||
<string name="ip_hint">IP address of GeForce PC</string>
|
||||
<string name="searching_pc">Searching for PCs on the network...</string>
|
||||
|
||||
<!-- AppList activity -->
|
||||
<string name="title_applist">Apps on</string>
|
||||
<string name="applist_menu_resume">Resume Session</string>
|
||||
<string name="applist_menu_quit">Quit Session</string>
|
||||
<string name="applist_menu_quit_and_start">Quit Current Game and Start</string>
|
||||
<string name="applist_menu_cancel">Cancel</string>
|
||||
<string name="applist_refresh_title">App List</string>
|
||||
<string name="applist_refresh_msg">Refreshing apps...</string>
|
||||
<string name="applist_refresh_error_title">Error</string>
|
||||
<string name="applist_refresh_error_msg">Failed to get app list</string>
|
||||
<string name="applist_quit_app">Quitting</string>
|
||||
<string name="applist_quit_success">Successfully quit</string>
|
||||
<string name="applist_quit_fail">Failed to quit</string>
|
||||
|
||||
<!-- Add computer manually activity -->
|
||||
<string name="title_add_pc">Add PC Manually</string>
|
||||
<string name="button_add_pc">Add PC</string>
|
||||
<string name="msg_add_pc">Connecting to the specified PC...</string>
|
||||
|
||||
<!-- Preferences -->
|
||||
<string name="category_basic_settings">Basic Settings</string>
|
||||
|
||||
Reference in New Issue
Block a user