res/values/strings.xml - Issue 9643003: Improve manual proxy configuration

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: res/values/strings.xml

Issue 9643003: Improve manual proxy configuration (Closed)

Patch Set: Add guide for Android <= 2.3 devices Created March 12, 2013, 3:45 p.m.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View side-by-side diff with in-line comments

Download patch

« res/raw/proxysettings_old.txt ('K') | « res/raw/proxysettings_old.txt ('k') | src/org/adblockplus/android/ConfigurationActivity.java » ('j') | src/org/adblockplus/android/ProxyConfigurationActivity.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: res/values/strings.xml

===================================================================

--- a/res/values/strings.xml

+++ b/res/values/strings.xml

@@ -4,7 +4,7 @@

<string name="app_name">Adblock Plus</string>

<string name="crash_name">Crash occurred</string>

<string name="configuration_name">Configuration information</string>

- <string name="proxysettings_name">Proxy settings</string>

+ <string name="proxysettings_name">Proxy configuration</string>

<string name="notif_wifi">Ads are blocked on WiFi connection</string>

<string name="notif_wifi_nofiltering">Passing-through on WiFi connection</string>

@@ -18,7 +18,7 @@

<string name="msg_crash_submission_failure">Failed to submit crash report, will try again later.</string>

<string name="msg_subscription_offer">We have selected a suitable subscription for you: \'%s\'. You can change it at any time in application settings.</string>

<string name="msg_notraffic">It seems that no traffic is passing through application.</string>

- <string name="msg_configuration">Please make sure that proxy server <b>localhost</b> and proxy port <b>%d</b> are configured in your phone network settings.</string>

+ <string name="msg_configuration">Adblock Plus can not change the proxy settings on your device, please configure it manually.</string>

<string name="msg_badport">Bad port value</string>

<string name="msg_clipboard">Text has been copied to clipboard</string>

<string name="msg_update_available">New update available</string>

@@ -43,7 +43,8 @@

<string name="build">build#</string>

- <string name="opensettings">Open settings</string>

+ <string name="configure">Configure</string>

+ <string name="opensettings">Open wireless settings</string>

<string name="synchronize_in_progress">downloading…</string>

<string name="synchronize_invalid_url">invalid url</string>