chrome/android/java/strings/android_chrome_strings.grd - Issue 615213003: Upstream NFC beam URL sharing code and add it to ChromeShell.

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: chrome/android/java/strings/android_chrome_strings.grd

Issue 615213003: Upstream NFC beam URL sharing code and add it to ChromeShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Updated sync shell manifest Created 6 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

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">	2 <grit current_release="1" latest_public_release="0">

3 <outputs>	3 <outputs>

4 <output filename="values-am/android_chrome_strings.xml" lang="am" type="andr oid" />	4 <output filename="values-am/android_chrome_strings.xml" lang="am" type="andr oid" />

5 <output filename="values-ar/android_chrome_strings.xml" lang="ar" type="andr oid" />	5 <output filename="values-ar/android_chrome_strings.xml" lang="ar" type="andr oid" />

6 <output filename="values-bg/android_chrome_strings.xml" lang="bg" type="andr oid" />	6 <output filename="values-bg/android_chrome_strings.xml" lang="bg" type="andr oid" />

7 <output filename="values-ca/android_chrome_strings.xml" lang="ca" type="andr oid" />	7 <output filename="values-ca/android_chrome_strings.xml" lang="ca" type="andr oid" />

8 <output filename="values-cs/android_chrome_strings.xml" lang="cs" type="andr oid" />	8 <output filename="values-cs/android_chrome_strings.xml" lang="cs" type="andr oid" />

9 <output filename="values-da/android_chrome_strings.xml" lang="da" type="andr oid" />	9 <output filename="values-da/android_chrome_strings.xml" lang="da" type="andr oid" />

10 <output filename="values-de/android_chrome_strings.xml" lang="de" type="andr oid" />	10 <output filename="values-de/android_chrome_strings.xml" lang="de" type="andr oid" />

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

383	383

384 <!-- Data Reduction Proxy -->	384 <!-- Data Reduction Proxy -->

385 <message name="IDS_DATA_REDUCTION_INFOBAR_TEXT" desc="Text to be displayed in the data reduction proxy infobar" translateable="false">	385 <message name="IDS_DATA_REDUCTION_INFOBAR_TEXT" desc="Text to be displayed in the data reduction proxy infobar" translateable="false">

386 You are part of a data reduction proxy field trial.	386 You are part of a data reduction proxy field trial.

387 </message>	387 </message>

388 <message name="IDS_DATA_REDUCTION_INFOBAR_LINK_TEXT" desc="Text to be disp layed in the data reduction proxy infobar link" translateable="false">	388 <message name="IDS_DATA_REDUCTION_INFOBAR_LINK_TEXT" desc="Text to be disp layed in the data reduction proxy infobar link" translateable="false">

389 Settings	389 Settings

390 </message>	390 </message>

391	391

	392 <!-- Android NFC Beam strings -->

	393 <message name="IDS_NFC_BEAM_ERROR_OVERLAY_ACTIVE" desc="Android Beam error - a tab is not in the foreground [CHAR-LIMIT=40]">

	394 Select a tab to beam

	395 </message>

	396 <message name="IDS_NFC_BEAM_ERROR_BAD_URL" desc="Android Beam error - the current tab has an invalid url [CHAR-LIMIT=40]">

	397 Can’t beam current tab

	398 </message>

	399

392 </messages>	400 </messages>

393 </release>	401 </release>

394 </grit>	402 </grit>

OLD	NEW

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/nfc/OWNERS ('k') | chrome/android/shell/java/AndroidManifest.xml » ('j') | no next file with comments »