June 2015 - tor-commits - lists.torproject.org

[orbot/master] adding patch for iptables building on x86
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 77d1b824119272a1ba9f0d2aff0890f84c34deac Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed May 13 12:17:54 2015 -0400 adding patch for iptables building on x86 --- external/Makefile | 3 +++ external/iptables-patch-4 | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/external/Makefile b/external/Makefile index b32fb91..39752e3 100644 --- a/external/Makefile +++ b/external/Makefile @@ -186,12 +186,15 @@ iptables/Makefile: cp iptables-patch-1 iptables cp iptables-patch-2 iptables cp iptables-patch-3 iptables + cp iptables-patch-4 iptables -cd iptables && \ patch -N -p1 --reject-file=- < iptables-patch-1 -cd iptables && \ patch -N -p1 --reject-file=- < iptables-patch-2 -cd iptables && \ patch -N -p1 --reject-file=- < iptables-patch-3 + -cd iptables && \ + patch -N -p0 --reject-file=- < iptables-patch-4 cd iptables && ./autogen.sh cp config.sub iptables cp config.guess iptables diff --git a/external/iptables-patch-4 b/external/iptables-patch-4 new file mode 100644 index 0000000..59b7671 --- /dev/null +++ b/external/iptables-patch-4 @@ -0,0 +1,10 @@ +--- extensions/libipt_ULOG.c 2015-05-13 11:59:59.752055326 -0400 ++++ extensions/libipt_ULOG.new.c 2015-05-13 12:09:29.410078607 -0400 +@@ -12,6 +12,7 @@ + #include <stdio.h> + #include <string.h> + #include <xtables.h> ++#define ffs(i) __builtin_ffs(i) + /* For 64bit kernel / 32bit userspace */ + #include <linux/netfilter_ipv4/ipt_ULOG.h> +

1 0

[orbot/master] update ant setup script to get all settings from their original sources
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 3c26f67392dab983e1d53acdb6864da228d914a2 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Wed Jun 3 16:00:09 2015 -0400 update ant setup script to get all settings from their original sources * target comes from project.properties * --- .gitignore | 4 ++++ BUILD | 2 +- setup-ant | 28 ++++++++++++++++++++++++++++ update-ant-build.sh | 7 ------- 4 files changed, 33 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 64134ea..028e6d1 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,7 @@ builds /patches/* obj releases + +# ant build products +build.xml +proguard-project.txt diff --git a/BUILD b/BUILD index bd53587..625252e 100644 --- a/BUILD +++ b/BUILD @@ -54,7 +54,7 @@ into < 1M chunks because some Android devices don't like resources larger than Now build the Android app - ./update-ant-build + ./setup-ant ant release This will produce an unsigned Tor package in ./bin/Orbot-unsigned.apk! diff --git a/setup-ant b/setup-ant new file mode 100755 index 0000000..fab844e --- /dev/null +++ b/setup-ant @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e +set -x + +if ! which android > /dev/null; then + if [ -z $ANDROID_HOME ]; then + if [ -e ~/.android/bashrc ]; then + . ~/.android/bashrc + else + echo "'android' not found, ANDROID_HOME must be set!" + exit + fi + else + export PATH="${ANDROID_HOME}/tools:$PATH" + fi +fi + +# fetch target from project.properties +eval `grep '^target=' project.properties` + +projectname=`sed -n 's,.*name="app_name">$.*$<.*,\1,p' res/values/strings.xml` + +android update project --path . --name $projectname --target $target --subprojects + +for lib in `sed -n 's,^android\.library\.reference\.[0-9][0-9]*=$.*$,\1,p' project.properties`; do + android update lib-project --path $lib --target $target +done diff --git a/update-ant-build.sh b/update-ant-build.sh deleted file mode 100755 index 2fa1bca..0000000 --- a/update-ant-build.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -# make sure your Android SDK tools path is set in SDK_BASE -android update project -t android-21 --path . --name Orbot --subprojects -android update lib-project -t android-21 --path external/appcompat -android update lib-project -t android-21 --path external/superuser-commands/RootCommands-Library/ -android update lib-project -t android-21 --path external/jsocks/jsockslib

1 0

[orbot/master] ./jenkins-build script for standard Guardian Project Jenkins build
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 663cade62d47ddc594727c66260af3fae240ab63 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Wed Jun 3 16:04:05 2015 -0400 ./jenkins-build script for standard Guardian Project Jenkins build --- jenkins-build | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/jenkins-build b/jenkins-build new file mode 100755 index 0000000..c56d5b0 --- /dev/null +++ b/jenkins-build @@ -0,0 +1,34 @@ +#!/bin/bash + +set -e +set -x + +if [ -z $ANDROID_HOME ]; then + if [ -e ~/.android/bashrc ]; then + . ~/.android/bashrc + else + echo "ANDROID_HOME must be set!" + exit + fi +fi + +if [ -z $ANDROID_NDK_HOME ]; then + if which ndk-build 2>&1 /dev/null; then + ANDROID_NDK_HOME=`which ndk-build | sed 's,/ndk-build,,'` + else + echo "ANDROID_NDK_HOME not set and 'ndk-build' not in PATH" + exit + fi +fi + +# reset version code/name to current date +versionCodeDate=`date +%s` +versionNameDate=`date +%Y-%m-%d_%H.%M.%S` + +sed -i \ + -e "s,android:versionCode=\"[0-9][0-9]*\",android:versionCode=\"$versionCodeDate\"," \ + -e "s,android:versionName=\"$[^\"][^\"]*$\",android:versionName=\"\1.$versionNameDate\"," \ + AndroidManifest.xml + +make -C external +./setup-ant

1 0

[orbot/master] switch to standard NDK env var: ANDROID_NDK_HOME
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit cf43fa247d3bc81a1927c7385fcaae9cd0fda84f Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Wed Jun 3 16:13:18 2015 -0400 switch to standard NDK env var: ANDROID_NDK_HOME ANDROID_NDK_HOME is hardcoded in gradle as the name of the env var: https://android.googlesource.com/platform/tools/build/+/master/gradle/src/m… --- BUILD | 2 +- external/Makefile | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/BUILD b/BUILD index 625252e..196dc63 100644 --- a/BUILD +++ b/BUILD @@ -27,7 +27,7 @@ Be sure that you have all of the git submodules up-to-date: To begin building, from the Orbot root directory, you first need to build all external C/native dependencies: - export NDK_BASE={PATH TO YOUR NDK INSTALL} + export ANDROID_NDK_HOME={PATH TO YOUR NDK INSTALL} make -C external At this point, you'll have Tor and Polipo binaries that can be run on an diff --git a/external/Makefile b/external/Makefile index 39752e3..c4b91b2 100644 --- a/external/Makefile +++ b/external/Makefile @@ -22,7 +22,7 @@ else endif # Android NDK setup -NDK_BASE ?= /opt/android-ndk +ANDROID_NDK_HOME ?= /opt/android-ndk NDK_PLATFORM_LEVEL ?= 16 NDK_TOOLCHAIN_VERSION=4.8 APP_ABI ?= armeabi @@ -33,7 +33,7 @@ endif ifneq ($(filter arm64%, $(APP_ABI)),) NDK_ABI := arm64 endif -NDK_SYSROOT=$(NDK_BASE)/platforms/android-$(NDK_PLATFORM_LEVEL)/arch-$(NDK_ABI) +NDK_SYSROOT=$(ANDROID_NDK_HOME)/platforms/android-$(NDK_PLATFORM_LEVEL)/arch-$(NDK_ABI) NDK_UNAME := $(shell uname -s | tr '[A-Z]' '[a-z]') ifneq ($(filter mips%, $(NDK_ABI)),) HOST := $(NDK_ABI)el-linux-android @@ -55,11 +55,11 @@ NDK_TOOLCHAIN := $(HOST)-$(NDK_TOOLCHAIN_VERSION) ifneq ($(filter x86%, $(NDK_ABI)),) NDK_TOOLCHAIN := $(NDK_ABI)-$(NDK_TOOLCHAIN_VERSION) endif -NDK_TOOLCHAIN_BASE=$(NDK_BASE)/toolchains/$(NDK_TOOLCHAIN)/prebuilt/$(NDK_UNAME)-$(NDK_PROCESSOR) +NDK_TOOLCHAIN_BASE=$(ANDROID_NDK_HOME)/toolchains/$(NDK_TOOLCHAIN)/prebuilt/$(NDK_UNAME)-$(NDK_PROCESSOR) # include Android's build flags TARGET_ARCH_ABI = $(APP_ABI) -include $(NDK_BASE)/toolchains/$(NDK_TOOLCHAIN)/setup.mk +include $(ANDROID_NDK_HOME)/toolchains/$(NDK_TOOLCHAIN)/setup.mk CC := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-gcc --sysroot=$(NDK_SYSROOT) CXX := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-g++ --sysroot=$(NDK_SYSROOT)

1 0

[orbot/master] put up error notification if Orbot cannot kill a process
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 2f1ad745386d599c4ad042bf0aed1fcf2a52b655 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Thu Jun 4 11:59:22 2015 -0400 put up error notification if Orbot cannot kill a process There are a couple of different times when Orbot will be unable to kill the running processes. One example is when Orbot is running, then uninstalled, then installed again. closes #5254 https://dev.guardianproject.info/issues/5254 --- res/values/strings.xml | 1 + src/org/torproject/android/service/TorService.java | 161 ++++++++++++-------- 2 files changed, 101 insertions(+), 61 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 87f205c..0f98f5e 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -222,6 +222,7 @@ <string name="hidden_service_on">hidden service on:</string> <string name="unable_to_read_hidden_service_name">unable to read hidden service name</string> <string name="unable_to_start_tor">Unable to start Tor:</string> + <string name="unable_to_reset_tor">Reboot your device, unable to reset Tor!</string> <string name="pref_use_sys_iptables_title">Use Default Iptables</string> <string name="pref_use_sys_iptables_summary">use the built-in iptables binary instead of the one bundled with Orbot</string> diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 50792b8..195fe98 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -429,34 +429,42 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon clearNotifications (); super.onDestroy(); } - + private void stopTor () { - + try - { + { Log.d(TAG,"Tor is stopping NOW"); - + shutdownTorProcess (); - + //stop the foreground priority and make sure to remove the persistant notification stopForeground(true); - + mCurrentStatus = STATUS_OFF; sendCallbackStatus(mCurrentStatus); - + if (mHasRoot && mEnableTransparentProxy) { Shell shellRoot = Shell.startRootShell(); disableTransparentProxy(shellRoot); shellRoot.close(); } - + clearNotifications(); - + sendCallbackLogMessage(getString(R.string.status_disabled)); } + catch (CannotKillException e) + { + Log.d(TAG, "An error occured stopping Tor", e); + logNotice("An error occured stopping Tor: " + e.getMessage()); + sendCallbackLogMessage(getString(R.string.unable_to_reset_tor)); + showToolbarNotification(getString(R.string.unable_to_reset_tor), + ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr); + } catch (Exception e) { Log.d(TAG, "An error occured stopping Tor",e); @@ -465,44 +473,44 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } } - - + + private String getHiddenServiceHostname () { SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); - + boolean enableHiddenServices = prefs.getBoolean("pref_hs_enable", false); - + StringBuffer result = new StringBuffer(); - + if (enableHiddenServices) { String hsPorts = prefs.getString("pref_hs_ports",""); - + StringTokenizer st = new StringTokenizer (hsPorts,","); String hsPortConfig = null; - + while (st.hasMoreTokens()) - { - + { + int hsPort = Integer.parseInt(st.nextToken().split(" ")[0]);; - + File fileDir = new File(appCacheHome, "hs" + hsPort); File file = new File(fileDir, "hostname"); - - + + if (file.exists()) { try { String onionHostname = Utils.readString(new FileInputStream(file)).trim(); - + if (result.length() > 0) result.append(","); - + result.append(onionHostname); - - + + } catch (FileNotFoundException e) { logException("unable to read onion hostname file",e); showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), HS_NOTIFY_ID, R.drawable.ic_stat_notifyerr); @@ -513,28 +521,28 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon { showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), HS_NOTIFY_ID, R.drawable.ic_stat_notifyerr); return null; - + } } - + if (result.length() > 0) { String onionHostname = result.toString(); - + showToolbarNotification(getString(R.string.hidden_service_on) + ' ' + onionHostname, HS_NOTIFY_ID, R.drawable.ic_stat_tor); Editor pEdit = prefs.edit(); pEdit.putString("pref_hs_hostname",onionHostname); pEdit.commit(); - + return onionHostname; } - + } - + return null; } - - + + private void shutdownTorProcess () throws Exception { @@ -542,47 +550,69 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon { logNotice("Using control port to shutdown Tor"); - - + + try { logNotice("sending HALT signal to Tor process"); conn.shutdownTor("HALT"); - + } catch (Exception e) { Log.d(TAG,"error shutting down Tor via connection",e); } - + conn = null; } - + killProcess(fileTor); - + killProcess(filePolipo); killProcess(fileObfsclient); killProcess(fileMeekclient); - - } - - private void killProcess (File fileProcBin) throws IOException - { + + public class CannotKillException extends IllegalStateException { + private static final long serialVersionUID = -286877277562592501L; + + public CannotKillException(File f) { + super("Cannot kill " + f.getAbsolutePath()); + } + } + + private void killProcess(File fileProcBin) throws IOException { int procId = -1; - Shell shell = Shell.startShell(); - - while ((procId = TorServiceUtils.findProcessId(fileProcBin.getCanonicalPath())) != -1) - { - + int killAttempts = 0; + + while ((procId = TorServiceUtils.findProcessId(fileProcBin.getCanonicalPath())) != -1) { + killAttempts++; logNotice("Found " + fileProcBin.getName() + " PID=" + procId + " - killing now..."); - - SimpleCommand killCommand = new SimpleCommand("toolbox kill -9 " + procId); - shell.add(killCommand); - killCommand = new SimpleCommand("kill -9 " + procId); - shell.add(killCommand); + String pidString = String.valueOf(procId); + /* + * first try as the normal app user to be safe, then if that fails, + * try root since the process might be left over from + * uninstall/reinstall with different UID. + */ + Shell shell; + if (mHasRoot && killAttempts > 2) { + shell = Shell.startRootShell(); + Log.i(TAG, "using a root shell"); + } else { + shell = Shell.startShell(); + } + shell.add(new SimpleCommand("busybox killall " + fileProcBin.getName())); + shell.add(new SimpleCommand("toolbox kill -9 " + pidString)); + shell.add(new SimpleCommand("busybox kill -9 " + pidString)); + shell.add(new SimpleCommand("kill -9 " + pidString)); + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + // ignored + } + shell.close(); + if (killAttempts > 4) + throw new CannotKillException(fileProcBin); } - - shell.close(); } - + private void logNotice (String msg) { if (msg != null && msg.trim().length() > 0) @@ -1405,21 +1435,30 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (mCurrentStatus == STATUS_OFF) { sendCallbackLogMessage (getString(R.string.status_starting_up)); - - + + try { boolean found = findExistingProc (); - + if (!found) { killProcess(fileTor); killProcess(filePolipo); - + startTor(); } } + catch (CannotKillException e) + { + logException(e.getMessage(), e); + mCurrentStatus = STATUS_OFF; + sendCallbackStatus(mCurrentStatus); + showToolbarNotification(getString(R.string.unable_to_reset_tor), + ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr); + stopTor(); + } catch (Exception e) {

