diff -r 0f2326c2a325 -r 1c3b8676e58c ginebra2/translations/browserLoc.ts
--- a/ginebra2/translations/browserLoc.ts	Wed Jun 23 17:59:43 2010 +0300
+++ b/ginebra2/translations/browserLoc.ts	Tue Jul 06 14:03:49 2010 +0300
@@ -1,51 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="3.0" language="en_GB" sourcelanguage="en_GB">
+<TS version="3.0" sourcelanguage="en_GB">
 <context>
 <message numerus="no" id="txt_browser_tag_error_tag_file_could_not_be_downloaded">
-    <comment>Info note for when there is a download error and item is not downloaded.</comment>        
+    <comment>Info note for when there is a download error and item is not downloaded, %1 is the name of the item</comment>        
     <source>Error: %1 could not be downloaded</source>
-    <translation variants="no">Error: %1 could not be downloaded</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id>txt_browser_downloading_file</extra-loc-layout_id>    
     <extra-loc-viewid>Browser_Downloads_001</extra-loc-viewid>
     <extra-loc-positionid>dpopinfo</extra-loc-positionid>
     <extra-loc-feature>Br</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_browser_network_switch_connection">
-    <comment>Prompt shown when a new network is available to use as the browser&apos;s network connection</comment>        
-    <source>%1 is now in range.  Switch connection?</source>
-    <translation variants="no">%1 is now in range.  Switch connection?</translation>
-    <extra-loc-layout_id>txt_browser_network_switch_connection</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_Network_001</extra-loc-viewid>
-    <extra-loc-positionid>dialog</extra-loc-positionid>
-    <extra-loc-feature>Br</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_browser_content_view_menu_image_save_image">
-    <comment>Content View Context Menu Image tab Save Image menu item</comment>        
-    <source>Save Image</source>
-    <translation variants="no">Save Image</translation>
-    <extra-loc-layout_id>txt_browser_content_view_menu_image_save_image</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_Content_Context_Menu_001d</extra-loc-viewid>
-    <extra-loc-positionid>menu</extra-loc-positionid>
-    <extra-loc-feature>Br</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_browser_content_view_menu_nav_history">
-    <comment>Content View Context Menu Navigation tab History menu item</comment>        
-    <source>History</source>
-    <translation variants="no">History</translation>
-    <extra-loc-layout_id>txt_browser_content_view_menu_nav_bookmarks</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_Content_Context_Menu_001a</extra-loc-viewid>
-    <extra-loc-positionid>menu</extra-loc-positionid>
-    <extra-loc-feature>Br</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
 <message numerus="no" id="txt_browser_content_view_browser">
-    <comment>Title of Content View.  We may not need this string, so this is a placeholder for now, just in case</comment>        
+    <comment>Title of Content View.</comment>        
     <source>Browser</source>
-    <translation variants="no">Browser</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id>txt_browser_windows_new_window</extra-loc-layout_id>    
     <extra-loc-viewid>Browser_Content_Title_001</extra-loc-viewid>
     <extra-loc-positionid>title</extra-loc-positionid>
@@ -55,27 +25,17 @@
 <message numerus="no" id="txt_browser_windows_windows">
     <comment>Title of Windows View</comment>        
     <source>Windows</source>
-    <translation variants="no">Windows</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id>txt_browser_windows_new_window</extra-loc-layout_id>    
     <extra-loc-viewid>Browser_Windows_001</extra-loc-viewid>
     <extra-loc-positionid>title</extra-loc-positionid>
     <extra-loc-feature>Br</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_browser_content_view_most_visited">
-    <comment>For the title of the Most Visited pages grid</comment>        
-    <source>Most Visited Pages</source>
-    <translation variants="no">Most Visited Pages</translation>
-    <extra-loc-layout_id>txt_browser_content_view_most_visited</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_Content_Most_Visited_001</extra-loc-viewid>
-    <extra-loc-positionid>title</extra-loc-positionid>
-    <extra-loc-feature>Br</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
 <message numerus="no" id="txt_browser_history_this_month">
     <comment>Subheading Label in History List</comment>        
     <source>This Month</source>
-    <translation variants="no">This Month</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id>txt_browser_history_today</extra-loc-layout_id>    
     <extra-loc-viewid>Browser_History_001</extra-loc-viewid>
     <extra-loc-positionid>subhead</extra-loc-positionid>
@@ -83,139 +43,79 @@
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_browser_bookmarks_cancel">
-    <comment>Button text when adding/editing a bookmark - right now we are using icons for this, this is a placeholder for possible future text</comment>        
+    <comment>Button text when adding/editing a bookmark</comment>        
     <source>Cancel</source>
-    <translation variants="no">Cancel</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id>txt_browser_bookmarks_done</extra-loc-layout_id>    
     <extra-loc-viewid>Browser_Bookmarks_001a</extra-loc-viewid>
     <extra-loc-positionid>button</extra-loc-positionid>
     <extra-loc-feature>Br</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_browser_content_view_menu_tab_navigation">
