Code drop from //branches/cupcake/...@124589

5 files changed, 356 insertions, 213 deletions

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
new file mode 100644
index 0000000..95501e4
--- /dev/null
+++ b/res/values/arrays.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+ * Copyright (C) 2008 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.
+ -->
+
+<resources>
+    <!-- Camera Preferences Video Quality dialog box entries -->
+    <string-array name="pref_camera_videoquality_entries">
+        <item>@string/pref_camera_videoquality_entry_0</item>
+        <item>@string/pref_camera_videoquality_entry_1</item>
+    </string-array>
+
+	<!-- Do not localize entryvalues -->
+    <string-array name="pref_camera_videoquality_entryvalues">
+        <item>0</item>
+        <item>1</item>
+    </string-array>
+
+</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
new file mode 100644
index 0000000..d07f3b9
--- /dev/null
+++ b/res/values/colors.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 2008, 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.
+*/
+-->
+<resources>
+    <color name="bubble_dark_background">#B2191919</color>
+</resources>
diff --git a/res/values/ids.xml b/res/values/ids.xml
index d60f413..367bfa2 100644
--- a/res/values/ids.xml
+++ b/res/values/ids.xml
@@ -17,17 +17,6 @@
 */
 -->
 <resources>
-    <item type="id" name="autoupload" />
-    <item type="id" name="duration" />
-    <item type="id" name="imagequality" />
-    <item type="id" name="playclicksound" />
-    <item type="id" name="preferred_gallery_view" />
-    <item type="id" name="resolution" />
-    <item type="id" name="t2" />
-    <item type="id" name="t3" />
-    <item type="id" name="t4" />
-    <item type="id" name="usesd" />
-    <item type="id" name="slideshowdelay" />
 </resources>
 
         
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e5b47fb..d465c52 100755..100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -17,352 +17,413 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- General strings -->
 
+    <!-- label for the icon meaning 'show me all the images' -->
     <string name="all_images">All pictures</string>
 
-    <string name="image_count"><xliff:g id="counter">%d</xliff:g> pictures</string>
+    <!-- label for the icon meaning 'show me all the videos' -->
+    <string name="all_videos">All videos</string>
+    
+    <!-- label for the icon meaning 'show me all the images that were taken with the camera' -->
     <string name="camera_label">Camera</string>
-    <string name="gallery_picker_label">Pictures</string>
+
+    <!-- label for the 'pictures application shown in the top level 'all applications' -->
+    <string name="gallery_picker_label">Gallery</string>
+
+    <!-- unused (do not translate) -->
     <string name="gallery_label">Pictures</string>
+    
+    <!-- label for the folder that contains Camera pictures in the gallery -->
+    <string name="gallery_camera_bucket_name">Camera pictures</string>
+
+    <!-- label for the folder that contains Camera videos in the gallery -->
+    <string name="gallery_camera_videos_bucket_name">Camera videos</string>
+    
+    <!-- menu pick: switch to Video cam mode -->
+    <string name="switch_to_video_lable">Switch to video</string>
+
+    <!-- menu pick: switch to camera mode -->
+    <string name="switch_to_camera_lable">Switch to camera</string>
+    
+    <!-- menu pick: crop the currently selected image -->
     <string name="crop_label">Crop picture</string>
+
+    <!-- menu pick: view the currently selected image -->
     <string name="view_label">View picture</string>
-    <string name="view_video_label">View video</string>
+
+    <!-- menu pick: go to the preferences screen for the camera or image gallery -->
     <string name="preferences_label">Camera settings</string>
-	<string name="picasa_upload_label">Picasa upload</string>
-	<string name="youtube_upload_label">YouTube upload</string>
-	
-    <string name="ok">OK</string>
-    <string name="stop">Stop</string>
-    <string name="record">Record</string>
+
+    <!-- alert to the user to wait for some operation to complete -->
     <string name="wait">Please wait\u2026</string>
+
+    <!-- alert to the user to that an SD card must be installed before using the camera -->
     <string name="no_storage">Please insert an SD card before using the camera.</string>
