Side by Side Diff: res/values/strings.xml
Issue 9437197:
ABP/Android Proxy switch (Closed)
Patch Set:
Created Feb. 28, 2013, 1:20 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« project.properties ('k')
|
res/values/styles.xml » ('j')
|
src/org/adblockplus/android/AdblockPlus.java » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 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 occured</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 settings</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_all">Ads are blocked on all connections</string> | 11 <string name="notif_all">Ads are blocked on all connections</string> |
| 11 <string name="notif_waiting">Waiting for traffic</string> | 12 <string name="notif_waiting">Waiting for traffic</string> |
| 12 <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> |
| 13 | 14 |
| 14 <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> |
| 15 <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> |
| 16 | 17 |
| 17 <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> |
| 18 <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 > |
| 19 <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> |
| (...skipping 25 matching lines...) Expand all Loading... | |
| 45 <string name="opensettings">Open settings</string> | 46 <string name="opensettings">Open settings</string> |
| 46 | 47 |
| 47 <string name="synchronize_in_progress">downloading…</string> | 48 <string name="synchronize_in_progress">downloading…</string> |
| 48 <string name="synchronize_invalid_url">invalid url</string> | 49 <string name="synchronize_invalid_url">invalid url</string> |
| 49 <string name="synchronize_connection_error">connection error</string> | 50 <string name="synchronize_connection_error">connection error</string> |
| 50 <string name="synchronize_invalid_data">invalid data</string> | 51 <string name="synchronize_invalid_data">invalid data</string> |
| 51 <string name="synchronize_checksum_mismatch">checksum mismatch</string> | 52 <string name="synchronize_checksum_mismatch">checksum mismatch</string> |
| 52 <string name="synchronize_last_at">last update</string> | 53 <string name="synchronize_last_at">last update</string> |
| 53 <string name="synchronize_never">not loaded</string> | 54 <string name="synchronize_never">not loaded</string> |
| 54 | 55 |
| 55 <string name="pref_enabled_title">Enable filtering</string> | 56 <string name="pref_enabled_title">Filtering</string> |
| 56 <string name="pref_enabled_summary_on">Adblock filtering is enabled</string> | 57 <string name="pref_enabled_summary_on">Adblock filtering is enabled</string> |
| 57 <string name="pref_enabled_summary_off">Adblock filtering is disabled</string> | 58 <string name="pref_enabled_summary_off">Adblock filtering is disabled</string> |
| 59 <string name="pref_proxyenabled_title">Proxy</string> | |
| 60 <string name="pref_proxyenabled_summary_on">Adblock proxy is enabled</string> | |
| 61 <string name="pref_proxyenabled_summary_off">Adblock proxy is disabled</string > | |
| 58 <string name="pref_startatboot_title">Start at boot</string> | 62 <string name="pref_startatboot_title">Start at boot</string> |
| 59 <string name="pref_startatboot_summary_on">Adblock Plus will start in backgrou nd automatically if it is enabled</string> | 63 <string name="pref_startatboot_summary_on">Adblock Plus will start in backgrou nd automatically if it is enabled</string> |
| 60 <string name="pref_startatboot_summary_off">Adblock Plus needs to be started m anually after boot</string> | 64 <string name="pref_startatboot_summary_off">Adblock Plus needs to be started m anually after boot</string> |
| 61 <string name="pref_subscription_title">Filter subscription</string> | 65 <string name="pref_subscription_title">Filter subscription</string> |
| 62 <string name="pref_refresh_title">Subscription refresh</string> | 66 <string name="pref_refresh_title">Subscription refresh</string> |
| 63 <string name="pref_wifirefresh_title">Refresh over WiFi only</string> | 67 <string name="pref_wifirefresh_title">Refresh over WiFi only</string> |
| 64 <string name="pref_wifirefresh_summary_on">Automatic refreshes will be perform ed only over WiFi connections</string> | 68 <string name="pref_wifirefresh_summary_on">Automatic refreshes will be perform ed only over WiFi connections</string> |
| 65 <string name="pref_wifirefresh_summary_off">Automatic refreshes will be perfor med over any connection</string> | 69 <string name="pref_wifirefresh_summary_off">Automatic refreshes will be perfor med over any connection</string> |
| 66 <string name="pref_hideicon_title">Hide icon</string> | 70 <string name="pref_hideicon_title">Hide icon</string> |
| 67 <string name="pref_hideicon_summary_on">Transparent notification icon is used to reduce annoyance</string> | 71 <string name="pref_hideicon_summary_on">Transparent notification icon is used to reduce annoyance</string> |
| 68 <string name="pref_hideicon_summary_off">Normal notification icon is used</str ing> | 72 <string name="pref_hideicon_summary_off">Normal notification icon is used</str ing> |
| 69 <string name="pref_advanced_title">Advanced settings</string> | 73 <string name="pref_advanced_title">Advanced settings</string> |
| 70 <string name="pref_proxy_title">Proxy</string> | 74 <string name="pref_proxy_title">Proxy</string> |
| 71 <string name="pref_proxyhost_title">Host</string> | 75 <string name="pref_proxyhost_title">Host</string> |
| 72 <string name="pref_proxyport_title">Port</string> | 76 <string name="pref_proxyport_title">Port</string> |
| 73 <string name="pref_proxyuser_title">User</string> | 77 <string name="pref_proxyuser_title">User</string> |
| 74 <string name="pref_proxypass_title">Password</string> | 78 <string name="pref_proxypass_title">Password</string> |
| 75 <string name="pref_support_title">Support</string> | 79 <string name="pref_support_title">Support</string> |
| 76 <string name="pref_crashreport_title">Crash report</string> | 80 <string name="pref_crashreport_title">Crash report</string> |
| 77 <string name="pref_crashreport_summary_on">Application will generate report if crashed and will ask to send it on next start</string> | 81 <string name="pref_crashreport_summary_on">Application will generate report if crashed and will ask to send it on next start</string> |
| 78 <string name="pref_crashreport_summary_off">Report will not be generated on ap plication crash</string> | 82 <string name="pref_crashreport_summary_off">Report will not be generated on ap plication crash</string> |
| 79 <string name="pref_checkupdate_title">Check for update</string> | 83 <string name="pref_checkupdate_title">Check for update</string> |
| 80 <string name="pref_configuration_title">Show configuration</string> | 84 <string name="pref_configuration_title">Show configuration</string> |
| 81 <string name="menu_advanced">Advanced settings</string> | 85 <string name="menu_advanced">Advanced settings</string> |
| 82 | 86 |
| 83 </resources> | 87 </resources> |
| OLD | NEW |
« no previous file with comments
|
« project.properties ('k')
|
res/values/styles.xml » ('j')
|
src/org/adblockplus/android/AdblockPlus.java » ('J')
