diff options
| author | John Reck <jreck@google.com> | 2011-07-29 11:19:45 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-29 11:19:45 -0700 |
| commit | 96ca6a8bb8cf687a69120ddd8df21f0687d187d7 (patch) | |
| tree | e454a29cb217781390f968304108e9d8f0b21e27 /res | |
| parent | e7546245ff57d1b6e4b6eadfdf705d76815508a1 (diff) | |
| parent | f26ff6306dec07a7fa34d0ad5c54b49aec268d18 (diff) | |
| download | packages_apps_browser-96ca6a8bb8cf687a69120ddd8df21f0687d187d7.zip packages_apps_browser-96ca6a8bb8cf687a69120ddd8df21f0687d187d7.tar.gz packages_apps_browser-96ca6a8bb8cf687a69120ddd8df21f0687d187d7.tar.bz2 | |
Merge "Make snapshot go live a popup menu"
Diffstat (limited to 'res')
| -rw-r--r-- | res/menu/snapshot_go_live.xml | 22 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 |
2 files changed, 24 insertions, 0 deletions
diff --git a/res/menu/snapshot_go_live.xml b/res/menu/snapshot_go_live.xml new file mode 100644 index 0000000..aa6b38e --- /dev/null +++ b/res/menu/snapshot_go_live.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:id="@+id/snapshot_go_live" + android:title="@string/snapshot_go_live" /> +</menu> + diff --git a/res/values/strings.xml b/res/values/strings.xml index ee3ce95..6c1b102 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1010,4 +1010,6 @@ <string name="empty_snapshots_folder">There are no saved pages.</string> <!-- Menu option to delete the currently selected saved page [CHAR LIMIT=50] --> <string name="remove_snapshot">Delete saved page</string> + <!-- Popup menu option to load the live version of a saved page [CHAR LIMIT=20] --> + <string name="snapshot_go_live">Go live</string> </resources> |