-    <comment>Content View Context Menu label for Navigation tab</comment>        
-    <source>Navigation</source>
-    <translation variants="no">Navigation</translation>
-    <extra-loc-layout_id>txt_browser_content_view_menu_tab_navigation</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_Content_Context_Menu_001</extra-loc-viewid>
-    <extra-loc-positionid>tab</extra-loc-positionid>
-    <extra-loc-feature>Br</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_browser_page_load_failed">
-    <comment>Error info notification message</comment>        
-    <source>Page load failed</source>
-    <translation variants="no">Page load failed</translation>
-    <extra-loc-layout_id>txt_browser_page_load_failed</extra-loc-layout_id>    
+<message numerus="no" id="txt_browser_error_page_load_failed">
+    <comment>Layout ID parent. Error info notification message</comment>        
+    <source>Unable to load page</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_error_page_load_failed</extra-loc-layout_id>    
     <extra-loc-viewid>Browser_Error_Dialog_001</extra-loc-viewid>
     <extra-loc-positionid>dpopinfo</extra-loc-positionid>
     <extra-loc-feature>Br</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_browser_content_view_menu_link_open_link">
-    <comment>Content View Context Menu Link tab Open Link in New Window menu item</comment>        
-    <source>Open Link in New Window</source>
-    <translation variants="no">Open Link in New Window</translation>
-    <extra-loc-layout_id>txt_browser_content_view_menu_link_open_link</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_Content_Context_Menu_001c</extra-loc-viewid>
-    <extra-loc-positionid>menu</extra-loc-positionid>
+<message numerus="no" id="txt_browser_info_message">
+    <comment>Layout ID parent. Error info notification message</comment>        
+    <source>Info Message</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_info_message</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_Error_Dialog_001</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
     <extra-loc-feature>Br</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_browser_most_visited_title">
-    <comment>Title for Most Visited view</comment>        
+    <comment>For the title of the Most Visited pages grid</comment>        
     <source>Most Visited</source>
-    <translation variants="no">Most Visited</translation>
-    <extra-loc-layout_id>txt_browser_most_visited_title</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_Most_Visited_01</extra-loc-viewid>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_most_visited_title_most_visited</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_Content_Most_Visited_001</extra-loc-viewid>
     <extra-loc-positionid>title</extra-loc-positionid>
     <extra-loc-feature>Br</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_browser_content_view_menu_nav_windows">
-    <comment>Content View Context Menu Navigation tab Windows menu item</comment>        
-    <source>Windows</source>
-    <translation variants="no">Windows</translation>
-    <extra-loc-layout_id>txt_browser_content_view_menu_nav_bookmarks</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_Content_Context_Menu_001a</extra-loc-viewid>
-    <extra-loc-positionid>menu</extra-loc-positionid>
-    <extra-loc-feature>Br</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_browser_settings_clear_data_cookies">
-    <comment>In the Browser Settings, for clearing cookies</comment>        
-    <source>Cookies</source>
-    <translation variants="no">Cookies</translation>
-    <extra-loc-layout_id>txt_browser_settings_clear_data_cache</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_Settings_001a</extra-loc-viewid>
-    <extra-loc-positionid>list</extra-loc-positionid>
-    <extra-loc-feature>Br</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
 <message numerus="no" id="txt_browser_content_view_menu_page_allow_popups">
-    <comment>Content View Context Menu Page tab Allow Pop-ups menu item</comment>        
+    <comment>Layout ID parent. Content View Context Menu Page tab Allow Pop-ups menu item</comment>        
     <source>Allow Pop-ups</source>
-    <translation variants="no">Allow Pop-ups</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id>txt_browser_content_view_menu_page_allow_popups</extra-loc-layout_id>    
     <extra-loc-viewid>Browser_Content_Context_Menu_001b</extra-loc-viewid>
     <extra-loc-positionid>menu</extra-loc-positionid>
     <extra-loc-feature>Br</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_browser_content_view_menu_page_block_popups">
-    <comment>Content View Context Menu Page tab Block Pop-ups menu item</comment>        
-    <source>Block Pop-ups</source>
-    <translation variants="no">Block Pop-ups</translation>
-    <extra-loc-layout_id>txt_browser_content_view_menu_page_block_popups</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_Content_Context_Menu_001b</extra-loc-viewid>
-    <extra-loc-positionid>menu</extra-loc-positionid>
-    <extra-loc-feature>Br</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_browser_settings_clear_data_all">
-    <comment>In the Browser Settings, for clearing all at once</comment>        
-    <source>Clear All</source>
-    <translation variants="no">Clear All</translation>
-    <extra-loc-layout_id>txt_browser_settings_clear_data_cache</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_Settings_001a</extra-loc-viewid>
-    <extra-loc-positionid>list</extra-loc-positionid>
-    <extra-loc-feature>Br</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
 <message numerus="no" id="txt_browser_settings_general_settings">
     <comment>Subheader in Settings View for General Settings</comment>        
     <source>General Settings</source>
-    <translation variants="no">General Settings</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id>txt_browser_settings_clear_data</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_Settings_001</extra-loc-viewid>
-    <extra-loc-positionid>subtitle</extra-loc-positionid>
+    <extra-loc-viewid>Browser_Settings_001b</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
     <extra-loc-feature>Br</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_browser_windows_new_window">
-    <comment>Title of New Window in Windows View and in Content View</comment>        
+    <comment>Layout ID parent. Title displayed above a new, blank window in the Windows view.</comment>        
     <source>New Window</source>