1 0

[orbot/master] remove Firefox ProxyMob recommendation, ProxyMob is no longer supported
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 0e6ba61ac0369072b6ff83a5df124b931b7f73f6 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Wed Jun 3 16:35:43 2015 -0400 remove Firefox ProxyMob recommendation, ProxyMob is no longer supported --- res/layout/layout_wizard_tips.xml | 9 --------- res/values/strings.xml | 6 ------ .../torproject/android/ui/wizard/PromoAppsActivity.java | 13 ------------- 3 files changed, 28 deletions(-) diff --git a/res/layout/layout_wizard_tips.xml b/res/layout/layout_wizard_tips.xml index f42a603..43afc43 100644 --- a/res/layout/layout_wizard_tips.xml +++ b/res/layout/layout_wizard_tips.xml @@ -64,15 +64,6 @@ android:text="@string/wizard_tips_duckgo" /> <Button - android:id="@+id/WizardRootButtonInstallFirefox" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:layout_marginTop="10px" - android:drawableLeft="@drawable/icon_firefox" - android:text="@string/wizard_tips_firefox" /> - - <Button android:id="@+id/WizardRootButtonInstallTwitter" android:layout_width="fill_parent" android:layout_height="wrap_content" diff --git a/res/values/strings.xml b/res/values/strings.xml index 64ab5fc..4844d42 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -79,8 +79,6 @@ <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string> <string name="wizard_tips_duckgo">DuckDuckGo Search Engine app</string> <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> - <string name="wizard_tips_firefox">Proxy Mobile add-on for Firefox (https://guardianproject.info/apps/firefoxprivacy)</string> - <string name="proxymob_setup_url">https://guardianproject.info/apps/firefoxprivacy</string> <string name="wizard_tips_twitter">Set Twitter proxy to host \"localhost\" and port 8118</string> <string name="wizard_tips_story_maker">StoryMaker - Make a story and leave it to tor for security!</string> <string name="story_maker_url">https://play.google.com/store/apps/details?id=info.guardianproject.mrapp</string> @@ -116,10 +114,6 @@ <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> <string name="wizard_tips_play">Find all Guardian Project apps on Google Play</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> -   <string name="wizard_transproxy_title">Transparent Proxying</string> <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string> diff --git a/src/org/torproject/android/ui/wizard/PromoAppsActivity.java b/src/org/torproject/android/ui/wizard/PromoAppsActivity.java index 0a61d71..b049625 100644 --- a/src/org/torproject/android/ui/wizard/PromoAppsActivity.java +++ b/src/org/torproject/android/ui/wizard/PromoAppsActivity.java @@ -83,20 +83,7 @@ public class PromoAppsActivity extends Activity implements OrbotConstants { } }); - - btnLink = (Button)findViewById(R.id.WizardRootButtonInstallFirefox); - btnLink.setOnClickListener(new OnClickListener() { - - public void onClick(View view) { - - String url = getString(R.string.proxymob_setup_url); - finish(); - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url))); - - } - }); - btnLink = (Button)findViewById(R.id.WizardRootButtonInstallTwitter); btnLink.setOnClickListener(new OnClickListener() {

1 0

[orbot/master] ./fix-translations script to fix common problems in the strings.xml
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit d55c7b7eaf7856a6be1bb118559b2ae880892b31 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Wed Jun 3 18:00:28 2015 -0400 ./fix-translations script to fix common problems in the strings.xml --- fix-translations | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/fix-translations b/fix-translations new file mode 100755 index 0000000..7402fe0 --- /dev/null +++ b/fix-translations @@ -0,0 +1,10 @@ +#!/bin/bash -x + +# Fix TypographyEllipsis programmatically +sed -i 's/\.\.\./…/g' res/values*/*.xml + +# Replace "--" with an "em dash" character +sed -i 's,$\>[^\<]*$--$[^\>]$,\1—\2,g' res/values*/*.xml + +# make sure apostrophes in strings are escaped +sed -i "s,$>[^<]*[^\\]$',\1\\\\',gp" res/values*/*.xml

1 0

[orbot/master] Promo Apps: choose "all apps" URL based on which app store is installed
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit e58a15ebd77dc90fcdfc926eb21be0c8e5c11aad Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Wed Jun 3 17:36:41 2015 -0400 Promo Apps: choose "all apps" URL based on which app store is installed Since most people using devices without Google Play will be in China, where Google is generally blocked, instead direct people to f-droid.org unless they have Google Play installed. --- res/layout/layout_wizard_tips.xml | 2 +- res/values-ar/strings.xml | 6 +- res/values-az/strings.xml | 2 +- res/values-bg/strings.xml | 2 +- res/values-ca/strings.xml | 2 +- res/values-cs-rCZ/strings.xml | 2 +- res/values-da/strings.xml | 2 +- res/values-de/strings.xml | 2 +- res/values-el/strings.xml | 2 +- res/values-eo/strings.xml | 2 +- res/values-es/strings.xml | 2 +- res/values-et/strings.xml | 2 +- res/values-eu/strings.xml | 2 +- res/values-fa/strings.xml | 2 +- res/values-fi/strings.xml | 2 +- res/values-fr-rFR/strings.xml | 2 +- res/values-fr/strings.xml | 2 +- res/values-gl/strings.xml | 2 +- res/values-he/strings.xml | 2 +- res/values-hr/strings.xml | 2 +- res/values-hu/strings.xml | 2 +- res/values-id-rID/strings.xml | 2 +- res/values-is/strings.xml | 2 +- res/values-it/strings.xml | 2 +- res/values-ja/strings.xml | 2 +- res/values-ko/strings.xml | 2 +- res/values-lv/strings.xml | 2 +- res/values-mk/strings.xml | 2 +- res/values-ms-rMY/strings.xml | 2 +- res/values-nb/strings.xml | 2 +- res/values-nl/strings.xml | 2 +- res/values-pl/strings.xml | 2 +- res/values-pt-rBR/strings.xml | 2 +- res/values-pt/strings.xml | 2 +- res/values-ro/strings.xml | 2 +- res/values-ru/strings.xml | 2 +- res/values-si-rLK/strings.xml | 2 +- res/values-sr/strings.xml | 2 +- res/values-sv/strings.xml | 2 +- res/values-tl/strings.xml | 2 +- res/values-tr/strings.xml | 2 +- res/values-uk/strings.xml | 2 +- res/values-vi/strings.xml | 2 +- res/values-zh-rTW/strings.xml | 2 +- res/values-zh/strings.xml | 2 +- res/values/strings.xml | 3 +- .../android/ui/wizard/PromoAppsActivity.java | 90 +++++++++++++------- 47 files changed, 108 insertions(+), 79 deletions(-) diff --git a/res/layout/layout_wizard_tips.xml b/res/layout/layout_wizard_tips.xml index 43afc43..83ed2d4 100644 --- a/res/layout/layout_wizard_tips.xml +++ b/res/layout/layout_wizard_tips.xml @@ -97,7 +97,7 @@ android:layout_gravity="left" android:layout_marginTop="10px" android:drawableLeft="@drawable/ic_play" - android:text="@string/wizard_tips_play" /> + android:text="@string/wizard_tips_fdroid_org" /> </LinearLayout> diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 8ace8ba..28af9d6 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -96,10 +96,8 @@ <string name="wizard_tips_title"> برامج معدة للعمل مع اوربوت</string> <string name="wizard_tips_orweb">Orweb: متصفح مصمّم للخصوصية و يعمل مع تور</string> <string name="wizard_tips_play">يمكنك الحصول علي جميع تطبيقات مشروع الجاردين على جوجل بلاي</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject -</string> -   diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml index b7c5ae3..9035a84 100644 --- a/res/values-az/strings.xml +++ b/res/values-az/strings.xml @@ -100,7 +100,7 @@ <string name="wizard_tips_orweb">Orveb: Tor vasitəsilə işləyən təhlükəsizliyi gücləndirilmiş brauzer</string> <string name="wizard_tips_play">Google Play-də bütün Guardian Layihə aplikasiyaları tap</string> - <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string> +  <string name="wizard_transproxy_title">Transparent Proxying</string> <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string> diff --git a/src/org/torproject/android/ui/wizard/PromoAppsActivity.java b/src/org/torproject/android/ui/wizard/PromoAppsActivity.java index a368165..048528f 100644 --- a/src/org/torproject/android/ui/wizard/PromoAppsActivity.java +++ b/src/org/torproject/android/ui/wizard/PromoAppsActivity.java @@ -3,7 +3,9 @@ package org.torproject.android.ui.wizard; import android.app.Activity; import android.content.Intent; import android.content.pm.PackageManager; +import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.ResolveInfo; +import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Bundle; import android.text.TextUtils; @@ -35,22 +37,22 @@ public class PromoAppsActivity extends Activity implements OrbotConstants { super.onCreate(savedInstanceState); } - + @Override protected void onStart() { - + super.onStart(); setContentView(R.layout.layout_wizard_tips); - + stepFive(); - + } - + @Override protected void onResume() { super.onResume(); - - + + } void stepFive(){ @@ -135,45 +137,64 @@ public class PromoAppsActivity extends Activity implements OrbotConstants { } }); - btnLink = (Button)findViewById(R.id.WizardRootButtonGooglePlay); + PackageManager pm = getPackageManager(); + final Intent intent = new Intent(Intent.ACTION_VIEW); + // change text and icon based on which app store is installed (or not) + try { + if (isAppInstalled(pm, FDROID_PACKAGE_NAME)) { + Drawable icon = pm.getApplicationIcon(FDROID_PACKAGE_NAME); + btnLink.setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null); + btnLink.setText(R.string.wizard_tips_fdroid); + intent.setPackage(FDROID_PACKAGE_NAME); + intent.setData(Uri.parse(FDROID_URI)); + } else if (isAppInstalled(pm, PLAY_PACKAGE_NAME)) { + Drawable icon = pm.getApplicationIcon(PLAY_PACKAGE_NAME); + btnLink.setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null); + btnLink.setText(R.string.wizard_tips_play); + intent.setPackage(PLAY_PACKAGE_NAME); + intent.setData(Uri.parse(PLAY_URI)); + } + } catch (NameNotFoundException e) { + e.printStackTrace(); + btnLink.setText(R.string.wizard_tips_fdroid_org); + intent.setData(Uri.parse(FDROID_URI)); + } btnLink.setOnClickListener(new OnClickListener() { - - public void onClick(View view) { - - String url = getString(R.string.wizard_tips_play_url); - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url))); + @Override + public void onClick(View view) { + startActivity(intent); } - }); - - + }); + + // Button back = ((Button)findViewById(R.id.btnWizard1)); Button next = ((Button)findViewById(R.id.btnWizard2)); - + /* back.setOnClickListener(new View.OnClickListener() { - + public void onClick(View v) { finish(); startActivityForResult(new Intent(PromoAppsActivity.this, ChooseLocaleWizardActivity.class), 1); } });*/ - + next.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { //showWizardFinal(); - + finish(); } }); - + } - - - + + + //Code to override the back button! @Override public boolean onKeyDown(int keyCode, KeyEvent event) { @@ -185,6 +206,15 @@ public class PromoAppsActivity extends Activity implements OrbotConstants { return false; } + boolean isAppInstalled(PackageManager pm, String packageName) { + try { + pm.getPackageInfo(packageName, PackageManager.GET_ACTIVITIES); + return true; + } catch (PackageManager.NameNotFoundException e) { + return false; + } + } + Intent getInstallIntent(String packageName) { final Intent intent = new Intent(Intent.ACTION_VIEW); intent.setData(Uri.parse(MARKET_URI + packageName)); @@ -215,21 +245,21 @@ public class PromoAppsActivity extends Activity implements OrbotConstants { { String title = null; String msg = null; - - + + title = context.getString(R.string.wizard_final); msg = context.getString(R.string.wizard_final_msg); - + DialogInterface.OnClickListener ocListener = new DialogInterface.OnClickListener() { - + @Override public void onClick(DialogInterface dialog, int which) { context.startActivity(new Intent(context, Orbot.class)); } }; - - + + new AlertDialog.Builder(context) .setIcon(R.drawable.icon) .setTitle(title)

1 0

