Merge "if savePicture failes, delete the file (which is now unreliable, and possibly large)"
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 0df308f..d13d480 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -16,8 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="1935869255545976415">"瀏覽器"</string>
- <!-- no translation found for choose_upload (3649366287575002063) -->
- <skip />
+ <string name="choose_upload" msgid="3649366287575002063">"選擇要上載的檔案"</string>
<string name="new_tab" msgid="4505722538297295141">"新視窗"</string>
<string name="active_tabs" msgid="3050623868203544623">"視窗"</string>
<string name="tab_bookmarks" msgid="2305793036003473653">"書籤"</string>
@@ -85,8 +84,7 @@
<string name="bookmark_needs_title" msgid="6245900436119218187">"請輸入書籤名稱。"</string>
<string name="bookmark_needs_url" msgid="7809876865972755158">"請選取書籤位置。"</string>
<string name="bookmark_url_not_valid" msgid="6719785633980202419">"網址無效。"</string>
- <!-- no translation found for bookmark_cannot_save_url (791722768778386941) -->
- <skip />
+ <string name="bookmark_cannot_save_url" msgid="791722768778386941">"無法將此網址加入書籤。"</string>
<string name="delete_bookmark" msgid="2422989994934201992">"刪除"</string>
<string name="bookmark_page" msgid="6845189305130307274">"將最後瀏覽的網頁加入書籤"</string>
<string name="switch_to_thumbnails" msgid="5493351529609043151">"縮圖檢視"</string>
@@ -114,8 +112,7 @@
<string name="contextmenu_copylink" msgid="5153657160294534270">"複製連結網址"</string>
<string name="contextmenu_download_image" msgid="4243829645180686912">"儲存圖片"</string>
<string name="contextmenu_view_image" msgid="3870625602053600905">"檢視圖片"</string>
- <!-- no translation found for contextmenu_set_wallpaper (3691902960115350686) -->
- <skip />
+ <string name="contextmenu_set_wallpaper" msgid="3691902960115350686">"設為桌布"</string>
<string name="contextmenu_dial_dot" msgid="5856550683415933806">"撥打…"</string>
<string name="contextmenu_add_contact" msgid="3183511922223645716">"新增聯絡人"</string>
<string name="contextmenu_send_mail" msgid="1014513374828775660">"傳送電子郵件"</string>
@@ -134,8 +131,7 @@
<string name="pref_content_plugins" msgid="7231944644794301582">"啟用外掛程式"</string>
<string name="pref_content_open_in_background_summary" msgid="1737664075721181678">"在目前視窗的後面開啟新視窗"</string>
<string name="pref_content_homepage" msgid="6082437160778559806">"設定首頁"</string>
- <!-- no translation found for pref_use_current (1493179933653044553) -->
- <skip />
+ <string name="pref_use_current" msgid="1493179933653044553">"使用目前的網頁"</string>
<string name="pref_content_autofit" msgid="8260474534053660809">"自動調整頁面"</string>
<string name="pref_content_autofit_summary" msgid="4587831659894879986">"配合螢幕大小調整網頁版面"</string>
<string name="pref_content_landscape_only" msgid="2022546812766219672">"僅以水平模式顯示"</string>
@@ -190,8 +186,7 @@
<string name="pref_content_load_page_summary" msgid="8792093504054149369">"顯示新開啟網頁的總覽畫面"</string>
<string name="pref_extras_title" msgid="3091250467679722382">"進階設定"</string>
<string name="pref_extras_website_settings" msgid="67866640052455549">"網站設定"</string>
- <!-- no translation found for pref_extras_website_settings_summary (1656771443223494406) -->
- <skip />
+ <string name="pref_extras_website_settings_summary" msgid="1656771443223494406">"個別網站的進階設定"</string>
<string name="pref_extras_reset_default" msgid="8904000515846202110">"還原至初始設定"</string>
<string name="pref_extras_reset_default_summary" msgid="7984680562706914966">"清除瀏覽器所有資料，並還原至初始設定"</string>
<string name="pref_extras_reset_default_dlg" msgid="6894807766578874830">"即將刪除所有瀏覽器資料，並將設定還原為預設值。"</string>
@@ -235,14 +230,12 @@
<string name="download_unknown_filename" msgid="4013465542563652175">"<未知>"</string>
<string name="download_menu_open" msgid="4888327480367757513">"開啟"</string>
<string name="download_menu_clear" msgid="6264454531553418124">"清除表單列表"</string>
- <!-- no translation found for download_menu_delete (8815502136393894148) -->
- <skip />
+ <string name="download_menu_delete" msgid="8815502136393894148">"刪除"</string>
<string name="download_menu_cancel" msgid="2545333007601851574">"取消下載"</string>
<string name="download_menu_cancel_all" msgid="2136550823151999166">"取消所有下載"</string>
<string name="download_cancel_dlg_title" msgid="8909108500262799748">"取消下載"</string>
<string name="download_cancel_dlg_msg" msgid="6285389170052357797">"所有 (<xliff:g id="DOWNLOAD_COUNT">%d</xliff:g>) 下載會取消並從下載記錄中清除。"</string>
- <!-- no translation found for download_delete_file (5330036497843073249) -->
- <skip />
+ <string name="download_delete_file" msgid="5330036497843073249">"即將刪除檔案"</string>
<string name="download_file_error_dlg_title" msgid="2693630283595384874">"空間不足"</string>
<string name="download_file_error_dlg_msg" msgid="5156405410324072471">"無法下載 <xliff:g id="FILENAME">%s</xliff:g>。"\n" 請清除手機上的空間或再試一次。"</string>
<string name="download_failed_generic_dlg_title" msgid="6106781095337833391">"下載失敗"</string>
@@ -250,8 +243,7 @@
<string name="download_no_sdcard_dlg_msg" msgid="2616399456116301518">"需要 SD 卡下載 <xliff:g id="FILENAME">%s</xliff:g>。"</string>
<string name="download_sdcard_busy_dlg_title" msgid="6877712666046917741">"無法使用 SD 卡"</string>
<string name="download_sdcard_busy_dlg_msg" msgid="3473883538192835204">"SD 記憶卡忙碌。如要允許下載，請選取通知中的 [停用 USB 儲存裝置]。"</string>
- <!-- no translation found for download_no_application_title (1286056729168874295) -->
- <skip />
+ <string name="download_no_application_title" msgid="1286056729168874295">"無法開啟檔案"</string>
<string name="retry" msgid="1835923075542266721">"重試"</string>
<string name="no_downloads" msgid="3947445710685021498">"下載記錄是空的。"</string>
<string name="download_error" msgid="413496839831257187">"下載失敗"</string>
@@ -277,10 +269,8 @@
<string name="geolocation_permissions_prompt_share" msgid="9084486342048347976">"分享位置資訊"</string>
<string name="geolocation_permissions_prompt_dont_share" msgid="6303025160237860300">"拒絕"</string>
<string name="geolocation_permissions_prompt_remember" msgid="3118526300707348308">"記住偏好設定"</string>
- <!-- no translation found for geolocation_permissions_prompt_toast_allowed (987286072035125498) -->
- <skip />
- <!-- no translation found for geolocation_permissions_prompt_toast_disallowed (7695100950212692515) -->
- <skip />
+ <string name="geolocation_permissions_prompt_toast_allowed" msgid="987286072035125498">"此網站可以存取您的位置資訊；您可以前往 [設定] -> [網站設定] 變更此設定"</string>
+ <string name="geolocation_permissions_prompt_toast_disallowed" msgid="7695100950212692515">"此網站無法存取您的位置資訊；您可以前往 [設定] -> [網站設定] 變更此設定"</string>
<string name="geolocation_settings_page_title" msgid="1745477985097536528">"清除位置資訊存取權"</string>
<string name="geolocation_settings_page_summary_allowed" msgid="9180251524290811398">"此網站目前可以存取您的位置資訊"</string>
<string name="geolocation_settings_page_summary_not_allowed" msgid="4589649082203102544">"此網站目前無法存取您的位置資訊"</string>
@@ -293,6 +283,5 @@
<string name="website_settings_clear_all_dialog_message" msgid="6150502090601476333">"即將刪除所有網站資料和位置存取權限。"</string>
<string name="website_settings_clear_all_dialog_ok_button" msgid="6401582240627669431">"刪除所有資料"</string>
<string name="website_settings_clear_all_dialog_cancel_button" msgid="1896757051856611674">"取消"</string>
- <!-- no translation found for progress_dialog_setting_wallpaper (4871900779338536674) -->
- <skip />
+ <string name="progress_dialog_setting_wallpaper" msgid="4871900779338536674">"設定桌布..."</string>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0bc559f..646c703 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -437,9 +437,9 @@
<!-- Settings label -->
<string name="pref_extras_reset_default">Reset to default</string>
<!-- Settings summary -->
- <string name="pref_extras_reset_default_summary">Clear all browser data and reset all settings to default</string>
+ <string name="pref_extras_reset_default_summary">Restore default settings</string>
<!-- Confirmation dialog message -->
- <string name="pref_extras_reset_default_dlg">All browser data will be deleted and settings will revert to default values.</string>
+ <string name="pref_extras_reset_default_dlg">Settings will revert to default values.</string>
<!-- Confirmation dialog title -->
<string name="pref_extras_reset_default_dlg_title">Reset to default</string>
<!-- Title for a group of settings -->
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index df80e99..a004212 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -306,6 +306,14 @@
PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "Browser");
+ // Find out if the network is currently up.
+ ConnectivityManager cm = (ConnectivityManager) getSystemService(
+ Context.CONNECTIVITY_SERVICE);
+ NetworkInfo info = cm.getActiveNetworkInfo();
+ if (info != null) {
+ mIsNetworkUp = info.isAvailable();
+ }
+
/* enables registration for changes in network status from
http stack */
mNetworkStateChangedFilter = new IntentFilter();