vanitasvitae/dandelion
1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2025-12-17 01:31:10 +01:00
Code Issues Releases Wiki Activity

Merged master

Browse source
This commit is contained in:
vanitasvitae 2016-10-10 15:07:30 +02:00
commit c09618f191
Signed by: vanitasvitae
GPG key ID: DCCFB3302C9E4615
62 changed files with 1943 additions and 1101 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/res/values/dimens.xml
View file

@ -7,6 +7,7 @@
<dimen name="activity_vertical_margin">16dp</dimen>
<dimen name="fab_margin">16dp</dimen>
<dimen name="appbar_padding_top">8dp</dimen>
<dimen name="bottom_toolbar_height">45dp</dimen>
<!-- Per the design guidelines, navigation drawers should be between 240dp and 320dp:
https://developer.android.com/design/patterns/navigation-drawer.html -->

4
app/src/main/res/values/strings-preferences.xml
View file

@ -85,7 +85,7 @@
<string name="pref_title__http_proxy_load_tor_preset">Load Tor Preset</string>
<string name="pref_desc__http_proxy_load_tor_preset">Load proxy settings for Tor (Orbot) HTTP Proxy</string>
<string name="pref_title__sub_proxy">Proxy</string>
<string name="pref_desc__sub_proxy">@string/pref_desc__http_proxy_enabled</string>
<string name="pref_desc__sub_proxy" translatable="false">@string/pref_desc__http_proxy_enabled</string>
<string name="pref_title__proxy_enabled">Enable Proxy</string>
<string name="pref_desc__http_proxy_enabled">Proxy Diaspora\'s traffic to circumvent firewalls.\nMay require restart</string>
<string name="pref_title__http_proxy_host">Host</string>
@ -96,7 +96,7 @@
<!-- Chrome custom tabs -->
<string name="pref_title__chrome_custom_tabs_enabled">Chrome Custom Tabs</string>
<string name="pref_desc__chrome_custom_tabs_enabled">Open external links with Chrome Custom Tabs. Chromium or Google Chrome needs to be installed for this feature</string>
<string name="pref_desc__chrome_custom_tabs_enabled">Open external links with Chrome Custom Tabs. Chromium or Google Chrome needs to be installed for this feature. \nIMPORTANT NOTE: Chrome Custom Tabs do not use configured proxy servers!</string>
<!-- Diaspora Settings -->
<string name="pref_title__personal_settings">Personal settings</string>