+
+    <!-- alert to the user to that the SD card is too full to complete the operation -->
     <string name="not_enough_space">Your SD card is full.</string>
-    <string name="no_images">Your album is empty.</string>
+
+    <!-- Toast/alert after saving wallpaper -->
     <string name="wallpaper">Setting wallpaper, please wait\u2026</string>
-    <string name="gallery_small">Small</string>
-    <string name="gallery_large">Large</string>
 
     <!-- Settings stuff -->
-    <string name="high">High</string>
-    <string name="med">Medium</string>
-    <string name="low">Low</string>
-
-    <string name="best_res">High</string>
-    <string name="medium_res">Medium</string>
-    <string name="low_res">Low</string>
-
-    <string name="sec1">1 sec</string>
-    <string name="sec2">2 secs</string>
-    <string name="sec3">3 secs</string>
-    <string name="sec4">4 secs</string>
-    <string name="sec5">5 secs</string>
-
-    <string name="yes">Yes</string>
-    <string name="no">No</string>
 
+    <!-- Toast/alert that the image is being saved to the SD card -->
     <string name="savingImage">Saving picture\u2026</string>
-	<string name="runningFaceDetection">Please wait\u2026</string>
+
+    <!-- Toast/alert that the face detection is being run -->
+    <string name="runningFaceDetection">Please wait\u2026</string>
 
     
-    <!-- Menu stuff -->
+    <!-- Menu items: -->
+    <!-- menu pick to change the orientation of the screen -->
     <string name="flip_orientation">Flip orientation</string>
+
+    <!-- menu pick to go to the settings screen -->
     <string name="settings">Settings</string>
-    <string name="zoom">Zoom</string>
-    <string name="testexif">Test Exif</string>
-    
+
+    <!-- menu pick to view the currently selected image -->
     <string name="view">View</string>
-    <string name="delete">Delete</string>
+
+    <!-- menu pick to view the details of the currently selected image -->
     <string name="details">Details</string>
+
+    <!-- menu pick to rotate the currently selected image (brings up submenu) -->
     <string name="rotate">Rotate</string>
+
+    <!-- menu pick to rotate the currently selected image to the left -->
     <string name="rotate_left">Rotate left</string>
+
+    <!-- menu pick to rotate the currently selected image to the right -->
     <string name="rotate_right">Rotate right</string>
-    <string name="set_wallpaper">Set as wallpaper</string>
+
+    <!-- menu pick to start a slide show -->
     <string name="slide_show">Slideshow</string>
     
-    <string name="confirm_delete">Confirm delete</string>
-    <string name="deny_delete">Cancel"</string>
+    <!-- menu pick to go to camera mode to capture a picture -->
+    <string name="capture_picture">Capture picture</string>
+    <!-- menu pick to go to video mode to capture a video -->
+    <string name="capture_video">Capture video</string>
     
-    <string name="upload">Upload</string>
-    <string name="upload_all">Upload all</string>
-	<string name="uploading_photos">Uploading pictures</string>
-	<string name="uploading_photos_2">Uploading pictures</string>
-	<string name="uploading_videos">Uploading videos</string>
-	<string name="uploading_videos_2">Uploading videos</string>
-	<string name="uploadingNPhotos">Uploading <xliff:g id="counter">%d</xliff:g> pictures</string>
-	<string name="uploadingNVideos">Uploading <xliff:g id="counter">%d</xliff:g> videos</string>
-	    
-    <string name="preview">Preview</string>
-    <string name="edit">Edit</string>
-    <string name="cancel">Cancel</string>
-    <string name="save">Save</string>
-    
-    <string name="crop_help">Hold ALT to resize.</string>
+    <!-- button indicating that the cropped image should be saved -->
     <string name="crop_save_text">Save</string>
+    <!-- button indicating that the cropped image should be reverted back to the original -->
     <string name="crop_discard_text">Discard</string>
-    
-    <string name="camera_mode_text">Mode</string>
-    <string name="camera_record_text">Record</string>
 