-    <translation variants="no">New Window</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id>txt_browser_windows_new_window</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_Content_Title_001</extra-loc-viewid>
+    <extra-loc-viewid>Browser_Windows_001 </extra-loc-viewid>
     <extra-loc-positionid>title</extra-loc-positionid>
     <extra-loc-feature>Br</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_browser_content_view_menu_page_share">
-    <comment>Content View Context Menu Page tab Share menu item</comment>        
-    <source>Share</source>
-    <translation variants="no">Share</translation>
-    <extra-loc-layout_id>txt_browser_content_view_menu_page_allow_popups</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_Content_Context_Menu_001b</extra-loc-viewid>
-    <extra-loc-positionid>menu</extra-loc-positionid>
-    <extra-loc-feature>Br</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
 <message numerus="no" id="txt_browser_content_view_menu_nav_exit">
-    <comment>Content View Context Menu Navigation tab Exit menu item - not needed now, but for future</comment>        
-    <source>Exit</source>
-    <translation variants="no">Exit</translation>
+    <comment>Content View Context Menu Navigation tab Exit menu item</comment>        
+    <source>Exit Browser</source>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id>txt_browser_content_view_menu_nav_bookmarks</extra-loc-layout_id>    
     <extra-loc-viewid>Browser_Content_Context_Menu_001a</extra-loc-viewid>
     <extra-loc-positionid>menu</extra-loc-positionid>
@@ -225,219 +125,99 @@
 <message numerus="no" id="txt_short_caption_browser">
     <comment>Caption for Application Library - grid view</comment>        
     <source>Web Browser</source>
-    <translation variants="no">Web Browser</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id>qtl_grid_applications_sec</extra-loc-layout_id>    
     <extra-loc-viewid>browser</extra-loc-viewid>
     <extra-loc-positionid>grid</extra-loc-positionid>
     <extra-loc-feature>br</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_browser_settings_general_settings_save_browser_history">
-    <comment>In the Browser Settings, for saving history</comment>        
-    <source>Save Browser History</source>
-    <translation variants="no">Save Browser History</translation>
-    <extra-loc-layout_id>txt_browser_settings_general_settings_save_browser_history</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_Settings_001b</extra-loc-viewid>
-    <extra-loc-positionid>list</extra-loc-positionid>
-    <extra-loc-feature>Br</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
 <message numerus="no" id="txt_browser_chrome_suggests_search_for">
-    <comment></comment>        
+    <comment>Displayed in the URL bar search suggestions drop-down menu, %1 is the search string</comment>        
     <source>Search for %1</source>
-    <translation variants="no">Search for %1</translation>
-    <extra-loc-layout_id></extra-loc-layout_id>    
-    <extra-loc-viewid></extra-loc-viewid>
-    <extra-loc-positionid></extra-loc-positionid>
-    <extra-loc-feature></extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_long_caption_browser">
-    <comment>Caption for Application Library - list view</comment>        
-    <source>Web Browser</source>
-    <translation variants="no">Web Browser</translation>
-    <extra-loc-layout_id>qtl_list_pri_large_graphic</extra-loc-layout_id>    
-    <extra-loc-viewid>browser</extra-loc-viewid>
-    <extra-loc-positionid>list</extra-loc-positionid>
-    <extra-loc-feature>br</extra-loc-feature>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_chrome_suggests_search_for</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_URLbar_001</extra-loc-viewid>
+    <extra-loc-positionid>opt</extra-loc-positionid>
+    <extra-loc-feature>Br</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_browser_content_view_menu_nav_settings">
     <comment>Content View Context Menu Navigation tab Settings menu item</comment>        
     <source>Settings</source>
-    <translation variants="no">Settings</translation>
-    <extra-loc-layout_id>txt_browser_content_view_menu_nav_bookmarks</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_Content_Context_Menu_001a</extra-loc-viewid>
-    <extra-loc-positionid>menu</extra-loc-positionid>
-    <extra-loc-feature>Br</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_browser_content_view_menu_nav_bookmarks">
-    <comment>Content View Context Menu Navigation tab Bookmarks menu item</comment>        
-    <source>Bookmarks</source>
-    <translation variants="no">Bookmarks</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id>txt_browser_content_view_menu_nav_bookmarks</extra-loc-layout_id>    
     <extra-loc-viewid>Browser_Content_Context_Menu_001a</extra-loc-viewid>
     <extra-loc-positionid>menu</extra-loc-positionid>
     <extra-loc-feature>Br</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_browser_content_view_menu_tab_image">
-    <comment>Content View Context Menu Image tab</comment>        
-    <source>Image</source>
-    <translation variants="no">Image</translation>
-    <extra-loc-layout_id>txt_browser_content_view_menu_tab_navigation</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_Content_Context_Menu_001</extra-loc-viewid>
-    <extra-loc-positionid>tab</extra-loc-positionid>
-    <extra-loc-feature>Br</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_browser_content_view_menu_link_share_link">
-    <comment>Content View Context Menu Link tab Share Link menu item</comment>        
-    <source>Share Link</source>
-    <translation variants="no">Share Link</translation>
-    <extra-loc-layout_id>txt_browser_content_view_menu_link_open_link</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_Content_Context_Menu_001c</extra-loc-viewid>
-    <extra-loc-positionid>menu</extra-loc-positionid>
-    <extra-loc-feature>Br</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
 <message numerus="no" id="txt_browser_content_view_menu_tab_link">
     <comment>Content View Context Menu Link tab</comment>        
     <source>Link</source>
-    <translation variants="no">Link</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id>txt_browser_content_view_menu_tab_navigation</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_Content_Context_Menu_001</extra-loc-viewid>
+    <extra-loc-viewid>Browser_Content_Context_Menu_001c</extra-loc-viewid>
     <extra-loc-positionid>tab</extra-loc-positionid>
     <extra-loc-feature>Br</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
+<message numerus="no" id="txt_browser_content_view_menu_nav_bookmarks">
+    <comment>Layout ID parent. Content View Context Menu Navigation tab Bookmarks menu item</comment>        
+    <source>Bookmarks</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_content_view_menu_nav_bookmarks</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_Content_Context_Menu_001a</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
+    <extra-loc-feature>Br</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
 <message numerus="no" id="txt_browser_content_view_menu_tab_link_image">
-    <comment>Content View Context Menu Link/Image tab</comment>        
+    <comment>Content View Context Menu Link/Image tab - this tab is for images that are also links.  So under it are: &quot;open link in new window&quot;, &quot;share link&quot;, &quot;save image&quot;</comment>        
     <source>Link/Image</source>
-    <translation variants="no">Link/Image</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id>txt_browser_content_view_menu_tab_navigation</extra-loc-layout_id>    
     <extra-loc-viewid>Browser_Content_Context_Menu_001</extra-loc-viewid>
     <extra-loc-positionid>tab</extra-loc-positionid>
     <extra-loc-feature>Br</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_browser_offline">
-    <comment></comment>        
-    <source>Offline</source>
-    <translation variants="no">Offline</translation>
-    <extra-loc-layout_id></extra-loc-layout_id>    
-    <extra-loc-viewid></extra-loc-viewid>
-    <extra-loc-positionid></extra-loc-positionid>
-    <extra-loc-feature></extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
 <message numerus="no" id="txt_browser_settings_clear_data">
-    <comment>Subheader in Settings View for Clear Data</comment>        
+    <comment>Layout ID parent. Subheader in Settings View for Clear Data</comment>        
     <source>Clear Data</source>
-    <translation variants="no">Clear Data</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id>txt_browser_settings_clear_data</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_Settings_001</extra-loc-viewid>
-    <extra-loc-positionid>subtitle</extra-loc-positionid>
+    <extra-loc-viewid>Browser_Settings_001a</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
     <extra-loc-feature>Br</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_browser_settings_clear_data_cache">
-    <comment>In the Browser Settings, for clearing cache</comment>        
+    <comment>Layout ID parent. In the Browser Settings, for clearing cache</comment>        
     <source>Cache</source>
-    <translation variants="no">Cache</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id>txt_browser_settings_clear_data_cache</extra-loc-layout_id>    
     <extra-loc-viewid>Browser_Settings_001a</extra-loc-viewid>
     <extra-loc-positionid>list</extra-loc-positionid>
     <extra-loc-feature>Br</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_browser_file_has_finished_downloading">
-    <comment>Info note for when an item has finished downloading.</comment>        
-    <source>%1 has finished downloading</source>
-    <translation variants="no">%1 has finished downloading</translation>
-    <extra-loc-layout_id>txt_browser_downloading_file</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_Downloads_001</extra-loc-viewid>
-    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
-    <extra-loc-feature>Br</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_browser_windows_blank">
-    <comment>Title displayed above a new, blank window in the Windows view.</comment>        
-    <source>New Window</source>
-    <translation variants="no">New Window</translation>
-    <extra-loc-layout_id>txt_browser_windows_blank</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_Windows_001 </extra-loc-viewid>
+<message numerus="no" id="txt_browser_bookmarks_bookmarks">
+    <comment>Page title in Bookmarks View</comment>        
+    <source>Bookmarks</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_windows_new_window</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_Bookmarks_001</extra-loc-viewid>
     <extra-loc-positionid>title</extra-loc-positionid>
     <extra-loc-feature>Br</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_browser_settings_general_settings_character_encoding">
