chrome/app/resources/locale_settings.grd - Issue 460066: Merge 33798 - Fix download dialog truncation in German locale....

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/app/resources/locale_settings.grd

Issue 460066: Merge 33798 - Fix download dialog truncation in German locale.... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/249/src/

Patch Set: Created 11 years 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

Property Changes:

Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/chrome/app/resources/locale_settings.grd:r69-2775
Merged /branches/172/src/chrome/app/resources/locale_settings.grd:r15630,16043

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

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

3 <outputs>	3 <outputs>

4 <output filename="grit/locale_settings.h" type="rc_header">	4 <output filename="grit/locale_settings.h" type="rc_header">

5 <emit emit_type='prepend'></emit>	5 <emit emit_type='prepend'></emit>

6 </output>	6 </output>

7 <output filename="locale_settings_am.rc" type="rc_all" lang="am" />	7 <output filename="locale_settings_am.rc" type="rc_all" lang="am" />

8 <output filename="locale_settings_ar.rc" type="rc_all" lang="ar" />	8 <output filename="locale_settings_ar.rc" type="rc_all" lang="ar" />

9 <output filename="locale_settings_bg.rc" type="rc_all" lang="bg" />	9 <output filename="locale_settings_bg.rc" type="rc_all" lang="bg" />

10 <output filename="locale_settings_bn.rc" type="rc_all" lang="bn" />	10 <output filename="locale_settings_bn.rc" type="rc_all" lang="bn" />

(...skipping 673 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
684 60	684 60

685 </message>	685 </message>

686 <message name="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES" use_name_for_ id="true">	686 <message name="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES" use_name_for_ id="true">

687 8	687 8

688 </message>	688 </message>

689	689

690 <!-- The URL for the "Aw snap" page. -->	690 <!-- The URL for the "Aw snap" page. -->

691 <message name="IDS_CRASH_REASON_URL" translateable="false">	691 <message name="IDS_CRASH_REASON_URL" translateable="false">

692 http://www.google.com/support/chrome/bin/answer.py?answer=95669&hl=[ GRITLANGCODE]	692 http://www.google.com/support/chrome/bin/answer.py?answer=95669&hl=[ GRITLANGCODE]

693 </message>	693 </message>

	694

	695 <!-- The default width and min height for the 'download_in_progress' dialo g. -->

	696 <message name="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS" use_name_for_id="true ">

	697 67

	698 </message>

	699 <message name="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES" use_name_for _id="true">

	700 4

	701 </message>

694 </messages>	702 </messages>

695 </release>	703 </release>

696 </grit>	704 </grit>

OLD	NEW

« no previous file with comments | « no previous file | chrome/app/resources/locale_settings_am.xtb » ('j') | no next file with comments »