blimp/client/app/android/java/strings/android_blimp_strings.grd - Issue 2173563003: Blimp settings UI integration for Chrome, everything still lives in Blimp.

Side by Side Diff: blimp/client/app/android/java/strings/android_blimp_strings.grd

Issue 2173563003: Blimp settings UI integration for Chrome, everything still lives in Blimp. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix nit issues, and prepare to commit. Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « blimp/client/app/android/java/src/org/chromium/blimp/preferences/PreferencesUtil.java ('k') | blimp/client/app/android/javatests/src/org/chromium/blimp/core/settings/BlimpPreferencesTest.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <?xml version="1.0" encoding="UTF-8"?>	1 <?xml version="1.0" encoding="UTF-8"?>

2 <grit current_release="1" latest_public_release="0" output_all_resource_defines= "false">	2 <grit current_release="1" latest_public_release="0" output_all_resource_defines= "false">

3 <outputs>	3 <outputs>

4 <output filename="values-am/android_blimp_strings.xml" lang="am" type="andro id" />	4 <output filename="values-am/android_blimp_strings.xml" lang="am" type="andro id" />

5 <output filename="values-ar/android_blimp_strings.xml" lang="ar" type="andro id" />	5 <output filename="values-ar/android_blimp_strings.xml" lang="ar" type="andro id" />

6 <output filename="values-bg/android_blimp_strings.xml" lang="bg" type="andro id" />	6 <output filename="values-bg/android_blimp_strings.xml" lang="bg" type="andro id" />

7 <output filename="values-ca/android_blimp_strings.xml" lang="ca" type="andro id" />	7 <output filename="values-ca/android_blimp_strings.xml" lang="ca" type="andro id" />

8 <output filename="values-cs/android_blimp_strings.xml" lang="cs" type="andro id" />	8 <output filename="values-cs/android_blimp_strings.xml" lang="cs" type="andro id" />

9 <output filename="values-da/android_blimp_strings.xml" lang="da" type="andro id" />	9 <output filename="values-da/android_blimp_strings.xml" lang="da" type="andro id" />

10 <output filename="values-de/android_blimp_strings.xml" lang="de" type="andro id" />	10 <output filename="values-de/android_blimp_strings.xml" lang="de" type="andro id" />

(...skipping 157 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
168 </message>	168 </message>

169 <message name="IDS_APPLICATION_VERSION_TITLE" desc="Application version ti tle.">	169 <message name="IDS_APPLICATION_VERSION_TITLE" desc="Application version ti tle.">

170 Application version	170 Application version

171 </message>	171 </message>

172 <message name="IDS_OS_VERSION_TITLE" desc="OS version title.">	172 <message name="IDS_OS_VERSION_TITLE" desc="OS version title.">

173 Operating system	173 Operating system

174 </message>	174 </message>

175 <message name="IDS_ABOUT_BLIMP_PREFERENCES" desc="About blimp preferences. ">	175 <message name="IDS_ABOUT_BLIMP_PREFERENCES" desc="About blimp preferences. ">

176 About Blimp	176 About Blimp

177 </message>	177 </message>

	178 <message name="IDS_RESTART_BLIMP" desc="Blimp restart message.">

	179 Restart Blimp

	180 </message>

	181 <message name="IDS_RESTART_NOW" desc="Restart now message">

	182 Restart Now

	183 </message>

	184

	185 <!-- Blimp UI strings, should prefix with blimp -->

	186 <!-- TODO(xingliu): Clean resources files in the future. http://crbug.com/6306 87 -->

	187 <message name="IDS_BLIMP_ABOUT_BLIMP_PREFERENCES" desc="About blimp prefer ences.">

	188 Blimp Settings

	189 </message>

	190 <message name="IDS_BLIMP_SWITCH" desc="Blimp Switch.">

	191 Blimp Switch

	192 </message>

178 <message name="IDS_BLIMP_ENGINE_IP" desc="Blimp Engine IP.">	193 <message name="IDS_BLIMP_ENGINE_IP" desc="Blimp Engine IP.">

179 Engine IP	194 Engine IP

180 </message>	195 </message>

181 <message name="IDS_BLIMP_ENGINE_VERSION" desc="Blimp Engine Version.">	196 <message name="IDS_BLIMP_ENGINE_VERSION" desc="Blimp Engine Version.">

182 Engine Version	197 Engine Version

183 </message>	198 </message>

184 <message name="IDS_BLIMP_ASSIGNER_URL" desc="Blimp Assigner URL.">	199 <message name="IDS_BLIMP_ASSIGNER_URL" desc="Blimp Assigner URL.">

185 Assigner URL	200 Assigner URL

186 </message>	201 </message>

187 <message name="IDS_BLIMP_ASSIGNER_CHANGED_PLEASE_RESTART" desc="Blimp assi gner changed, restart message.">	202 <message name="IDS_BLIMP_ASSIGNER_CHANGED_PLEASE_RESTART" desc="Blimp assig ner changed, restart message.">

188 Please restart the application to use the new assigner configuration.	203 Please restart the application to use the new assigner configuration.

189 </message>	204 </message>

190 <message name="IDS_RESTART_BLIMP" desc="Blimp restart message.">	205 <message name="IDS_BLIMP_SWITCH_CHANGED_PLEASE_RESTART" desc="Blimp switch changed, restart message.">

	206 Blimp switch changed, Please restart the application.

	207 </message>

	208 <message name="IDS_BLIMP_RESTART_BLIMP" desc="Blimp restart message.">

191 Restart Blimp	209 Restart Blimp

192 </message>	210 </message>

193 <message name="IDS_RESTART_NOW" desc="Restart now message">	211 <message name="IDS_BLIMP_RESTART_NOW" desc="Restart now message">

194 Restart Now	212 Restart Now

195 </message>	213 </message>

196 </messages>	214 </messages>

197 </release>	215 </release>

198 </grit>	216 </grit>

OLD	NEW