Add support for branded strings to iOS build.
commit528e09f0193a4f8c077b828e2926abb76f8f2d1b
authorsdefresne <sdefresne@chromium.org>
Tue, 1 Sep 2015 12:12:32 +0000 (1 05:12 -0700)
committerCommit bot <commit-bot@chromium.org>
Tue, 1 Sep 2015 12:13:10 +0000 (1 12:13 +0000)
tree30e7de75ae795f931cc190a71c2c30a877eedf31
parent23c4fe2f82a715b617d8cf68dcee0b3055b654eb
Add support for branded strings to iOS build.

Add two new files ios_{chromium,google_chrome}_strings.grd (and the empty
.xtb files) to ios/chrome/app/strings for branded strings (i.e. strings
that reference the product, see http://goo.gl/6614MQ).

Fix ios/chrome/tools/build/ios_repack_locales.py to pack those strings
when branding flag is set, and require the flag to be set (except when
just listing the output).

Pass the -b flag when calling out ios_repack_locales.py script and update
tools/gritsettings/resource_ids to give some room for branded iOS strings.

Rename ios/chrome/app/strings/ios_strings_resources.grd to ios_strings.grd
to be in line with how the other string localization files are named.

BUG=475514

Review URL: https://codereview.chromium.org/1310073004

Cr-Commit-Position: refs/heads/master@{#346630}
164 files changed:
chrome/chrome_resources.gyp
ios/chrome/app/strings/ios_chromium_strings.grd [new file with mode: 0644]
ios/chrome/app/strings/ios_google_chrome_strings.grd [new file with mode: 0644]
ios/chrome/app/strings/ios_strings.grd [new file with mode: 0644]
ios/chrome/app/strings/ios_strings_resources.grd [deleted file]
ios/chrome/app/strings/resources/ios_chromium_strings_am.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_ar.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_bg.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_bn.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_ca.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_cs.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_da.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_de.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_el.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_en-GB.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_es-419.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_es.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_et.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_fa.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_fi.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_fil.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_fr.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_gu.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_hi.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_hr.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_hu.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_id.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_it.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_iw.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_ja.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_kn.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_ko.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_lt.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_lv.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_ml.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_mr.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_ms.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_nl.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_no.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_pl.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_pt-BR.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_pt-PT.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_ro.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_ru.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_sk.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_sl.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_sr.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_sv.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_sw.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_ta.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_te.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_th.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_tr.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_uk.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_vi.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_zh-CN.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_chromium_strings_zh-TW.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_am.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_ar.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_bg.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_bn.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_ca.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_cs.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_da.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_de.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_el.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_en-GB.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_es-419.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_es.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_et.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_fa.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_fi.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_fil.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_fr.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_gu.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_hi.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_hr.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_hu.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_id.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_it.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_iw.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_ja.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_kn.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_ko.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_lt.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_lv.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_ml.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_mr.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_ms.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_nl.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_no.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_pl.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_pt-BR.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_pt-PT.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_ro.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_ru.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_sk.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_sl.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_sr.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_sv.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_sw.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_ta.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_te.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_th.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_tr.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_uk.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_vi.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_zh-CN.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_google_chrome_strings_zh-TW.xtb [new file with mode: 0644]
ios/chrome/app/strings/resources/ios_strings_am.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_am.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_ar.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_ar.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_bg.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_bg.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_bn.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_bn.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_ca.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_ca.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_cs.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_cs.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_da.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_da.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_de.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_de.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_el.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_el.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_en-GB.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_en-GB.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_es-419.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_es-419.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_es.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_es.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_et.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_et.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_fa.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_fa.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_fi.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_fi.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_fil.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_fil.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_fr.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_fr.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_gu.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_gu.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_hi.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_hi.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_hr.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_hr.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_hu.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_hu.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_id.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_id.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_it.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_it.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_iw.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_iw.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_ja.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_ja.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_kn.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_kn.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_ko.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_ko.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_lt.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_lt.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_lv.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_lv.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_ml.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_ml.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_mr.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_mr.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_ms.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_ms.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_nl.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_nl.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_no.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_no.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_pl.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_pl.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_pt-BR.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_pt-BR.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_pt-PT.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_pt-PT.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_ro.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_ro.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_ru.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_ru.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_sk.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_sk.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_sl.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_sl.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_sr.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_sr.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_sv.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_sv.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_sw.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_sw.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_ta.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_ta.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_te.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_te.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_th.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_th.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_tr.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_tr.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_uk.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_uk.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_vi.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_vi.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_zh-CN.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_zh-CN.xtb with 100% similarity]
ios/chrome/app/strings/resources/ios_strings_zh-TW.xtb [moved from ios/chrome/app/strings/resources/ios_strings_resources_zh-TW.xtb with 100% similarity]
ios/chrome/ios_chrome_resources.gyp
ios/chrome/tools/build/ios_repack_locales.py
tools/gritsettings/resource_ids