mobile/android/base/locales/Makefile.in - Issue 29322413: Issue 2750 - [Support other languages] Apply Firefox's translations

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
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
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
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
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: mobile/android/base/locales/Makefile.in

Issue 29322413: Issue 2750 - [Support other languages] Apply Firefox's translations (Closed)

Patch Set: Created July 15, 2015, 1:49 p.m.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Index: mobile/android/base/locales/Makefile.in

diff --git a/mobile/android/base/locales/Makefile.in b/mobile/android/base/locales/Makefile.in

index 7851f5ad89e0035833584fb811c5187f4d34e15d..bcd64b3f9d3673c2888aee59649fd85b7a8ce786 100644

--- a/mobile/android/base/locales/Makefile.in

+++ b/mobile/android/base/locales/Makefile.in

@@ -15,6 +15,9 @@ SEARCHSTRINGSPATH = $(abspath $(call MERGE_FILE,search_strings.dtd))

SYNCSTRINGSPATH = $(abspath $(call MERGE_FILE,sync_strings.dtd))

STRINGSPATH = $(abspath $(call MERGE_FILE,android_strings.dtd))

+ABBSTRINGSPATH = $(or $(wildcard $(srcdir)/adblockbrowser/$(ABr_CD)/android_strings.dtd), \

+ $(wildcard $(srcdir)/adblockbrowser/$(AB_CD)/android_strings.dtd), \

+ $(srcdir)/adblockbrowser/en-US/android_strings.dtd)

ifeq (,$(XPI_NAME))

BRANDPATH = $(abspath $(DEPTH)/dist/bin/chrome/$(AB_CD)/locale/branding/brand.dtd)

else

@@ -67,6 +70,7 @@ strings-xml-preqs =\

$(strings-xml-in) \

$(BRANDPATH) \

$(STRINGSPATH) \

+ $(ABBSTRINGSPATH) \

$(SEARCHSTRINGSPATH) \

$(SYNCSTRINGSPATH) \

$(BOOKMARKSPATH) \

@@ -86,6 +90,7 @@ $(dir-strings-xml)/strings.xml: $(strings-xml-preqs)

-DMOZ_ANDROID_SHARED_FXACCOUNT_TYPE=$(MOZ_ANDROID_SHARED_FXACCOUNT_TYPE) \

-DMOZ_APP_DISPLAYNAME='@MOZ_APP_DISPLAYNAME@' \

-DSTRINGSPATH='$(STRINGSPATH)' \

+ -DABBSTRINGSPATH='$(ABBSTRINGSPATH)' \

-DSYNCSTRINGSPATH='$(SYNCSTRINGSPATH)' \

-DSEARCHSTRINGSPATH='$(SEARCHSTRINGSPATH)' \

$< \