Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: res/values/strings.xml

Issue 9643003: Improve manual proxy configuration (Closed)
Patch Set: Created March 6, 2013, 2:13 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <resources> 2 <resources>
3 3
4 <string name="app_name">Adblock Plus</string> 4 <string name="app_name">Adblock Plus</string>
5 <string name="crash_name">Crash occurred</string> 5 <string name="crash_name">Crash occurred</string>
6 <string name="configuration_name">Configuration information</string> 6 <string name="configuration_name">Configuration information</string>
7 <string name="proxysettings_name">Proxy settings</string> 7 <string name="proxysettings_name">Proxy configuration</string>
8 8
9 <string name="notif_wifi">Ads are blocked on WiFi connection</string> 9 <string name="notif_wifi">Ads are blocked on WiFi connection</string>
10 <string name="notif_wifi_nofiltering">Passing-through on WiFi connection</stri ng> 10 <string name="notif_wifi_nofiltering">Passing-through on WiFi connection</stri ng>
11 <string name="notif_all">Ads are blocked on all connections</string> 11 <string name="notif_all">Ads are blocked on all connections</string>
12 <string name="notif_waiting">Waiting for traffic</string> 12 <string name="notif_waiting">Waiting for traffic</string>
13 <string name="notif_notraffic">You probably need to adjust configuration</stri ng> 13 <string name="notif_notraffic">You probably need to adjust configuration</stri ng>
14 14
15 <string name="crash_dialog_text">It seems that the application encountered a p roblem and was forcefully stopped on previous launch. You can help us fix this i f you send us error report by clicking \'OK\'.</string> 15 <string name="crash_dialog_text">It seems that the application encountered a p roblem and was forcefully stopped on previous launch. You can help us fix this i f you send us error report by clicking \'OK\'.</string>
16 <string name="crash_dialog_comment_prompt">You might add your comments about t he problem below:</string> 16 <string name="crash_dialog_comment_prompt">You might add your comments about t he problem below:</string>
17 17
18 <string name="msg_crash_submission_failure">Failed to submit crash report, wil l try again later.</string> 18 <string name="msg_crash_submission_failure">Failed to submit crash report, wil l try again later.</string>
19 <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 > 19 <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 >
20 <string name="msg_notraffic">It seems that no traffic is passing through appli cation.</string> 20 <string name="msg_notraffic">It seems that no traffic is passing through appli cation.</string>
21 <string name="msg_configuration">Please make sure that proxy server &lt;b&gt;l ocalhost&lt;/b&gt; and proxy port &lt;b&gt;%d&lt;/b&gt; are configured in your p hone network settings.</string> 21 <string name="msg_configuration">Adblock Plus can not change the proxy setting s on your device, please configure it manually.</string>
Andrey Novikov 2013/03/07 10:26:34 This message is also shown on not-rooted 2.x devic
Felix Dahlke 2013/03/07 10:31:59 I think we should show a different popup then, wit
22 <string name="msg_badport">Bad port value</string> 22 <string name="msg_badport">Bad port value</string>
23 <string name="msg_clipboard">Text has been copied to clipboard</string> 23 <string name="msg_clipboard">Text has been copied to clipboard</string>
24 <string name="msg_update_available">New update available</string> 24 <string name="msg_update_available">New update available</string>
25 <string name="msg_update_missing">You are running the latest version</string> 25 <string name="msg_update_missing">You are running the latest version</string>
26 <string name="msg_update_description">New update is available for download. Pr oceed?</string> 26 <string name="msg_update_description">New update is available for download. Pr oceed?</string>
27 <string name="msg_update_downloading">Downloading update: %d%%</string> 27 <string name="msg_update_downloading">Downloading update: %d%%</string>
28 <string name="msg_update_ready">Ready to install update</string> 28 <string name="msg_update_ready">Ready to install update</string>
29 <string name="msg_update_fail">Failed to check for updates, please try again l ater</string> 29 <string name="msg_update_fail">Failed to check for updates, please try again l ater</string>
30 <string name="msg_hideicon_warning">&lt;b&gt;Please note&lt;/b&gt;: The best w e can do is make the icon invisible. If we remove the icon, Android could stop A dblock Plus any time, which will result in loss of connectivity.</string> 30 <string name="msg_hideicon_warning">&lt;b&gt;Please note&lt;/b&gt;: The best w e can do is make the icon invisible. If we remove the icon, Android could stop A dblock Plus any time, which will result in loss of connectivity.</string>
31 <string name="msg_hideicon_native">You can &lt;b&gt;completely disable&lt;/b&g t; notification icon through Android settings. For this uncheck &lt;i&gt;Show no tifications&lt;/i&gt; check box in &lt;i&gt;Application info&lt;/i&gt;. Press &l t;i&gt;Show me&lt;/i&gt; to open it now.</string> 31 <string name="msg_hideicon_native">You can &lt;b&gt;completely disable&lt;/b&g t; notification icon through Android settings. For this uncheck &lt;i&gt;Show no tifications&lt;/i&gt; check box in &lt;i&gt;Application info&lt;/i&gt;. Press &l t;i&gt;Show me&lt;/i&gt; to open it now.</string>
32 32
33 <string name="configuring_url">https://adblockplus.org/en/android-config</stri ng> 33 <string name="configuring_url">https://adblockplus.org/en/android-config</stri ng>
34 <string name="configuring_proxy_url">https://adblockplus.org/en/android-config #proxy</string> 34 <string name="configuring_proxy_url">https://adblockplus.org/en/android-config #proxy</string>
35 35
36 <string name="ok">OK</string> 36 <string name="ok">OK</string>
37 <string name="cancel">Cancel</string> 37 <string name="cancel">Cancel</string>
38 <string name="error">Error</string> 38 <string name="error">Error</string>
39 <string name="warning">Warning</string> 39 <string name="warning">Warning</string>
40 <string name="about">About</string> 40 <string name="about">About</string>
41 <string name="help">Help</string> 41 <string name="help">Help</string>
42 <string name="version">Version</string> 42 <string name="version">Version</string>
43 <string name="build">build#</string> 43 <string name="build">build#</string>
44 <string name="gotit">Got it</string> 44 <string name="gotit">Got it</string>
45 <string name="showme">Show me</string> 45 <string name="showme">Show me</string>
46 <string name="opensettings">Open settings</string> 46 <string name="configure">Configure</string>
47 <string name="opensettings">Open wireless settings</string>
47 48
48 <string name="synchronize_in_progress">downloading&#8230;</string> 49 <string name="synchronize_in_progress">downloading&#8230;</string>
49 <string name="synchronize_invalid_url">invalid url</string> 50 <string name="synchronize_invalid_url">invalid url</string>
50 <string name="synchronize_connection_error">connection error</string> 51 <string name="synchronize_connection_error">connection error</string>
51 <string name="synchronize_invalid_data">invalid data</string> 52 <string name="synchronize_invalid_data">invalid data</string>
52 <string name="synchronize_checksum_mismatch">checksum mismatch</string> 53 <string name="synchronize_checksum_mismatch">checksum mismatch</string>
53 <string name="synchronize_last_at">last update</string> 54 <string name="synchronize_last_at">last update</string>
54 <string name="synchronize_never">not loaded</string> 55 <string name="synchronize_never">not loaded</string>
55 56
56 <string name="pref_enabled_title">Filtering</string> 57 <string name="pref_enabled_title">Filtering</string>
(...skipping 21 matching lines...) Expand all
78 <string name="pref_proxypass_title">Password</string> 79 <string name="pref_proxypass_title">Password</string>
79 <string name="pref_support_title">Support</string> 80 <string name="pref_support_title">Support</string>
80 <string name="pref_crashreport_title">Crash report</string> 81 <string name="pref_crashreport_title">Crash report</string>
81 <string name="pref_crashreport_summary_on">Application will generate report if crashed and will ask to send it on next start</string> 82 <string name="pref_crashreport_summary_on">Application will generate report if crashed and will ask to send it on next start</string>
82 <string name="pref_crashreport_summary_off">Report will not be generated on ap plication crash</string> 83 <string name="pref_crashreport_summary_off">Report will not be generated on ap plication crash</string>
83 <string name="pref_checkupdate_title">Check for update</string> 84 <string name="pref_checkupdate_title">Check for update</string>
84 <string name="pref_configuration_title">Show configuration</string> 85 <string name="pref_configuration_title">Show configuration</string>
85 <string name="menu_advanced">Advanced settings</string> 86 <string name="menu_advanced">Advanced settings</string>
86 87
87 </resources> 88 </resources>
OLDNEW

Powered by Google App Engine
This is Rietveld