-    <comment>In the Browser Settings, for character encoding</comment>        
-    <source>Character Encoding</source>
-    <translation variants="no">Character Encoding</translation>
-    <extra-loc-layout_id>txt_browser_settings_general_settings_save_browser_history</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_Settings_001</extra-loc-viewid>
-    <extra-loc-positionid>formlabel_1</extra-loc-positionid>
-    <extra-loc-feature>Br</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_browser_settings_general_settings_yes">
-    <comment>In the Browser Settings, for setting an option to Yes, also in Browser Network connection dialog</comment>        
-    <source>Yes</source>
-    <translation variants="no">Yes</translation>
-    <extra-loc-layout_id>txt_browser_settings_general_settings_yes</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_Settings_001, Browser_Network_001</extra-loc-viewid>
-    <extra-loc-positionid>button</extra-loc-positionid>
-    <extra-loc-feature>Br</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_browser_bookmarks_done">
-    <comment>Button text when adding/editing a bookmark - right now we are using icons for this, this is a placeholder for possible future text</comment>        
-    <source>Done</source>
-    <translation variants="no">Done</translation>
-    <extra-loc-layout_id>txt_browser_bookmarks_done</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_Bookmarks_001a</extra-loc-viewid>
-    <extra-loc-positionid>button</extra-loc-positionid>
-    <extra-loc-feature>Br</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_browser_settings_general_settings_save_forms_passwords">
-    <comment>In the Browser Settings, for saving forms and passwords</comment>        
-    <source>Save Forms/Passwords</source>
-    <translation variants="no">Save Forms/Passwords</translation>
-    <extra-loc-layout_id>txt_browser_settings_general_settings_save_browser_history</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_Settings_001b</extra-loc-viewid>
-    <extra-loc-positionid>list</extra-loc-positionid>
-    <extra-loc-feature>Br</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_browser_history_delete_are_you_sure">
-    <comment>Dialog displayed in the History View when a user clears their History</comment>        
-    <source>Are you sure you want to permanently delete your history?</source>
-    <translation variants="no">Are you sure you want to permanently delete your history?</translation>
-    <extra-loc-layout_id>txt_browser_history_delete_are_you_sure</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_History_001</extra-loc-viewid>
-    <extra-loc-positionid>dialog</extra-loc-positionid>
-    <extra-loc-feature>Br</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_browser_url_bar_drop_down_search_for">
-    <comment>Displayed in the URL bar search suggestions drop-down menu</comment>        
-    <source>Search for %1</source>
-    <translation variants="no">Search for %1</translation>
-    <extra-loc-layout_id>txt_browser_url_bar_drop_down_search_for</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_URLbar_001</extra-loc-viewid>
-    <extra-loc-positionid>opt</extra-loc-positionid>
-    <extra-loc-feature>Br</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_browser_bookmarks_bookmarks">
-    <comment>Page title in Bookmarks View</comment>        
-    <source>Bookmarks</source>
-    <translation variants="no">Bookmarks</translation>
-    <extra-loc-layout_id>txt_browser_windows_new_window</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_Bookmarks_001</extra-loc-viewid>
+<message numerus="no" id="txt_browser_content_view_new_window">
+    <comment>Title of New Window in Content View</comment>        
+    <source>New Window</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_content_view_new_window</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_Content_Title_001</extra-loc-viewid>
     <extra-loc-positionid>title</extra-loc-positionid>
     <extra-loc-feature>Br</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
@@ -445,7 +225,7 @@
 <message numerus="no" id="txt_browser_history_history">
     <comment>Title of History View</comment>        
     <source>History</source>
-    <translation variants="no">History</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id>txt_browser_windows_new_window</extra-loc-layout_id>    
     <extra-loc-viewid>Browser_History_001</extra-loc-viewid>
     <extra-loc-positionid>title</extra-loc-positionid>
@@ -455,7 +235,7 @@
 <message numerus="no" id="txt_browser_settings_settings">
     <comment>Title of Settings View</comment>        
     <source>Settings</source>
-    <translation variants="no">Settings</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id>txt_browser_windows_new_window</extra-loc-layout_id>    
     <extra-loc-viewid>Browser_Settings_001</extra-loc-viewid>
     <extra-loc-positionid>title</extra-loc-positionid>
@@ -463,9 +243,9 @@
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_browser_history_today">
-    <comment>Subheading Label in History List</comment>        
+    <comment>Layout ID parent. Subheading Label in History List</comment>        
     <source>Today</source>
-    <translation variants="no">Today</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id>txt_browser_history_today</extra-loc-layout_id>    
     <extra-loc-viewid>Browser_History_001</extra-loc-viewid>
     <extra-loc-positionid>subhead</extra-loc-positionid>
@@ -473,144 +253,414 @@
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_browser_settings_general_settings_no">
-    <comment>In the Browser Settings, for setting an option to No, also in Browser Network connection dialog</comment>        
+    <comment>In the Browser Settings, for setting an option to No</comment>        
     <source>No</source>
-    <translation variants="no">No</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id>txt_browser_settings_general_settings_yes</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_Settings_001, Browser_Network_001</extra-loc-viewid>
-    <extra-loc-positionid>button</extra-loc-positionid>
-    <extra-loc-feature>Br</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_browser_settings_clear_data_history">
-    <comment>In the Browser Settings, for clearing history</comment>        
-    <source>History</source>
-    <translation variants="no">History</translation>
-    <extra-loc-layout_id>txt_browser_settings_clear_data_cache</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_Settings_001a</extra-loc-viewid>
-    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-viewid>Browser_Settings_001b</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_1_2_val</extra-loc-positionid>
     <extra-loc-feature>Br</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_browser_content_view_menu_page_add_bookmark">
     <comment>Content View Context Menu Page tab Add Bookmark menu item</comment>        
     <source>Add Bookmark</source>
-    <translation variants="no">Add Bookmark</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id>txt_browser_content_view_menu_page_allow_popups</extra-loc-layout_id>    
     <extra-loc-viewid>Browser_Content_Context_Menu_001b</extra-loc-viewid>
     <extra-loc-positionid>menu</extra-loc-positionid>
     <extra-loc-feature>Br</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_browser_history_yesterday">
