316670 - Trademark Review for ZH-CN

Status: RESOLVED FIXED

(Marketing :: Trademark Permissions, task)

Description

[Rafael Ebron (:rebron)]

1) Please add Yahoo!Search plug-in
2) Change /browser-region/region.properties so that:
browser.search.order.2=Google
browser.search.order.1=Yahoo
3) Bookmarks.html
  a) remove urban dictionary
  b) Wikipedia can be: http://zh.wikipedia.org/wiki/%25s right?

Comment 1

[Rafael Ebron (:rebron)]

Attachment: yahoo plug-in image

Comment 2

[Rafael Ebron (:rebron)]

Attachment: yahoo plugin

Comment 3

[Axel Hecht [:Pike]]

Actually, the names need to match in order, thus

browser.search.order.1=Yahoo! China Search

Comment 4

[Axel Hecht [:Pike]]

Attachment: the corresponding patch

This patch has linux line endings, the attached plugin has windows ones. Just
for reference.

Comment 5

[Axel Hecht [:Pike]]

Holy, if you'd note a review (you'll have to do a comment, flags don't work in
marketing), I'd check this in, if you don't mind.

Comment 6

[Rafael Ebron (:rebron)]

Attachment: Yahoo!

shortened name

Comment 7

[Rafael Ebron (:rebron)]

Attachment: patch with just name=Yahoo

Comment 8

[Rafael Ebron (:rebron)]

Attachment: Updated with search order

Comment 9

[Rafael Ebron (:rebron)]

Need to remove Answers.com from list.

Comment 10

[Rafael Ebron (:rebron)]

Attachment: w/ shortened yahoo text

Comment 11

[Rafael Ebron (:rebron)]

Attachment: Yahoo

Comment 12

[Axel Hecht [:Pike]]

Comment on attachment 203543 [details] [diff] [review]
Yahoo

patch doesn't like UTF-16LE, and I have no grip on how to make that patch apply. I tried to iconv it to UTF-8, but patch still complains.

Comment 13

[Rafael Ebron (:rebron)]

Attachment: utf-8 encoded?

Does this work?

Comment 14

[Axel Hecht [:Pike]]

patching file chrome/browser-region/region.properties
patch: **** malformed patch at line 20: +browser.search.order.6=Taobao

Could this be a line ending issue?

Comment 15

[Axel Hecht [:Pike]]

Attachment: actually a patch, fixes more issues than all the above, but not central

This patch fixes:

- search plugins, yahoo-cn added, amazondotcom fixed to en-US one, update paths.
non-cn names are ok, as those are .com services. No update for baidu is ok.

- region.properties, start.mozilla.org fixed to zh-cn.start.mozilla.com, and search engine order.

- bookmarks, removed getfirefox, fixed store, changed wikipedia, removed urban. 
Without a URL from Mozilla China, there's no good way to fix the central.html 
link.

Comment 16

[Shaohua Wen]

Dear Axel,
  Could you checkin the patch or I have to?
  My wife just bored a boy on 11.16,So I don't have time for 
some days...
  I will try to contact other team members to do the QA for
1.5 rcs/final.
  Thanks&Regards,
Holy

Comment 17

[Axel Hecht [:Pike]]

Congratulations, Holy. I do think that releasing a real-life child is more
important than Firefox, and I'll do the checking in.

Comment 18

[Axel Hecht [:Pike]]

Attachment: fixes central and answers.com

I forgot to remove answers.com in the previous patch, and I got a URL for central
from Mozilla China, namely, 
http://www.mozilla.org.cn/products/firefox/central.jsp.

Checking this patch in for Holy.

Comment 19

[Rafael Ebron (:rebron)]

One more change.  Need homePageSingleStartURL to be

#expand
homePageSingleStartMainURL=http://zh-cn.start.mozilla.com/firefox?client=firefox-a&rls=__MOZ_DISTRIBUTION_ID_UNQUOTED__:__AB_CD__:official

This is in brand.properties

Comment 20

[Axel Hecht [:Pike]]

Attachment: take the technically right way and use __AB_CD__, too.

Comment 21

[Axel Hecht [:Pike]]

Comment on attachment 203942 [details] [diff] [review]
take the technically right way and use __AB_CD__, too.

due to timing issues with the upcoming release, I checked this in for Holy, too.

Comment 22

[Axel Hecht [:Pike]]

AFAICT, this is FIXED now.

Comment 23

[Shaohua Wen]

(In reply to comment #19)
> One more change.  Need homePageSingleStartURL to be
> 
> #expand
> homePageSingleStartMainURL=http://zh-cn.start.mozilla.com/firefox?client=firefox-a&rls=__MOZ_DISTRIBUTION_ID_UNQUOTED__:__AB_CD__:official
> 
> This is in brand.properties
> 
Thanks!
what's the usage of this commented line?

Comment 24

[Axel Hecht [:Pike]]

It's actually one line, which substitutes all the __FOO__ occurences by the 
right strings (if defined elsewhere, of course).