Merge cherry-pick

This commit is contained in:
topjohnwu
2016-09-18 02:32:08 +08:00
committed by d8ahazard
parent 2abd0265c8
commit ccab6eb7c4
10 changed files with 71 additions and 113 deletions
+1 -1
View File
@@ -83,7 +83,7 @@
<string name="no_root_access">No root access, functionality limited</string>
<string name="no_thanks">No thanks</string>
<string name="update_title">%1$s Update!</string>
<string name="update_msg"><![CDATA[New version v%2$s of %1$s is available!<br>Changelog:<br>%3$s]]></string>
<string name="update_msg">New version v%2$s of %1$s is available!\nChangelog:\n%3$s</string>
<string name="download_install">Download and install</string>
<string name="download_file_error">Error downloading file</string>
<string name="manual_install">File downloaded in %1$s\nFlash it in recovery manually</string>