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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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, 5 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 side-by-side diff with in-line comments

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 »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: blimp/client/app/android/java/strings/android_blimp_strings.grd

diff --git a/blimp/client/app/android/java/strings/android_blimp_strings.grd b/blimp/client/app/android/java/strings/android_blimp_strings.grd

index addf5875d4649c80ee3b32ccf72afa23e60341e1..720d47b7cd27488047860d6a34790f5e1b1b8f3f 100644

--- a/blimp/client/app/android/java/strings/android_blimp_strings.grd

+++ b/blimp/client/app/android/java/strings/android_blimp_strings.grd

@@ -175,6 +175,21 @@

About Blimp

</message>

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

+ Restart Blimp

+ </message>

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

+ Restart Now

+ </message>

+

+

+ <message name="IDS_BLIMP_ABOUT_BLIMP_PREFERENCES" desc="About blimp preferences.">

+ Blimp Settings

+ </message>

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

+ Blimp Switch

+ </message>

Engine IP

</message>

@@ -184,13 +199,16 @@

Assigner URL

</message>

- <message name="IDS_BLIMP_ASSIGNER_CHANGED_PLEASE_RESTART" desc="Blimp assigner changed, restart message.">

+ <message name="IDS_BLIMP_ASSIGNER_CHANGED_PLEASE_RESTART" desc="Blimp assigner changed, restart message.">

Please restart the application to use the new assigner configuration.

</message>

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

+ <message name="IDS_BLIMP_SWITCH_CHANGED_PLEASE_RESTART" desc="Blimp switch changed, restart message.">

+ Blimp switch changed, Please restart the application.

+ </message>

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

Restart Blimp

</message>

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

+ <message name="IDS_BLIMP_RESTART_NOW" desc="Restart now message">

Restart Now

</message>

</messages>