content/shell/android/res/values/strings.xml - Issue 11085008: [Android] Upstream content detection and ChromeBrowserProvider tests.

Side by Side Diff

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

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

Side by Side Diff: content/shell/android/res/values/strings.xml

Issue 11085008: [Android] Upstream content detection and ChromeBrowserProvider tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase after landing resources separately. Created 8 years, 2 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 | Annotate | Revision Log

« no previous file with comments | « content/shell/android/javatests/src/org/chromium/content_shell/ContentShellTestBase.java ('k') | content/test/data/android/device_files/content_detection/click_listeners.html » ('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	2

3 <!-- Copyright (c) 2012 The Chromium Authors. All rights reserved.	3 <!-- Copyright (c) 2012 The Chromium Authors. All rights reserved.

4	4

5 Use of this source code is governed by a BSD-style license that can be	5 Use of this source code is governed by a BSD-style license that can be

6 found in the LICENSE file.	6 found in the LICENSE file.

7 -->	7 -->

8	8

9 <resources>	9 <resources>

	10 <string name="url_hint">Type URL Here</string>

	11 <string name="accessibility_content_view">Web View</string>

10	12

11 <string name="url_hint">Type URL Here</string>	13 <!-- Action Bar -->

12	14 <string name="action_bar_share">Share</string>

13 <string name="accessibility_content_view">Web View</string>	15 <string name="action_bar_search">Search</string>

14	16

15 <!-- Media Player -->	17 <!-- Media Player -->

16 <string name="media_player_error_title">Cannot play video</string>	18 <string name="media_player_error_title">Cannot play video</string>

17 <string name="media_player_error_text_invalid_progressive_playback">	19 <string name="media_player_error_text_invalid_progressive_playback">

18 Sorry, this video is not valid for streaming to this device.</string>	20 Sorry, this video is not valid for streaming to this device.</string>

19 <string name="media_player_error_text_unknown">	21 <string name="media_player_error_text_unknown">

20 Sorry, this video cannot be played.</string>	22 Sorry, this video cannot be played.</string>

21 <string name="media_player_error_button">OK</string>	23 <string name="media_player_error_button">OK</string>

22 </resources>	24 </resources>

OLD	NEW