PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of 55d7fcbfc2 to master.

Browse Source 
Change-Id: Ib0876ea153e8a8f7c8ad5438915d39c9ae97e51b
This commit is contained in:
Rubin Xu
2016-01-27 00:34:53 +00:00
parent 06dc55d6ce 55d7fcbfc2
commit b557817abc
2 changed files with 43 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -1630,6 +1630,8 @@
<string name="wifi_unchanged">(unchanged)</string>
<!-- Hint for unspecified fields -->
<string name="wifi_unspecified">(unspecified)</string>
<!-- Hint for multiple certificates being added to the configuration -->
<string name="wifi_multiple_cert_added">(Multiple certificates added)</string>
<!-- Substring of status line when Wi-Fi Protected Setup (WPS) is available and
string is listed first [CHAR LIMIT=20]-->
<string name="wifi_wps_available_first_item">WPS available</string>