Index: chrome/app/chromium_strings.grd |
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd |
index 15e26a803d194fe413fb3cfec6c4a3c97d9b5e33..867ce3306f962d55d7dee8d9b9735a7116c9c023 100644 |
--- a/chrome/app/chromium_strings.grd |
+++ b/chrome/app/chromium_strings.grd |
@@ -20,13 +20,7 @@ If you update this file, be sure also to update google_chrome_strings.grd. --> |
<output filename="chromium_strings_en-GB.pak" type="data_package" lang="en-GB" /> |
<output filename="chromium_strings_en-US.pak" type="data_package" lang="en" /> |
<output filename="chromium_strings_es.pak" type="data_package" lang="es" /> |
- <if expr="is_ios"> |
- <!-- iOS uses es-MX for es-419 --> |
- <output filename="chromium_strings_es-MX.pak" type="data_package" lang="es-419" /> |
- </if> |
- <if expr="not is_ios"> |
- <output filename="chromium_strings_es-419.pak" type="data_package" lang="es-419" /> |
- </if> |
+ <output filename="chromium_strings_es-419.pak" type="data_package" lang="es-419" /> |
<output filename="chromium_strings_et.pak" type="data_package" lang="et" /> |
<output filename="chromium_strings_fa.pak" type="data_package" lang="fa" /> |
<output filename="chromium_strings_fake-bidi.pak" type="data_package" lang="fake-bidi" /> |
@@ -52,13 +46,7 @@ If you update this file, be sure also to update google_chrome_strings.grd. --> |
<output filename="chromium_strings_nb.pak" type="data_package" lang="no" /> |
<!-- 'no' for Norwegian Bokmål. It should be 'nb'. --> |
<output filename="chromium_strings_pl.pak" type="data_package" lang="pl" /> |
- <if expr="is_ios"> |
- <!-- iOS uses pt for pt-BR --> |
- <output filename="chromium_strings_pt.pak" type="data_package" lang="pt-BR" /> |
- </if> |
- <if expr="not is_ios"> |
- <output filename="chromium_strings_pt-BR.pak" type="data_package" lang="pt-BR" /> |
- </if> |
+ <output filename="chromium_strings_pt-BR.pak" type="data_package" lang="pt-BR" /> |
<output filename="chromium_strings_pt-PT.pak" type="data_package" lang="pt-PT" /> |
<output filename="chromium_strings_ro.pak" type="data_package" lang="ro" /> |
<output filename="chromium_strings_ru.pak" type="data_package" lang="ru" /> |
@@ -134,7 +122,7 @@ If you update this file, be sure also to update google_chrome_strings.grd. --> |
<release seq="1" allow_pseudo="false"> |
<messages fallback_to_english="true"> |
<!-- Settings specific strings --> |
- <if expr="not is_android and not is_ios"> |
+ <if expr="not is_android"> |
<part file="settings_chromium_strings.grdp" /> |
</if> |
@@ -307,13 +295,7 @@ If you update this file, be sure also to update google_chrome_strings.grd. --> |
Get Started with Chromium OS |
</message> |
</if> |
- <if expr="is_ios"> |
- <message name="IDS_NEW_TAB_CHROME_WELCOME_PAGE_TITLE" |
- desc="Title for the hard-coded thumbnail that represents the Google Chrome Welcome page. This is used on the NTP when there aren't enough thumbnails to show. [Length: 14em]"> |
- Welcome |
- </message> |
- </if> |
- <if expr="not chromeos and not is_ios"> |
+ <if expr="not chromeos"> |
<message name="IDS_NEW_TAB_CHROME_WELCOME_PAGE_TITLE" |
desc="Title for the hard-coded thumbnail that represents the Google Chrome Welcome page. This is used on the NTP when there aren't enough thumbnails to show."> |
Welcome to Chromium |
@@ -974,7 +956,7 @@ Signing in anyway will merge Chromium information like bookmarks, history, and o |
</if> |
<!-- Material Design User Manager --> |
- <if expr="not is_android and not is_ios and not chromeos"> |
+ <if expr="not is_android and not chromeos"> |
<!-- Supervised user create confirmation page --> |
<message name="IDS_SUPERVISED_USER_CREATED_TEXT" desc="Informative text for the confirmation dialog that appears after a supervised user has been created."> |
To set which websites <ph name="NEW_PROFILE_NAME">$1<ex>New User</ex></ph> can view, you can configure restrictions and settings by visiting <ph name="BEGIN_LINK_1"><a target="_blank" href="$3"></ph><ph name="DISPLAY_LINK">$4</ph><ph name="END_LINK_1"></a></ph>. If you do not change the default settings, <ph name="NEW_PROFILE_NAME">$1<ex>New User</ex></ph> can browse everything on the web. |
@@ -1279,7 +1261,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@example.com</ |
</if> |
<!-- Welcome page (chrome://welcome) strings --> |
- <if expr="not chromeos and not is_android and not is_ios"> |
+ <if expr="not chromeos and not is_android"> |
<message name="IDS_WELCOME_HEADER" desc="A message which will appear as the header on the Welcome UI if the user has never run Chromium before."> |
Welcome to Chromium |
</message> |