-    <string name="camera_keep">Save</string>
+    <!-- Confirmation dialog title after deleting a picture -->
     <string name="confirm_delete_title">Delete</string>
+    <!-- Confirmation dialog message after deleting a picture -->
     <string name="confirm_delete_message">The picture will be deleted.</string>
-
+    <!-- Confirmation dialog message after deleting a video -->
+    <string name="confirm_delete_video_message">The video will be deleted.</string>
+    <!-- button indicating that the picture just taken should be deleted -->
     <string name="camera_toss">Delete</string>
+
+    <!-- button indicating that the picture just taken should be shared by email, mms, etc -->
     <string name="camera_share">Share</string>
+
+    <!-- button indicating that the picture just taken should be set as a contact photo, wallpaper, etc -->
     <string name="camera_set">Set as</string>
-    <string name="camera_crop">Crop</string>
-    <string name="camera_done">New picture</string>
+
+    <!-- button indicating that the video just taken should be played -->
+    <string name="camera_play">Play</string>
     
+    <!-- button indicating that the picture just taken should be cropped -->
+    <string name="camera_crop">Crop</string>
+
+    <!-- Toast after deleting a picture -->
     <string name="camera_tossing">Deleting\u2026</string>
-    <string name="camera_keeping">Keeping\u2026</string>
-    <string name="camera_flash_setting">Flash setting</string>
 
-    <string name="no_way_to_share_image">This picture cannot be saved.</string>
+    <!-- Toast after trying to share a picture indicating that there are no applications which are capable of so doing. -->
+    <string name="no_way_to_share_image">This picture cannot be shared.</string>
+
+    <!-- Toast after trying to share a video indicating that there are no applications which are capable of so doing. -->
     <string name="no_way_to_share_video">This video cannot be shared.</string>
 
-    <string name="autocrop_before_query">Crop before?</string>
-    <string name="autocrop_yes">Yes</string>
-    <string name="autocrop_no">Yes</string>
+    <!-- Do not translate -->
     <string name="video_play">Play</string>
-    <string name="share_youtube">YouTube</string>
 
-	<string name="camera_switch_to_video">Switch to video</string>
-	<string name="camera_switch_to_photo">Switch to picture</string>
+    <!-- Button indicating to go to the image gallery -->
+    <string name="camera_gallery_photos_text">Gallery</string>
 
-    <string name="camera_NoStorageView_text">Please insert an SD card before using the camera.</string>
-    <string name="camera_ZoomIn_text">Zoom in</string>
-    <string name="camera_ZoomOut_text">Zoom out</string>
-    <string name="camera_movie_record_counter_text">01:30:00</string>
-    <string name="camera_gallery_photos_text">Pictures</string>
-    <string name="camera_gallery_videos_text">Video Album</string>
-    
-    <string name="camera_shareby_email">Email</string>
-    <string name="camera_shareby_mms">MMS</string>
-    <string name="camera_shareby_picasa">Picasaweb</string>
-    <string name="camera_shareby_picasa_all">Picasaweb (all pictures)</string>
-    
-    <string name="camera_flash_auto">AutoFlash</string>
-    <string name="camera_flash_on">Flash ON</string>
-    <string name="camera_flash_off">Flash OFF</string>
-    
+    <!-- String indicating an action of picking a picture to use as wallpaper (e.g. set wallpaper from "Pictures") -->
     <string name="camera_pick_wallpaper">Pictures</string>
     <string name="camera_setas_wallpaper">Wallpaper</string>
 
     <string name="camera_setas_wallpaper_drm">Purchased pictures</string>
-    <string name="camera_setas_contact">Contact picture</string>
-    <string name="camera_setas_myfave">myFaves</string>
     
     <string name="camera_selectphoto">Select this picture</string>
+
+    <!-- Button indicating to skip the picture just taken and take another one (this is used
+         when the camera is invoked for the purpose of returning a picture to another activity
+         such as a contacts photo). -->
     <string name="camera_takenewphoto">Capture new picture</string>
 
-    <string name="camera_selectvideo">Select this video</string>
+    <!-- Do not translate -->
     <string name="camera_takenewvideo">Capture new video</string>
