Skip to content

GitLab

T
tangled
Commit 8796d92e authored by newt@chromium.org's avatar newt@chromium.org
Browse files
Options

Upstream Android-specific strings. 

BUG=136951


Review URL: https://chromiumcodereview.appspot.com/10824121

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150217 0039d316-1c4b-4281-b951-d872f2087c98
parent 0c6a0813
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 215 additions and 70 deletions
build/common.gypi
View file @ 8796d92e
...@@ -17,17 +17,23 @@ ...@@ -17,17 +17,23 @@
'variables': { 'variables': {
'variables': { 'variables': {
'variables': { 'variables': {
# Whether we're building a ChromeOS build. 'variables': {
'chromeos%': 0, # Whether we're building a ChromeOS build.
'chromeos%': 0,
# Whether we are using Views Toolkit # Whether or not we are using the Aura windowing framework.
'toolkit_views%': 0, 'use_aura%': 0,
# Whether or not we are using the Aura windowing framework. # Whether or not we are building the Ash shell.
'use_aura%': 0, 'use_ash%': 0,
},
# Copy conditionally-set variables out one scope.
'chromeos%': '<(chromeos)',
'use_aura%': '<(use_aura)',
'use_ash%': '<(use_ash)',
# Whether or not we are building the Ash shell. # Whether we are using Views Toolkit
'use_ash%': 0, 'toolkit_views%': 0,
# Use OpenSSL instead of NSS. Under development: see http://crbug.com/62803 # Use OpenSSL instead of NSS. Under development: see http://crbug.com/62803
'use_openssl%': 0, 'use_openssl%': 0,
...@@ -57,6 +63,24 @@ ...@@ -57,6 +63,24 @@
# based on 'buildtype' (i.e. we don't care about saving symbols for # based on 'buildtype' (i.e. we don't care about saving symbols for
# non-Official # builds). # non-Official # builds).
'buildtype%': 'Dev', 'buildtype%': 'Dev',
'conditions': [
# ChromeOS implies ash.
['chromeos==1', {
'use_ash%': 1,
'use_aura%': 1,
}],
# For now, Windows builds that |use_aura| should also imply using
# ash. This rule should be removed for the future when Windows is
# using the aura windows without the ash interface.
['use_aura==1 and OS=="win"', {
'use_ash%': 1,
}],
['use_ash==1', {
'use_aura%': 1,
}],
],
}, },
# Copy conditionally-set variables out one scope. # Copy conditionally-set variables out one scope.
'chromeos%': '<(chromeos)', 'chromeos%': '<(chromeos)',
...@@ -87,23 +111,6 @@ ...@@ -87,23 +111,6 @@
'<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/;s/i86pc/ia32/")', '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/;s/i86pc/ia32/")',
}], }],
# Chromeos implies ash.
['chromeos==1', {
'use_ash%': 1,
'use_aura%': 1,
}],
# For now, Windows *AND* Linux builds that |use_aura| should also
# imply using ash. This rule should be removed for the future when
# both Linux and Windows are using the aura windows without the ash
# interface.
['use_aura==1 and OS=="win"', {
'use_ash%': 1,
}],
['use_ash==1', {
'use_aura%': 1,
}],
# Set default value of toolkit_views based on OS. # Set default value of toolkit_views based on OS.
['OS=="win" or chromeos==1 or use_aura==1', { ['OS=="win" or chromeos==1 or use_aura==1', {
'toolkit_views%': 1, 'toolkit_views%': 1,
...@@ -111,6 +118,13 @@ ...@@ -111,6 +118,13 @@
'toolkit_views%': 0, 'toolkit_views%': 0,
}], }],
# Set toolkit_uses_gtk for the Chromium browser on Linux.
['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_aura==0', {
'toolkit_uses_gtk%': 1,
}, {
'toolkit_uses_gtk%': 0,
}],
# Enable HiDPI on Mac OS. # Enable HiDPI on Mac OS.
['OS=="mac"', { ['OS=="mac"', {
'enable_hidpi%': 1, 'enable_hidpi%': 1,
...@@ -127,6 +141,7 @@ ...@@ -127,6 +141,7 @@
'chromeos%': '<(chromeos)', 'chromeos%': '<(chromeos)',
'host_arch%': '<(host_arch)', 'host_arch%': '<(host_arch)',
'toolkit_views%': '<(toolkit_views)', 'toolkit_views%': '<(toolkit_views)',
'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
'use_aura%': '<(use_aura)', 'use_aura%': '<(use_aura)',
'use_ash%': '<(use_ash)', 'use_ash%': '<(use_ash)',
'use_openssl%': '<(use_openssl)', 'use_openssl%': '<(use_openssl)',
...@@ -412,13 +427,6 @@ ...@@ -412,13 +427,6 @@
'use_x11%': 1, 'use_x11%': 1,
}], }],
# Set toolkit_uses_gtk for the Chromium browser on Linux.
['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_aura==0', {
'toolkit_uses_gtk%': 1,
}, {
'toolkit_uses_gtk%': 0,
}],
# We always use skia text rendering in Aura on Windows, since GDI # We always use skia text rendering in Aura on Windows, since GDI
# doesn't agree with our BackingStore. # doesn't agree with our BackingStore.
# TODO(beng): remove once skia text rendering is on by default. # TODO(beng): remove once skia text rendering is on by default.
...@@ -436,7 +444,7 @@ ...@@ -436,7 +444,7 @@
'use_gnome_keyring%': 1, 'use_gnome_keyring%': 1,
}], }],
['toolkit_views==0 or OS=="mac" or OS=="ios"', { ['toolkit_uses_gtk==1 or OS=="mac" or OS=="ios"', {
# GTK+, Mac and iOS want Title Case strings # GTK+, Mac and iOS want Title Case strings
'use_titlecase_in_grd_files%': 1, 'use_titlecase_in_grd_files%': 1,
}], }],
......
chrome/app/chromium_strings.grd
View file @ 8796d92e
...@@ -437,9 +437,16 @@ Chromium is unable to recover your settings. ...@@ -437,9 +437,16 @@ Chromium is unable to recover your settings.
<message name="IDS_CRASH_RECOVERY_CONTENT" desc="Text content telling the user the browser has crashed."> <message name="IDS_CRASH_RECOVERY_CONTENT" desc="Text content telling the user the browser has crashed.">
Whoa! Chromium has crashed. Relaunch now? Whoa! Chromium has crashed. Relaunch now?
</message> </message>
<message name="IDS_PASSWORD_MANAGER_SAVE_PASSWORD_PROMPT" desc="Info bar message to save a password"> <if expr="not pp_ifdef('android')">
Do you want Chromium to save your password? <message name="IDS_PASSWORD_MANAGER_SAVE_PASSWORD_PROMPT" desc="Info bar message to save a password">
</message> Do you want Chromium to save your password?
</message>
</if>
<if expr="pp_ifdef('android')">
<message name="IDS_PASSWORD_MANAGER_SAVE_PASSWORD_PROMPT" desc="Mobile: Info bar message to save a password">
Do you want Chromium to save your password for this site?
</message>
</if>
<message name="IDS_FR_BUBBLE_QUESTION" desc="Main text for the bubble"> <message name="IDS_FR_BUBBLE_QUESTION" desc="Main text for the bubble">
Chromium uses your default search engine, which is currently set to <ph name="PAGE_TITLE">$1<ex>Google</ex></ph>. Do you want to keep your default search engine? Chromium uses your default search engine, which is currently set to <ph name="PAGE_TITLE">$1<ex>Google</ex></ph>. Do you want to keep your default search engine?
</message> </message>
......
chrome/app/generated_resources.grd
View file @ 8796d92e
This diff is collapsed.
chrome/app/google_chrome_strings.grd
View file @ 8796d92e
...@@ -360,9 +360,16 @@ Google Chrome is unable to recover your settings. ...@@ -360,9 +360,16 @@ Google Chrome is unable to recover your settings.
<message name="IDS_CRASH_RECOVERY_CONTENT" desc="Text content telling the user the browser has crashed."> <message name="IDS_CRASH_RECOVERY_CONTENT" desc="Text content telling the user the browser has crashed.">
Whoa! Google Chrome has crashed. Relaunch now? Whoa! Google Chrome has crashed. Relaunch now?
</message> </message>
<message name="IDS_PASSWORD_MANAGER_SAVE_PASSWORD_PROMPT" desc="Info bar message to save a password"> <if expr="not pp_ifdef('android')">
Do you want Google Chrome to save your password? <message name="IDS_PASSWORD_MANAGER_SAVE_PASSWORD_PROMPT" desc="Info bar message to save a password">
</message> Do you want Google Chrome to save your password?
</message>
</if>
<if expr="pp_ifdef('android')">
<message name="IDS_PASSWORD_MANAGER_SAVE_PASSWORD_PROMPT" desc="Mobile: Info bar message to save a password">
Do you want Google Chrome to save your password for this site?
</message>
</if>
<message name="IDS_FR_BUBBLE_QUESTION" desc="Main text for the bubble"> <message name="IDS_FR_BUBBLE_QUESTION" desc="Main text for the bubble">
Google Chrome uses your default search engine, which is currently set to <ph name="PAGE_TITLE">$1<ex>Google</ex></ph>. Do you want to keep your default search engine? Google Chrome uses your default search engine, which is currently set to <ph name="PAGE_TITLE">$1<ex>Google</ex></ph>. Do you want to keep your default search engine?
</message> </message>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment