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

resolve merge conflicts of cb1968148a to master

Browse Source 
Test: make RunSettingsRoboTests
Change-Id: I436af9f0415b9ad7ea0ea53f4f68d337fdbaa0aa
This commit is contained in:
Robin Lee
2017-01-19 23:58:20 +00:00
parent 5228059c50 cb1968148a
commit edfeaace61
4 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -5379,6 +5379,8 @@
<!-- Toast message when there is no network connection to start VPN. [CHAR LIMIT=100] -->
<string name="vpn_no_network">There is no network connection. Please try again later.</string>
<!-- Toast message when VPN has disconnected automatically due to Clear credentials. [CHAR LIMIT=NONE] -->
<string name="vpn_disconnected">Disconnected from VPN</string>
<!-- Toast message when a certificate is missing. [CHAR LIMIT=100] -->
<string name="vpn_missing_cert">A certificate is missing. Please edit the profile.</string>