-    <string name="camera_playvideo">Play</string>
 
+    <!-- Settings screen, section heading  -->
     <string name="pref_gallery_category">General settings</string>
+
+    <!-- Settings screen, section heading  -->
     <string name="pref_slideshow_category">Slideshow settings</string>
-    <string name="pref_camera_category">Camera</string>
+    <string name="pref_camera_general_settings_category">General settings</string>
 
+    <!-- Settings screen, setting summary text -->
     <string name="pref_gallery_size_title">Picture size</string>
+
+    <!-- Settings screen, title for preference for image size to be used in the im -->
     <string name="pref_gallery_size_summary">Select the display size of pictures</string>
+    <!-- Title of dialog that appears after selecting Picture size setting option -->
     <string name="pref_gallery_size_dialogtitle">Picture size</string>
+    <!-- Options in dialog that appears after selecting Picture size setting option -->
     <string-array name="pref_gallery_size_choices">
+        <!-- size choice of "large" -->
         <item>Large</item>
+        <!-- size choice of "small" -->
         <item>Small</item>
     </string-array>
-
+    <!-- Do not translate. Option values in dialog that appears after selecting Picture size setting option -->
     <string-array name="pref_gallery_size_values">
+        <!-- do not translate -->
         <item>1</item>
+        <!-- do not translate -->
         <item>0</item>
     </string-array>
+    <!-- Do not translate. Default option value in dialog that appears after selecting Picture size setting option -->
     <string name="default_value_pref_gallery_size">1</string>
-
+    <!-- Settings screen, setting option name -->
     <string name="pref_gallery_sort_title">Picture sort</string>
+    <!-- Settings screen, setting summary text -->
     <string name="pref_gallery_sort_summary">Select the sort order of pictures</string>
+    <!-- Title of dialog that appears after selecting Picture sort setting option -->
     <string name="pref_gallery_sort_dialogtitle">Picture sort</string>
+    <!-- Options in dialog that appears after selecting Picture sort setting option -->
     <string-array name="pref_gallery_sort_choices">
+        <!-- Preference choice to show "newest first" -->
         <item>Newest first</item>
+        <!-- Preference choice to show "newest last" -->
         <item>Newest last</item>
     </string-array>
-
+    <!-- Do not translate. Option values in dialog that appears after selecting Picture sort setting option -->
     <string-array name="pref_gallery_sort_values">
+        <!-- do not translate -->
         <item>descending</item>
+        <!-- do not translate -->
         <item>ascending</item>
     </string-array>
+    <!-- Do not translate. Default option value in dialog that appears after selecting Picture sort setting option -->
     <string name="default_value_pref_gallery_sort">descending</string>
-
+    <!-- Settings screen, setting option name -->
     <string name="pref_gallery_slideshow_interval_title">Slideshow interval</string>
+    <!-- Settings screen, setting summary text -->
     <string name="pref_gallery_slideshow_interval_summary">Select how long each slide displays in the show</string>
+    <!-- Title of dialog that appears after selecting Slideshow interval setting option -->
     <string name="pref_gallery_slideshow_interval_dialogtitle">Slideshow interval</string>
+    <!-- Options in dialog that appears after selecting Slideshow interval
+     setting option -->
     <string-array name="pref_gallery_slideshow_interval_choices">
-    	<item>2 seconds</item>
+        <!-- slide show interval "N seconds" where N is 2 -->
+        <item>2 seconds</item>
+        <!-- slide show interval "N seconds" where N is 3 -->
         <item>3 seconds</item>
+        <!-- slide show interval "N seconds" where N is 4 -->
         <item>4 seconds</item>
     </string-array>
-
+    <!-- Do not translate. Option values in dialog that appears after selecting Slideshow interval setting option -->
     <string-array name="pref_gallery_slideshow_interval_values">
-    	<item>"2"</item>
+        <!-- do not translate -->
+        <item>"2"</item>
+        <!-- do not translate -->
         <item>"3"</item>
+        <!-- do not translate -->
         <item>"4"</item>
     </string-array>
