am 34c8499c: am d22af61d: Merge "Added catch of SQLiteException when updating screenshot"
* commit '34c8499cc0fadea73233b0bd8e33f26811972ad1':
Added catch of SQLiteException when updating screenshot
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 648fbc5..a13f4f0 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -38,7 +38,7 @@
<string name="page_info" msgid="4048529256302257195">"የገፅ መረጃ"</string>
<string name="page_info_view" msgid="5303490449842635158">"የገፅ መረጃ ዕይ"</string>
<string name="page_info_address" msgid="2222306609532903254">"አድራሻ:"</string>
- <string name="ssl_warnings_header" msgid="79744901983636370">"ለዚህ ድረ ገፅ የደህንነት ምስክሩ ላይ ችግሮች አሉ።"</string>
+ <string name="ssl_warnings_header" msgid="79744901983636370">"ለእዚህ ድረ ገፅ የደህንነት ምስክሩ ላይ ችግሮች አሉ።"</string>
<string name="ssl_continue" msgid="8031515015829358457">"ቀጥል"</string>
<string name="security_warning" msgid="6607795404322797541">"የደህንነት ቅንብሮች"</string>
<string name="view_certificate" msgid="1472768887529093862">"ምስክሮች ዕይ"</string>
@@ -342,7 +342,7 @@
<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="7941769772784366199">"ይህ ጣቢያ በአሁኑ ጊዜ የአንተን ስፍራ መድረስ አይችልም"</string>
- <string name="geolocation_settings_page_dialog_message" msgid="8772923416296868537">"ለዚህ ድር ጣቢያ የስፍራ ድረስ አጽዳ"</string>
+ <string name="geolocation_settings_page_dialog_message" msgid="8772923416296868537">"ለእዚህ ድር ጣቢያ የስፍራ ድረስ አጽዳ"</string>
<string name="geolocation_settings_page_dialog_ok_button" msgid="2113465477131017852">"እሺ"</string>
<string name="geolocation_settings_page_dialog_cancel_button" msgid="7941036504673409747">"ይቅር"</string>
<string name="website_settings_clear_all" msgid="8739804325997655980">"ሁሉንም አጥራ"</string>
@@ -355,7 +355,7 @@
<string name="other_bookmarks" msgid="8021889794475657319">"ሌሎች እልባቶች"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"y1"</string>
<string name="account_chooser_dialog_title" msgid="3314204833188808194">"መለያ ምረጥ"</string>
- <string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"ከGoogle መለያ ጋር አሳምር"</string>
+ <string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"ከGoogle መለያ ጋር አስምር"</string>
<string name="import_bookmarks_dialog_description" msgid="2362897194870789609">"ዕልባቶች በዚህ መሣሪያ ላይ ከ Google መለያጋር ገና አልተጎዳኙም። እነዚህን ዕልባቶች ወደ መለያ በማከል አስቀምጥ።ለማመሳሰል ካልፈለግክ እነዚህን ዕልባቶች ሰርዝ።"</string>
<string name="import_bookmarks_dialog_select_add_account" msgid="7643058662272484895">"በዚህ መሣሪያ ላይ ዕልባቶችን አክል እና በGoogle መለያ ማሳመር ጀምር።"</string>
<string name="import_bookmarks_dialog_delete_select_account" msgid="4333848003180415516">"በዚህ መሣሪያ ላይ ዕልባቶችን አክል እና በGoogle መለያ ማሳመር ጀምር።"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 379b97a..78f80fc 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -110,7 +110,7 @@
<string name="contextmenu_openlink" msgid="7237961252214188935">"Abrir"</string>
<string name="contextmenu_openlink_newwindow" msgid="1205313604181761403">"Abrir en pestaña nueva"</string>
<string name="contextmenu_openlink_newwindow_background" msgid="4690381019116746687">"Abrir vínculo en nueva pestaña en segundo plano"</string>
- <string name="contextmenu_savelink" msgid="5508554930832538184">"Guardar enlace"</string>
+ <string name="contextmenu_savelink" msgid="5508554930832538184">"Guardar vínculo"</string>
<string name="contextmenu_sharelink" msgid="5392275392280130331">"Compartir vínculo"</string>
<string name="contextmenu_copy" msgid="398860586635404030">"Copiar"</string>
<string name="contextmenu_copylink" msgid="5153657160294534270">"Copiar URL de vínculo"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 48421b4..b7b6ee6 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -355,7 +355,7 @@
<string name="other_bookmarks" msgid="8021889794475657319">"نشانک‌های دیگر"</string>
<string name="rlz_access_point" msgid="7165847807377650632">"Y1"</string>
<string name="account_chooser_dialog_title" msgid="3314204833188808194">"انتخاب حساب"</string>
- <string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"همگام سازی با حساب Google"</string>
+ <string name="import_bookmarks_dialog_title" msgid="3325557652271172128">"همگام‌سازی با حساب Google"</string>
<string name="import_bookmarks_dialog_description" msgid="2362897194870789609">"نشانک‌های موجود در این دستگاه هنوز با یک حساب Google مرتبط نشده‌‌اند. این نشانک‌ها را با افزودن آن‌ها به یک حساب ذخیره کنید. اگر نمی‌خواهید این نشانک‌ها را همگام‌سازی کنید، آن‌ها را حذف نمایید."</string>
<string name="import_bookmarks_dialog_select_add_account" msgid="7643058662272484895">"اکنون نشانک‌های موجود در این دستگاه را اضافه کرده و شروع به همگام‌سازی با حساب Google کنید"</string>
<string name="import_bookmarks_dialog_delete_select_account" msgid="4333848003180415516">"نشانک‌های کنونی موجود در این دستگاه را حذف کرده و شروع به همگام‌سازی آن‌ها با حساب Google کنید"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 36e45a1..cc0fe51 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -93,9 +93,8 @@
<string name="delete_bookmark_warning" msgid="7825328496411904321">"\"<xliff:g id="BOOKMARK">%s</xliff:g>\" बुकमार्क हटाएं?"</string>
<string name="open_all_in_new_window" msgid="455786763426575293">"सभी को नए टैब में खोलें"</string>
<string name="goto_dot" msgid="3895839050522602723">"जाएं"</string>
- <string name="select_dot" msgid="6299170761900561967">"पाठ का चयन करें"</string>
- <!-- no translation found for close_other_tabs (7693157495148282778) -->
- <skip />
+ <string name="select_dot" msgid="6299170761900561967">"पाठ को चुनें"</string>
+ <string name="close_other_tabs" msgid="7693157495148282778">"अन्य टैब बंद करें"</string>
<string name="bookmarks" msgid="1961279134885867815">"बुकमार्क"</string>
<string name="shortcut_bookmark" msgid="3974876480401135895">"बुकमार्क"</string>
<string name="shortcut_bookmark_title" msgid="7570786275916681296">"कोई बुकमार्क चुनें"</string>
@@ -115,8 +114,8 @@
<string name="contextmenu_sharelink" msgid="5392275392280130331">"लिंक शेयर करें"</string>
<string name="contextmenu_copy" msgid="398860586635404030">"प्रतिलिपि बनाएं"</string>
<string name="contextmenu_copylink" msgid="5153657160294534270">"लिंक URL की प्रतिलिपि बनाएं"</string>
- <string name="contextmenu_download_image" msgid="4243829645180686912">"छवि सहेजें"</string>
- <string name="contextmenu_view_image" msgid="3870625602053600905">"छवि देखें"</string>
+ <string name="contextmenu_download_image" msgid="4243829645180686912">"चित्र सहेजें"</string>
+ <string name="contextmenu_view_image" msgid="3870625602053600905">"चित्र देखें"</string>
<string name="contextmenu_set_wallpaper" msgid="3691902960115350686">"वॉलपेपर के रूप में सेट करें"</string>
<string name="contextmenu_dial_dot" msgid="5856550683415933806">"डायल करें…"</string>
<string name="contextmenu_add_contact" msgid="3183511922223645716">"संपर्क जोड़ें"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 30919ee..2566c29 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -271,8 +271,8 @@
<string name="pref_lab_title" msgid="5571091610359629423">"Labs"</string>
<string name="pref_lab_quick_controls" msgid="3267606522082281367">"Kontrol cepat"</string>
<string name="pref_lab_quick_controls_summary" msgid="3149664132600968775">"Geser jempol dari ujung kiri atau kanan untuk membuka kontrol cepat dan menyembunyikan aplikasi dan bilah URL"</string>
- <string name="pref_use_instant_search" msgid="1119176077760723740">"Google Sekejap"</string>
- <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Gunakan Google Sekejap di Google Penelusuran agar hasilnya tampil selagi mengetik (ini dapat menambah pemakaian data)."</string>
+ <string name="pref_use_instant_search" msgid="1119176077760723740">"Google Instan"</string>
+ <string name="pref_use_instant_search_summary" msgid="839320474961917522">"Gunakan Google Instan di Google Penelusuran agar hasilnya tampil selagi mengetik (ini dapat menambah pemakaian data)."</string>
<string name="pref_lab_fullscreen" msgid="8173609016657987973">"Layar penuh"</string>
<string name="pref_lab_fullscreen_summary" msgid="7694738112219376740">"Gunakan mode layar lebar untuk menyembunyikan bilah status"</string>
<string name="pref_data_title" msgid="7255058703417796578">"Pengelolaan bandwidth"</string>
@@ -370,7 +370,7 @@
<string name="import_bookmarks_dialog_import" msgid="6933613853573899218">"Tambahkan bookmark Android ke bookmark untuk <xliff:g id="GOOGLE_ACCOUNT">%s</xliff:g>"</string>
<string name="menu_share_url" msgid="5851814357333739700">"Bagikan"</string>
<string name="max_tabs_warning" msgid="4122034303809457570">"Tidak ada lagi tab yang tersedia"</string>
- <string name="instant_search_label" msgid="8769284297650716935">"Google dengan Sekejap (Labs)"</string>
+ <string name="instant_search_label" msgid="8769284297650716935">"Google dengan Instan (Labs)"</string>
<string name="preview" msgid="6450823514561689038">"Pratinjau"</string>
<string name="local_bookmarks" msgid="533816851415228520">"Lokal"</string>
<string name="ua_switcher_desktop" msgid="220097077327558435">"Minta situs desktop"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 3dd019a..e259e04 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -102,9 +102,9 @@
<string name="menu_view_download" msgid="2124570321712995120">"Transferências"</string>
<string name="copy_page_url" msgid="1188679152608889555">"Copiar URL da página"</string>
<string name="share_page" msgid="593756995297268343">"Partilhar página"</string>
- <string name="menu_save_snapshot" msgid="6935080344031126139">"Guardar para leitura off-line"</string>
+ <string name="menu_save_snapshot" msgid="6935080344031126139">"Guardar para leitura offline"</string>
<string name="saving_snapshot" msgid="1693789062351182809">"A guardar..."</string>
- <string name="snapshot_failed" msgid="4584580873565876033">"Não foi possível guardar para leitura off-line."</string>
+ <string name="snapshot_failed" msgid="4584580873565876033">"Não foi possível guardar para leitura offline."</string>
<string name="contextheader_folder_bookmarkcount" msgid="353987136645619089">"<xliff:g id="BOOKMARK_COUNT">%d</xliff:g> marcadores"</string>
<string name="contextheader_folder_empty" msgid="974171637803391651">"Pasta vazia"</string>
<string name="contextmenu_openlink" msgid="7237961252214188935">"Abrir"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index f6aa0eb..aa4e99f 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -373,7 +373,7 @@
<string name="instant_search_label" msgid="8769284297650716935">"使用 Google 互動智慧搜尋 (研究室)"</string>
<string name="preview" msgid="6450823514561689038">"預覽"</string>
<string name="local_bookmarks" msgid="533816851415228520">"本機"</string>
- <string name="ua_switcher_desktop" msgid="220097077327558435">"要求桌面版網站"</string>
+ <string name="ua_switcher_desktop" msgid="220097077327558435">"要求電腦版網站"</string>
<string name="permission_preload_label" msgid="4856971662337877316">"預先載入結果"</string>
<string name="empty_snapshots_folder" msgid="7675378008107026013">"沒有已儲存的網頁。"</string>
<string name="remove_snapshot" msgid="1624447424544976849">"刪除儲存的頁面"</string>