-    <comment>Subheading Label in History List</comment>        
-    <source>Yesterday</source>
-    <translation variants="no">Yesterday</translation>
-    <extra-loc-layout_id>txt_browser_history_today</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_History_001</extra-loc-viewid>
-    <extra-loc-positionid>subhead</extra-loc-positionid>
-    <extra-loc-feature>Br</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_browser_settings_clear_data_bookmarks">
-    <comment>In the Browser Settings, for clearing bookmarks</comment>        
-    <source>Bookmarks</source>
-    <translation variants="no">Bookmarks</translation>
-    <extra-loc-layout_id>txt_browser_settings_clear_data_cache</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_Settings_001a</extra-loc-viewid>
-    <extra-loc-positionid>list</extra-loc-positionid>
-    <extra-loc-feature>Br</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
-<message numerus="no" id="txt_browser_input_dial_add_bm">
-    <comment>Title for bookmarks input editor for adding a bm</comment>        
-    <source>Add Bookmark</source>
-    <translation variants="no">Add Bookmark</translation>
-    <extra-loc-layout_id>txt_browser_input_dial_add_bm</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_Dialog_01</extra-loc-viewid>
-    <extra-loc-positionid>title</extra-loc-positionid>
-    <extra-loc-feature>Br</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
 <message numerus="no" id="txt_browser_downloading_file">
-    <comment>Info note for when a new item starts downloading</comment>        
+    <comment>Layout ID parent. Info note for when a new item starts downloading, %1 is the name of the item that is downloading</comment>        
     <source>Downloading %1</source>
-    <translation variants="no">Downloading %1</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id>txt_browser_downloading_file</extra-loc-layout_id>    
     <extra-loc-viewid>Browser_Downloads_001</extra-loc-viewid>
     <extra-loc-positionid>dpopinfo</extra-loc-positionid>
     <extra-loc-feature>Br</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_browser_settings_general_settings_character_encoding_automatic">
-    <comment>In the Browser Settings, drop-down menu item for character encoding.  Automatic is the default item.</comment>        
-    <source>Automatic</source>
-    <translation variants="no">Automatic</translation>
-    <extra-loc-layout_id>txt_browser_settings_general_settings_character_encoding_automatic</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_Settings_001c</extra-loc-viewid>
-    <extra-loc-positionid>formlabel_1_val</extra-loc-positionid>
+<message numerus="no" id="txt_browser_content_view_menu_page_block_popups">
+    <comment>Content View Context Menu Page tab Block Pop-ups menu item</comment>        
+    <source>Block Popups</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_content_view_menu_page_allow_popups</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_Content_Context_Menu_001b</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
     <extra-loc-feature>Br</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_browser_content_view_menu_tab_page">
     <comment>Content View Context Menu label for Page tab</comment>        
     <source>Page</source>
-    <translation variants="no">Page</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id>txt_browser_content_view_menu_tab_navigation</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_Content_Context_Menu_001</extra-loc-viewid>
+    <extra-loc-viewid>Browser_Content_Context_Menu_001b</extra-loc-viewid>
+    <extra-loc-positionid>tab</extra-loc-positionid>
+    <extra-loc-feature>Br</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_browser_settings_clear_data_form_data">
+    <comment>In the Browser Settings, for clearing form data</comment>        
+    <source>Form Data</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_settings_clear_data_cache</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_Settings_001a</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>Br</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_browser_error_dialog_close_some">
+    <comment>Error dialog shown when device is running out of memory.</comment>        
+    <source>Close some browser windows or applications.</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_error_dialog_device_low</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_Memory_Low_Dialog_001</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>Br</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_browser_content_view_menu_nav_history">
+    <comment>Content View Context Menu Navigation tab History menu item</comment>        
+    <source>History</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_content_view_menu_nav_bookmarks</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_Content_Context_Menu_001a</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
+    <extra-loc-feature>Br</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_browser_content_view_menu_image_save_image">
+    <comment>Content View Context Menu Image tab Save Image menu item</comment>        
+    <source>Save Image</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_content_view_menu_image_save_image</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_Content_Context_Menu_001d</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
+    <extra-loc-feature>Br</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_browser_network_switch_connection">
+    <comment>Prompt shown when a new network is available to use as the browser&apos;s network connection, %1 is the network name</comment>        
+    <source>%1 is now in range.  Switch connection?</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_network_switch_connection</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_Network_001</extra-loc-viewid>
+    <extra-loc-positionid>dialog</extra-loc-positionid>
+    <extra-loc-feature>Br</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_browser_content_view_menu_tab_navigation">
+    <comment>Layout ID parent. Content View Context Menu label for Navigation tab</comment>        
+    <source>Navigation</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_content_view_menu_tab_navigation</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_Content_Context_Menu_001a</extra-loc-viewid>
     <extra-loc-positionid>tab</extra-loc-positionid>
     <extra-loc-feature>Br</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_browser_history_this_week">