+    <!-- Do not translate. Default option value in dialog that appears after selecting Slideshow interval setting option -->
     <string name="default_value_pref_gallery_slideshow_interval">"2"</string>
-    
+    <!-- Settings screen, setting option name -->
     <string name="pref_gallery_slideshow_transition_title">Slideshow transition</string>
+    <!-- Settings screen, setting summary text -->
     <string name="pref_gallery_slideshow_transition_summary">Select the effect used when moving from one slide to the next</string>
+    <!-- Title of dialog that appears after selecting Slideshow transition setting option -->
     <string name="pref_gallery_slideshow_transition_dialogtitle">Slideshow transition</string>
+    <!-- Options in dialog that appears after selecting Slideshow transition
+     setting option -->
     <string-array name="pref_gallery_slideshow_transition_choices">
-    	<item>Fade in &amp; out</item>
+        <!-- Slide show transition to fade in and fade out -->
+        <item>Fade in &amp; out</item>
+        <!-- Slide show transition to slide in and out from the left and right -->
         <item>Slide left - right</item>
+        <!-- Slide show transition to slide in and out from the top and bottom -->
         <item>Slide up - down</item>
+        <!-- Slide show transition to be chosen randomly -->
         <item>Random selection</item>
     </string-array>
-
+    <!-- Do not translate. Option values in dialog that appears after selecting Slideshow transition setting option -->
     <string-array name="pref_gallery_slideshow_transition_values">
-    	<item>"0"</item>
-    	<item>"1"</item>
+        <!-- do not translate -->
+        <item>"0"</item>
+        <!-- do not translate -->
+        <item>"1"</item>
+        <!-- do not translate -->
         <item>"2"</item>
+        <!-- do not translate -->
         <item>"-1"</item>
     </string-array>
+    <!-- Do not translate. Default option value in dialog that appears after selecting Slideshow transition setting option -->
     <string name="default_value_pref_gallery_slideshow_transition">"0"</string>
-    
+
+    <!-- Settings screen, setting check box name -->
     <string name="pref_gallery_slideshow_repeat_title">Repeat slideshow</string>
+
+    <!-- Settings screen, setting summary text -->
     <string name="pref_gallery_slideshow_repeat_summary">Play slideshow more than once</string>
-    <string name="pref_gallery_slideshow_repeat_dialogtitle">Repeat slideshow?</string>
-    
+
+    <!-- Settings screen, setting check box name -->
     <string name="pref_gallery_slideshow_shuffle_title">Shuffle slides</string>
+
+    <!-- Settings screen, setting summary text -->
     <string name="pref_gallery_slideshow_shuffle_summary">Show pictures in random order</string>
-    <string name="pref_gallery_slideshow_shuffle_dialogtitle">Shuffle pictures?</string>
-    
-    <string name="pref_camera_autoupload_title">Auto-upload pictures</string>
-    <string name="pref_camera_autoupload_summary">Upload pictures to Picasa automatically</string>
 
+    <!-- Settings screen, setting title text -->
     <string name="pref_camera_recordlocation_title">Store location in pictures</string>
-    <string name="pref_camera_recordlocation_summary">Record location in picture data</string>
 
-    <string name="pref_camera_shuttersound_title">Play shutter sound</string>
-    <string name="pref_camera_shuttersound_summary">Play a sound when taking a picture</string>
+    <!-- Settings screen, setting summary text -->
+    <string name="pref_camera_recordlocation_summary">Record location in picture data</string>
 
+    <!-- Do not translate -->
     <string name="pref_camera_upload_albumname_title">Picasa album name</string>
+
+    <!-- Do not translate -->
     <string name="pref_camera_upload_albumname_summary">Name the destination album for your pictures (<xliff:g id="summary">%s</xliff:g>)</string>
+
+    <!-- Do not translate -->
     <string name="pref_camera_upload_albumname_dialogtitle">Picasa album name</string>
 
+    <!-- Settings screen, setting title text -->
     <string name="pref_camera_postpicturemenu_title">Prompt after capture</string>
