Merge remote-tracking branch 'upstream/cm-11.0'
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index 410e107..7e5cff6 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -17,10 +17,19 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="contextmenu_openlink_incognito_newwindow">Åbn i ny inkognito-tab</string>
- <string name="contextmenu_openlink_incognito_newwindow_background">Åbn i ny inkognito-tab i baggrunden</string>
+ <string name="contextmenu_openlink_incognito_newwindow_background">Åbn i ny inkognito-fane i baggrunden</string>
<string name="pref_content_ua">Brugeragent</string>
<string name="pref_content_ua_summary">Vælg en brugeragent</string>
<string name="pref_lab_websockets">WebSockets</string>
<string name="pref_lab_websockets_summary">Slå WebSockets til</string>
<string name="accessibility_button_homescreen">Startskærm</string>
+ <string name="pref_security_site_whitelist_cookies">Reducér tracking. Slet jævnligt cookies</string>
+ <string name="pref_security_site_whitelist_cookies_never">Slet aldrig</string>
+ <string name="pref_security_site_whitelist_cookies_only">Slet fra alle websteder, der ikke er på min positivliste</string>
+ <string name="pref_security_site_whitelist_cookies_and_data">Slet også alle lokale databaser</string>
+ <string name="pref_security_site_whitelist_cookies_verbose">Cookie tæller</string>
+ <string name="pref_security_site_whitelist_cookies_verbose_summary">Vis antallet af slettede og resterende cookies</string>
+ <string name="site_cookies_whitelisted">Behold websteders cookies</string>
+ <string name="cookies_deleted_info">cookies slettet</string>
+ <string name="cookies_remain_info">cookies resterer</string>
</resources>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index 8b0c328..39dc312 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -25,6 +25,8 @@
<string name="accessibility_button_homescreen">Startbildschirm</string>
<string name="pref_security_site_whitelist_cookies">Tracking durch regelmäßiges Löschen der Cookies reduzieren</string>
<string name="pref_security_site_whitelist_cookies_never">Nie löschen</string>
+ <string name="pref_security_site_whitelist_cookies_only">Von allen Seiten löschen, die nicht auf der Whitelist sind</string>
+ <string name="pref_security_site_whitelist_cookies_and_data">Auch alle lokalen Datenbanken löschen</string>
<string name="pref_security_site_whitelist_cookies_verbose">Cookie-Zähler</string>
<string name="pref_security_site_whitelist_cookies_verbose_summary">Die Anzahl der gelöschten und verbleibenden Cookies anzeigen</string>
<string name="site_cookies_whitelisted">Cookies dieser Seite beibehalten</string>
diff --git a/res/values-es-rXA/cm_strings.xml b/res/values-es-rXA/cm_strings.xml
index 2042d22..0768530 100644
--- a/res/values-es-rXA/cm_strings.xml
+++ b/res/values-es-rXA/cm_strings.xml
@@ -23,4 +23,13 @@
<string name="pref_lab_websockets">WebSockets</string>
<string name="pref_lab_websockets_summary">Habilitar WebSockets</string>
<string name="accessibility_button_homescreen">Pantalla d\'aniciu</string>
+ <string name="pref_security_site_whitelist_cookies">Amenorgar el siguimientu. Desaniciar cookies regularmente</string>
+ <string name="pref_security_site_whitelist_cookies_never">Enxamás desaniciar</string>
+ <string name="pref_security_site_whitelist_cookies_only">Desaniciar de tolos sitios que nun tean na llista blanca</string>
+ <string name="pref_security_site_whitelist_cookies_and_data">Desaniciar tamién de toles bases de datos llocales</string>
+ <string name="pref_security_site_whitelist_cookies_verbose">Cuntador de cookies</string>
+ <string name="pref_security_site_whitelist_cookies_verbose_summary">Amosar el númberu de cookies guardaes y desaniciaes</string>
+ <string name="site_cookies_whitelisted">Caltener les cookies del sitiu</string>
+ <string name="cookies_deleted_info">cookies desaniciaes</string>
+ <string name="cookies_remain_info">cookies calteníes</string>
</resources>
diff --git a/res/values-ku/strings.xml b/res/values-ku/strings.xml
new file mode 100644
index 0000000..396bf98
--- /dev/null
+++ b/res/values-ku/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
+<!-- Copyright (C) 2007 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="open_bookmark">کردنهوه</string>
+ <string name="contextmenu_openlink">کردنهوه</string>
+ <string name="choosertitle_sharevia">بهشداریپێکردن له ڕێگهی</string>
+ <string name="clear">پاکردنەوە</string>
+ <string name="autofill_profile_editor_save_profile">پاشەکەوتکردن</string>
+ <string name="pref_privacy_location_title">ناوچه</string>
+</resources>
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index 42bfafc..f7e40b2 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -16,6 +16,8 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name">Browser</string>
+ <string name="choose_upload">Fichier fir eropzelueden auswielen</string>
+ <string name="new_tab">Neien Tab</string>
<string name="tab_bookmarks">Lieszeechen</string>
<string name="tab_most_visited">Meeschtbesicht</string>
<string name="tab_history">Historique</string>
@@ -23,17 +25,21 @@
<string name="username">Numm</string>
<string name="password">Passwuert</string>
<string name="action">Aloggen</string>
+ <string name="bookmarks_add_page">Lieszeeche späicheren</string>
<string name="bookmarks_search">Browser</string>
<string name="cancel">Ofbriechen</string>
+ <string name="ok">OK</string>
<string name="title_bar_loading">Gëtt gelueden\u2026</string>
<string name="page_info">Säiteninfo</string>
<string name="page_info_view">Säiteninfo ukucken</string>
<string name="page_info_address">Adress:</string>
+ <string name="ssl_continue">Weider</string>
<string name="security_warning">Sécherheetswarnung</string>
<string name="view_certificate">Zertifikat ukucken</string>
<string name="ssl_go_back">Zréck</string>
<string name="stop">Stopp</string>
<string name="back">Zréck</string>
+ <string name="forward">Weider</string>
<string name="do_not_save">Ofbriechen</string>
<string name="location">Adress</string>
<string name="account">Kont</string>
@@ -42,10 +48,17 @@
<string name="delete_folder">Dossier läschen</string>
<string name="no_subfolders">Keng Ënnerdossieren.</string>
<string name="add_to_bookmarks_menu_option">Lieszeechen</string>
+ <string name="add_to_other_folder_menu_option">Aneren Dossier</string>
+ <string name="http">http://</string>
<string name="remove">Ewechhuelen</string>
<string name="open_bookmark">Opmaachen</string>
+ <string name="remove_from_bookmarks">Aus de Lieszeechen eraushuelen</string>
+ <string name="bookmark_thumbnail_view">Miniaturen</string>
+ <string name="bookmark_list_view">Lëscht</string>
+ <string name="close_other_tabs">All déi aner Tabs zoumaachen</string>
<string name="bookmarks">Favoritten</string>
<string name="history">Historique</string>
+ <string name="share_page">Säit deelen</string>
<string name="contextmenu_openlink">Opmaachen</string>
<string name="contextmenu_sharelink">Link deelen</string>
<string name="contextmenu_add_contact">Kontakt dobäisetzen</string>
@@ -55,14 +68,42 @@
<string name="clear">Eidel maachen</string>
<string name="browser_bookmarks_page_bookmarks_text">Lieszeechen</string>
<string name="menu_preferences">Astellungen</string>
+ <string-array name="pref_homepage_choices">
+ <item>Current page</item>
+ <item>Blank page</item>
+ <item>Default page</item>
+ <item>Most visited sites</item>
+ <item>Aner</item>
+ </string-array>
+ <string name="pref_general_sync_title">Sync</string>
+ <string name="autologin_bar_login_text">Aloggen</string>
<string name="autofill_profile_editor_save_profile">Späicheren</string>
+ <string name="pref_privacy_location_title">Lokaliséierung</string>
+ <string-array name="pref_data_preload_choices">
+ <item>Ni</item>
+ <item>Only on Wi-Fi</item>
+ <item>Always</item>
+ </string-array>
+ <string-array name="pref_link_prefetch_choices">
+ <item>Ni</item>
+ <item>Only on Wi-Fi</item>
+ <item>Always</item>
+ </string-array>
<string name="search_button_text">Lass</string>
+ <string name="allow">Erlaben</string>
<string name="webstorage_clear_data_dialog_ok_button">OK</string>
+ <string name="webstorage_clear_data_dialog_cancel_button">Ofbriechen</string>
+ <string name="geolocation_permissions_prompt_dont_share">Refuséieren</string>
<string name="geolocation_settings_page_dialog_ok_button">OK</string>
+ <string name="geolocation_settings_page_dialog_cancel_button">Ofbriechen</string>
<string name="website_settings_clear_all_dialog_ok_button">OK</string>
+ <string name="website_settings_clear_all_dialog_cancel_button">Ofbriechen</string>
<string name="defaultBookmarksUpButton">Lieszeechen</string>
<string name="import_bookmarks_wizard_next">Weider</string>
+ <string name="import_bookmarks_wizard_cancel">Ofbriechen</string>
+ <string name="import_bookmarks_wizard_done">Fäerdeg</string>
<string name="accessibility_button_back">Zréck</string>
+ <string name="accessibility_button_search">Sichen</string>
<string name="accessibility_button_bookmarks">Lieszeechen</string>
<string name="accessibility_button_go">Lass</string>
</resources>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index c6b4d03..4685003 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -23,4 +23,13 @@
<string name="pref_lab_websockets">WebSockets</string>
<string name="pref_lab_websockets_summary">Aktiver WebSockets</string>
<string name="accessibility_button_homescreen">Hjemmeskjerm</string>
+ <string name="pref_security_site_whitelist_cookies">Redusere sporing. Slett informasjonskapsler ofte</string>
+ <string name="pref_security_site_whitelist_cookies_never">Aldri slette</string>
+ <string name="pref_security_site_whitelist_cookies_only">Slette fra alle områder som ikke er i min hviteliste</string>
+ <string name="pref_security_site_whitelist_cookies_and_data">Også slette alle lokale databaser</string>
+ <string name="pref_security_site_whitelist_cookies_verbose">Cookie teller</string>
+ <string name="pref_security_site_whitelist_cookies_verbose_summary">Vis antall slettede og gjenstående cookies</string>
+ <string name="site_cookies_whitelisted">Beholde nettstedets cookies</string>
+ <string name="cookies_deleted_info">informasjonskapslene slettet</string>
+ <string name="cookies_remain_info">informasjonskapsler forblir</string>
</resources>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index 6d8bc47..537c996 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -25,7 +25,7 @@
<string name="accessibility_button_homescreen">Startscherm</string>
<string name="pref_security_site_whitelist_cookies">Volgen verminderen. Vaak cookies verwijderen</string>
<string name="pref_security_site_whitelist_cookies_never">Nooit verwijderen</string>
- <string name="pref_security_site_whitelist_cookies_only">Verwijderen van alle sites die niet in mijn whitelist staan</string>
+ <string name="pref_security_site_whitelist_cookies_only">Verwijderen van alle sites die niet in de whitelist staan</string>
<string name="pref_security_site_whitelist_cookies_and_data">Ook alle \"localstorage\"-databases verwijderen</string>
<string name="pref_security_site_whitelist_cookies_verbose">Aantal cookies</string>
<string name="pref_security_site_whitelist_cookies_verbose_summary">Het aantal verwijderde en overgebleven cookies weergeven</string>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
new file mode 100644
index 0000000..6a01a9e
--- /dev/null
+++ b/res/values-ro/cm_strings.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
+<!--
+ Copyright (C) 2012-2014 The CyanogenMod 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="contextmenu_openlink_incognito_newwindow">Deschide incognito într-o nouă filă</string>
+ <string name="contextmenu_openlink_incognito_newwindow_background">Deschide incognito într-o nouă filă de fundal</string>
+ <string name="pref_content_ua">Agent utilizator</string>
+ <string name="pref_content_ua_summary">Alege un agent utilizator</string>
+ <string name="pref_lab_websockets">WebSockets</string>
+ <string name="pref_lab_websockets_summary">Permite WebSockets</string>
+ <string name="accessibility_button_homescreen">Ecranul principal</string>
+ <string name="pref_security_site_whitelist_cookies">Reducere supraveghere. Șterge cookies în mod frecvent</string>
+ <string name="pref_security_site_whitelist_cookies_never">Nu șterge niciodată</string>
+ <string name="pref_security_site_whitelist_cookies_only">Șterge de pe toate site-urile care nu sunt în lista albă</string>
+ <string name="pref_security_site_whitelist_cookies_and_data">Șterge și bazele de date stocate local</string>
+ <string name="pref_security_site_whitelist_cookies_verbose">Numărul de cookies</string>
+ <string name="pref_security_site_whitelist_cookies_verbose_summary">Arată numărul de cookie-uri șterse și rămase</string>
+ <string name="site_cookies_whitelisted">Păstrează cookie-urile site-ului</string>
+ <string name="cookies_deleted_info">cookie-uri șterse</string>
+ <string name="cookies_remain_info">cookie-uri rămase</string>
+</resources>
diff --git a/res/values-si/cm_strings.xml b/res/values-si/cm_strings.xml
index 564e30f..7af51ea 100644
--- a/res/values-si/cm_strings.xml
+++ b/res/values-si/cm_strings.xml
@@ -23,4 +23,13 @@
<string name="pref_lab_websockets">වෙබ්කෙවෙනි</string>
<string name="pref_lab_websockets_summary">වෙබ්කෙවෙනි සබල කරන්න</string>
<string name="accessibility_button_homescreen">මුල් තිරය</string>
+ <string name="pref_security_site_whitelist_cookies">ඉලියීම පහත හෙළන්න. නිතර කුකි මකා දමන්න</string>
+ <string name="pref_security_site_whitelist_cookies_never">කවදාවත් මකන්න එපා</string>
+ <string name="pref_security_site_whitelist_cookies_only">මගේ සුදු ලැයිස්තුව තුල නොමැති සියලුම අඩවීන්ගෙන් මකාදමන්න</string>
+ <string name="pref_security_site_whitelist_cookies_and_data">ස්ථානික ආචයිත දත්ත ගබඩා සියල්ලත් මකා දමන්න</string>
+ <string name="pref_security_site_whitelist_cookies_verbose">කුකි ගණන</string>
+ <string name="pref_security_site_whitelist_cookies_verbose_summary">මකා දැමුණු සහ ඉතිරි කුකි ගණන පෙන්වන්න</string>
+ <string name="site_cookies_whitelisted">අඩවියේ කුකි තබාගන්න</string>
+ <string name="cookies_deleted_info">කුකි මකා දැමුණි</string>
+ <string name="cookies_remain_info">ඉතිරි කුකි</string>
</resources>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index e800830..b491dc5 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -23,5 +23,13 @@
<string name="pref_lab_websockets">WebSockets</string>
<string name="pref_lab_websockets_summary">启用 WebSockets</string>
<string name="accessibility_button_homescreen">主屏幕</string>
+ <string name="pref_security_site_whitelist_cookies">减少跟踪。频繁地删除 cookies</string>
<string name="pref_security_site_whitelist_cookies_never">从不删除</string>
+ <string name="pref_security_site_whitelist_cookies_only">删除所有不在我的白名单的网站</string>
+ <string name="pref_security_site_whitelist_cookies_and_data">同时删除所有本地存储数据库</string>
+ <string name="pref_security_site_whitelist_cookies_verbose">Cookie 计数</string>
+ <string name="pref_security_site_whitelist_cookies_verbose_summary">显示已删除和剩余的 cookie 数量</string>
+ <string name="site_cookies_whitelisted">保持网站的 cookies</string>
+ <string name="cookies_deleted_info">cookies 已删除</string>
+ <string name="cookies_remain_info">剩余 cookies</string>
</resources>
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
index 9345f63..52cf8ec 100644
--- a/res/values-zh-rHK/cm_strings.xml
+++ b/res/values-zh-rHK/cm_strings.xml
@@ -23,4 +23,10 @@
<string name="pref_lab_websockets">WebSockets</string>
<string name="pref_lab_websockets_summary">啟用 WebSockets</string>
<string name="accessibility_button_homescreen">主螢幕</string>
+ <string name="pref_security_site_whitelist_cookies">減少跟蹤。頻繁刪除 cookies</string>
+ <string name="pref_security_site_whitelist_cookies_never">從不刪除</string>
+ <string name="pref_security_site_whitelist_cookies_only">刪除白名單外所有網站</string>
+ <string name="pref_security_site_whitelist_cookies_and_data">同時刪除所有本機存放的數據庫</string>
+ <string name="pref_security_site_whitelist_cookies_verbose_summary">顯示已刪除和剩餘的 cookie 的數量</string>
+ <string name="site_cookies_whitelisted">保持網站的 cookie</string>
</resources>