summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornyquist@chromium.org <nyquist@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-09 00:50:31 +0000
committernyquist@chromium.org <nyquist@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-09 00:50:31 +0000
commit8332cdb0954e78236c1a2fe8e01cd16b0ac97ce1 (patch)
tree166d1b95223a3d92e190cd04731bfed860f7aa19
parentf63cb553aa542b3b7186c5ea2e71e026f9af9157 (diff)
downloadchromium_src-8332cdb0954e78236c1a2fe8e01cd16b0ac97ce1.zip
chromium_src-8332cdb0954e78236c1a2fe8e01cd16b0ac97ce1.tar.gz
chromium_src-8332cdb0954e78236c1a2fe8e01cd16b0ac97ce1.tar.bz2
Revert 125726 - During a string merge in r125715, an old <if> wasn't removed.
Review URL: https://chromiumcodereview.appspot.com/9653010 TBR=nyquist@chromium.org Review URL: https://chromiumcodereview.appspot.com/9646018 git-svn-id: svn://svn.chromium.org/chrome/branches/1025/src@125740 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/app/generated_resources.grd1
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 6342367..33dab98 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6837,6 +6837,7 @@ The following plug-in is unresponsive: <ph name="PLUGIN_NAME">$1
<message name="IDS_BOOKMARK_EDITOR_CONFIRM_DELETE" desc="The message shown in the dialog asking the user to confirm deleting a folder.">
This folder contains <ph name="COUNT">$1<ex>5</ex></ph> bookmarks. Are you sure you want to delete it?
</message>
+ <if expr="not pp_ifdef('use_titlecase')">
<if expr="pp_ifdef('android') and not pp_ifdef('use_titlecase')">
<message name="IDS_BOOKMARK_BAR_FOLDER_NAME" desc="Mobile: Name shown in the tree for the bookmarks bar folder">
Desktop bookmarks