-    <string name="pref_camera_postpicturemenu_summary">Display action menu (save, delete, ...) after capture</string>
 
-    <string name="camerasettings_preferred_view_label">Preferred view:</string>
+    <!-- Settings screen, setting summary text -->
+    <string name="pref_camera_postpicturemenu_summary">Display action menu (save, delete, \u2026) after capture</string>
+
+    <!-- Settings screen, Video quality category title -->
+    <string name="pref_camera_videoquality_category">Video quality</string>
+    
+    <!-- Default video quality setting. A numerical value. Do not translate. -->
+    <string name="pref_camera_videoquality_default">0</string>
+    
+    <!-- Settings screen, Video quality title -->
+    <string name="pref_camera_videoquality_title">Video quality</string>
+    
+    <!-- Settings screen, Video quality summary -->
+    <string name="pref_camera_videoquality_summary">Select video quality level</string>
+    
+    <!-- Settings screen, Video quality dialog radio button choices -->
+    <string name="pref_camera_videoquality_entry_0">Low (for MMS messages)</string>
+    <string name="pref_camera_videoquality_entry_1">High (for SD card)</string>
+    
+    <!-- Settings screen, Video codec dialog title -->
+    <string name="pref_camera_videoquality_dialogtitle">Video quality</string>
+    
+    <!-- Menu item to go to the settings screen -->
     <string name="camerasettings">Settings</string>
-    <string name="camerasettings_autoupload_label">Automatically upload pictures to Web</string>
-    <string name="camerasettings_test2_label">test2:</string>
-    <string name="camerasettings_test3_label">test3:</string>
-    <string name="camerasettings_play_click_sound_label">Shutter sound</string>
-    <string name="camerasettings_resolution_label">Resolution:</string>
-    <string name="camerasettings_test4_label">test4:</string>
-    <string name="camerasettings_duration_label">Duration:</string>
-    <string name="camerasettings_use_sd_card_label">Save pictures to SD card</string>
-    <string name="camerasettings_image_quality_label">Picture quality:</string>
-    <string name="camerasettings_on">On</string>
-    <string name="camerasettings_off">Off</string>
-    <string name="camerasettings_yes">Yes</string>
-    <string name="camerasettings_no">No</string>
-    <string name="camerasettings_done">Done</string>
-
-    <string name="gallerysettings_duration">Duration of each slide in slideshows</string>
-
-    <!-- The actual seconds are hardwired in GallerySettings.java. These are just labels. -->
-    <string name="gallerysettings_speed1">1 second</string>
-    <string name="gallerysettings_speed2">3 seconds</string>
-    <string name="gallerysettings_speed3">5 seconds</string>
-
-    <string name="image_gallery_status_text"></string>
-    <string name="image_gallery_NoImageView_text">No pictures found.</string>
-    <string name="video_gallery_NoImageView_text">No videos found.</string>
 
-	<string name="image_gallery_picker_images">Pictures</string>
-	<string name="image_gallery_picker_videos">Videos</string>
+    <!-- Text message indicating that there are no pictures on the SD card -->
+    <string name="image_gallery_NoImageView_text">No pictures found.</string>
 
+    <!-- Preference title for whether the user should be prompted form confirmation when deleting images  -->
     <string name="pref_gallery_confirm_delete_title">Confirm deletions</string>
+
+    <!-- Preference summary for whether the user should be prompted form confirmation when deleting images  -->
     <string name="pref_gallery_confirm_delete_summary">Show confirmation before deleting pictures</string>
 