[orbot/master] Promo Apps: use Play or FDroid links, fallback to https://f-droid.org
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 545afe7f6db13836ee4d9e3f05151f2fe28d9b21 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Wed Jun 3 17:27:52 2015 -0400 Promo Apps: use Play or FDroid links, fallback to https://f-droid.org This automatically detects whether Google Play or FDroid is installed, if so, clicking the promo app button will take the user straight to the install page. If neither is installed, then the user is taken to the page for that app on https://f-droid.org --- res/values-ar/strings.xml | 4 +- res/values-az/strings.xml | 8 +- res/values-bg/strings.xml | 8 +- res/values-bn-rBD/strings.xml | 2 +- res/values-bs/strings.xml | 2 +- res/values-ca/strings.xml | 8 +- res/values-cs-rCZ/strings.xml | 8 +- res/values-cs/strings.xml | 4 +- res/values-cy/strings.xml | 2 +- res/values-da/strings.xml | 4 +- res/values-de-rAT/strings.xml | 2 +- res/values-de/strings.xml | 12 +- res/values-el/strings.xml | 8 +- res/values-en-rGB/strings.xml | 2 +- res/values-eo/strings.xml | 8 +- res/values-es-rAR/strings.xml | 2 +- res/values-es/strings.xml | 12 +- res/values-et/strings.xml | 8 +- res/values-eu/strings.xml | 8 +- res/values-fa/strings.xml | 12 +- res/values-fi/strings.xml | 8 +- res/values-fr-rFR/strings.xml | 12 +- res/values-fr/strings.xml | 8 +- res/values-gl/strings.xml | 8 +- res/values-gu-rIN/strings.xml | 2 +- res/values-gu/strings.xml | 2 +- res/values-he/strings.xml | 4 +- res/values-hi/strings.xml | 2 +- res/values-hr-rHR/strings.xml | 2 +- res/values-hr/strings.xml | 8 +- res/values-hu/strings.xml | 12 +- res/values-hy-rAM/strings.xml | 2 +- res/values-ia/strings.xml | 2 +- res/values-id-rID/strings.xml | 8 +- res/values-id/strings.xml | 2 +- res/values-is/strings.xml | 8 +- res/values-it/strings.xml | 8 +- res/values-ja/strings.xml | 8 +- res/values-ka/strings.xml | 2 +- res/values-kn-rIN/strings.xml | 2 +- res/values-kn/strings.xml | 2 +- res/values-ko/strings.xml | 8 +- res/values-ku/strings.xml | 2 +- res/values-ky/strings.xml | 2 +- res/values-lt/strings.xml | 2 +- res/values-lv/strings.xml | 8 +- res/values-mk/strings.xml | 8 +- res/values-ml/strings.xml | 2 +- res/values-mn-rMN/strings.xml | 2 +- res/values-ms-rMY/strings.xml | 4 +- res/values-ms/strings.xml | 6 +- res/values-my/strings.xml | 2 +- res/values-nb/strings.xml | 8 +- res/values-nl/strings.xml | 8 +- res/values-pa/strings.xml | 2 +- res/values-pl/strings.xml | 12 +- res/values-pt-rBR/strings.xml | 8 +- res/values-pt/strings.xml | 8 +- res/values-ro-rRO/strings.xml | 2 +- res/values-ro/strings.xml | 8 +- res/values-rs-rAR/strings.xml | 2 +- res/values-ru/strings.xml | 8 +- res/values-si-rLK/strings.xml | 4 +- res/values-si/strings.xml | 2 +- res/values-sk-rSK/strings.xml | 2 +- res/values-sk/strings.xml | 2 +- res/values-sl/strings.xml | 2 +- res/values-sn/strings.xml | 2 +- res/values-sq-rAL/strings.xml | 2 +- res/values-sq/strings.xml | 2 +- res/values-sr/strings.xml | 4 +- res/values-sv/strings.xml | 8 +- res/values-ta/strings.xml | 2 +- res/values-te-rIN/strings.xml | 2 +- res/values-th/strings.xml | 2 +- res/values-tl/strings.xml | 8 +- res/values-tr/strings.xml | 10 +- res/values-uk/strings.xml | 8 +- res/values-ur/strings.xml | 2 +- res/values-uz/strings.xml | 4 +- res/values-vi/strings.xml | 8 +- res/values-zh-rTW/strings.xml | 8 +- res/values-zh/strings.xml | 12 +- res/values/strings.xml | 5 - .../android/ui/wizard/PromoAppsActivity.java | 117 +++++++++++++------- 85 files changed, 300 insertions(+), 266 deletions(-) diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index c8ef74d..8ace8ba 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -73,7 +73,7 @@ <string name="wizard_tips_msg">التطبيقات التالية تم تطويرها حتي تعمل مع اوربوت. اضغط علي ما تريد تثبيتة علي جهازك الأن, أو يمكنك ان تجدهم لاحقاً علي جوجل بلاي, أو علي موقعنا GuardianProject.info أو من خلال F-Droid.org.</string> <string name="wizard_tips_proxy">إعدادات البروكسي - تعلم كيفية تكوين التطبيقات لتعمل مع اوربوت</string> <string name="wizard_tips_duckgo">تطبيق محرك البحث DuckDuckGo</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_twitter">اضبط البروكسي الخاص بتويتر إلي مستضيف \"localhost\" و المنفذ إلي 8118</string> <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">إعدادات البروكسي</string> @@ -100,7 +100,7 @@ </string>   <string name="wizard_transproxy_title">بروكسي ضمني</string> diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml index 9c19bed..b7c5ae3 100644 --- a/res/values-az/strings.xml +++ b/res/values-az/strings.xml @@ -74,7 +74,7 @@ <string name="wizard_tips_otrchat">ChatSecure - Android üçün təhlükəsiz mesajlaşma müştərisi</string> <string name="wizard_tips_proxy">Proksi Seçimləri - Aplikasiyaların Orbotla necə işləyəcəyini öyrən</string> <string name="wizard_tips_duckgo">DuckDuckGO Axtarış Qurğu aplikasiyası</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_twitter">\"Yerlihost\" və 8118 portuna sahiblik üçün Twitter proksini quraşdır</string> <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Proksi qurğuları</string> @@ -96,14 +96,14 @@  <string name="wizard_tips_title">Orbot-a Açıq Aplikasiyalar</string> <string name="wizard_tips_gibberbot">ChatSecure: Çat aplikasiyasını Qeydsiz Şifrləmə ilə təhlükəsizləşdir</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> + <string name="wizard_tips_orweb">Orveb: Tor vasitəsilə işləyən təhlükəsizliyi gücləndirilmiş brauzer</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + <string name="wizard_tips_play">Google Play-də bütün Guardian Layihə aplikasiyaları tap</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">Şəffaf Proksiləmə</string> diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index e5a79cb..0658540 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -77,7 +77,7 @@ <string name="wizard_tips_otrchat">ChatSecure - Криптиран чат програма за Андроид</string> <string name="wizard_tips_proxy">Proxy Settings - Научете как да конфигурирате приложения да работят през Орбот</string> <string name="wizard_tips_duckgo">DuckDuckGo Търсачка</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_twitter">Нагласете проксито на Twitter на \"localhost\" и порт 8118</string> <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Прокси настройки</string> @@ -99,14 +99,14 @@  <string name="wizard_tips_title">Приложения през Орбот</string> <string name="wizard_tips_gibberbot">ChatSecure: Криптирана чат програма с подръжка на Off-the-Record енкрипция.</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> + <string name="wizard_tips_orweb">Orweb: Браузър с повишена анонимност, който работи през Тор</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + <string name="wizard_tips_play">Намери всики Guardin Project програми в Google Play</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">Прозрачно прокси</string> diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml index d8d0467..cccea53 100644 --- a/res/values-bn-rBD/strings.xml +++ b/res/values-bn-rBD/strings.xml @@ -9,7 +9,7 @@    <string name="default_bridges"></string> diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml index a55a212..b2f8861 100644 --- a/res/values-bs/strings.xml +++ b/res/values-bs/strings.xml @@ -15,7 +15,7 @@     <string name="wizard_tips_title">Aplicacions dissenyades per a l\'Orbot</string> <string name="wizard_tips_gibberbot">ChatSecure: Aplicació de xat segur amb encriptació confidencial.</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> + <string name="wizard_tips_orweb">Orweb: Navegador amb privacitat millorada que funciona a través de Tor</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + <string name="wizard_tips_play">Trobareu totes les aplicacions de Guardian Project a Google Play Store</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">Servidor intermediari transparent</string> diff --git a/res/values-cs-rCZ/strings.xml b/res/values-cs-rCZ/strings.xml index d8e52f5..6189e31 100644 --- a/res/values-cs-rCZ/strings.xml +++ b/res/values-cs-rCZ/strings.xml @@ -74,7 +74,7 @@ <string name="wizard_tips_otrchat">ChatSecure - Bezpečný instant messaging klient pro Android</string> <string name="wizard_tips_proxy">Proxy Nastavení - Naučte se, jak nastavit aplikace, aby pracovaly s Orbotem</string> <string name="wizard_tips_duckgo">Aplikace DuckDuckGo pro vyhledávací engine</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_twitter">Nastavit Twitter proxy na host \"localhost\" a port 8118</string> <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Nastavení Proxy</string> @@ -96,14 +96,14 @@  <string name="wizard_tips_title">Orbot-povolené aplikace</string> <string name="wizard_tips_gibberbot">ChatSecure: Bezpečná chatovací aplikace s technologií Off-the-Record Encryption</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> + <string name="wizard_tips_orweb">Orweb: webový prohlížeč s rozšířeným soukromím pracující přes Tor</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + <string name="wizard_tips_play">Najděte všechny aplikace Guardian Projektu na Obchodu Play</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">Transparentní proxy</string> diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 2a1604d..700e7a2 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -64,10 +64,10 @@ <string name="wizard_warning_title">Varování</string>   - <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string> +   <string name="wizard_transproxy_title">Transparentní proxy</string> diff --git a/res/values-cy/strings.xml b/res/values-cy/strings.xml index 285b3a7..cf63874 100644 --- a/res/values-cy/strings.xml +++ b/res/values-cy/strings.xml @@ -62,7 +62,7 @@    <string name="wizard_transproxy_title">Dirprwyo\'n dryloyw</string> diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 7ec6481..5bc69ff 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -73,7 +73,7 @@ <string name="wizard_tips_msg">De nedenstående programmer er udviklet for at fungere med Orbot. Klik hver knap for at installere nu. Ellers kan de senere findes på Google play, på hjemmesiden GuardianProject.info eller via F-Droid.org.</string> <string name="wizard_tips_proxy">Proxy indstillinger - Lær hvordan du konfigurerer apps til at fungere med Orbot</string> <string name="wizard_tips_duckgo">DuckDuckGo søgemaskine-programmet</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_twitter">Indstil Twitter proxyen til værten \"localhost\" og port 8118</string> <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Proxy-indstillinger</string> @@ -99,7 +99,7 @@ <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">Transperant Proxying</string> diff --git a/res/values-de-rAT/strings.xml b/res/values-de-rAT/strings.xml index d8d0467..cccea53 100644 --- a/res/values-de-rAT/strings.xml +++ b/res/values-de-rAT/strings.xml @@ -9,7 +9,7 @@    <string name="default_bridges"></string> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 85259d7..c497bf0 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -74,11 +74,11 @@ <string name="wizard_tips_otrchat">ChatSecure - Ein sicheres Sofortnachrichtenprogramm für Android</string> <string name="wizard_tips_proxy">Vermittlungseinstellungen - Lernen, wie Sie Anwendungen so konfigurieren, dass sie mit Orbot zusammenarbeiten.</string> <string name="wizard_tips_duckgo">Duckduckgo-Suchmaschinen-App</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_firefox">Proxy Mobile Add-on für Firefox (https://guardianproject.info/apps/firefoxprivacy)</string> <string name="proxymob_setup_url">https://guardianproject.info/apps/firefoxprivacy</string> <string name="wizard_tips_twitter">Twitter-Proxy auf den Rechner »localhost« und Port 8118 einstellen</string> - <string name="story_maker_url">https://play.google.com/store/apps/details?id=info.guardianproject.mrapp</string> + <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Vermittlungseinstellungen</string> <string name="wizard_final">Orbot ist bereit!</string> @@ -100,14 +100,14 @@  <string name="wizard_tips_title">Orbot aktivierte Anwendungen</string> <string name="wizard_tips_gibberbot">ChatSecure: Sichere Unterhaltungsanwendung mit vertraulicher Verschlüsselung</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> + <string name="wizard_tips_orweb">Orweb: Ein im Datenschutz erweiterter Browser, der durch Tor arbeitet</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + <string name="wizard_tips_play">Alle Guardian Project-Anwendungen im Google Play Store finden</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">Transparente Vermittlung</string> @@ -249,7 +249,7 @@ <string name="pref_torrc_summary">NUR FÜR EXPERTEN: torrc-Konfigurationszeilen direkt eingeben</string> <string name="pref_torrc_dialog">Benutzerdefinierte Torrc</string> <string name="wizard_tips_martus">Mobile Martus - Benetech-Anwendung zur Menschenrechtsdokumentierung</string> - <string name="martus_url">https://play.google.com/store/apps/details?id=org.martus.android</string> + <string name="your_tor_public_ips_">Ihre öffentlichen IPs für Tor:</string> <string name="app_conflict">Anwendungskonflikt</string> <string name="pref_transproxy_refresh_title">Automatische Transproxy-Aktualisierung</string> diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index eb436d1..19dc032 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -74,7 +74,7 @@ <string name="wizard_tips_otrchat">ChatSecure - Εφαρμογή ασφαλούς ανταλλαγής άμεσων μηνυμάτων για Android</string> <string name="wizard_tips_proxy">Ρυθμίσεις proxy: Μάθετε πώς θα ρυθμίσετε τις εφαρμογές ώστε να λειτουργούν με το Orbot</string> <string name="wizard_tips_duckgo">Εφαρμογή Μηχανής Αναζήτησης Duckduckgo</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_twitter">Το Twitter υποστηρίζει http proxy localhost:8118</string> <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Ρυθμίσεις proxy</string> @@ -96,14 +96,14 @@  <string name="wizard_tips_title">Εφαρμογές συμβατές με Orbot</string> <string name="wizard_tips_gibberbot">ChatSecure: Ασφαλές chat app με Off-the-Record κρυπτογράφηση</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> + <string name="wizard_tips_orweb">Orweb - Περιηγητής ιστού με ενισχυμένη ασφάλεια που είναι συμβατό με Tor</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + <string name="wizard_tips_play">Βρες όλες τις εφαρμογές Guardian Project στο Google Play</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">Διαφανής μεσολάβηση διακομιστή</string> diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index 24b11a8..48851ee 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -10,7 +10,7 @@     <string name="wizard_tips_title">Aplikaĵoj permesitaj por Orbot</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + + <string name="wizard_tips_play">Trovu ĉiujn aplikaĵojn de Guardian Project ĉe Google Play</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_hint">(Marku ĉi tiun butonon se vi ne scias pri kio ni parolas)</string> diff --git a/res/values-es-rAR/strings.xml b/res/values-es-rAR/strings.xml index e20e7fa..67c66b7 100644 --- a/res/values-es-rAR/strings.xml +++ b/res/values-es-rAR/strings.xml @@ -58,7 +58,7 @@    <string name="wizard_transproxy_title">Proxying Transparente</string> diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index c902488..e18abb6 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -78,12 +78,12 @@ <string name="wizard_tips_otrchat">ChatSecure - Cliente de mensajería instantánea segura para Android</string> <string name="wizard_tips_proxy">Preferencias para proxy - aprenda cómo configurar aplicaciones para que trabajen con Orbot</string> <string name="wizard_tips_duckgo">Aplicación del motor de búsqueda DuckDuckGo</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_firefox">Complemento Proxy Mobile para Firefox (https://guardianproject.info/apps/firefoxprivacy)</string> <string name="proxymob_setup_url">https://guardianproject.info/apps/firefoxprivacy</string> <string name="wizard_tips_twitter">Configure por proxy la aplicación de Twitter en localhost:8118</string> <string name="wizard_tips_story_maker">StoryMaker - ¡Elabore una historia y déjesela a Tor por seguridad!</string> - <string name="story_maker_url">https://play.google.com/store/apps/details?id=info.guardianproject.mrapp&am…</string> + <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Preferencias para proxy</string> <string name="wizard_proxy_help_msg">Si la aplicación Android que está utilizando puede soportar el uso de un proxy (interpuesto) HTTP o SOCKS, entonces puede configurarla para que conecte a Orbot y use Tor.\n\n\nLa configuración del servidor es 127.0.0.1 o \"localhost\". Para HTTP, la configuración del puerto es 8118. Para SOCKS, el proxy está en el 9050. Debe utilizar la configuración para SOCKS4A o SOCKS5 si es posible.\n\n\n\nPuede aprender más acerca de proxyficación en Android a través de las preguntas frecuentes (FAQ) en: http://tinyurl.com/proxyandroid\n </string> @@ -111,14 +111,14 @@  <string name="wizard_tips_title">Aplicaciones habilitadas para Orbot</string> <string name="wizard_tips_gibberbot">ChatSecure: Aplicación de chat segura con cifrado Off-The-Record (OTR)</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> + <string name="wizard_tips_orweb">Orweb - navegador de privacidad-mejorada que funciona a través de Tor</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + <string name="wizard_tips_play">Descubre todas las aplicaciones de Guardian Project en Google Play</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">Proxyficación transparente</string> @@ -266,7 +266,7 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de <string name="pref_torrc_summary">SÓLO EXPERTOS: Introduzca directamente las líneas de configuración en el fichero torrc</string> <string name="pref_torrc_dialog">torrc personalizado</string> <string name="wizard_tips_martus">Martus Móvil - Aplicación de documentación de derechos humanos de Benetech</string> - <string name="martus_url">https://play.google.com/store/apps/details?id=org.martus.android&hl=es</string> + <string name="your_tor_public_ips_">Las IPs públicas de su Tor:</string> <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Por favor, deshabilite esta aplicación en Android->Configuración->Aplicaciones si está teniendo problemas con Orbot:</string> <string name="app_conflict">Conflicto de la aplicación</string> diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml index 12212cb..eab2c48 100644 --- a/res/values-et/strings.xml +++ b/res/values-et/strings.xml @@ -74,7 +74,7 @@ <string name="wizard_tips_otrchat">ChatSecure - Turvaline kiirsõnumiklient Androidile</string> <string name="wizard_tips_proxy">Proxy seaded - Õpi kuidas seadistada rakendusi töötama koos Orbot\'iga</string> <string name="wizard_tips_duckgo">DuckDuckGo otsingumootori rakendus</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_twitter">Seadistage Twitteri proxy server \"localhost\" ja port 8118</string> <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Proxyseaded</string> @@ -96,14 +96,14 @@  <string name="wizard_tips_title">Orbot\'ile mõeldud rakendused</string> <string name="wizard_tips_gibberbot">ChatSecure: Turvaline vestlusrakendus Off-the-Record krüptoga</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> + <string name="wizard_tips_orweb">Orweb: Kõrgendatud privaatsusega veebisirvik mis töötab läbi Tor\'i</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + <string name="wizard_tips_play">Kõik Guardian Project rakendused on leitavad ka Google Play kaudu</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">Läbipaistev Proxy</string> diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index 5b4005a..345cac3 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -74,7 +74,7 @@ <string name="wizard_tips_otrchat">ChatSecure - Andriodentzako berehalako mezulari bezero ziurra</string> <string name="wizard_tips_proxy">Proxy Ezarpenak - Ikasi zure aplikazioak Orbotekin funtziona dezaten nola konfiguratu</string> <string name="wizard_tips_duckgo">DuckDuckGo Bilaketa Motorraren appa</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_twitter">Twittereko proxyaren ostalarian \"localhost\" jarri eta portuan 8118</string> <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Proxy Ezarpenak</string> @@ -96,14 +96,14 @@  <string name="wizard_tips_title">Orbot-Gaitutako Aplikazioak</string> <string name="wizard_tips_gibberbot">ChatSecure: Txat aplikazio segurua Off-the-Record enkriptazioarekin.</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> + <string name="wizard_tips_orweb">Orweb - Tor bidez lan egiten duen pribatutasun-hobetua duen nabigatzailea</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + <string name="wizard_tips_play">Google Play-n Guardiak Proiektuko aplikazio guztiak bilatu</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">Proxyatze Gardena</string> diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 580265e..150bb58 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -76,12 +76,12 @@ <string name="wizard_tips_otrchat">ChatSecure - برنامه امن ارسال پیغام فوری برای اندروئید</string> <string name="wizard_tips_proxy">تنظیمات پروکسی - یادگیری تنظیم اپلیکیشن ها برای کار با ربات پیازی</string> <string name="wizard_tips_duckgo">اپلیکیشن موتور جستجوی داک داک گو</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_firefox">افزوده پروکسی موبایل برای فایرفاکس (https://guardianproject.info/apps/firefoxprivacy)</string> <string name="proxymob_setup_url">https://guardianproject.info/apps/firefoxprivacy</string> <string name="wizard_tips_twitter">توییتر از \"http proxy \"localhost:8118 پشتیبانی می کند</string> <string name="wizard_tips_story_maker">StoryMaker - ساختن یک داستان و ترک آن به Tor برای امنیت!</string> - <string name="story_maker_url">https://play.google.com/store/apps/details?id=info.guardianproject.mrapp</string> + <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">تنظیمات پروکسی</string> <string name="wizard_final">ربات پیازی آماده استفاده میباشد!</string> @@ -103,14 +103,14 @@  <string name="wizard_tips_title"> اپلیکیشنهایی که ربات پیازی روی آنها فعال است</string> <string name="wizard_tips_gibberbot">ChatSecure:برنامه امن گفتگوی محرمانه با قابلیت رمزگزاری</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> + <string name="wizard_tips_orweb">مرورگر پیازی: مرورگر طراحی شده برای حفظ حریم خصوصی و افزونساز ربات پیازی</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + <string name="wizard_tips_play">تمامي برنامه هاي Guardian Project را در Google Play پيدا كنيد.</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">پروکسی کردن شفاف</string> @@ -253,7 +253,7 @@ <string name="pref_dnsport_dialog">پیکربندی پورت DNS</string> <string name="pref_torrc_title">پیکربندی سفارشی Torrc</string> <string name="pref_torrc_dialog">سفارشی Torrc</string> - <string name="martus_url">https://play.google.com/store/apps/details?id=org.martus.android</string> + <string name="your_tor_public_ips_">IP های عمومی Tor شما:</string> <string name="app_conflict">تعارض برنامه</string> <string name="pref_transproxy_refresh_title">خودکار تازه کردن Transproxy</string> diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 3413f91..3c40ffe 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -74,7 +74,7 @@ <string name="wizard_tips_otrchat">ChatSecure - Turvallinen pikaviestisovellus Androidille</string> <string name="wizard_tips_proxy">Välityspalvelinasetukset - Opi konfiguroimaan sovellukset toimimaan Orbotin kanssa</string> <string name="wizard_tips_duckgo">DuckDuckGo-hakukonesovellus</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_twitter">Aseta Twitter-välityspalvelinisännäksi \"localhost\" ja portiksi 8118</string> <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Välityspalvelinasetukset</string> @@ -96,14 +96,14 @@  <string name="wizard_tips_title">Orbotia käyttävät sovellukset</string> <string name="wizard_tips_gibberbot">ChatSecure: Turvallinen chattailusovellus Off-the-Record -salauksella</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> + <string name="wizard_tips_orweb">Orweb: Tietosuojaa parantava selain, joka toimii Torin läpi</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + <string name="wizard_tips_play">Löydä kaikki Guardian-projektin sovellukset Googlen Play-kaupasta</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">Läpinäkyvä tiedonvälitys</string> diff --git a/res/values-fr-rFR/strings.xml b/res/values-fr-rFR/strings.xml index 760614e..5d26704 100644 --- a/res/values-fr-rFR/strings.xml +++ b/res/values-fr-rFR/strings.xml @@ -78,12 +78,12 @@ <string name="wizard_tips_otrchat">ChatSecure - Client sécurisé de messagerie instantanée pour Android</string> <string name="wizard_tips_proxy">Paramètres du relais - Apprendre à configurer des applis pour qu\'elles fonctionnent avec Orbot</string> <string name="wizard_tips_duckgo">Appli du moteur de recherche DuckDuckgo</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_firefox">Module *Mandataire mobile* pour Firefox (https://guardianproject.info/apps/firefoxprivacy)</string> <string name="proxymob_setup_url">https://guardianproject.info/apps/firefoxprivacy</string> <string name="wizard_tips_twitter">Configurer le mandataire Twitter sur l\'hôte « localhost:8118 » et le port 8118</string> <string name="wizard_tips_story_maker">Faiseur d\'histoires - Rédigez une histoire et laissez Tor s\'occuper de la sécurité !</string> - <string name="story_maker_url">https://play.google.com/store/apps/details?id=info.guardianproject.mrapp</string> + <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Paramètres du mandataire</string> <string name="wizard_proxy_help_msg">Si l\'appli Android que vous utilisez peut prendre en charge un mandataire HTTP ou SOCKS, vous pouvez alors la configurer pour se connecter à Orbot et utiliser Tor.\n\n\n Le paramètre de l\'hôte est 127.0.0.1 or « localhost ». Pour HTTP, le paramètre de port est 8118. Pour SOCKS, le mandataire est 9050. Vous devriez utiliser SOCKS4A ou SOCKS5 si possible.\n \n\n\n Vous pouvez en apprendre davantage sur l\'utilisation d\'un serveur mandataire sur Android dans la FAQ sur : http://tinyurl.com/proxyandroid\n </string> @@ -111,14 +111,14 @@  <string name="wizard_tips_title">Applis conçues pour Orbot</string> <string name="wizard_tips_gibberbot">Chatsecure : appli sécurisée de clavardage avec chiffrement confidentiel </string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> + <string name="wizard_tips_orweb">Orweb : navigateur à confidentialité améliorée qui fonctionne avec Tor</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + <string name="wizard_tips_play">Trouver toutes les applis du Projet Guardian sur Google Play</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">Relayage transparent</string> @@ -265,7 +265,7 @@ <string name="pref_torrc_summary">EXPERTS SEULEMENT : saisissez les lignes de configuration de torrc direct</string> <string name="pref_torrc_dialog">Personnaliser Torrc </string> <string name="wizard_tips_martus">Martus mobile - Appli de documentation pour les droits humains de Benetech</string> - <string name="martus_url">https://play.google.com/store/apps/details?id=org.martus.android</string> + <string name="your_tor_public_ips_">Vos IP publiques Tor :</string> <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Veuillez désactiver cette appli dans Android->Paramètres->Applications si vous éprouvez des problèmes avec Orbot :</string> <string name="app_conflict">Conflit d\'applis</string> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 6b6dde6..9b00404 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -75,7 +75,7 @@ <string name="wizard_tips_otrchat">Gibberbot - Client de messagerie instantanée pour Android</string> <string name="wizard_tips_proxy">Configuration du proxy - Apprendre comment configurer les applications pour qu\'elles fonctionnent avec Orbot</string> <string name="wizard_tips_duckgo">Application DuckDuckgo Search Engine</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_firefox">Firefox avec le plugin Proxy Mobile (installation complémentaire)</string> <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string> <string name="wizard_tips_twitter">Twitter supporte le proxy http \"localhost:8118\"</string> @@ -105,14 +105,14 @@  <string name="wizard_tips_title">Applications Orbot</string> <string name="wizard_tips_gibberbot">Gibberbot: application de clavardage sécurisé avec chiffrement Off-the-Record</string> - <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> + <string name="wizard_tips_orweb">ORWEB (Android 1.x seulement) - navigateur créé pour protéger votre vie privée & pour Orbot</string> - <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string> + <string name="wizard_tips_play">Trouver toutes les applications de Guardian Project sur Google Play</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">Proxy transparent</string> diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml index 3bb3f49..5627e07 100644 --- a/res/values-gl/strings.xml +++ b/res/values-gl/strings.xml @@ -74,7 +74,7 @@ <string name="wizard_tips_otrchat">ChatSecure - Cliente de mensaxería instantánea segura para Android</string> <string name="wizard_tips_proxy">Axustes do Proxy - Aprenda cómo configurar aplicativos para que funcionen con Orbot</string> <string name="wizard_tips_duckgo">Aplicativo do Motor de Búsquedas DuckDuckGo</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_twitter">Axustar o host para proxy de Twitter a \"localhost\" e porto 8118</string> <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Axustes do proxy</string> @@ -96,14 +96,14 @@  <string name="wizard_tips_title">Aplicativos Habilitados para Orbot</string> <string name="wizard_tips_gibberbot">CahtSecure: Aplicativo de chat seguro con Off-the-Record Encryption (OTR)</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> + <string name="wizard_tips_orweb">Orweb: Navegador con privacidade mellorada que traballa a través de Tor</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + <string name="wizard_tips_play">Atope todos os aplicativos de Guardian Project apps en Google Play</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">Proxy Transparente</string> diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml index 95492e5..47becf2 100644 --- a/res/values-gu-rIN/strings.xml +++ b/res/values-gu-rIN/strings.xml @@ -11,7 +11,7 @@         <string name="wizard_transproxy_title">פרוקסי שקוף</string> diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index 730f408..2bf7df6 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -18,7 +18,7 @@    <string name="wizard_transproxy_none">कोई नहीं</string> diff --git a/res/values-hr-rHR/strings.xml b/res/values-hr-rHR/strings.xml index 74971db..a992579 100644 --- a/res/values-hr-rHR/strings.xml +++ b/res/values-hr-rHR/strings.xml @@ -23,7 +23,7 @@    <string name="wizard_transproxy_none">Nepoznato</string> diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index 6fc58d7..6e3ddd8 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -74,7 +74,7 @@ <string name="wizard_tips_otrchat">ChatSecure - Sigurni klijent instant poruka za Adnroid</string> <string name="wizard_tips_proxy">Proxy Postavke - Naučite kako konfigurirati aplikacije za rad s Orbot-om</string> <string name="wizard_tips_duckgo">DuckDuckGo aplikacija za pretraživanje</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_twitter">Namjesti Twitter proxy na host \"localhost\" i port 8118</string> <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Postavke Proxy-a</string> @@ -96,14 +96,14 @@  <string name="wizard_tips_title">Orbot-Omogućene Aplikacije</string> <string name="wizard_tips_gibberbot">ChatSecure: Sigurna aplikacija za čavrljanje s Povjerljivom Enkripcijom</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> + <string name="wizard_tips_orweb">Orweb: Preglednik poboljšane privatnosti koji radi kroz Tor</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + <string name="wizard_tips_play">Pronađi sve Guardian Projekt aplikacije na Google Play</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">Transparentni Proxy</string> diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index 37d32a0..0f01958 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -74,12 +74,12 @@ <string name="wizard_tips_otrchat">ChatSecure - Biztonságos üzenetküldő Androidra</string> <string name="wizard_tips_proxy">Proxy beállítások - Tanulja meg, hogyan állíthatja be alkalmazásait, hogy együttműködjenek az Orbot-tal</string> <string name="wizard_tips_duckgo">Duckduckgo keresőgép alkalmazás</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_firefox">Proxy Mobile bővítmény Firefox-hoz (https://guardianproject.info/apps/firefoxprivacy)</string> <string name="proxymob_setup_url">https://guardianproject.info/apps/firefoxprivacy</string> <string name="wizard_tips_twitter">A Twitter támogatja a \"localhost:8118\" http proxyt</string> <string name="wizard_tips_story_maker">StoryMaker - Készítsen egy sztorit, és hagyja a Tor-ra a biztonságért!</string> - <string name="story_maker_url">https://play.google.com/store/apps/details?id=info.guardianproject.mrapp</string> + <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Proxy beállítások</string> <string name="wizard_final">Az Orbot kész!</string> @@ -100,14 +100,14 @@  <string name="wizard_tips_title">Orbot-engedélyezett Alkalmazások</string> <string name="wizard_tips_gibberbot">ChatSecure: Biztonságos üzenetküldő app OTR titkosítással</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> + <string name="wizard_tips_orweb">ORWEB (csak Android 1.x) - Böngésző, kifejezetten adatvédelemre és az Orbot-hoz</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + <string name="wizard_tips_play">Az összes Guardian Project alkalmazás keresése a Google Play-en</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">Átlátszó proxyzás</string> @@ -254,7 +254,7 @@ <string name="pref_torrc_summary">CSAK SZAKÉRTŐKNEK: torrc konfigurációs sorok közvetlen beírása</string> <string name="pref_torrc_dialog">Egyedi Torrc</string> <string name="wizard_tips_martus">Mobile Martus - Benetech meberi jog dokumentáló alkalmazás</string> - <string name="martus_url">https://play.google.com/store/apps/details?id=org.martus.android</string> + <string name="your_tor_public_ips_">A Tor publikus IP-je:</string> <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Kérjk tiltsa le az alkalmazést az Android->Beállítások->Alkalmazások alatt, ha az Orbot-tal problémái vannak: </string> <string name="app_conflict">App ütközés</string> diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml index d8d0467..cccea53 100644 --- a/res/values-hy-rAM/strings.xml +++ b/res/values-hy-rAM/strings.xml @@ -9,7 +9,7 @@    <string name="default_bridges"></string> diff --git a/res/values-ia/strings.xml b/res/values-ia/strings.xml index f0dc49c..bcf631f 100644 --- a/res/values-ia/strings.xml +++ b/res/values-ia/strings.xml @@ -23,7 +23,7 @@    <string name="wizard_transproxy_none">Nulle</string> diff --git a/res/values-id-rID/strings.xml b/res/values-id-rID/strings.xml index fa11b32..8af87c7 100644 --- a/res/values-id-rID/strings.xml +++ b/res/values-id-rID/strings.xml @@ -74,7 +74,7 @@ <string name="wizard_tips_otrchat">ChatSecure - Client instant messaging aman untuk Android</string> <string name="wizard_tips_proxy">Pengaturan Proxy - Pelajari bagaimana mengkonfigurasikan aplikasi untuk bekerja dengan Orbot</string> <string name="wizard_tips_duckgo">Aplikasi Mesin Pencari DuckDuckGo</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_twitter">Setel proxy Twitter ke host \"localhost\" dan port 8118</string> <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Pengaturan Proxy</string> @@ -96,14 +96,14 @@  <string name="wizard_tips_title">Orbot-Aplikasi Teraktifkan</string> <string name="wizard_tips_gibberbot">ChatSecure: Aplikasi obrolan aman dengan Enkripsi Off-the-Record</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> + <string name="wizard_tips_orweb">Orweb: Peramban dengan Peningkatan-privasi yang bekerja melalui Tor</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + <string name="wizard_tips_play">Temukan semua aplikasi Guardian Project di Google Play</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">Transparan Proxying</string> diff --git a/res/values-id/strings.xml b/res/values-id/strings.xml index d320e49..17cf397 100644 --- a/res/values-id/strings.xml +++ b/res/values-id/strings.xml @@ -41,7 +41,7 @@    <string name="wizard_transproxy_none">Tidak ada</string> diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml index dbc36ac..20687d7 100644 --- a/res/values-is/strings.xml +++ b/res/values-is/strings.xml @@ -74,7 +74,7 @@ <string name="wizard_tips_otrchat">ChatSecure - Öruggur spjall þjónn fyrir Android</string> <string name="wizard_tips_proxy">Proxy Stillingar - Lærðu hvernig á að stilla smáforrit til að virka með Orbot</string> <string name="wizard_tips_duckgo">DuckDuckGo Leitarvél smáforrit</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_twitter">Setja Twitter proxy hýsir til \"localhost\" and port 8118</string> <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Proxy Stillingar</string> @@ -96,14 +96,14 @@  <string name="wizard_tips_title">Orbot-Virk Smáforrit</string> <string name="wizard_tips_gibberbot">ChatSecure: Öruggt spjall smáforrit með Utanvegar Dulkóðun</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> + <string name="wizard_tips_orweb">Orweb: Næðis-bættur vafri sem virkar í gegnum Tor</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + <string name="wizard_tips_play">Finndu öll Guardian Verkefnis smáforrit á Google Play</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">Gegnsæ Proxýun</string> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 866156c..c1e2ce2 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -74,7 +74,7 @@ <string name="wizard_tips_otrchat">ChatSecure - Client sicuro di messaggistica istantanea, per Android</string> <string name="wizard_tips_proxy">Impostazioni proxy - Ulteriori informazioni su come configurare le app per funzionare con Orbot</string> <string name="wizard_tips_duckgo">App del motore di ricerca Duckduckgo</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_twitter">Twitter supporta il proxy http \"localhost:8118\"</string> <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Impostazioni proxy</string> @@ -96,14 +96,14 @@  <string name="wizard_tips_title">Orbot-App abilitate</string> <string name="wizard_tips_gibberbot">ChatSecure: App chat sicura con Cifratura Off-the-Record</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> + <string name="wizard_tips_orweb">Orweb - Browser progettato per la privacy e Orbot</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + <string name="wizard_tips_play">Cerca tutte le app del Guardian Project su Google Play</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">Proxying trasparente</string> diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 9110d90..8b48b41 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -74,7 +74,7 @@ <string name="wizard_tips_otrchat">ChatSecure - Android 用のセキュアなインスタントメッセージクライアント</string> <string name="wizard_tips_proxy">Proxy Settings - Orbotでアプリを動かすための手順書</string> <string name="wizard_tips_duckgo">DuckDuckGo 検索エンジンアプリ</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_twitter">Twitter proxyを「localhost」と8118番ポートに合わせる</string> <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">プロキシ設定</string> @@ -96,14 +96,14 @@  <string name="wizard_tips_title">Orbotが有効化されたアプリ</string> <string name="wizard_tips_gibberbot">ChatSecure: 非記録式暗号によるセキュアなチャットアプリ</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> + <string name="wizard_tips_orweb">Orweb: Torを使う匿名インターネットブラウザ</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + <string name="wizard_tips_play">Google Playで全てのGuardian Projectのアプリを見つける</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">透過プロキシ</string> diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml index 0f46066..a044399 100644 --- a/res/values-ka/strings.xml +++ b/res/values-ka/strings.xml @@ -9,7 +9,7 @@       <string name="default_bridges"></string> diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml index 0f46066..a044399 100644 --- a/res/values-kn/strings.xml +++ b/res/values-kn/strings.xml @@ -9,7 +9,7 @@     <string name="wizard_tips_title">Orbot을 사용하는 앱</string> <string name="wizard_tips_gibberbot">ChatSecure: 오프 더 레코드 암호화를 적용한 안전한 채팅 앱</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> + <string name="wizard_tips_orweb">Orweb: 토르를 통해 작동하는 보안 강화 브라우저</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + <string name="wizard_tips_play">구글 플레이에서 모든 가디언 프로젝트 앱 찾기</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">투명 프록시</string> diff --git a/res/values-ku/strings.xml b/res/values-ku/strings.xml index 0f46066..a044399 100644 --- a/res/values-ku/strings.xml +++ b/res/values-ku/strings.xml @@ -9,7 +9,7 @@          <string name="wizard_transproxy_none">Joks</string> diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index ce19f64..2ba0609 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -74,7 +74,7 @@ <string name="wizard_tips_otrchat">ChatSecure - Drošs Android\'a tūlītējās ziņojumapmaiņas klients</string> <string name="wizard_tips_proxy">Starpnieka iestatījumi - Uzzini kā konfigurēt lietotnes, lai tās strādātu ar Orbot</string> <string name="wizard_tips_duckgo">Meklētājprogrammas Duckduckgo lietotne</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_twitter">Twitter atbalsta http starpnieku \"localhost:8118\"</string> <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Starpnieka iestatījumi</string> @@ -96,14 +96,14 @@  <string name="wizard_tips_title">Orbot\'a iespējotas lietotnes</string> <string name="wizard_tips_gibberbot">ChatSecure: Padarīt tērzēšanas lietotni drošāku ar Off-the-Record šifrēšanu</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> + <string name="wizard_tips_orweb">Orweb: Pārlūks ar uzlabotu privātumu un kurš strādā caur Tor tīklu</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + <string name="wizard_tips_play">Visas Guardian Project\'a lietotnes atrodamas Google Play\'ā</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">Pārredzama starpniekošana</string> diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml index 3f320dc..5158e59 100644 --- a/res/values-mk/strings.xml +++ b/res/values-mk/strings.xml @@ -73,7 +73,7 @@ <string name="wizard_tips_msg">Ви препорачуваме да презимате и користите апликации кои што знаат како директно да се поврзат со Орбот. Притиснете на копчињата подолу за инсталирање.</string> <string name="wizard_tips_otrchat">ChatSecure - Сигурносен инстант клиент за разговор за Android</string> <string name="wizard_tips_proxy">Подесувања на прокси - Научете како да ги конфигурирате апликациите да работат со Орбот</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Подесувања на прокси</string> <string name="wizard_final">Орбот е спремен!</string> @@ -92,14 +92,14 @@ <string name="wizard_permissions_root_msg2">Доколку не сакате ова да го направите, ве молиме осигурајте се дека користите апликации кои работат со Орбот</string>  <string name="wizard_tips_gibberbot">ChatSecure: Сигурносна апликација за разговор со Off-the-Record Енкрипција</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> + <string name="wizard_tips_orweb">Орвеб: Моќен анонимен прелистувач кој работи преку Тор</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + <string name="wizard_tips_play">Најди ги сите Guardian Project апликации на Google Play</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">Транспарентно прокси</string> diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml index d8d0467..cccea53 100644 --- a/res/values-ml/strings.xml +++ b/res/values-ml/strings.xml @@ -9,7 +9,7 @@    <string name="default_bridges"></string> diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml index d8d0467..cccea53 100644 --- a/res/values-mn-rMN/strings.xml +++ b/res/values-mn-rMN/strings.xml @@ -9,7 +9,7 @@    <string name="default_bridges"></string> diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml index 4cbc683..8e527d3 100644 --- a/res/values-ms-rMY/strings.xml +++ b/res/values-ms-rMY/strings.xml @@ -73,7 +73,7 @@ <string name="wizard_tips_msg">Aplikasi di bawah dibangunkan untuk digunakan bersama Orbot. Klik setiap butang untuk pasang sekarang, atau anda boleh cari nanti di Android Market.</string> <string name="wizard_tips_proxy">Tetapan Proksi - Belajar bagaimana untuk mengkonfigurasi aplikasi untuk bekerja dengan Orbot</string> <string name="wizard_tips_duckgo">DuckDuckGo Enjin Carian</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_twitter">Tetapkan proxy twitter kepada hos \"localhost\" dan pada port 8118</string> <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Tetapan proxy</string> @@ -99,7 +99,7 @@ <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">Proxy Telus</string> diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml index 55ff746..c485ba7 100644 --- a/res/values-ms/strings.xml +++ b/res/values-ms/strings.xml @@ -97,12 +97,12 @@  <string name="wizard_tips_title">Aplikasi yang membenarkan Orbot</string> <string name="wizard_tips_gibberbot">Gibberbot: sembang app selamat dengan Penyulitan Off-the-Rekod</string> - <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> + <string name="wizard_tips_orweb">Orweb: Privasi ditambah penyemak imbas yang bekerja melalui Tor</string> - <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string> +   <string name="wizard_transproxy_title">Proxy Telus</string> diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml index b32196c..6f1e1d0 100644 --- a/res/values-my/strings.xml +++ b/res/values-my/strings.xml @@ -23,7 +23,7 @@    <string name="wizard_transproxy_none">ဘာမှမရှိ</string> diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 17b2503..0741073 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -74,7 +74,7 @@ <string name="wizard_tips_otrchat">ChatSecure - Sikret lynmeldingsklient for Android</string> <string name="wizard_tips_proxy">Proxy-innstillinger - Lær hvordan du konfigurerer applikasjoner til å fungere med Orbot</string> <string name="wizard_tips_duckgo">DuckDuckGo søkemotor applikasjon</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_twitter">Sett Twitters proxy til \"localhost\", og port 8118</string> <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Proxyinnstillinger</string> @@ -96,14 +96,14 @@  <string name="wizard_tips_title">Orbot aktiverte applikasjoner</string> <string name="wizard_tips_gibberbot">ChatSecure: Sikret sludreprogram med OTR-kryptering</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> + <string name="wizard_tips_orweb">Orweb: Nettleser med forsterket personvern som fungerer gjennom Tor</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + <string name="wizard_tips_play">Finn alle Guardian Prosjekt sine applikasjoner på Google Play</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">Transparent Proxying</string> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index ade3ed7..f982fcd 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -74,7 +74,7 @@ <string name="wizard_tips_otrchat">ChatSecure - Beveiligde instant messaging cliënt voor Andrdoid</string> <string name="wizard_tips_proxy">Proxy Instellingen - Leer hoe je apps te configureren voor Orbot</string> <string name="wizard_tips_duckgo">Duckduckgo Zoekmachine app</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_twitter">Twitter ondersteunt http proxy \"localhost:8118\"</string> <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Proxy Instellingen</string> @@ -96,14 +96,14 @@  <string name="wizard_tips_title">Orbot geschikte Apps</string> <string name="wizard_tips_gibberbot">ChatSecure: Beveiligde chat app met Off-the-Record versleuteling</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> + <string name="wizard_tips_orweb">ORWEB (Alleen Android 1.x) - Browser gemaakt voor privacy & voor Orbot</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + <string name="wizard_tips_play">Vind alle Guardian Project apps op Google Play</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">Tranparante Proxy</string> diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml index 3edb9f9..ef3b1c4 100644 --- a/res/values-pa/strings.xml +++ b/res/values-pa/strings.xml @@ -15,7 +15,7 @@    <string name="wizard_transproxy_none">ਖਾਲੀ</string> diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 0f8df67..34ee20a 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -78,12 +78,12 @@ <string name="wizard_tips_otrchat">ChatSecure - Bezpieczny komunikator pod Androida</string> <string name="wizard_tips_proxy">Ustawienia Proxy - Dowiedz się, jak konfigurować aplikacje do współpracy z Orbotem</string> <string name="wizard_tips_duckgo">Aplikacja Duckduckgo Search Engine</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_firefox">Dodatek Proxy Mobile dla Firefox (https://guardianproject.info/apps/firefoxprivacy)</string> <string name="proxymob_setup_url">https://guardianproject.info/apps/firefoxprivacy</string> <string name="wizard_tips_twitter">Twitter obsługuje proxy http \"localhost:8118\"</string> <string name="wizard_tips_story_maker">StoryMaker - Napisz artukuł, historię, a bezpieczeństwo pozostaw Torowi.</string> - <string name="story_maker_url">https://play.google.com/store/apps/details?id=info.guardianproject.mrapp</string> + <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Ustawienia Proxy</string> <string name="wizard_proxy_help_msg">Jeśli aplikacja na Androida, której używasz obsługuje proxy HTTP lub SOCKS proxy, to możesz skonfigurować ją do łączenia się z Orbotem i używania Tora. Ustawienie hosta to 127.0.0.1 lub \"localhost\". Dla HTTP, numer portu to 8118. Dla SOCKS proxy to 9050. Powinno się używać SOCKS4A lub SOCKS5, jeśli to możliwe.\n \n\n\n Możesz dowiedzieć się więcej o przekierowaniu ruchu na Androidzie z FAQ pod adresem: http://tinyurl.com/proxyandroid\n </string> @@ -111,14 +111,14 @@  <string name="wizard_tips_title">Orbot-Włączone Aplikacje</string> <string name="wizard_tips_gibberbot">ChatSecure: Bezpieczny komunikator z szyfrowaniem Off-the-Record</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> + <string name="wizard_tips_orweb">ORWEB (tylko Android 1.x) - Przeglądarka zaprojektowana do prywatności i dla Orbota</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + <string name="wizard_tips_play">Znajdź wszystkie aplikacje Guardian Project na Google Play</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">Transparentne Proxy</string> @@ -265,7 +265,7 @@ <string name="pref_torrc_summary">TYLKO DLA EKSPERTÓW: wpisz linijki konfiguracyjne torrc</string> <string name="pref_torrc_dialog">Torrc klienta</string> <string name="wizard_tips_martus">Mobile Martus - Benetech Dokumentacja Aplikacji Praw Człowieka</string> - <string name="martus_url">https://play.google.com/store/apps/details?id=org.martus.android</string> + <string name="your_tor_public_ips_">Twoje publiczne Tor IP:</string> <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Proszę wyłącz tą aplikację w Android->Ustawienia->Aplikacje jesli masz problemy z Orbot:</string> <string name="app_conflict">Konflikt aplikacji</string> diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml index 353f358..e2775bf 100644 --- a/res/values-pt-rBR/strings.xml +++ b/res/values-pt-rBR/strings.xml @@ -74,7 +74,7 @@ <string name="wizard_tips_otrchat">ChatSecure - cliente de mensagem instantânea segura para Android</string> <string name="wizard_tips_proxy">Configurações de Proxy - Aprenda como configurar apps para trabalhar com Orbot</string> <string name="wizard_tips_duckgo">Ferramenta de Busca DuckDuckGo</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_twitter">Define o proxy do Twitter para \"localhost\" e a porta 8118</string> <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Configurações de Proxy</string> @@ -96,14 +96,14 @@  <string name="wizard_tips_title">Apps Orbot Habilitadas</string> <string name="wizard_tips_gibberbot">ChatSecure: app de chat seguro com criptografia Off-the-Record</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> + <string name="wizard_tips_orweb">Orweb: Navegador de reforço de privacidade que trabalha através do Tor</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + <string name="wizard_tips_play">Encontre todos os aplicativos da Guardian Project no Google Play</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">Proxy Transparente</string> diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 730f0e2..790c818 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -66,7 +66,7 @@ <string name="wizard_tips_otrchat">ChatSecure - Cliente de mensagens instantâneas seguras para Android</string> <string name="wizard_tips_proxy">Configurações do Proxy - Aprenda a configurar as apps para funcionarem com o Orbot</string> <string name="wizard_tips_duckgo">App de Mecanismo de Procura DuckDuckGo</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_twitter">Defina o proxy do Twitter para hospedeiro \"localhost\" e porta 8118</string> <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Definições Proxy</string> @@ -85,14 +85,14 @@ <string name="wizard_permissions_root_msg1">Opcionalmente, pode conceder acesso de Administrador\' ao Orbot para ativar as funções avançadas, tais como, Proxy Transparente.</string>  <string name="wizard_tips_title">Orbot - Apps Ativadas</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> + <string name="wizard_tips_orweb">Orweb: Privacidade melhorada que funciona via Tor</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + <string name="wizard_tips_play">Encontre todas as apps do Projeto Guardian na Play Store da Google</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">Proxy Transparente</string> diff --git a/res/values-ro-rRO/strings.xml b/res/values-ro-rRO/strings.xml index c58f766..183eff0 100644 --- a/res/values-ro-rRO/strings.xml +++ b/res/values-ro-rRO/strings.xml @@ -23,7 +23,7 @@    <string name="wizard_transproxy_none">Nimic</string> diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 73e071c..373c6ae 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -74,7 +74,7 @@ <string name="wizard_tips_otrchat">ChatSecure - Mesagerie instantanee securizată pentru Android</string> <string name="wizard_tips_proxy">Setari pentru proxy - Invata cum sa configurezi aplicatii sa fie compatibile cu Orbot</string> <string name="wizard_tips_duckgo">Motor de cautare DuckDuckGo</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_twitter">Seteaza proxy-ul Twitter \"localhost\" su portul 8118</string> <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Setări proxy</string> @@ -96,14 +96,14 @@  <string name="wizard_tips_title">Aplicatii cu Orbot activat</string> <string name="wizard_tips_gibberbot">ChatSecure: Aplicație sigură de chat cu codare Off-the-Record</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> + <string name="wizard_tips_orweb">Orweb: browser de internet cu setari avansate de intimitate care functioneaza cu Tor</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + <string name="wizard_tips_play">Gaseste toate aplicatile Guardian Project pe Google Play</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">Proxy transparent</string> diff --git a/res/values-rs-rAR/strings.xml b/res/values-rs-rAR/strings.xml index dc0d516..44c2f11 100644 --- a/res/values-rs-rAR/strings.xml +++ b/res/values-rs-rAR/strings.xml @@ -48,7 +48,7 @@     <string name="wizard_tips_title">Приложения, работающие с Orbot:</string> <string name="wizard_tips_gibberbot">ChatSecure: приложение для общения с поддержкой Off-the-Record шифрования</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> + <string name="wizard_tips_orweb">ORWEB (Только для версии Android 1.x) - Браузер, разработанный для обеспечения безопасности и для Orbot</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + <string name="wizard_tips_play">Найти все приложения Guardian Project на Google Play</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">Прозрачное Проксирование</string> diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml index 54e431e..a5b002c 100644 --- a/res/values-si-rLK/strings.xml +++ b/res/values-si-rLK/strings.xml @@ -73,7 +73,7 @@ <string name="wizard_tips_msg">පහත යොමු සාදා ඇත්තේ Orbot සමග වැඩ කිරීමට ය. ස්ථාපනය කිරීම සදහා එක් එක් බොත්තම මත ක්ලික් කරන්න. නැතහොත් ඔබට මෙම යොමු Google Play, GuardianProject.info වෙබ්අඩවියෙන් හෝ F-Droid.org වලින් සොයා ගත හැක.</string> <string name="wizard_tips_proxy">නියුතු සේවා සිටුවම් - Orbot සමග ක්‍රියාකිරීමට අනෙක් යොමු වින්‍යාස කරන ආකාරය හදාරන්න </string> <string name="wizard_tips_duckgo">DuckDuckGo සෙවුම් යන්ත්‍ර යෙදුම </string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_twitter">Twitter නියුතුසේවාව \"localhost\" සත්කාරකයට හා පෝටය 8118 ට පිහිටුවන්න </string> <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">නියුතු සේවා සිටුවම් </string> @@ -99,7 +99,7 @@ <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">පාරදෘශ්‍ය නියුතුසේවා</string> diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml index 0f46066..a044399 100644 --- a/res/values-si/strings.xml +++ b/res/values-si/strings.xml @@ -9,7 +9,7 @@          <string name="wizard_transproxy_none">Žiadny</string> diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index e7fa0f1..6b685d9 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -77,7 +77,7 @@    <string name="status">Stanje</string> diff --git a/res/values-sn/strings.xml b/res/values-sn/strings.xml index 80f6e73..ec31980 100644 --- a/res/values-sn/strings.xml +++ b/res/values-sn/strings.xml @@ -19,7 +19,7 @@    <string name="default_bridges"></string> diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml index d8d0467..cccea53 100644 --- a/res/values-sq-rAL/strings.xml +++ b/res/values-sq-rAL/strings.xml @@ -9,7 +9,7 @@    <string name="default_bridges"></string> diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml index 56be9b0..9bc7fa0 100644 --- a/res/values-sq/strings.xml +++ b/res/values-sq/strings.xml @@ -23,7 +23,7 @@    <string name="wizard_transproxy_none">Asnjë</string> diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 60b56eb..c373fcc 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -73,7 +73,7 @@ <string name="wizard_tips_msg">Апликације наведене испод су развијене да би радиле са Орботом. Кликните свако дугме које желите сада да инсталирате, а у супротном их можете пронаћи и у Google Play продавници, на GuardianProject.info веб страници или преко F-Droid.org.</string> <string name="wizard_tips_proxy">Прокси поставке - Научите како да подесите апликације да раде са Орботом</string> <string name="wizard_tips_duckgo">DuckDuckGo апликација за претраживање интернета</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_twitter">Подесите Твитер да користи порт 8118 на локалном хосту.</string> <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Прокси подешавања</string> @@ -99,7 +99,7 @@ <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">Транспарентно слање кроз прокси</string> diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index fbf5254..a345fc0 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -74,7 +74,7 @@ <string name="wizard_tips_otrchat">ChatSecure - Säker chattklient för Android</string> <string name="wizard_tips_proxy">Proxy-inställningar - Lär dig hur du konfigurerar appar att fungera med Orbot</string> <string name="wizard_tips_duckgo">DuckDuckGo Sökmotor App</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_twitter">Ställ in Twitter proxy till värd \"localhost\" och port 8118</string> <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Proxy-inställningar</string> @@ -96,14 +96,14 @@  <string name="wizard_tips_title">Orbot-Anpassade Appar</string> <string name="wizard_tips_gibberbot">ChatSecure: Säkert chatt app med Off-the-Record kryptering</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> + <string name="wizard_tips_orweb">Orweb: Integritets-förbättrande webbläsare som fungerar genom Tor</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + <string name="wizard_tips_play">Hitta alla Guardian Project appar på Google Play</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">Transparent Proxy</string> diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml index d8d0467..cccea53 100644 --- a/res/values-ta/strings.xml +++ b/res/values-ta/strings.xml @@ -9,7 +9,7 @@    <string name="default_bridges"></string> diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml index 0f46066..a044399 100644 --- a/res/values-te-rIN/strings.xml +++ b/res/values-te-rIN/strings.xml @@ -9,7 +9,7 @@      <string name="wizard_transproxy_title">พร็อกซีล่อง</string> diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index fa61dda..472ef93 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -74,7 +74,7 @@ <string name="wizard_tips_otrchat">ChatSecure - Isang Secure instant messaging client para sa Android</string> <string name="wizard_tips_proxy">Proxy Settings - Alamin paano magkompigura ng apps para gumana sa Orbot</string> <string name="wizard_tips_duckgo">DuckDuckGo Search Engine app</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_twitter">I-set ang Twitter proxy sa host \"localhost\" at port 8118</string> <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Proxy Settings</string> @@ -96,14 +96,14 @@  <string name="wizard_tips_title">Orbot-Enabled Apps</string> <string name="wizard_tips_gibberbot">ChatSecure: Isang secure chat app na may Off-the-Record Encryption</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> + <string name="wizard_tips_orweb">Orweb: rivacy-enhanced browser na gumagana sa Tor</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + <string name="wizard_tips_play">Hanapin ang lahat ng Guardian Project apps sa Google Play</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">Transparent Proxying</string> diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 4c7f96d..218db87 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -75,10 +75,10 @@ <string name="wizard_tips_otrchat">ChatSecure - Android için güvenli anında mesajlaşma istemcisi</string> <string name="wizard_tips_proxy">Vekil Ayarları - Uygulamaların, Orbot ile birlikte çalışmalarını nasıl ayarlayacağınızı öğrenin.</string> <string name="wizard_tips_duckgo">DuckDuckGo Arama Motoru uygulaması</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="proxymob_setup_url">https://guardianproject.info/apps/firefoxprivacy</string> <string name="wizard_tips_twitter">Twitter proxy sunucusunu \"localhost\" ve bağlantı noktası 8118 olarak ayarlayın</string> - <string name="story_maker_url">https://play.google.com/store/apps/details?id=info.guardianproject.mrapp</string> + <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Proxy Ayarları</string> <string name="wizard_final">Orbot hazır!</string> @@ -99,14 +99,14 @@  <string name="wizard_tips_title">Orbot\'un aktif olduğu eklentiler</string> <string name="wizard_tips_gibberbot">ChatSecure: Güvenli Kayıt-dışı Şifreleme yapabilen sohbet uygulaması</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> + <string name="wizard_tips_orweb">Orweb: Tor üzerinden çalışabilen, gizliliği artırılmış tarayıcı.</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + <string name="wizard_tips_play">Google Play\'deki tüm Guardian Projesi uygulamalarına bakın</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">Şeffaf Vekillendirme</string> diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index ef141ca..b4b9d9c 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -74,7 +74,7 @@ <string name="wizard_tips_otrchat">ChatSecure - Захищений обмін повідомленнями в Android</string> <string name="wizard_tips_proxy">Налаштування проксі — дізнайтесь як налаштувати додатки для роботи з Orbot</string> <string name="wizard_tips_duckgo">Додаток пошукової системи DuckDuckGo</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_twitter">Twitter підтримує http проксі «localhost:8118»</string> <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Налаштування Проксі</string> @@ -96,14 +96,14 @@  <string name="wizard_tips_title">Додатки, що працюють з Orbot:</string> <string name="wizard_tips_gibberbot">ChatSecure: додаток для спілкування з підтримкою Off-the-Record шифрування</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> + <string name="wizard_tips_orweb">ORWEB (Тільки для версії Android 1.x) - браузер, розроблений для забезпечення безпеки і для Orbot</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + <string name="wizard_tips_play">Знайти всі додатки Guardian Project на Google Play</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">Прозоре Проксування</string> diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml index 22c1de7..338847e 100644 --- a/res/values-ur/strings.xml +++ b/res/values-ur/strings.xml @@ -15,7 +15,7 @@     - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Proksi moslamalari</string> <string name="wizard_final">Orbot tayyor!</string> @@ -35,7 +35,7 @@    <string name="pref_proxy_type_dialog">Proksi turini kiriting</string> diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 47db180..0883aee 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -74,7 +74,7 @@ <string name="wizard_tips_otrchat">ChatSecure - Ứng dụng tin nhắn an toàn cho Android</string> <string name="wizard_tips_proxy">Cài Đặt Proxy - Hãy học cách thức thiết trí ứng dụng để dùng với Orbot</string> <string name="wizard_tips_duckgo">Ứng dụng tìm kiếm DuckDuckGo</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_twitter">Cài Twitter proxy đến máy chủ \"localhost\" và cổng 8118</string> <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Những Cài đặt máy chủ proxy</string> @@ -96,14 +96,14 @@  <string name="wizard_tips_title">Các ứng dụng đã được áp dụng Orbot</string> <string name="wizard_tips_gibberbot">ChatSecure: ứng dụng chat an toàn với mã hóa Off-the-Record</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> + <string name="wizard_tips_orweb">Orweb: Trình duyệt có khả năng bảo mật cao được dùng qua mạng Tor</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + <string name="wizard_tips_play">Hãy tìm những ứng dụng của Guardian Project trên Google Play</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">Đang chuyển tiếp theo dạng hiển thị</string> diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 0cb7073..f23b133 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -58,7 +58,7 @@ <string name="wizard_configure">組態 Tor 網路</string> <string name="wizard_configure_all">所有應用程式都通過 Tor 代理</string> <string name="wizard_tips_duckgo">DuckDuckGo 搜尋引擎應用程式</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">代理伺服器設定</string>  @@ -71,13 +71,13 @@  <string name="wizard_permissions_title">許可權</string>  - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + + <string name="wizard_tips_play">在 Google Play 尋找所有的 Guardian Project 應用程式</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">通透式代理</string> diff --git a/res/values-zh/strings.xml b/res/values-zh/strings.xml index 2858d23..1f81af9 100644 --- a/res/values-zh/strings.xml +++ b/res/values-zh/strings.xml @@ -77,11 +77,11 @@ <string name="wizard_tips_otrchat">ChatSecure - Android 上的安全即时通讯客户端</string> <string name="wizard_tips_proxy">代理设置 - 学习如何配置应用程序使用 Orbot</string> <string name="wizard_tips_duckgo">DuckDuckGo 搜索引擎应用程序</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_firefox">适用于移动版 Firefox 的代理扩展 (https://guardianproject.info/apps/firefoxprivacy)</string> <string name="proxymob_setup_url">https://guardianproject.info/apps/firefoxprivacy</string> <string name="wizard_tips_twitter">将 Twitter 代理的主机设置 localhost 并将端口设置为 8118</string> - <string name="story_maker_url">https://play.google.com/store/apps/details?id=info.guardianproject.mrapp</string> + <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">代理设置</string> <string name="wizard_final">Orbot 已就绪！</string> @@ -103,14 +103,14 @@  <string name="wizard_tips_title">使用 Orbot 的应用程序</string> <string name="wizard_tips_gibberbot">ChatSecure：具有 OTF 加密共的安全通讯应用</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> + <string name="wizard_tips_orweb">Orweb：使用 Tor 网络的隐私保护浏览器</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> + <string name="wizard_tips_play">在 Google Play 商店查找所有 Guardian Project 的应用程序</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>   <string name="wizard_transproxy_title">透明代理</string> @@ -256,7 +256,7 @@ <string name="pref_torrc_title">Torrc 自定义配置</string> <string name="pref_torrc_summary">仅供专家：直接输入 torrc 配置行</string> <string name="pref_torrc_dialog">自定义 Torrc</string> - <string name="martus_url">https://play.google.com/store/apps/details?id=org.martus.android</string> + <string name="your_tor_public_ips_">您的 Tor 公网 IP:</string> <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">如果您使用 Orbot 遇到问题，请在 Android->设置->应用中禁用本应用：</string> <string name="app_conflict">应用冲突</string> diff --git a/res/values/strings.xml b/res/values/strings.xml index 4844d42..309345c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -78,10 +78,8 @@ <string name="wizard_tips_otrchat">ChatSecure - Secure instant messaging client for Android</string> <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string> <string name="wizard_tips_duckgo">DuckDuckGo Search Engine app</string> - <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> <string name="wizard_tips_twitter">Set Twitter proxy to host \"localhost\" and port 8118</string> <string name="wizard_tips_story_maker">StoryMaker - Make a story and leave it to tor for security!</string> - <string name="story_maker_url">https://play.google.com/store/apps/details?id=info.guardianproject.mrapp</string> <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">Proxy Settings</string> <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n\n The host settings is 127.0.0.1 or \"localhost\". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible.\n \n\n\n You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid\n </string> @@ -109,9 +107,7 @@  <string name="wizard_tips_title">Orbot-Enabled Apps</string> <string name="wizard_tips_gibberbot">ChatSecure: Secure chat app with Off-the-Record Encryption</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> <string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</string> - <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> <string name="wizard_tips_play">Find all Guardian Project apps on Google Play</string> <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>  @@ -282,7 +278,6 @@ <string name="pref_torrc_dialog">Custom Torrc</string> <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> diff --git a/src/org/torproject/android/ui/wizard/PromoAppsActivity.java b/src/org/torproject/android/ui/wizard/PromoAppsActivity.java index b049625..a368165 100644 --- a/src/org/torproject/android/ui/wizard/PromoAppsActivity.java +++ b/src/org/torproject/android/ui/wizard/PromoAppsActivity.java @@ -1,20 +1,35 @@ package org.torproject.android.ui.wizard; -import org.torproject.android.R; -import org.torproject.android.OrbotConstants; - import android.app.Activity; import android.content.Intent; +import android.content.pm.PackageManager; +import android.content.pm.ResolveInfo; import android.net.Uri; import android.os.Bundle; +import android.text.TextUtils; +import android.util.Log; import android.view.KeyEvent; import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; -import android.widget.TextView; + +import org.torproject.android.OrbotConstants; +import org.torproject.android.R; + +import java.util.List; public class PromoAppsActivity extends Activity implements OrbotConstants { + final static String MARKET_URI = "market://details?id="; + final static String FDROID_APP_URI = "https://f-droid.org/repository/browse/?fdid="; + final static String PLAY_APP_URI = "https://play.google.com/store/apps/details?id="; + final static String FDROID_URI = "https://f-droid.org/repository/browse/?fdfilter=info.guardianproject"; + final static String PLAY_URI = "https://play.google.com/store/apps/developer?id=The+Guardian+Project"; + + private final static String FDROID_PACKAGE_NAME = "org.fdroid.fdroid"; + private final static String PLAY_PACKAGE_NAME = "com.android.vending"; + + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -39,47 +54,45 @@ public class PromoAppsActivity extends Activity implements OrbotConstants { } void stepFive(){ - - + + String title = getString(R.string.wizard_tips_title); - + setTitle(title); - + Button btnLink = (Button)findViewById(R.id.WizardRootButtonInstallGibberbot); - + btnLink.setOnClickListener(new OnClickListener() { - - public void onClick(View view) { - String url = getString(R.string.gibberbot_apk_url); + @Override + public void onClick(View view) { finish(); - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url))); + startActivity(getInstallIntent("info.guardianproject.otr.app.im")); } }); - + btnLink = (Button)findViewById(R.id.WizardRootButtonInstallOrweb); btnLink.setOnClickListener(new OnClickListener() { - + + @Override public void onClick(View view) { - - String url = getString(R.string.orweb_apk_url); finish(); - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url))); + startActivity(getInstallIntent("info.guardianproject.browser")); } }); - + btnLink = (Button)findViewById(R.id.WizardRootButtonInstallDuckgo); btnLink.setOnClickListener(new OnClickListener() { - + + @Override public void onClick(View view) { - - String url = getString(R.string.duckgo_apk_url); + finish(); - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url))); + startActivity(getInstallIntent("com.duckduckgo.mobile.android")); } }); @@ -87,41 +100,42 @@ public class PromoAppsActivity extends Activity implements OrbotConstants { btnLink = (Button)findViewById(R.id.WizardRootButtonInstallTwitter); btnLink.setOnClickListener(new OnClickListener() { - + + @Override public void onClick(View view) { - + String url = getString(R.string.twitter_setup_url); finish(); startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url))); } }); - + btnLink = (Button)findViewById(R.id.WizardRootButtonInstallStoryMaker); btnLink.setOnClickListener(new OnClickListener() { - + + @Override public void onClick(View view) { - - String url = getString(R.string.story_maker_url); - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url))); + finish(); + startActivity(getInstallIntent("info.guardianproject.mrapp")); } }); - + btnLink = (Button)findViewById(R.id.WizardRootButtonInstallMartus); btnLink.setOnClickListener(new OnClickListener() { - + + @Override public void onClick(View view) { - - String url = getString(R.string.martus_url); - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url))); + finish(); + startActivity(getInstallIntent("org.martus.android")); } }); - - + + btnLink = (Button)findViewById(R.id.WizardRootButtonGooglePlay); btnLink.setOnClickListener(new OnClickListener() { @@ -170,8 +184,33 @@ public class PromoAppsActivity extends Activity implements OrbotConstants { } return false; } - - /* + + Intent getInstallIntent(String packageName) { + final Intent intent = new Intent(Intent.ACTION_VIEW); + intent.setData(Uri.parse(MARKET_URI + packageName)); + + PackageManager pm = getPackageManager(); + List<ResolveInfo> resInfos = pm.queryIntentActivities(intent, 0); + + String foundPackageName = null; + for (ResolveInfo r : resInfos) { + Log.i(TAG, "market: " + r.activityInfo.packageName); + if (TextUtils.equals(r.activityInfo.packageName, FDROID_PACKAGE_NAME) + || TextUtils.equals(r.activityInfo.packageName, PLAY_PACKAGE_NAME)) { + foundPackageName = r.activityInfo.packageName; + break; + } + } + + if (foundPackageName == null) { + intent.setData(Uri.parse(FDROID_APP_URI + packageName)); + } else { + intent.setPackage(foundPackageName); + } + return intent; + } + + /* private void showWizardFinal () { String title = null;