+<message numerus="no" id="txt_browser_content_view_menu_link_open_link">
+    <comment>Layout ID parent. Content View Context Menu Link tab Open Link in New Window menu item</comment>        
+    <source>Open Link in New Window</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_content_view_menu_link_open_link</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_Content_Context_Menu_001c</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
+    <extra-loc-feature>Br</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_browser_settings_clear_data_cookies">
+    <comment>In the Browser Settings, for clearing cookies</comment>        
+    <source>Cookies</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_settings_clear_data_cache</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_Settings_001a</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>Br</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_browser_content_view_menu_nav_windows">
+    <comment>Content View Context Menu Navigation tab Windows menu item</comment>        
+    <source>Windows</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_content_view_menu_nav_bookmarks</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_Content_Context_Menu_001a</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
+    <extra-loc-feature>Br</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_browser_settings_clear_data_all">
+    <comment>In the Browser Settings, for clearing all at once</comment>        
+    <source>Clear All</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_settings_clear_data_cache</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_Settings_001a</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>Br</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_browser_content_view_menu_page_share">
+    <comment>Content View Context Menu Page tab Share menu item</comment>        
+    <source>Share</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_content_view_menu_page_allow_popups</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_Content_Context_Menu_001b</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
+    <extra-loc-feature>Br</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_browser_settings_general_settings_save_browser_history">
+    <comment>Layout ID parent. In the Browser Settings, for saving history</comment>        
+    <source>Save Browser History</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_settings_general_settings_save_browser_history</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_Settings_001b</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_1</extra-loc-positionid>
+    <extra-loc-feature>Br</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_long_caption_browser">
+    <comment>Caption for Application Library - list view</comment>        
+    <source>Web Browser</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>qtl_list_pri_large_graphic</extra-loc-layout_id>    
+    <extra-loc-viewid>browser</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>br</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_browser_error_generic_error_msg">
+    <comment>Generic error message in dialog when the network does not send an error.</comment>        
+    <source>Network error</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_error_page_load_failed</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_Error_Dialog_001</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>Br</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_browser_network_switch_connection_yes">
+    <comment>Layout ID parent. In the Browser Network switch connection dialog</comment>        
+    <source>Yes</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_network_switch_connection_yes</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_Network_001</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>Br</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_browser_content_view_menu_link_share_link">
+    <comment>Content View Context Menu Link tab Share Link menu item</comment>        
+    <source>Share Link</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_content_view_menu_link_open_link</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_Content_Context_Menu_001c</extra-loc-viewid>
+    <extra-loc-positionid>menu</extra-loc-positionid>
+    <extra-loc-feature>Br</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_browser_content_view_menu_tab_image">
+    <comment>Content View Context Menu Image tab</comment>        
+    <source>Image</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_content_view_menu_tab_navigation</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_Content_Context_Menu_001d</extra-loc-viewid>
+    <extra-loc-positionid>tab</extra-loc-positionid>
+    <extra-loc-feature>Br</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_browser_offline">
+    <comment>Status of browser connection, shown next to Page Title in Browser status bar in Content View</comment>        
+    <source>Offline</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_offline</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_Content_Title_001</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>Br</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_browser_file_has_finished_downloading">
+    <comment>Info note for when an item has finished downloading, %1 is the name of the item that has been downloaded</comment>        
+    <source>%1 has finished downloading</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_downloading_file</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_Downloads_001</extra-loc-viewid>
+    <extra-loc-positionid>dpopinfo</extra-loc-positionid>
+    <extra-loc-feature>Br</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_browser_settings_general_settings_yes">
+    <comment>Layout ID parent. In the Browser Settings, for setting an option to Yes</comment>        
+    <source>Yes</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_settings_general_settings_yes</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_Settings_001b</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_1_2_val</extra-loc-positionid>
+    <extra-loc-feature>Br</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_browser_settings_general_settings_character_encoding">
+    <comment>In the Browser Settings, for character encoding</comment>        
+    <source>Character Encoding</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_settings_general_settings_save_browser_history</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_Settings_001b</extra-loc-viewid>
+    <extra-loc-positionid>formlabel_1</extra-loc-positionid>
+    <extra-loc-feature>Br</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_browser_bookmarks_done">
+    <comment>Layout ID parent. Button text when adding/editing a bookmark</comment>        
+    <source>Done</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_bookmarks_done</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_Bookmarks_001a</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>Br</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_browser_network_switch_connection_no">
+    <comment>In the Browser Network switch connection dialog</comment>        
+    <source>No</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_network_switch_connection_yes</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_Network_001</extra-loc-viewid>
+    <extra-loc-positionid>button</extra-loc-positionid>
+    <extra-loc-feature>Br</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_browser_settings_general_settings_save_forms_passwords">
+    <comment>In the Browser Settings, for saving forms and passwords</comment>        
+    <source>Save Forms/Passwords</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_settings_general_settings_save_browser_history</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_Settings_001b</extra-loc-viewid>
+    <extra-loc-positionid>setlabel_2</extra-loc-positionid>
+    <extra-loc-feature>Br</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_browser_history_delete_are_you_sure">
+    <comment>Dialog displayed in the History View when a user clears their History</comment>        
+    <source>Are you sure you want to permanently delete your history?</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_history_delete_are_you_sure</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_History_001</extra-loc-viewid>
+    <extra-loc-positionid>dialog</extra-loc-positionid>
+    <extra-loc-feature>Br</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_browser_settings_clear_data_history">
+    <comment>In the Browser Settings, for clearing history</comment>        
+    <source>History</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_settings_clear_data_cache</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_Settings_001a</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>Br</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_browser_settings_general_settings_about">
+    <comment>In the Browser Settings, for info about the browser (version info etc)</comment>        
+    <source>About Browser</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_settings_general_settings_save_browser_history</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_Settings_001b</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>Br</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_browser_error_dialog_device_low">
+    <comment>Layout ID parent.  Error dialog shown when device is running out of memory.</comment>        
+    <source>Device Low On Memory</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_error_dialog_device_low</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_Memory_Low_Dialog_001</extra-loc-viewid>
+    <extra-loc-positionid>dpophead</extra-loc-positionid>
+    <extra-loc-feature>Br</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_browser_settings_clear_data_bookmarks">
+    <comment>In the Browser Settings, for clearing bookmarks</comment>        
+    <source>Bookmarks</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_settings_clear_data_cache</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_Settings_001a</extra-loc-viewid>
+    <extra-loc-positionid>list</extra-loc-positionid>
+    <extra-loc-feature>Br</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_browser_history_yesterday">
     <comment>Subheading Label in History List</comment>        