-    <string name="viewimage_gps_latitude_label_text">GPS latitude</string>
-    <string name="viewimage_res_label_text">Resolution</string>
-    <string name="viewimage_make_label_text">Make</string>
-    <string name="viewimage_comments_text"></string>
-    <string name="viewimage_digitalzoom_text"></string>
-    <string name="viewimage_orientation_label_text">Orientation</string>
-    <string name="viewimage_res_text"></string>
-    <string name="viewimage_gps_longitude_label_text">GPS longitude</string>
-    <string name="viewimage_model_text"></string>
-    <string name="viewimage_gps_longitude_text"></string>
-    <string name="viewimage_make_text"></string>
-    <string name="viewimage_status_text">Press Enter or Space to zoom.</string>
-    <string name="viewimage_comments_label_text">Comments</string>
-    <string name="viewimage_flash_text"></string>
-    <string name="viewimage_digitalzoom_label_text">Digital zoom</string>
-    <string name="viewimage_orientation_text"></string>
-    <string name="viewimage_flash_label_text">Flash used</string>
-    <string name="viewimage_gps_latitude_text"></string>
-    <string name="viewimage_datetaken_text"></string>
-    <string name="viewimage_model_label_text">From</string>
-    <string name="viewimage_datetaken_label_text">Date</string>
-
-    <string name="camera_zoom_3_text">Zoom 4x</string>
-    <string name="camera_zoom_2_text">Zoom 2x</string>
-    <string name="camera_zoom_1_text">Zoom 1.3x</string>
-    <string name="camera_zoom_normal_text">1x</string>
-    
-    <!-- Details stuff -->
+   <!-- Details stuff -->
+    <!-- Do not translate -->
     <string name="details_title_text">myvideo</string>
-    <string name="details_uploaded_text">Successfully uploaded</string>
+    <!-- Do not translate -->
     <string name="details_tags_text">monster</string>
+    <!-- Do not translate -->
     <string name="details_category_label">Category:</string>
+    <!-- Do not translate -->
     <string name="details_description_label">Description:</string>
+    <!-- Do not translate -->
     <string name="details_publicView_text">Public</string>
+    <!-- Do not translate -->
     <string name="details_tags_label">Tags:</string>
+    <!-- Do not translate -->
     <string name="details_description_text">testdescription</string>
+    <!-- Do not translate -->
     <string name="details_title_label">Title:</string>
+    <!-- Do not translate -->
     <string name="details_save_text">Save</string>
+    <!-- Do not translate -->
     <string name="details_language_label">Language:</string>
+    <!-- Do not translate -->
     <string name="details_privateView_text">Private</string>
+
+    <!-- Title of Details dialog  -->
+    <string name="details_panel_title">Details</string> 
+    <!-- Label in message of Details dialog  -->
+    <string name="details_file_size">File size:</string>
+    <!-- Label in message of Details dialog  -->
+    <string name="details_image_resolution">Resolution:</string>
+    <!-- Label in message of Details dialog  -->
+    <string name="details_date_taken">Date taken:</string>
     
-    <!-- Upload stuff -->
-    <string name="upload_default_tags_text">video</string>
-    <string name="upload_default_description_text">description goes here</string>
-    <string name="upload_default_category_text">Entertainment</string>
-    
-    <string name="details_panel_title">Details</string>
-	
-	<string name="details_file_size">File size:</string>
-	<string name="details_image_resolution">Resolution:</string>
-	<string name="details_date_taken">Date taken:</string>
-	
-	<string name="context_menu_header">Picture options</string>
-
-	<string name="multiface_crop_help">Tap a face to begin.</string>	    
-	<string name="camera_button_hint">Press Capture button to take picture.</string>
-	
-	<string name="photos_gallery_title">Pictures</string>
-	<string name="videos_gallery_title">Videos</string>
-	<string name="pick_photos_gallery_title">Select picture</string>
-	<string name="pick_videos_gallery_title">Select video</string>
+    <!-- Text of context menu when an image is selected -->
+    <string name="context_menu_header">Picture options</string>
+    <!-- Text of context menu when a video is selected -->
+    <string name="video_context_menu_header">Video options</string>
+    <!-- Hint that appears when cropping an image with more than one face -->
+    <string name="multiface_crop_help">Tap a face to begin.</string>
+    <!-- Hint/toast that appears when user first opens capture screen on still picture camera -->
+    <string name="camera_button_hint">Press Capture button to take picture.</string>
+    <!-- Hint/toast that appears when user first opens capture screen on video camera -->
+    <string name="video_camera_button_hint">Press Capture button to record video.</string>
     
