commit 28877b12e2118a25b8e13c714b1cff01f592de84 Author: Nathan Freitas nathan@freitas.net Date: Thu Aug 7 12:43:00 2014 -0400

new strings for app conflict checker function --- res/raw/obfsclient.mp3 | Bin 0 -> 809784 bytes res/raw/polipo.mp3 | Bin 0 -> 123237 bytes res/raw/tor.mp3 | Bin 0 -> 1694866 bytes res/raw/xtables.mp3 | Bin 0 -> 152674 bytes res/values/strings.xml | 2 ++ 5 files changed, 2 insertions(+)

diff --git a/res/raw/obfsclient.mp3 b/res/raw/obfsclient.mp3 new file mode 100644 index 0000000..4573599 Binary files /dev/null and b/res/raw/obfsclient.mp3 differ diff --git a/res/raw/polipo.mp3 b/res/raw/polipo.mp3 new file mode 100644 index 0000000..95cb16d Binary files /dev/null and b/res/raw/polipo.mp3 differ diff --git a/res/raw/tor.mp3 b/res/raw/tor.mp3 new file mode 100644 index 0000000..cf441cb Binary files /dev/null and b/res/raw/tor.mp3 differ diff --git a/res/raw/xtables.mp3 b/res/raw/xtables.mp3 new file mode 100644 index 0000000..ebef599 Binary files /dev/null and b/res/raw/xtables.mp3 differ diff --git a/res/values/strings.xml b/res/values/strings.xml index 6ee02f8..91264a8 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -278,6 +278,8 @@ <string name="wizard_tips_martus">Mobile Martus - Benetech Human Rights Documentation App</string> <string name="martus_url">https://play.google.com/store/apps/details?id=org.martus.android</string> <string name="your_tor_public_ips_">Your Tor Public IPs:</string> + <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">"Please disable this app in Android->Settings->Apps if you are having problems with Orbot: "</string> + <string name="app_conflict">App Conflict</string>

</resources>