Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(47)

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

Issue 2322843002: Propagate connection info to Blimp android UI. (Closed)
Patch Set: Merge conflicts. Created 4 years, 3 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
OLDNEW
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 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 </message> 183 </message>
184 184
185 <!-- Blimp UI strings, should prefix with blimp --> 185 <!-- Blimp UI strings, should prefix with blimp -->
186 <!-- TODO(xingliu): Clean resources files in the future. http://crbug.com/6306 87 --> 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."> 187 <message name="IDS_BLIMP_ABOUT_BLIMP_PREFERENCES" desc="About blimp prefer ences.">
188 Blimp Settings 188 Blimp Settings
189 </message> 189 </message>
190 <message name="IDS_BLIMP_SWITCH" desc="Blimp Switch."> 190 <message name="IDS_BLIMP_SWITCH" desc="Blimp Switch.">
191 Blimp Switch 191 Blimp Switch
192 </message> 192 </message>
193 <message name="IDS_BLIMP_ENGINE_IP" desc="Blimp Engine IP."> 193 <message name="IDS_BLIMP_ENGINE_IP" desc="Blimp Engine ip.">
194 Engine IP 194 Engine IP
195 </message> 195 </message>
196 <message name="IDS_BLIMP_ENGINE_INFO" desc="Blimp Engine info.">
197 Engine Info
198 </message>
196 <message name="IDS_BLIMP_ENGINE_VERSION" desc="Blimp Engine Version."> 199 <message name="IDS_BLIMP_ENGINE_VERSION" desc="Blimp Engine Version.">
197 Engine Version 200 Engine Version
198 </message> 201 </message>
199 <message name="IDS_BLIMP_ASSIGNER_URL" desc="Blimp Assigner URL."> 202 <message name="IDS_BLIMP_ASSIGNER_URL" desc="Blimp Assigner URL.">
200 Assigner URL 203 Assigner URL
201 </message> 204 </message>
202 <message name="IDS_BLIMP_ASSIGNER_CHANGED_PLEASE_RESTART" desc="Blimp assi gner changed, restart message."> 205 <message name="IDS_BLIMP_ASSIGNER_CHANGED_PLEASE_RESTART" desc="Blimp assi gner changed, restart message.">
203 Please restart the application to use the new assigner configuration. 206 Please restart the application to use the new assigner configuration.
204 </message> 207 </message>
205 <message name="IDS_BLIMP_SIGN_OUT_RESTART" desc="User sign out, restart me ssage."> 208 <message name="IDS_BLIMP_SIGN_OUT_RESTART" desc="User sign out, restart me ssage.">
(...skipping 22 matching lines...) Expand all
228 </message> 231 </message>
229 <message name="IDS_BLIMP_SIGN_IN_MSG" desc="Sign in message."> 232 <message name="IDS_BLIMP_SIGN_IN_MSG" desc="Sign in message.">
230 Please sign in to google account to enable Blimp. 233 Please sign in to google account to enable Blimp.
231 </message> 234 </message>
232 <message name="IDS_BLIMP_SIGN_IN_BTN" desc="Sign in button."> 235 <message name="IDS_BLIMP_SIGN_IN_BTN" desc="Sign in button.">
233 Sign in now 236 Sign in now
234 </message> 237 </message>
235 </messages> 238 </messages>
236 </release> 239 </release>
237 </grit> 240 </grit>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698