summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2009-10-14 03:20:21 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-14 03:20:21 -0700
commit003aaebd34a2cdc54aa1e164ee506fa5964e5547 (patch)
tree49b810cde9d868bf08195c8c95926dd4a3b815db /res
parent9be8c7c7d7a60e02841d61c56b53368dbb96bc99 (diff)
parentfaf8b399f550c05f77de0297f8a6fb55d2fe9b2a (diff)
downloadpackages_apps_Browser-003aaebd34a2cdc54aa1e164ee506fa5964e5547.zip
packages_apps_Browser-003aaebd34a2cdc54aa1e164ee506fa5964e5547.tar.gz
packages_apps_Browser-003aaebd34a2cdc54aa1e164ee506fa5964e5547.tar.bz2
am faf8b399: am de353621: Don\'t allow the user to save bookmarks with a scheme that the Browser cannot directly handle.
Merge commit 'faf8b399f550c05f77de0297f8a6fb55d2fe9b2a' * commit 'faf8b399f550c05f77de0297f8a6fb55d2fe9b2a': Don't allow the user to save bookmarks with a scheme that the Browser cannot directly handle.
Diffstat (limited to 'res')
-rw-r--r--res/values/strings.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 467c7c5..1da745a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -171,6 +171,8 @@
<string name="empty_bookmark">"Cannot create empty bookmark."</string>
<!-- Error that appears in the title of Bookmark dialog when user selects OK with invalid URL -->
<string name="bookmark_url_not_valid">URL is not valid.</string>
+ <!-- Error that appears in the Bookmark dialog when user selects OK with a URL of a type we cannot bookmark -->
+ <string name="bookmark_cannot_save_url">This URL cannot be bookmarked.</string>
<!-- Title of a confirmation dialog when the user deletes a bookmark-->
<string name="delete_bookmark">Delete</string>
<!-- Menu item in the page that displays all bookmarks. It brings up a