1 0

[orbot/master] remove unused icons to save space
by n8fr8＠torproject.org 25 Jun '15

25 Jun '15

commit 81cf67f9558d05b770c58228094c97299dcaa840 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Wed Jun 3 18:20:51 2015 -0400 remove unused icons to save space These are all reported by `ant debug lint` as unused. --- res/drawable-hdpi-v11/ic_menu_agenda.png | Bin 1010 -> 0 bytes res/drawable-hdpi-v11/ic_menu_clear_playlist.png | Bin 1163 -> 0 bytes res/drawable-hdpi-v11/ic_stat_notify.png | Bin 900 -> 0 bytes res/drawable-hdpi-v9/ic_menu_agenda.png | Bin 1010 -> 0 bytes res/drawable-hdpi-v9/ic_menu_clear_playlist.png | Bin 1163 -> 0 bytes res/drawable-hdpi-v9/ic_stat_notify.png | Bin 1014 -> 0 bytes res/drawable-hdpi/ic_action_browse.png | Bin 1790 -> 0 bytes res/drawable-hdpi/ic_action_start.png | Bin 474 -> 0 bytes res/drawable-hdpi/ic_menu_agenda.png | Bin 1010 -> 0 bytes res/drawable-hdpi/ic_menu_clear_playlist.png | Bin 1163 -> 0 bytes res/drawable-hdpi/ic_stat_notify.png | Bin 1701 -> 0 bytes res/drawable-ldpi-v11/ic_menu_agenda.png | Bin 1010 -> 0 bytes res/drawable-ldpi-v11/ic_menu_clear_playlist.png | Bin 1163 -> 0 bytes res/drawable-ldpi-v11/ic_stat_notify.png | Bin 398 -> 0 bytes res/drawable-ldpi-v9/ic_menu_agenda.png | Bin 1010 -> 0 bytes res/drawable-ldpi-v9/ic_menu_clear_playlist.png | Bin 1163 -> 0 bytes res/drawable-ldpi-v9/ic_stat_notify.png | Bin 466 -> 0 bytes res/drawable-ldpi/ic_action_browse.png | Bin 729 -> 0 bytes res/drawable-ldpi/ic_action_start.png | Bin 255 -> 0 bytes res/drawable-ldpi/ic_menu_agenda.png | Bin 1010 -> 0 bytes res/drawable-ldpi/ic_menu_clear_playlist.png | Bin 1163 -> 0 bytes res/drawable-ldpi/ic_stat_notify.png | Bin 761 -> 0 bytes res/drawable-mdpi-v11/ic_menu_agenda.png | Bin 1010 -> 0 bytes res/drawable-mdpi-v11/ic_menu_clear_playlist.png | Bin 1163 -> 0 bytes res/drawable-mdpi-v11/ic_stat_notify.png | Bin 563 -> 0 bytes res/drawable-mdpi-v9/ic_menu_agenda.png | Bin 1010 -> 0 bytes res/drawable-mdpi-v9/ic_menu_clear_playlist.png | Bin 1163 -> 0 bytes res/drawable-mdpi-v9/ic_stat_notify.png | Bin 644 -> 0 bytes res/drawable-mdpi/ic_action_browse.png | Bin 1072 -> 0 bytes res/drawable-mdpi/ic_action_start.png | Bin 305 -> 0 bytes res/drawable-mdpi/ic_menu_agenda.png | Bin 1010 -> 0 bytes res/drawable-mdpi/ic_menu_clear_playlist.png | Bin 1163 -> 0 bytes res/drawable-mdpi/ic_stat_notify.png | Bin 1033 -> 0 bytes res/drawable-xhdpi-v11/ic_menu_agenda.png | Bin 1010 -> 0 bytes res/drawable-xhdpi-v11/ic_menu_clear_playlist.png | Bin 1163 -> 0 bytes res/drawable-xhdpi-v11/ic_stat_notify.png | Bin 1203 -> 0 bytes res/drawable-xhdpi-v9/ic_menu_agenda.png | Bin 1010 -> 0 bytes res/drawable-xhdpi-v9/ic_menu_clear_playlist.png | Bin 1163 -> 0 bytes res/drawable-xhdpi-v9/ic_stat_notify.png | Bin 1445 -> 0 bytes res/drawable-xhdpi/ic_action_browse.png | Bin 2616 -> 0 bytes res/drawable-xhdpi/ic_action_start.png | Bin 585 -> 0 bytes res/drawable-xhdpi/ic_menu_agenda.png | Bin 1010 -> 0 bytes res/drawable-xhdpi/ic_menu_clear_playlist.png | Bin 1163 -> 0 bytes res/drawable-xhdpi/ic_stat_notify.png | Bin 2324 -> 0 bytes res/drawable-xxhdpi/ic_menu_agenda.png | Bin 1010 -> 0 bytes res/drawable-xxhdpi/ic_menu_clear_playlist.png | Bin 1163 -> 0 bytes res/drawable-xxxhdpi/ic_menu_agenda.png | Bin 1010 -> 0 bytes res/drawable-xxxhdpi/ic_menu_clear_playlist.png | Bin 1163 -> 0 bytes res/drawable/bindingtile.png | Bin 27503 -> 0 bytes res/drawable/button_stop.png | Bin 1462 -> 0 bytes res/drawable/geometric.png | Bin 4770 -> 0 bytes res/drawable/ic_inverse.png | Bin 1027 -> 0 bytes res/drawable/ic_menu_agenda.png | Bin 1010 -> 0 bytes res/drawable/ic_menu_check.png | Bin 2709 -> 0 bytes res/drawable/ic_menu_clear_playlist.png | Bin 1163 -> 0 bytes res/drawable/ic_menu_home.png | Bin 2048 -> 0 bytes res/drawable/ic_menu_reports.png | Bin 2379 -> 0 bytes res/drawable/ic_menu_settings.png | Bin 2905 -> 0 bytes res/drawable/icon_firefox.png | Bin 5627 -> 0 bytes res/drawable/menu_settings.png | Bin 1227 -> 0 bytes res/drawable/menu_start.png | Bin 1202 -> 0 bytes res/drawable/nav_refresh.png | Bin 3138 -> 0 bytes res/drawable/onion.png | Bin 12877 -> 0 bytes res/drawable/proxymob.png | Bin 11265 -> 0 bytes res/drawable/tor128.png | Bin 16062 -> 0 bytes res/drawable/torerror.png | Bin 14633 -> 0 bytes res/drawable/torstopping.png | Bin 14633 -> 0 bytes res/drawable/txture.png | Bin 56071 -> 0 bytes res/drawable/vidalia.png | Bin 16062 -> 0 bytes res/drawable/warning.png | Bin 2735 -> 0 bytes 70 files changed, 0 insertions(+), 0 deletions(-) diff --git a/res/drawable-hdpi-v11/ic_menu_agenda.png b/res/drawable-hdpi-v11/ic_menu_agenda.png deleted file mode 100755 index c63a12b..0000000 Binary files a/res/drawable-hdpi-v11/ic_menu_agenda.png and /dev/null differ diff --git a/res/drawable-hdpi-v11/ic_menu_clear_playlist.png b/res/drawable-hdpi-v11/ic_menu_clear_playlist.png deleted file mode 100644 index 9100a69..0000000 Binary files a/res/drawable-hdpi-v11/ic_menu_clear_playlist.png and /dev/null differ diff --git a/res/drawable-hdpi-v11/ic_stat_notify.png b/res/drawable-hdpi-v11/ic_stat_notify.png deleted file mode 100644 index f977038..0000000 Binary files a/res/drawable-hdpi-v11/ic_stat_notify.png and /dev/null differ diff --git a/res/drawable-hdpi-v9/ic_menu_agenda.png b/res/drawable-hdpi-v9/ic_menu_agenda.png deleted file mode 100755 index c63a12b..0000000 Binary files a/res/drawable-hdpi-v9/ic_menu_agenda.png and /dev/null differ diff --git a/res/drawable-hdpi-v9/ic_menu_clear_playlist.png b/res/drawable-hdpi-v9/ic_menu_clear_playlist.png deleted file mode 100644 index 9100a69..0000000 Binary files a/res/drawable-hdpi-v9/ic_menu_clear_playlist.png and /dev/null differ diff --git a/res/drawable-hdpi-v9/ic_stat_notify.png b/res/drawable-hdpi-v9/ic_stat_notify.png deleted file mode 100644 index 45e749e..0000000 Binary files a/res/drawable-hdpi-v9/ic_stat_notify.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_action_browse.png b/res/drawable-hdpi/ic_action_browse.png deleted file mode 100644 index 0972bbd..0000000 Binary files a/res/drawable-hdpi/ic_action_browse.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_action_start.png b/res/drawable-hdpi/ic_action_start.png deleted file mode 100644 index 8b7b829..0000000 Binary files a/res/drawable-hdpi/ic_action_start.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_menu_agenda.png b/res/drawable-hdpi/ic_menu_agenda.png deleted file mode 100755 index c63a12b..0000000 Binary files a/res/drawable-hdpi/ic_menu_agenda.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_menu_clear_playlist.png b/res/drawable-hdpi/ic_menu_clear_playlist.png deleted file mode 100644 index 9100a69..0000000 Binary files a/res/drawable-hdpi/ic_menu_clear_playlist.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_stat_notify.png b/res/drawable-hdpi/ic_stat_notify.png deleted file mode 100644 index 06a4259..0000000 Binary files a/res/drawable-hdpi/ic_stat_notify.png and /dev/null differ diff --git a/res/drawable-ldpi-v11/ic_menu_agenda.png b/res/drawable-ldpi-v11/ic_menu_agenda.png deleted file mode 100755 index c63a12b..0000000 Binary files a/res/drawable-ldpi-v11/ic_menu_agenda.png and /dev/null differ diff --git a/res/drawable-ldpi-v11/ic_menu_clear_playlist.png b/res/drawable-ldpi-v11/ic_menu_clear_playlist.png deleted file mode 100644 index 9100a69..0000000 Binary files a/res/drawable-ldpi-v11/ic_menu_clear_playlist.png and /dev/null differ diff --git a/res/drawable-ldpi-v11/ic_stat_notify.png b/res/drawable-ldpi-v11/ic_stat_notify.png deleted file mode 100644 index 9fdf779..0000000 Binary files a/res/drawable-ldpi-v11/ic_stat_notify.png and /dev/null differ diff --git a/res/drawable-ldpi-v9/ic_menu_agenda.png b/res/drawable-ldpi-v9/ic_menu_agenda.png deleted file mode 100755 index c63a12b..0000000 Binary files a/res/drawable-ldpi-v9/ic_menu_agenda.png and /dev/null differ diff --git a/res/drawable-ldpi-v9/ic_menu_clear_playlist.png b/res/drawable-ldpi-v9/ic_menu_clear_playlist.png deleted file mode 100644 index 9100a69..0000000 Binary files a/res/drawable-ldpi-v9/ic_menu_clear_playlist.png and /dev/null differ diff --git a/res/drawable-ldpi-v9/ic_stat_notify.png b/res/drawable-ldpi-v9/ic_stat_notify.png deleted file mode 100644 index 2a93206..0000000 Binary files a/res/drawable-ldpi-v9/ic_stat_notify.png and /dev/null differ diff --git a/res/drawable-ldpi/ic_action_browse.png b/res/drawable-ldpi/ic_action_browse.png deleted file mode 100644 index 9cf751b..0000000 Binary files a/res/drawable-ldpi/ic_action_browse.png and /dev/null differ diff --git a/res/drawable-ldpi/ic_action_start.png b/res/drawable-ldpi/ic_action_start.png deleted file mode 100644 index fc098d2..0000000 Binary files a/res/drawable-ldpi/ic_action_start.png and /dev/null differ diff --git a/res/drawable-ldpi/ic_menu_agenda.png b/res/drawable-ldpi/ic_menu_agenda.png deleted file mode 100755 index c63a12b..0000000 Binary files a/res/drawable-ldpi/ic_menu_agenda.png and /dev/null differ diff --git a/res/drawable-ldpi/ic_menu_clear_playlist.png b/res/drawable-ldpi/ic_menu_clear_playlist.png deleted file mode 100644 index 9100a69..0000000 Binary files a/res/drawable-ldpi/ic_menu_clear_playlist.png and /dev/null differ diff --git a/res/drawable-ldpi/ic_stat_notify.png b/res/drawable-ldpi/ic_stat_notify.png deleted file mode 100644 index 70ae017..0000000 Binary files a/res/drawable-ldpi/ic_stat_notify.png and /dev/null differ diff --git a/res/drawable-mdpi-v11/ic_menu_agenda.png b/res/drawable-mdpi-v11/ic_menu_agenda.png deleted file mode 100755 index c63a12b..0000000 Binary files a/res/drawable-mdpi-v11/ic_menu_agenda.png and /dev/null differ diff --git a/res/drawable-mdpi-v11/ic_menu_clear_playlist.png b/res/drawable-mdpi-v11/ic_menu_clear_playlist.png deleted file mode 100644 index 9100a69..0000000 Binary files a/res/drawable-mdpi-v11/ic_menu_clear_playlist.png and /dev/null differ diff --git a/res/drawable-mdpi-v11/ic_stat_notify.png b/res/drawable-mdpi-v11/ic_stat_notify.png deleted file mode 100644 index 8e4f9bf..0000000 Binary files a/res/drawable-mdpi-v11/ic_stat_notify.png and /dev/null differ diff --git a/res/drawable-mdpi-v9/ic_menu_agenda.png b/res/drawable-mdpi-v9/ic_menu_agenda.png deleted file mode 100755 index c63a12b..0000000 Binary files a/res/drawable-mdpi-v9/ic_menu_agenda.png and /dev/null differ diff --git a/res/drawable-mdpi-v9/ic_menu_clear_playlist.png b/res/drawable-mdpi-v9/ic_menu_clear_playlist.png deleted file mode 100644 index 9100a69..0000000 Binary files a/res/drawable-mdpi-v9/ic_menu_clear_playlist.png and /dev/null differ diff --git a/res/drawable-mdpi-v9/ic_stat_notify.png b/res/drawable-mdpi-v9/ic_stat_notify.png deleted file mode 100644 index 19fbc97..0000000 Binary files a/res/drawable-mdpi-v9/ic_stat_notify.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_action_browse.png b/res/drawable-mdpi/ic_action_browse.png deleted file mode 100644 index cb6075f..0000000 Binary files a/res/drawable-mdpi/ic_action_browse.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_action_start.png b/res/drawable-mdpi/ic_action_start.png deleted file mode 100644 index 7d9f391..0000000 Binary files a/res/drawable-mdpi/ic_action_start.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_menu_agenda.png b/res/drawable-mdpi/ic_menu_agenda.png deleted file mode 100755 index c63a12b..0000000 Binary files a/res/drawable-mdpi/ic_menu_agenda.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_menu_clear_playlist.png b/res/drawable-mdpi/ic_menu_clear_playlist.png deleted file mode 100644 index 9100a69..0000000 Binary files a/res/drawable-mdpi/ic_menu_clear_playlist.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_stat_notify.png b/res/drawable-mdpi/ic_stat_notify.png deleted file mode 100644 index 48f1670..0000000 Binary files a/res/drawable-mdpi/ic_stat_notify.png and /dev/null differ diff --git a/res/drawable-xhdpi-v11/ic_menu_agenda.png b/res/drawable-xhdpi-v11/ic_menu_agenda.png deleted file mode 100755 index c63a12b..0000000 Binary files a/res/drawable-xhdpi-v11/ic_menu_agenda.png and /dev/null differ diff --git a/res/drawable-xhdpi-v11/ic_menu_clear_playlist.png b/res/drawable-xhdpi-v11/ic_menu_clear_playlist.png deleted file mode 100644 index 9100a69..0000000 Binary files a/res/drawable-xhdpi-v11/ic_menu_clear_playlist.png and /dev/null differ diff --git a/res/drawable-xhdpi-v11/ic_stat_notify.png b/res/drawable-xhdpi-v11/ic_stat_notify.png deleted file mode 100644 index 75d0aef..0000000 Binary files a/res/drawable-xhdpi-v11/ic_stat_notify.png and /dev/null differ diff --git a/res/drawable-xhdpi-v9/ic_menu_agenda.png b/res/drawable-xhdpi-v9/ic_menu_agenda.png deleted file mode 100755 index c63a12b..0000000 Binary files a/res/drawable-xhdpi-v9/ic_menu_agenda.png and /dev/null differ diff --git a/res/drawable-xhdpi-v9/ic_menu_clear_playlist.png b/res/drawable-xhdpi-v9/ic_menu_clear_playlist.png deleted file mode 100644 index 9100a69..0000000 Binary files a/res/drawable-xhdpi-v9/ic_menu_clear_playlist.png and /dev/null differ diff --git a/res/drawable-xhdpi-v9/ic_stat_notify.png b/res/drawable-xhdpi-v9/ic_stat_notify.png deleted file mode 100644 index b9ec593..0000000 Binary files a/res/drawable-xhdpi-v9/ic_stat_notify.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_action_browse.png b/res/drawable-xhdpi/ic_action_browse.png deleted file mode 100644 index d7ca5b6..0000000 Binary files a/res/drawable-xhdpi/ic_action_browse.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_action_start.png b/res/drawable-xhdpi/ic_action_start.png deleted file mode 100644 index f45cadd..0000000 Binary files a/res/drawable-xhdpi/ic_action_start.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_agenda.png b/res/drawable-xhdpi/ic_menu_agenda.png deleted file mode 100755 index c63a12b..0000000 Binary files a/res/drawable-xhdpi/ic_menu_agenda.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_clear_playlist.png b/res/drawable-xhdpi/ic_menu_clear_playlist.png deleted file mode 100644 index 9100a69..0000000 Binary files a/res/drawable-xhdpi/ic_menu_clear_playlist.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_stat_notify.png b/res/drawable-xhdpi/ic_stat_notify.png deleted file mode 100644 index 71be265..0000000 Binary files a/res/drawable-xhdpi/ic_stat_notify.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_menu_agenda.png b/res/drawable-xxhdpi/ic_menu_agenda.png deleted file mode 100755 index c63a12b..0000000 Binary files a/res/drawable-xxhdpi/ic_menu_agenda.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_menu_clear_playlist.png b/res/drawable-xxhdpi/ic_menu_clear_playlist.png deleted file mode 100644 index 9100a69..0000000 Binary files a/res/drawable-xxhdpi/ic_menu_clear_playlist.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_menu_agenda.png b/res/drawable-xxxhdpi/ic_menu_agenda.png deleted file mode 100755 index c63a12b..0000000 Binary files a/res/drawable-xxxhdpi/ic_menu_agenda.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_menu_clear_playlist.png b/res/drawable-xxxhdpi/ic_menu_clear_playlist.png deleted file mode 100644 index 9100a69..0000000 Binary files a/res/drawable-xxxhdpi/ic_menu_clear_playlist.png and /dev/null differ diff --git a/res/drawable/bindingtile.png b/res/drawable/bindingtile.png deleted file mode 100644 index 7a325e9..0000000 Binary files a/res/drawable/bindingtile.png and /dev/null differ diff --git a/res/drawable/button_stop.png b/res/drawable/button_stop.png deleted file mode 100644 index d97a3a8..0000000 Binary files a/res/drawable/button_stop.png and /dev/null differ diff --git a/res/drawable/geometric.png b/res/drawable/geometric.png deleted file mode 100644 index 07f5137..0000000 Binary files a/res/drawable/geometric.png and /dev/null differ diff --git a/res/drawable/ic_inverse.png b/res/drawable/ic_inverse.png deleted file mode 100644 index 65eff2c..0000000 Binary files a/res/drawable/ic_inverse.png and /dev/null differ diff --git a/res/drawable/ic_menu_agenda.png b/res/drawable/ic_menu_agenda.png deleted file mode 100755 index c63a12b..0000000 Binary files a/res/drawable/ic_menu_agenda.png and /dev/null differ diff --git a/res/drawable/ic_menu_check.png b/res/drawable/ic_menu_check.png deleted file mode 100644 index c187304..0000000 Binary files a/res/drawable/ic_menu_check.png and /dev/null differ diff --git a/res/drawable/ic_menu_clear_playlist.png b/res/drawable/ic_menu_clear_playlist.png deleted file mode 100644 index 9100a69..0000000 Binary files a/res/drawable/ic_menu_clear_playlist.png and /dev/null differ diff --git a/res/drawable/ic_menu_home.png b/res/drawable/ic_menu_home.png deleted file mode 100644 index 34943f6..0000000 Binary files a/res/drawable/ic_menu_home.png and /dev/null differ diff --git a/res/drawable/ic_menu_reports.png b/res/drawable/ic_menu_reports.png deleted file mode 100644 index f61bbd8..0000000 Binary files a/res/drawable/ic_menu_reports.png and /dev/null differ diff --git a/res/drawable/ic_menu_settings.png b/res/drawable/ic_menu_settings.png deleted file mode 100644 index 2e88b0f..0000000 Binary files a/res/drawable/ic_menu_settings.png and /dev/null differ diff --git a/res/drawable/icon_firefox.png b/res/drawable/icon_firefox.png deleted file mode 100644 index 65d6684..0000000 Binary files a/res/drawable/icon_firefox.png and /dev/null differ diff --git a/res/drawable/menu_settings.png b/res/drawable/menu_settings.png deleted file mode 100644 index 577e055..0000000 Binary files a/res/drawable/menu_settings.png and /dev/null differ diff --git a/res/drawable/menu_start.png b/res/drawable/menu_start.png deleted file mode 100644 index 2d0d2e2..0000000 Binary files a/res/drawable/menu_start.png and /dev/null differ diff --git a/res/drawable/nav_refresh.png b/res/drawable/nav_refresh.png deleted file mode 100644 index bb9d855..0000000 Binary files a/res/drawable/nav_refresh.png and /dev/null differ diff --git a/res/drawable/onion.png b/res/drawable/onion.png deleted file mode 100644 index 2285819..0000000 Binary files a/res/drawable/onion.png and /dev/null differ diff --git a/res/drawable/proxymob.png b/res/drawable/proxymob.png deleted file mode 100644 index 6e23219..0000000 Binary files a/res/drawable/proxymob.png and /dev/null differ diff --git a/res/drawable/tor128.png b/res/drawable/tor128.png deleted file mode 100644 index f6ce203..0000000 Binary files a/res/drawable/tor128.png and /dev/null differ diff --git a/res/drawable/torerror.png b/res/drawable/torerror.png deleted file mode 100644 index 0e8eeed..0000000 Binary files a/res/drawable/torerror.png and /dev/null differ diff --git a/res/drawable/torstopping.png b/res/drawable/torstopping.png deleted file mode 100644 index 0e8eeed..0000000 Binary files a/res/drawable/torstopping.png and /dev/null differ diff --git a/res/drawable/txture.png b/res/drawable/txture.png deleted file mode 100644 index 2549c49..0000000 Binary files a/res/drawable/txture.png and /dev/null differ diff --git a/res/drawable/vidalia.png b/res/drawable/vidalia.png deleted file mode 100644 index f6ce203..0000000 Binary files a/res/drawable/vidalia.png and /dev/null differ diff --git a/res/drawable/warning.png b/res/drawable/warning.png deleted file mode 100644 index f5371dc..0000000 Binary files a/res/drawable/warning.png and /dev/null differ

1 0