-    <!-- YouTube upload stuff -->
-    <string name="upload_info_title">Title:</string>
-    <string name="upload_info_description">Description:</string>
-    <string name="upload_info_category">Category:</string>
-    <string name="upload_info_tags">Tags:</string>
-    <string name="upload_info_upload">Upload</string>
-    <string name="upload_info_private">If unchecked, only you can see the movie</string>
-    <string name="upload_dialog_title">Upload to YouTube - type video details</string>
+    <!-- Activity title when in the image gallery to see pictures -->   
+    <string name="photos_gallery_title">Gallery</string>
+
+    <!-- Activity title when in the image gallery to select a picture -->   
+    <string name="pick_photos_gallery_title">Select picture</string>
+
+    <!-- Activity title when in the image gallery to see videos -->
+    <string name="videos_gallery_title">Gallery</string>
+
+    <!-- Activity title when in the image gallery to select a video -->
+    <string name="pick_videos_gallery_title">Select video</string>
     
+    <!-- onscreen text indicating the progress of generating thumbnails.  Basically some number followed by the word "remaining" -->    
     <string name="loading_progress_format_string"><xliff:g id="counter">%d</xliff:g> remaining</string>
     
-    <string name="space_remaining_k"><xliff:g id="counter">%d</xliff:g>K</string>
-
-    <!-- Displayed in the title of the chooser for things to do with an image that
-         is to be sent to another application. -->
+    <!-- Displayed in the title of the dialog for things to do with a picture that
+         is to be sent to another application: -->
     <string name="sendImage">Share picture via</string>
+
+    <!-- Displayed in the title of the dialog for things to do with a picture that
+         is to be "set as" (e.g. set as contact photo or set as wallpaper) -->
     <string name="setImage">Set picture as</string>
     
-    <!-- Displayed in the title of the chooser for things to do with a video that
+    <!-- Displayed in the title of the dialog for things to do with a video that
          is to be sent to another application. -->
     <string name="sendVideo">Share video via</string>
+    
+    <!-- Activity label. This might show up in the activity-picker -->
+    <string name="movieviewlabel">Movies</string>
+    <!-- shown in the video player view while the video is being loaded, before it starts playing -->
+    <string name="loading_video">Loading video\u2026</string>
+ 
+    <!-- Displayed as a toast when a picture is saved -->
+    <string name="picture_saved">Picture saved to SD card.</string>
+    <!-- Displayed as a toast when a picture is deleted -->
+    <string name="picture_deleted">Picture deleted.</string>
+        
+    <!-- Displayed as a toast when a video is saved -->
+    <string name="video_saved">Video saved to SD card.</string>
+    <!-- Displayed as a toast when a video is deleted -->
+    <string name="video_deleted">Video deleted.</string>
+
+    <!-- Low-memory dialog title -->
+    <string name="spaceIsLow_title">Space is low</string>
+    <!-- Low-memory dialog message -->
+    <string name="spaceIsLow_content">Your SD card is running out of space. Change the quality setting or delete items from Gallery.</string>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
new file mode 100644
index 0000000..726a952
--- /dev/null
+++ b/res/values/styles.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+* Copyright (C) 2008 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.
+*/
+-->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <style name="OnscreenActionIcon">
+        <item name="android:focusable">true</item>
+        <item name="android:clickable">true</item>
+        <item name="android:textSize">13dip</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:ellipsize">marquee</item>
+        <item name="android:shadowColor">#FF000000</item>
+        <item name="android:shadowRadius">2.0</item>
+        <item name="android:textColor">#FFF</item>
+        <item name="android:gravity">center_horizontal</item>
+        <item name="android:layout_width">fill_parent</item>
+        <item name="android:layout_height">fill_parent</item>
+        <item name="android:paddingLeft">5dip</item>
+        <item name="android:paddingRight">5dip</item>
+        <item name="android:drawablePadding">3dip</item>
+        <item name="android:paddingTop">2dip</item>
+        <item name="android:layout_marginLeft">10dip</item>
+        <item name="android:layout_marginRight">10dip</item>
+    </style>
+</resources>