-    <source>This Week</source>
-    <translation variants="no">This Week</translation>
+    <source>Yesterday</source>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id>txt_browser_history_today</extra-loc-layout_id>    
     <extra-loc-viewid>Browser_History_001</extra-loc-viewid>
     <extra-loc-positionid>subhead</extra-loc-positionid>
     <extra-loc-feature>Br</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_browser_input_dial_edit_bm">
-    <comment>Title for bookmarks input editor for editing a bm</comment>        
-    <source>Edit Bookmark</source>
-    <translation variants="no">Edit Bookmark</translation>
+<message numerus="no" id="txt_browser_settings_general_settings_character_encoding_automatic">
+    <comment>Layout ID parent. In the Browser Settings, drop-down menu item for character encoding.  Automatic is the default item.</comment>        
+    <source>Automatic</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_settings_general_settings_character_encoding_automatic</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_Settings_001b</extra-loc-viewid>
+    <extra-loc-positionid>formlabel_1_val</extra-loc-positionid>
+    <extra-loc-feature>Br</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_browser_input_dial_add_bm">
+    <comment>Layout ID parent. Title for bookmarks dialog for adding a bm</comment>        
+    <source>Add Bookmark</source>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id>txt_browser_input_dial_add_bm</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_Dialog_01</extra-loc-viewid>
+    <extra-loc-viewid>Browser_Bookmark_Dialog_001</extra-loc-viewid>
     <extra-loc-positionid>title</extra-loc-positionid>
     <extra-loc-feature>Br</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
+<message numerus="no" id="txt_browser_history_this_week">
+    <comment>Subheading Label in History List</comment>        
+    <source>This Week</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_history_today</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_History_001</extra-loc-viewid>
+    <extra-loc-positionid>subhead</extra-loc-positionid>
+    <extra-loc-feature>Br</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
 <message numerus="no" id="txt_tsw_caption_browser">
     <comment>Caption for Task Switcher</comment>        
     <source>Web Browser</source>
-    <translation variants="no">Web Browser</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id>txt_tsw_caption_browser</extra-loc-layout_id>    
     <extra-loc-viewid>tsw_01</extra-loc-viewid>
     <extra-loc-positionid>caption</extra-loc-positionid>
     <extra-loc-feature>ts</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
+<message numerus="no" id="txt_browser_input_dial_edit_bm">
+    <comment>Title for bookmarks dialog for editing a bm</comment>        
+    <source>Edit Bookmark</source>
+    <translation variants="no" type="unfinished"></translation>
+    <extra-loc-layout_id>txt_browser_input_dial_add_bm</extra-loc-layout_id>    
+    <extra-loc-viewid>Browser_Bookmark_Dialog_001</extra-loc-viewid>
+    <extra-loc-positionid>title</extra-loc-positionid>
+    <extra-loc-feature>Br</extra-loc-feature>
+    <extra-loc-blank>False</extra-loc-blank>
+</message>
 <message numerus="no" id="txt_browser_settings_general_settings_character_encoding_unicode">
     <comment>In the Browser Settings, drop-down menu item for character encoding</comment>        
     <source>Unicode</source>
-    <translation variants="no">Unicode</translation>
+    <translation variants="no" type="unfinished"></translation>
     <extra-loc-layout_id>txt_browser_settings_general_settings_character_encoding_automatic</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_Settings_001c</extra-loc-viewid>
+    <extra-loc-viewid>Browser_Settings_001b</extra-loc-viewid>
     <extra-loc-positionid>formlabel_1_val</extra-loc-positionid>
     <extra-loc-feature>Br</extra-loc-feature>
     <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_browser_settings_clear_data_form_data">
-    <comment>In the Browser Settings, for clearing form data</comment>        
-    <source>Form Data</source>
-    <translation variants="no">Form Data</translation>
-    <extra-loc-layout_id>txt_browser_settings_clear_data_cache</extra-loc-layout_id>    
-    <extra-loc-viewid>Browser_Settings_001a</extra-loc-viewid>
-    <extra-loc-positionid>list</extra-loc-positionid>
-    <extra-loc-feature>Br</extra-loc-feature>
-    <extra-loc-blank>False</extra-loc-blank>
-</message>
 </context>
 </TS>