summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorerg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-25 21:34:04 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-25 21:34:04 +0000
commit9c8f1501112092eba0e1c411c2c196487eb61b00 (patch)
tree38a5b7452b7bb9d9a5334eb3740f4cdc1fe8da51 /chrome/app
parent66761b95332549f825999e482c17c94675275f49 (diff)
downloadchromium_src-9c8f1501112092eba0e1c411c2c196487eb61b00.zip
chromium_src-9c8f1501112092eba0e1c411c2c196487eb61b00.tar.gz
chromium_src-9c8f1501112092eba0e1c411c2c196487eb61b00.tar.bz2
Reapply r50859 with chromeos fixes.
GTK: First draft of the unified cut/copy/paste and +/-/Fullscreen menu items. Adds special menu item types that allow shoving buttons into them, along with tracking which button is selected. We now are halfway to the mocks that the chrome-ui-leads sent out. Review URL: http://codereview.chromium.org/2800015 BUG=45757 TEST=none Review URL: http://codereview.chromium.org/2879002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50896 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd9
1 files changed, 9 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 5f69015..450a158 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -822,12 +822,21 @@ each locale. -->
<message name="IDS_ZOOM_PLUS" desc="In Title Case: The text label of the Make Text Larger menu item">
&amp;Larger
</message>
+ <message name="IDS_ZOOM_PLUS2" desc="The text label of the Make Text Larger menu item in the merged menu">
+ +
+ </message>
<message name="IDS_ZOOM_NORMAL" desc="In Title Case: The text label of the Make Text Normal Size menu item">
&amp;Normal
</message>
<message name="IDS_ZOOM_MINUS" desc="In Title Case: The text label of the Make Text Smaller menu item">
&amp;Smaller
</message>
+ <message name="IDS_ZOOM_MINUS2" desc="The text label of the Make Text Smaller menu item in the merged menu">
+ -
+ </message>
+ <message name="IDS_ZOOM_PERCENT" desc="Current pages zoom factor; shown in merged menu">
+ <ph name="VALUE">$1<ex>100</ex></ph>%
+ </message>
<message name="IDS_ENCODING_MENU" desc="In Title Case: The text label of the Encoding submenu">
&amp;Encoding
</message>