summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
Diffstat (limited to 'res/values')
-rw-r--r--res/values/all_search_engines.xml8
-rw-r--r--res/values/bookmarks_icons.xml26
-rw-r--r--res/values/donottranslate-search_engines.xml2
-rw-r--r--res/values/strings.xml32
4 files changed, 54 insertions, 14 deletions
diff --git a/res/values/all_search_engines.xml b/res/values/all_search_engines.xml
index a87c880c4..4dcac6897 100644
--- a/res/values/all_search_engines.xml
+++ b/res/values/all_search_engines.xml
@@ -36,6 +36,14 @@ http://www.opensearch.org/Specifications/OpenSearch/1.1/Draft_4#OpenSearch_1.1_p
-->
<resources>
+ <string-array name="disabled" translatable="false">
+ <item>Disabled</item>
+ <item></item>
+ <item></item>
+ <item></item>
+ <item>UTF-8</item>
+ <item></item>
+ </string-array>
<string-array name="yahoo_uk" translatable="false">
<item>Yahoo! UK &amp; Ireland</item>
<item>uk.yahoo.com</item>
diff --git a/res/values/bookmarks_icons.xml b/res/values/bookmarks_icons.xml
index 50d7eaf60..fe2385fef 100644
--- a/res/values/bookmarks_icons.xml
+++ b/res/values/bookmarks_icons.xml
@@ -1,11 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<array name="bookmark_preloads">
- <item>@raw/favicon_google</item>
- <item>@raw/thumb_google</item>
- <item>@raw/favicon_cyanogenmod</item>
- <item>@raw/thumb_cyanogenmod</item>
- <item>@raw/favicon_cmwiki</item>
- <item>@raw/thumb_cmwiki</item>
+ <item>@raw/favicon_fsf</item>
+ <item>@raw/thumb_fsf</item>
+ <item>@raw/favicon_fsfe</item>
+ <item>@raw/thumb_fsfe</item>
+ <item>@raw/favicon_eff</item>
+ <item>@raw/thumb_eff</item>
+ <item>@raw/favicon_wikipedia</item>
+ <item>@raw/thumb_wikipedia</item>
+ <item>@raw/favicon_gnu</item>
+ <item>@raw/thumb_gnu</item>
+ <item>@raw/favicon_replicant</item>
+ <item>@raw/thumb_replicant</item>
+ <item>@raw/favicon_replicant</item>
+ <item>@raw/thumb_replicant_blog</item>
+ <item>@raw/favicon_replicant</item>
+ <item>@raw/thumb_replicant_wiki</item>
+ <item>@raw/favicon_replicant</item>
+ <item>@raw/thumb_replicant_tracker</item>
+ <item>@raw/favicon_replicant</item>
+ <item>@raw/thumb_replicant_forums</item>
</array>
</resources>
diff --git a/res/values/donottranslate-search_engines.xml b/res/values/donottranslate-search_engines.xml
index 54ff23754..f55d99ada 100644
--- a/res/values/donottranslate-search_engines.xml
+++ b/res/values/donottranslate-search_engines.xml
@@ -22,9 +22,9 @@ Each value in the string-array is the name of a value in all_search_engines.xml
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="search_engines">
+ <item>disabled</item>
<item>google</item>
<item>yahoo</item>
<item>bing</item>
- <item>duckduckgo</item>
</string-array>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d79c7f783..29f2be286 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -487,6 +487,10 @@
<!-- Settings summmary -->
<string name="pref_security_show_security_warning_summary">Show warning if there\'s a problem with a site\'s security</string>
<!-- Settings label -->
+ <string name="pref_security_show_search_suggestions">Show search suggestions</string>
+ <!-- Settings summmary -->
+ <string name="pref_security_show_search_suggestions_summary">Show search suggestions when typing in the URL field</string>
+ <!-- Settings label -->
<string name="pref_security_accept_cookies">Accept cookies</string>
<!-- Settings summary -->
<string name="pref_security_accept_cookies_summary">Allow sites to save and read cookie data</string>
@@ -795,16 +799,30 @@
<!-- The default homepage. -->
<string name="homepage_base" translatable="false">
- https://www.google.com/webhp?client={CID}&amp;source=android-home</string>
+ about:blank</string>
<!-- Bookmarks -->
<string-array name="bookmarks" translatable="false">
- <item>Google</item>
- <item>http://www.google.com</item>
- <item>CyanogenMod</item>
- <item>http://www.cyanogenmod.org</item>
- <item>CyanogenMod Wiki</item>
- <item>http://wiki.cyanogenmod.org/w/Main_Page</item>
+ <item>FSF</item>
+ <item>https://www.fsf.org/</item>
+ <item>FSFE</item>
+ <item>https://www.fsfe.org/</item>
+ <item>EFF</item>
+ <item>https://www.eff.org/</item>
+ <item>Wikipedia</item>
+ <item>https://www.wikipedia.org/</item>
+ <item>GNU</item>
+ <item>https://www.gnu.org/</item>
+ <item>Replicant</item>
+ <item>https://www.replicant.us/</item>
+ <item>Replicant blog</item>
+ <item>https://blog.replicant.us/</item>
+ <item>Replicant wiki</item>
+ <item>https://redmine.replicant.us/projects/replicant/wiki</item>
+ <item>Replicant tracker</item>
+ <item>https://redmine.replicant.us/projects/replicant/issues</item>
+ <item>Replicant forums</item>
+ <item>https://redmine.replicant.us/projects/replicant/boards</item>
</string-array>
<!-- The description of the suggestion that lets the user search the web for the query currently